diff options
| author | IIMarckus <iimarckus@gmail.com> | 2015-06-25 23:30:16 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2015-06-25 23:30:16 -0600 |
| commit | 89073da581022316228818272892cb12c851cb68 (patch) | |
| tree | a3a05d6e8ce94f2ce415c9e577cec2766e61935d | |
| parent | ded477e69ec753a3d637e7d590b7fc3cabccf86e (diff) | |
Label flypoint callbacks.
31 files changed, 558 insertions, 951 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index d3732aa1e..e67d7d981 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -97,6 +97,7 @@ EVENT_GOT_TM12_SWEET_SCENT EQU $07a EVENT_RELEASED_THE_BEASTS EQU $07b EVENT_GOT_MASTER_BALL_FROM_ELM EQU $07c EVENT_FOUND_REVIVE_IN_ROCKET_BASE_B1F EQU $086 +EVENT_MET_FLORIA EQU $0b9 EVENT_CAN_GIVE_GS_BALL_TO_KURT EQU $0be EVENT_RETURNED_MACHINE_PART EQU $0c9 EVENT_MET_MANAGER_AT_POWER_PLANT EQU $0ca @@ -570,6 +571,9 @@ EVENT_RIVAL_SPROUT_TOWER EQU $6c4 EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE EQU $6ff EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER EQU $700 EVENT_ELMS_AIDE_IN_LAB EQU $701 +EVENT_BOULDER_IN_BLACKTHORN_GYM_1 EQU $706 +EVENT_BOULDER_IN_BLACKTHORN_GYM_2 EQU $707 +EVENT_BOULDER_IN_BLACKTHORN_GYM_3 EQU $708 EVENT_BOULDER_IN_ICE_PATH_1 EQU $70d EVENT_BOULDER_IN_ICE_PATH_2 EQU $70e EVENT_BOULDER_IN_ICE_PATH_3 EQU $70f @@ -577,6 +581,7 @@ EVENT_BOULDER_IN_ICE_PATH_4 EQU $710 EVENT_OPENED_MT_SILVER EQU $74f EVENT_FOUGHT_SNORLAX EQU $750 EVENT_RED_IN_MT_SILVER EQU $762 +EVENT_FLORIA_AT_SUDOWOODO EQU $769 EVENT_TRAINERS_IN_CERULEAN_GYM EQU $76f EVENT_TELEPORT_GUY EQU $77c EVENT_PICKED_UP_FOCUS_BAND EQU $77d diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index dca9e6167..15bdcf56b 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,38 +1,32 @@ -AzaleaTown_MapScriptHeader: ; 0x198000 +AzaleaTown_MapScriptHeader: ; trigger count db 3 ; triggers - dw UnknownScript_0x198011, $0000 - dw UnknownScript_0x198012, $0000 - dw UnknownScript_0x198013, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 ; callback count db 1 ; callbacks + dbw 5, .Flypoint - dbw 5, UnknownScript_0x198014 -; 0x198011 - -UnknownScript_0x198011: ; 0x198011 +.Trigger1 end -; 0x198012 -UnknownScript_0x198012: ; 0x198012 +.Trigger2 end -; 0x198013 -UnknownScript_0x198013: ; 0x198013 +.Trigger3 end -; 0x198014 -UnknownScript_0x198014: ; 0x198014 - setflag $0044 +.Flypoint + setflag ENGINE_FLYPOINT_AZALEA return -; 0x198018 -UnknownScript_0x198018: ; 0x198018 +UnknownScript_0x198018: moveperson $b, $b, $b spriteface $0, $3 showemote $0, $0, 15 @@ -42,9 +36,8 @@ UnknownScript_0x198018: ; 0x198018 applymovement $b, MovementData_0x198134 spriteface $0, $0 jump UnknownScript_0x198049 -; 0x198034 -UnknownScript_0x198034: ; 0x198034 +UnknownScript_0x198034: spriteface $0, $3 showemote $0, $0, 15 special Functionc48f @@ -52,7 +45,7 @@ UnknownScript_0x198034: ; 0x198034 appear $b applymovement $b, MovementData_0x19813c spriteface $0, $1 -UnknownScript_0x198049: ; 0x198049 +UnknownScript_0x198049: playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x19814d @@ -70,9 +63,8 @@ UnknownScript_0x198049: ; 0x198049 reloadmapmusic returnafterbattle jump UnknownScript_0x198091 -; 0x198071 -UnknownScript_0x198071: ; 0x198071 +UnknownScript_0x198071: winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b loadtrainer RIVAL1, RIVAL1_4 @@ -80,9 +72,8 @@ UnknownScript_0x198071: ; 0x198071 reloadmapmusic returnafterbattle jump UnknownScript_0x198091 -; 0x198081 -UnknownScript_0x198081: ; 0x198081 +UnknownScript_0x198081: winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b loadtrainer RIVAL1, RIVAL1_5 @@ -90,9 +81,8 @@ UnknownScript_0x198081: ; 0x198081 reloadmapmusic returnafterbattle jump UnknownScript_0x198091 -; 0x198091 -UnknownScript_0x198091: ; 0x198091 +UnknownScript_0x198091: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x198233 @@ -106,17 +96,14 @@ UnknownScript_0x198091: ; 0x198091 waitbutton playmapmusic end -; 0x1980ab -AzaleaRocketScript_0x1980ab: ; 0x1980ab +AzaleaRocketScript_0x1980ab: jumptextfaceplayer UnknownText_0x19837b -; 0x1980ae -AzaleaRocketScript_0x1980ae: ; 0x1980ae +AzaleaRocketScript_0x1980ae: jumptextfaceplayer UnknownText_0x1983c7 -; 0x1980b1 -GrampsScript_0x1980b1: ; 0x1980b1 +GrampsScript_0x1980b1: faceplayer loadfont checkevent EVENT_CLEARED_SLOWPOKE_WELL @@ -125,24 +112,20 @@ GrampsScript_0x1980b1: ; 0x1980b1 closetext loadmovesprites end -; 0x1980bf -UnknownScript_0x1980bf: ; 0x1980bf +UnknownScript_0x1980bf: writetext UnknownText_0x198473 closetext loadmovesprites end -; 0x1980c5 -TeacherScript_0x1980c5: ; 0x1980c5 +TeacherScript_0x1980c5: jumptextfaceplayer UnknownText_0x1984ce -; 0x1980c8 -YoungsterScript_0x1980c8: ; 0x1980c8 +YoungsterScript_0x1980c8: jumptextfaceplayer UnknownText_0x19851a -; 0x1980cb -SlowpokeScript_0x1980cb: ; 0x1980cb +SlowpokeScript_0x1980cb: loadfont writetext UnknownText_0x1985b0 pause 60 @@ -151,9 +134,8 @@ SlowpokeScript_0x1980cb: ; 0x1980cb closetext loadmovesprites end -; 0x1980da -WoosterScript: ; 0x1980da +WoosterScript: ; unused faceplayer loadfont @@ -162,9 +144,8 @@ WoosterScript: ; 0x1980da closetext loadmovesprites end -; 0x1980e5 -UnknownScript_0x1980e5: ; 0x1980e5 +UnknownScript_0x1980e5: applymovement $0, MovementData_0x198148 loadfont writetext UnknownText_0x1985df @@ -182,9 +163,8 @@ UnknownScript_0x1980e5: ; 0x1980e5 dotrigger $0 loadmovesprites end -; 0x19810c -KurtOutsideScript_0x19810c: ; 0x19810c +KurtOutsideScript_0x19810c: faceplayer loadfont writetext UnknownText_0x198628 @@ -192,7 +172,6 @@ KurtOutsideScript_0x19810c: ; 0x19810c spriteface $d, $2 loadmovesprites end -; 0x198117 AzaleaTownSign: jumptext AzaleaTownSignText @@ -221,13 +200,12 @@ AzaleaTownMartSign: WhiteApricornTree: fruittree $14 -MapAzaleaTownSignpostItem8: ; 0x198131 +MapAzaleaTownSignpostItem8: dw $00b1 db FULL_HEAL -; 0x198134 -MovementData_0x198134: ; 0x198134 +MovementData_0x198134: step_left step_left step_left @@ -236,9 +214,8 @@ MovementData_0x198134: ; 0x198134 step_left turn_head_up step_end -; 0x19813c -MovementData_0x19813c: ; 0x19813c +MovementData_0x19813c: step_left step_left step_left @@ -247,24 +224,21 @@ MovementData_0x19813c: ; 0x19813c step_left turn_head_down step_end -; 0x198144 -MovementData_0x198144: ; 0x198144 +MovementData_0x198144: step_left step_left step_left step_end -; 0x198148 -MovementData_0x198148: ; 0x198148 +MovementData_0x198148: step_left step_left step_up turn_head_left step_end -; 0x19814d -UnknownText_0x19814d: ; 0x19814d +UnknownText_0x19814d: text "…Tell me some-" line "thing." @@ -280,9 +254,8 @@ UnknownText_0x19814d: ; 0x19814d line "Then let's see how" cont "good you are." done -; 0x1981e6 -UnknownText_0x1981e6: ; 0x1981e6 +UnknownText_0x1981e6: text "… Humph! Useless" line "#MON!" @@ -292,9 +265,8 @@ UnknownText_0x1981e6: ; 0x1981e6 para "my #MON were" line "weak." done -; 0x198233 -UnknownText_0x198233: ; 0x198233 +UnknownText_0x198233: text "I hate the weak." para "#MON, trainers." @@ -323,15 +295,13 @@ UnknownText_0x198233: ; 0x198233 para "like you is only a" line "distraction." done -; 0x19835b -UnknownText_0x19835b: ; 0x19835b +UnknownText_0x19835b: text "…Humph! I knew" line "you were lying." done -; 0x19837b -UnknownText_0x19837b: ; 0x19837b +UnknownText_0x19837b: text "It's unsafe to go" line "in there, so I'm" cont "standing guard." @@ -339,9 +309,8 @@ UnknownText_0x19837b: ; 0x19837b para "Aren't I a good" line "Samaritan?" done -; 0x1983c7 -UnknownText_0x1983c7: ; 0x1983c7 +UnknownText_0x1983c7: text "Do you know about" line "SLOWPOKETAIL? I" cont "heard it's tasty!" @@ -349,9 +318,8 @@ UnknownText_0x1983c7: ; 0x1983c7 para "Aren't you glad I" line "told you that?" done -; 0x19841b -UnknownText_0x19841b: ; 0x19841b +UnknownText_0x19841b: text "The SLOWPOKE have" line "disappeared from" cont "town…" @@ -360,9 +328,8 @@ UnknownText_0x19841b: ; 0x19841b line "TAILS are being" cont "sold somewhere." done -; 0x198473 -UnknownText_0x198473: ; 0x198473 +UnknownText_0x198473: text "The SLOWPOKE have" line "returned." @@ -372,9 +339,8 @@ UnknownText_0x198473: ; 0x198473 para "goofing off some-" line "where." done -; 0x1984ce -UnknownText_0x1984ce: ; 0x1984ce +UnknownText_0x1984ce: text "Did you come to" line "get KURT to make" cont "some BALLS?" @@ -382,9 +348,8 @@ UnknownText_0x1984ce: ; 0x1984ce para "A lot of people do" line "just that." done -; 0x19851a -UnknownText_0x19851a: ; 0x19851a +UnknownText_0x19851a: text "Cut through AZALEA" line "and you'll be in" cont "ILEX FOREST." @@ -399,45 +364,38 @@ UnknownText_0x19851a: ; 0x19851a line "#MON can CUT" cont "down trees." done -; 0x1985b0 -UnknownText_0x1985b0: ; 0x1985b0 +UnknownText_0x1985b0: text "SLOWPOKE: …" para $56, " ", $56, " ", $56 done -; 0x1985c3 -UnknownText_0x1985c3: ; 0x1985c3 +UnknownText_0x1985c3: text $56, " ", $56, "Yawn?" done -; 0x1985cd -WoosterText: ; 0x1985cd +WoosterText: text "WOOSTER: Gugyoo…" done -; 0x1985df -UnknownText_0x1985df: ; 0x1985df +UnknownText_0x1985df: text "ILEX FOREST is" line "restless!" para "What is going on?" done -; 0x19860b -UnknownText_0x19860b: ; 0x19860b +UnknownText_0x19860b: text $52, ", here's" line "your GS BALL back!" done -; 0x198628 -UnknownText_0x198628: ; 0x198628 +UnknownText_0x198628: text "Could you go see" line "why ILEX FOREST is" cont "so restless?" done -; 0x19865a AzaleaTownSignText: text "AZALEA TOWN" @@ -489,7 +447,7 @@ AzaleaTownIlexForestSignText: line "gate." done -AzaleaTown_MapEventHeader: ; 0x1987c1 +AzaleaTown_MapEventHeader: ; filler db 0, 0 @@ -536,4 +494,3 @@ AzaleaTown_MapEventHeader: ; 0x1987c1 person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4 -; 0x1988d0 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 4628a134f..4f0055689 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,4 +1,4 @@ -BattleTowerOutside_MapScriptHeader: ; 0x9f852 +BattleTowerOutside_MapScriptHeader: ; trigger count db 0 @@ -6,47 +6,37 @@ BattleTowerOutside_MapScriptHeader: ; 0x9f852 db 2 ; callbacks + dbw 1, .Callback1 + dbw 2, .Callback2 - dbw 1, UnknownScript_0x9f85a - - dbw 2, UnknownScript_0x9f85b -; 0x9f85a - -UnknownScript_0x9f85a: ; 0x9f85a +.Callback1 return -; 0x9f85b -UnknownScript_0x9f85b: ; 0x9f85b +.Callback2 clearevent $07cf return -; 0x9f85f -StandingYoungsterScript_0x9f85f: ; 0x9f85f +StandingYoungsterScript_0x9f85f: jumptextfaceplayer UnknownText_0x9f930 -; 0x9f862 -BuenaScript_0x9f862: ; 0x9f862 +BuenaScript_0x9f862: jumptextfaceplayer UnknownText_0x9f9db -; 0x9f865 -SailorScript_0x9f865: ; 0x9f865 +SailorScript_0x9f865: jumptextfaceplayer UnknownText_0x9fa8c -; 0x9f868 -MapBattleTowerOutsideSignpost0Script: ; 0x9f868 +MapBattleTowerOutsideSignpost0Script: jumptext UnknownText_0x9fafc -; 0x9f86b -UnknownText_0x9f86b: ; 0x9f86b +UnknownText_0x9f86b: text "Wow, the BATTLE" line "TOWER is huge! My" para "neck is tired from" line "looking up at it." done -; 0x9f8b3 -UnknownText_0x9f8b3: ; 0x9f8b3 +UnknownText_0x9f8b3: text "Wow, the BATTLE" line "TOWER is huge!" @@ -59,9 +49,8 @@ UnknownText_0x9f8b3: ; 0x9f8b3 para "a wide variety of" line "#MON." done -; 0x9f930 -UnknownText_0x9f930: ; 0x9f930 +UnknownText_0x9f930: text "Wow, the BATTLE" line "TOWER is huge!" @@ -69,9 +58,8 @@ UnknownText_0x9f930: ; 0x9f930 line "kinds of #MON" cont "in there!" done -; 0x9f97b -UnknownText_0x9f97b: ; 0x9f97b +UnknownText_0x9f97b: text "What on earth do" line "they do here?" @@ -81,9 +69,8 @@ UnknownText_0x9f97b: ; 0x9f97b para "it must be for" line "#MON battles." done -; 0x9f9db -UnknownText_0x9f9db: ; 0x9f9db +UnknownText_0x9f9db: text "You can use only" line "three #MON." @@ -93,9 +80,8 @@ UnknownText_0x9f9db: ; 0x9f9db para "should go into" line "battle…" done -; 0x9fa32 -UnknownText_0x9fa32: ; 0x9fa32 +UnknownText_0x9fa32: text "Ehehehe…" line "I sneaked out of" cont "work to come here." @@ -104,9 +90,8 @@ UnknownText_0x9fa32: ; 0x9fa32 line "up until I become" cont "a LEADER!" done -; 0x9fa8c -UnknownText_0x9fa8c: ; 0x9fa8c +UnknownText_0x9fa8c: text "Hehehe, I snuck" line "out from work." @@ -116,33 +101,28 @@ UnknownText_0x9fa8c: ; 0x9fa8c para "I have to win it" line "all. That I must!" done -; 0x9faee -UnknownText_0x9faee: ; 0x9faee +UnknownText_0x9faee: text "BATTLE TOWER" done -; 0x9fafc -UnknownText_0x9fafc: ; 0x9fafc +UnknownText_0x9fafc: text "BATTLE TOWER" para "Take the Ultimate" line "Trainer Challenge!" done -; 0x9fb2f -UnknownText_0x9fb2f: ; 0x9fb2f +UnknownText_0x9fb2f: text "The BATTLE TOWER's" line "doors are closed…" done -; 0x9fb54 -UnknownText_0x9fb54: ; 0x9fb54 +UnknownText_0x9fb54: text "It's open!" done -; 0x9fb5f -BattleTowerOutside_MapEventHeader: ; 0x9fb5f +BattleTowerOutside_MapEventHeader: ; filler db 0, 0 @@ -166,4 +146,3 @@ BattleTowerOutside_MapEventHeader: ; 0x9fb5f person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, $ffff person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, $07cf person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff -; 0x9fbb2 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 8699891d1..22ab61f05 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ -BlackthornCity_MapScriptHeader: ; 0x1a46d0 +BlackthornCity_MapScriptHeader: ; trigger count db 0 @@ -6,17 +6,14 @@ BlackthornCity_MapScriptHeader: ; 0x1a46d0 db 2 ; callbacks + dbw 5, .FlyPoint + dbw 2, .Santos - dbw 5, UnknownScript_0x1a46d8 - - dbw 2, SantosCallback - -UnknownScript_0x1a46d8: ; 0x1a46d8 - setflag $004b +.FlyPoint + setflag ENGINE_FLYPOINT_BLACKTHORN return -; 0x1a46dc -SantosCallback: +.Santos checkcode $b if_equal SATURDAY, .SantosAppears disappear $9 @@ -26,7 +23,7 @@ SantosCallback: appear $9 return -SuperNerdScript_0x1a46e8: ; 0x1a46e8 +SuperNerdScript_0x1a46e8: faceplayer loadfont checkevent EVENT_BEAT_CLAIR @@ -37,31 +34,26 @@ SuperNerdScript_0x1a46e8: ; 0x1a46e8 closetext loadmovesprites end -; 0x1a46fc -UnknownScript_0x1a46fc: ; 0x1a46fc +UnknownScript_0x1a46fc: writetext UnknownText_0x1a47f3 closetext loadmovesprites end -; 0x1a4702 -UnknownScript_0x1a4702: ; 0x1a4702 +UnknownScript_0x1a4702: writetext UnknownText_0x1a4865 closetext loadmovesprites end -; 0x1a4708 -GrampsScript_0x1a4708: ; 0x1a4708 +GrampsScript_0x1a4708: jumptextfaceplayer UnknownText_0x1a48c3 -; 0x1a470b -GrampsScript_0x1a470b: ; 0x1a470b +GrampsScript_0x1a470b: jumptextfaceplayer UnknownText_0x1a48fb -; 0x1a470e -BlackBeltScript_0x1a470e: ; 0x1a470e +BlackBeltScript_0x1a470e: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER @@ -70,26 +62,21 @@ BlackBeltScript_0x1a470e: ; 0x1a470e closetext loadmovesprites end -; 0x1a471c -UnknownScript_0x1a471c: ; 0x1a471c +UnknownScript_0x1a471c: writetext UnknownText_0x1a4983 closetext loadmovesprites end -; 0x1a4722 -CooltrainerFScript_0x1a4722: ; 0x1a4722 +CooltrainerFScript_0x1a4722: jumptextfaceplayer UnknownText_0x1a49bd -; 0x1a4725 -YoungsterScript_0x1a4725: ; 0x1a4725 +YoungsterScript_0x1a4725: jumptextfaceplayer UnknownText_0x1a49f1 -; 0x1a4728 -CooltrainerFScript_0x1a4728: ; 0x1a4728 +CooltrainerFScript_0x1a4728: jumptextfaceplayer UnknownText_0x1a4b1e -; 0x1a472b SantosScript: faceplayer @@ -148,7 +135,7 @@ BlackthornCityPokeCenterSign: BlackthornCityMartSign: jumpstd martsign -UnknownText_0x1a477a: ; 0x1a477a +UnknownText_0x1a477a: text "I am sorry." para "CLAIR, our GYM" @@ -161,9 +148,8 @@ UnknownText_0x1a477a: ; 0x1a477a line "when our LEADER" cont "will return." done -; 0x1a47f3 -UnknownText_0x1a47f3: ; 0x1a47f3 +UnknownText_0x1a47f3: text "CLAIR, our GYM" line "LEADER, is waiting" cont "for you." @@ -174,9 +160,8 @@ UnknownText_0x1a47f3: ; 0x1a47f3 para "a run-of-the-mill" line "trainer to win." done -; 0x1a4865 -UnknownText_0x1a4865: ; 0x1a4865 +UnknownText_0x1a4865: text "You defeated" line "CLAIR?" @@ -188,18 +173,16 @@ UnknownText_0x1a4865: ; 0x1a4865 para "anyone other than" line "LANCE." done -; 0x1a48c3 -UnknownText_0x1a48c3: ; 0x1a48c3 +UnknownText_0x1a48c3: text "No. Only chosen" line "trainers may train" para "here." line "Please leave." done -; 0x1a48fb -UnknownText_0x1a48fb: ; 0x1a48fb +UnknownText_0x1a48fb: text "If CLAIR allows" line "it, her grand-" cont "father--our MASTER" @@ -207,37 +190,32 @@ UnknownText_0x1a48fb: ; 0x1a48fb para "You may enter." done -; 0x1a494a -UnknownText_0x1a494a: ; 0x1a494a +UnknownText_0x1a494a: text "My radio's busted?" line "Lately, I only get" cont "this weird signal." done -; 0x1a4983 -UnknownText_0x1a4983: ; 0x1a4983 +UnknownText_0x1a4983: text "Arooo! Voices in" line "my head!" para "Huh? I'm listening" line "to my radio!" done -; 0x1a49bd -UnknownText_0x1a49bd: ; 0x1a49bd +UnknownText_0x1a49bd: text "Are you going to" line "make your #MON" cont "forget some moves?" done -; 0x1a49f1 -UnknownText_0x1a49f1: ; 0x1a49f1 +UnknownText_0x1a49f1: text "Dragon masters all" line "come from the city" cont "of BLACKTHORN." done -; 0x1a4a27 MeetSantosText: text "SANTOS: …" @@ -279,7 +257,7 @@ SantosNotSaturdayText: line "not Saturday…" done -UnknownText_0x1a4b1e: ; 0x1a4b1e +UnknownText_0x1a4b1e: text "Wow, you came" line "through the ICE" cont "PATH?" @@ -287,7 +265,6 @@ UnknownText_0x1a4b1e: ; 0x1a4b1e para "You must be a real" line "hotshot trainer!" done -; 0x1a4b67 BlackthornCitySignText: text "BLACKTHORN CITY" @@ -296,7 +273,7 @@ BlackthornCitySignText: line "Retreat" done -BlackthornGymSignText: ; 0x1a4b91 +BlackthornGymSignText: text "BLACKTHORN CITY" line "#MON GYM" cont "LEADER: CLAIR" @@ -304,7 +281,6 @@ BlackthornGymSignText: ; 0x1a4b91 para "The Blessed User" line "of Dragon #MON" done -; 0x1a4bd9 MoveDeletersHouseSignText: text "MOVE DELETER'S" @@ -316,7 +292,7 @@ DragonDensSignText: line "AHEAD" done -BlackthornCityTrainerTipsText: ; 0x1a4c03 +BlackthornCityTrainerTipsText: text "TRAINER TIPS" para "A #MON holding" @@ -326,9 +302,8 @@ BlackthornCityTrainerTipsText: ; 0x1a4c03 line "of any status" cont "problem." done -; 0x1a4c57 -BlackthornCity_MapEventHeader: ; 0x1a4c57 +BlackthornCity_MapEventHeader: ; filler db 0, 0 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 8b15397d3..39e84224b 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ -BlackthornGym1F_MapScriptHeader: ; 0x194e00 +BlackthornGym1F_MapScriptHeader: ; trigger count db 0 @@ -6,27 +6,24 @@ BlackthornGym1F_MapScriptHeader: ; 0x194e00 db 1 ; callbacks + dbw 1, .Boulders - dbw 1, UnknownScript_0x194e05 -; 0x194e05 - -UnknownScript_0x194e05: ; 0x194e05 - checkevent $0706 - iffalse UnknownScript_0x194e0f +.Boulders + checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + iffalse .skip1 changeblock $8, $2, $3b -UnknownScript_0x194e0f: ; 0x194e0f - checkevent $0707 - iffalse UnknownScript_0x194e19 +.skip1 + checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + iffalse .skip2 changeblock $2, $4, $3a -UnknownScript_0x194e19: ; 0x194e19 - checkevent $0708 - iffalse UnknownScript_0x194e23 +.skip2 + checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + iffalse .skip3 changeblock $8, $6, $3b -UnknownScript_0x194e23: ; 0x194e23 +.skip3 return -; 0x194e24 -ClairScript_0x194e24: ; 0x194e24 +ClairScript_0x194e24: faceplayer loadfont checkflag $0022 @@ -54,16 +51,14 @@ ClairScript_0x194e24: ; 0x194e24 setevent $074c clearevent $074d end -; 0x194e63 -UnknownScript_0x194e63: ; 0x194e63 +UnknownScript_0x194e63: writetext UnknownText_0x195162 closetext loadmovesprites end -; 0x194e69 -UnknownScript_0x194e69: ; 0x194e69 +UnknownScript_0x194e69: checkevent EVENT_GOT_TM24_DRAGONBREATH iftrue UnknownScript_0x194e94 writetext UnknownText_0x195196 @@ -79,23 +74,20 @@ UnknownScript_0x194e69: ; 0x194e69 writetext UnknownText_0x1951d1 keeptextopen jump UnknownScript_0x194e94 -; 0x194e8e -UnknownScript_0x194e8e: ; 0x194e8e +UnknownScript_0x194e8e: writetext UnknownText_0x19524f closetext loadmovesprites end -; 0x194e94 -UnknownScript_0x194e94: ; 0x194e94 +UnknownScript_0x194e94: writetext UnknownText_0x195272 closetext loadmovesprites end -; 0x194e9a -TrainerCooltrainermPaul: ; 0x194e9a +TrainerCooltrainermPaul: ; bit/flag number dw $54a @@ -113,18 +105,16 @@ TrainerCooltrainermPaul: ; 0x194e9a ; script when talk again dw CooltrainermPaulScript -; 0x194ea6 -CooltrainermPaulScript: ; 0x194ea6 +CooltrainermPaulScript: talkaftercancel loadfont writetext UnknownText_0x1953f1 closetext loadmovesprites end -; 0x194eae -TrainerCooltrainermMike: ; 0x194eae +TrainerCooltrainermMike: ; bit/flag number dw $54c @@ -142,18 +132,16 @@ TrainerCooltrainermMike: ; 0x194eae ; script when talk again dw CooltrainermMikeScript -; 0x194eba -CooltrainermMikeScript: ; 0x194eba +CooltrainermMikeScript: talkaftercancel loadfont writetext UnknownText_0x195467 closetext loadmovesprites end -; 0x194ec2 -TrainerCooltrainerfLola: ; 0x194ec2 +TrainerCooltrainerfLola: ; bit/flag number dw $55e @@ -171,18 +159,16 @@ TrainerCooltrainerfLola: ; 0x194ec2 ; script when talk again dw CooltrainerfLolaScript -; 0x194ece -CooltrainerfLolaScript: ; 0x194ece +CooltrainerfLolaScript: talkaftercancel loadfont writetext UnknownText_0x195516 closetext loadmovesprites end -; 0x194ed6 -BlackthornGymGuyScript: ; 0x194ed6 +BlackthornGymGuyScript: faceplayer loadfont checkevent EVENT_BEAT_CLAIR @@ -197,7 +183,6 @@ BlackthornGymGuyScript: ; 0x194ed6 closetext loadmovesprites end -; 0x194eea BlackthornGymStatue: checkflag ENGINE_RISINGBADGE @@ -207,7 +192,7 @@ BlackthornGymStatue: trainertotext CLAIR, 1, $1 jumpstd gymstatue2 -UnknownText_0x194efa: ; 0x194efa +UnknownText_0x194efa: text "I am CLAIR." para "The world's best" @@ -231,18 +216,16 @@ UnknownText_0x194efa: ; 0x194efa para "power against any" line "opponent!" done -; 0x194fd6 -UnknownText_0x194fd6: ; 0x194fd6 +UnknownText_0x194fd6: text "I lost?" para "I don't believe" line "it. There must be" cont "some mistake…" done -; 0x19500e -UnknownText_0x19500e: ; 0x19500e +UnknownText_0x19500e: text "I won't admit" line "this." @@ -276,31 +259,27 @@ UnknownText_0x19500e: ; 0x19500e line "worthy of a GYM" cont "BADGE!" done -; 0x195162 -UnknownText_0x195162: ; 0x195162 +UnknownText_0x195162: text "What's the matter?" para "Is it too much to" line "expect of you?" done -; 0x195196 -UnknownText_0x195196: ; 0x195196 +UnknownText_0x195196: text "You've kept me" line "waiting!" para "Here! Take this!" done -; 0x1951bf -UnknownText_0x1951bf: ; 0x1951bf +UnknownText_0x1951bf: text $52, " received" line "TM24." done -; 0x1951d1 -UnknownText_0x1951d1: ; 0x1951d1 +UnknownText_0x1951d1: text "That contains" line "DRAGONBREATH." @@ -312,15 +291,13 @@ UnknownText_0x1951d1: ; 0x1951d1 line "it, you don't have" cont "to take it." done -; 0x19524f -UnknownText_0x19524f: ; 0x19524f +UnknownText_0x19524f: text "What is this? You" line "don't have room?" done -; 0x195272 -UnknownText_0x195272: ; 0x195272 +UnknownText_0x195272: text "What's the matter?" para "Aren't you headed" @@ -350,54 +327,47 @@ UnknownText_0x195272: ; 0x195272 para "Give it every-" line "thing you've got." done -; 0x195396 -CooltrainermPaulSeenText: ; 0x195396 +CooltrainermPaulSeenText: text "Your first battle" line "against dragons?" para "I'll show you how" line "tough they are!" done -; 0x1953db -CooltrainermPaulBeatenText: ; 0x1953db +CooltrainermPaulBeatenText: text "My dragon #MON" line "lost?" done -; 0x1953f1 -UnknownText_0x1953f1: ; 0x1953f1 +UnknownText_0x1953f1: text "LANCE told you" line "that he'd like to" para "see you again?" line "Not a chance!" done -; 0x19542f -CooltrainermMikeSeenText: ; 0x19542f +CooltrainermMikeSeenText: text "My chance of" line "losing? Not even" cont "one percent!" done -; 0x19545b -CooltrainermMikeBeatenText: ; 0x19545b +CooltrainermMikeBeatenText: text "That's odd." done -; 0x195467 -UnknownText_0x195467: ; 0x195467 +UnknownText_0x195467: text "I know my short-" line "comings now." para "Thanks for showing" line "me!" done -; 0x19549d -CooltrainerfLolaSeenText: ; 0x19549d +CooltrainerfLolaSeenText: text "Dragons are sacred" line "#MON." @@ -410,21 +380,18 @@ CooltrainerfLolaSeenText: ; 0x19549d para "be able to beat" line "them." done -; 0x19550a -CooltrainerfLolaBeatenText: ; 0x19550a +CooltrainerfLolaBeatenText: text "Way to go!" done -; 0x195516 -UnknownText_0x195516: ; 0x195516 +UnknownText_0x195516: text "Dragons are weak" line "against dragon-" cont "type moves." done -; 0x195544 -BlackthornGymGuyText: ; 0x195544 +BlackthornGymGuyText: text "Yo! CHAMP in" line "making!" @@ -448,9 +415,8 @@ BlackthornGymGuyText: ; 0x195544 para "to be weak against" line "ice-type moves." done -; 0x195632 -BlackthornGymGuyWinText: ; 0x195632 +BlackthornGymGuyWinText: text "You were great to" line "beat CLAIR!" @@ -462,9 +428,8 @@ BlackthornGymGuyWinText: ; 0x195632 line "to becoming the" cont "#MON CHAMPION!" done -; 0x1956ae -BlackthornGym1F_MapEventHeader: ; 0x1956ae +BlackthornGym1F_MapEventHeader: ; filler db 0, 0 @@ -493,4 +458,3 @@ BlackthornGym1F_MapEventHeader: ; 0x1956ae person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, $ffff person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff -; 0x195722 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index ad6d0ccec..b82264200 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ -BlackthornGym2F_MapScriptHeader: ; 0x195722 +BlackthornGym2F_MapScriptHeader: ; trigger count db 0 @@ -6,69 +6,59 @@ BlackthornGym2F_MapScriptHeader: ; 0x195722 db 1 ; callbacks + dbw 3, .Boulders - dbw 3, UnknownScript_0x195727 -; 0x195727 - -UnknownScript_0x195727: ; 0x195727 - writecmdqueue CmdQueue_0x19572b +.Boulders + writecmdqueue .BoulderCmdQueue return -; 0x19572b -CmdQueue_0x19572b: ; 0x19572b - dbw 2, StoneTable_0x195730 ; check if any stones are sitting on a warp +.BoulderCmdQueue + dbw 2, .BoulderTable ; check if any stones are sitting on a warp db 0, 0 ; filler -; 0x195730 -StoneTable_0x195730: ; 0x195730 +.BoulderTable db 5, 4 ; warp, person - dw UnknownScript_0x19573d + dw .Disappear4 db 3, 5 ; warp, person - dw UnknownScript_0x195742 + dw .Disappear5 db 4, 6 ; warp, person - dw UnknownScript_0x195747 + dw .Disappear6 db $ff ; end -; 0x19573d -UnknownScript_0x19573d: ; 0x19573d +.Disappear4 disappear 4 - jump UnknownScript_0x19574c -; 0x195742 + jump .Fall -UnknownScript_0x195742: ; 0x195742 +.Disappear5 disappear 5 - jump UnknownScript_0x19574c -; 0x195747 + jump .Fall -UnknownScript_0x195747: ; 0x195747 +.Disappear6 disappear 6 - jump UnknownScript_0x19574c -; 0x19574c + jump .Fall -UnknownScript_0x19574c: ; 0x19574c +.Fall pause 30 - scall UnknownScript_0x195758 + scall .FX loadfont - writetext UnknownText_0x1958a5 + writetext BlackthornGym2FBoulderFellText closetext loadmovesprites end -; 0x195758 -UnknownScript_0x195758: ; 0x195758 +.FX playsound SFX_STRENGTH earthquake 80 end -; 0x19575e BlackthornGymBoulder: jumpstd strengthboulder -TrainerCooltrainermCody: ; 0x195761 +TrainerCooltrainermCody: ; bit/flag number dw $54b @@ -86,18 +76,16 @@ TrainerCooltrainermCody: ; 0x195761 ; script when talk again dw CooltrainermCodyScript -; 0x19576d -CooltrainermCodyScript: ; 0x19576d +CooltrainermCodyScript: talkaftercancel loadfont writetext UnknownText_0x1957d5 closetext loadmovesprites end -; 0x195775 -TrainerCooltrainerfFran: ; 0x195775 +TrainerCooltrainerfFran: ; bit/flag number dw $55d @@ -115,31 +103,27 @@ TrainerCooltrainerfFran: ; 0x195775 ; script when talk again dw CooltrainerfFranScript -; 0x195781 -CooltrainerfFranScript: ; 0x195781 +CooltrainerfFranScript: talkaftercancel loadfont writetext UnknownText_0x195883 closetext loadmovesprites end -; 0x195789 -CooltrainermCodySeenText: ; 0x195789 +CooltrainermCodySeenText: text "It's not as if we" line "all use dragon-" cont "type #MON." done -; 0x1957b6 -CooltrainermCodyBeatenText: ; 0x1957b6 +CooltrainermCodyBeatenText: text "Rats! If only I" line "had a dragon!" done -; 0x1957d5 -UnknownText_0x1957d5: ; 0x1957d5 +UnknownText_0x1957d5: text "Members of our" line "dragon-user clan" @@ -149,9 +133,8 @@ UnknownText_0x1957d5: ; 0x1957d5 para "our MASTER allows" line "it." done -; 0x19582b -CooltrainerfFranSeenText: ; 0x19582b +CooltrainerfFranSeenText: text "I can't allow a" line "nameless trainer" cont "past me!" @@ -159,26 +142,22 @@ CooltrainerfFranSeenText: ; 0x19582b para "CLAIR would be" line "livid if I did!" done -; 0x195874 -CooltrainerfFranBeatenText: ; 0x195874 +CooltrainerfFranBeatenText: text "Awww… I lost…" done -; 0x195883 -UnknownText_0x195883: ; 0x195883 +UnknownText_0x195883: text "Uh-oh… CLAIR is" line "going to be mad…" done -; 0x1958a5 -UnknownText_0x1958a5: ; 0x1958a5 +BlackthornGym2FBoulderFellText: text "The boulder fell" line "through!" done -; 0x1958c0 -BlackthornGym2F_MapEventHeader: ; 0x1958c0 +BlackthornGym2F_MapEventHeader: ; filler db 0, 0 @@ -200,9 +179,9 @@ BlackthornGym2F_MapEventHeader: ; 0x1958c0 db 8 person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff - person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0706 - person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0707 - person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $0708 + person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, $ffff diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index e30c94af3..4641777b4 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ -CeladonCity_MapScriptHeader: ; 0x1a9f3a +CeladonCity_MapScriptHeader: ; trigger count db 0 @@ -6,14 +6,13 @@ CeladonCity_MapScriptHeader: ; 0x1a9f3a db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, .Callback - -.Callback - setflag $003d +.FlyPoint + setflag ENGINE_FLYPOINT_CELADON return -FisherScript_0x1a9f43: ; 0x1a9f43 +FisherScript_0x1a9f43: jumptextfaceplayer UnknownText_0x1a9f7d CeladonCityPoliwrath: @@ -24,53 +23,53 @@ CeladonCityPoliwrath: loadmovesprites end -TeacherScript_0x1a9f50: ; 0x1a9f50 +TeacherScript_0x1a9f50: jumptextfaceplayer UnknownText_0x1a9fde -GrampsScript_0x1a9f53: ; 0x1a9f53 +GrampsScript_0x1a9f53: jumptextfaceplayer UnknownText_0x1aa043 -GrampsScript_0x1a9f56: ; 0x1a9f56 +GrampsScript_0x1a9f56: jumptextfaceplayer UnknownText_0x1aa0dc -YoungsterScript_0x1a9f59: ; 0x1a9f59 +YoungsterScript_0x1a9f59: jumptextfaceplayer UnknownText_0x1aa115 -YoungsterScript_0x1a9f5c: ; 0x1a9f5c +YoungsterScript_0x1a9f5c: jumptextfaceplayer UnknownText_0x1aa155 -TeacherScript_0x1a9f5f: ; 0x1a9f5f +TeacherScript_0x1a9f5f: jumptextfaceplayer UnknownText_0x1aa1bd -LassScript_0x1a9f62: ; 0x1a9f62 +LassScript_0x1a9f62: jumptextfaceplayer UnknownText_0x1aa306 -CeladonCitySign: ; 0x1a9f65 +CeladonCitySign: jumptext CeladonCitySignText -CeladonGymSign: ; 0x1a9f68 +CeladonGymSign: jumptext CeladonGymSignText -CeladonCityDeptStoreSign: ; 0x1a9f6b +CeladonCityDeptStoreSign: jumptext CeladonCityDeptStoreSignText -CeladonCityMansionSign: ; 0x1a9f6e +CeladonCityMansionSign: jumptext CeladonCityMansionSignText -CeladonCityGameCornerSign: ; 0x1a9f71 +CeladonCityGameCornerSign: jumptext CeladonCityGameCornerSignText -CeladonCityTrainerTips: ; 0x1a9f74 +CeladonCityTrainerTips: jumptext CeladonCityTrainerTipsText -CeladonCityPokeCenterSign: ; 0x1a9f77 +CeladonCityPokeCenterSign: jumpstd pokecentersign -MapCeladonCitySignpostItem7: ; 0x1a9f7a +MapCeladonCitySignpostItem7: dw $00fd db PP_UP -UnknownText_0x1a9f7d: ; 0x1a9f7d +UnknownText_0x1a9f7d: text "This POLIWRATH is" line "my partner." @@ -78,13 +77,12 @@ UnknownText_0x1a9f7d: ; 0x1a9f7d line "ever evolve into a" cont "frog #MON." done -; 0x1a9fcb CeladonCityPoliwrathText: text "POLIWRATH: Croak!" done -UnknownText_0x1a9fde: ; 0x1a9fde +UnknownText_0x1a9fde: text "I lost at the slot" line "machines again…" @@ -94,9 +92,8 @@ UnknownText_0x1a9fde: ; 0x1a9fde para "You should check" line "them out too." done -; 0x1aa043 -UnknownText_0x1aa043: ; 0x1aa043 +UnknownText_0x1aa043: text "GRIMER have been" line "appearing lately." @@ -110,18 +107,16 @@ UnknownText_0x1aa043: ; 0x1aa043 line "come from? This is" cont "a serious problem…" done -; 0x1aa0dc -UnknownText_0x1aa0dc: ; 0x1aa0dc +UnknownText_0x1aa0dc: text "Nihihi! This GYM" line "is great! Only" para "girls are allowed" line "here!" done -; 0x1aa115 -UnknownText_0x1aa115: ; 0x1aa115 +UnknownText_0x1aa115: text "Want to know a" line "secret?" @@ -129,9 +124,8 @@ UnknownText_0x1aa115: ; 0x1aa115 line "has a hidden back" cont "door." done -; 0x1aa155 -UnknownText_0x1aa155: ; 0x1aa155 +UnknownText_0x1aa155: text "They're holding an" line "eating contest at" cont "the restaurant." @@ -140,9 +134,8 @@ UnknownText_0x1aa155: ; 0x1aa155 line "go at it makes me" cont "feel bloated…" done -; 0x1aa1bd -UnknownText_0x1aa1bd: ; 0x1aa1bd +UnknownText_0x1aa1bd: text "CELADON DEPT.STORE" line "has the biggest" @@ -158,10 +151,9 @@ UnknownText_0x1aa1bd: ; 0x1aa1bd para "Gee… I sound like" line "a sales clerk." done -; 0x1aa25b ; possibly unused -UnknownText_0x1aa25b: ; 0x1aa25b +UnknownText_0x1aa25b: text "I love being" line "surrounded by tall" cont "buildings!" @@ -178,26 +170,23 @@ UnknownText_0x1aa25b: ; 0x1aa25b para "place like that in" line "KANTO…" done -; 0x1aa306 -UnknownText_0x1aa306: ; 0x1aa306 +UnknownText_0x1aa306: text "Looking at the" line "ground while I was" para "walking made me" line "dizzy." done -; 0x1aa340 -CeladonCitySignText: ; 0x1aa340 +CeladonCitySignText: text "CELADON CITY" para "The City of" line "Rainbow Dreams" done -; 0x1aa369 -CeladonGymSignText: ; 0x1aa369 +CeladonGymSignText: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" @@ -205,28 +194,24 @@ CeladonGymSignText: ; 0x1aa369 para "The Nature-Loving" line "Princess" done -; 0x1aa3a9 -CeladonCityDeptStoreSignText: ; 0x1aa3a9 +CeladonCityDeptStoreSignText: text "Find What You" line "Need at CELADON" cont "DEPT.STORE!" done -; 0x1aa3d4 -CeladonCityMansionSignText: ; 0x1aa3d4 +CeladonCityMansionSignText: text "CELADON MANSION" done -; 0x1aa3e5 -CeladonCityGameCornerSignText: ; 0x1aa3e5 +CeladonCityGameCornerSignText: text "The Playground for" line "Everybody--CELADON" cont "GAME CORNER" done -; 0x1aa418 -CeladonCityTrainerTipsText: ; 0x1aa418 +CeladonCityTrainerTipsText: text "TRAINER TIPS" para "GUARD SPEC." @@ -240,9 +225,8 @@ CeladonCityTrainerTipsText: ; 0x1aa418 line "CELADON DEPT." cont "STORE!" done -; 0x1aa497 -CeladonCity_MapEventHeader: ; 0x1aa497 +CeladonCity_MapEventHeader: ; filler db 0, 0 @@ -283,4 +267,3 @@ CeladonCity_MapEventHeader: ; 0x1aa497 person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, $ffff person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, $ffff person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, $ffff -; 0x1aa567 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index e174ace9b..b6da8e22f 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -6,11 +6,10 @@ CeruleanCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, .Callback - -.Callback - setflag $0038 +.FlyPoint + setflag ENGINE_FLYPOINT_CERULEAN return CooltrainerMScript_0x184009: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 9843c801a..0b2b1cf2f 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,33 +1,28 @@ -CherrygroveCity_MapScriptHeader: ; 0x19c000 +CherrygroveCity_MapScriptHeader: ; trigger count db 2 ; triggers - dw UnknownScript_0x19c00d, $0000 - dw UnknownScript_0x19c00e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x19c00f -; 0x19c00d - -UnknownScript_0x19c00d: ; 0x19c00d +.Trigger1 end -; 0x19c00e -UnknownScript_0x19c00e: ; 0x19c00e +.Trigger2 end -; 0x19c00f -UnknownScript_0x19c00f: ; 0x19c00f - setflag $0042 +.FlyPoint + setflag ENGINE_FLYPOINT_CHERRYGROVE return -; 0x19c013 -CherrygroveCityGuideGent: ; 0x19c013 +CherrygroveCityGuideGent: faceplayer loadfont writetext GuideGentIntroText @@ -89,13 +84,12 @@ CherrygroveCityGuideGent: ; 0x19c013 waitbutton end -.UnknownScript_0x19c097 ; 0x19c097 +.UnknownScript_0x19c097 jumpstd $002f end -.mapcardname ; 0x19c09b +.mapcardname db "MAP CARD@" -; 0x19c0a4 .No writetext GuideGentNoText @@ -103,11 +97,10 @@ CherrygroveCityGuideGent: ; 0x19c013 loadmovesprites end -UnknownScript_0x19c0aa: ; 0x19c0aa +UnknownScript_0x19c0aa: moveperson $3, $27, $7 -; 0x19c0ae -UnknownScript_0x19c0ae: ; 0x19c0ae +UnknownScript_0x19c0ae: spriteface $0, $3 showemote $0, $0, 15 special Functionc48f @@ -133,9 +126,8 @@ UnknownScript_0x19c0ae: ; 0x19c0ae reloadmap iftrue UnknownScript_0x19c11a jump UnknownScript_0x19c126 -; 0x19c0ee -UnknownScript_0x19c0ee: ; 0x19c0ee +UnknownScript_0x19c0ee: winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 loadtrainer RIVAL1, RIVAL1_1 @@ -145,9 +137,8 @@ UnknownScript_0x19c0ee: ; 0x19c0ee reloadmap iftrue UnknownScript_0x19c11a jump UnknownScript_0x19c126 -; 0x19c104 -UnknownScript_0x19c104: ; 0x19c104 +UnknownScript_0x19c104: winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 loadtrainer RIVAL1, RIVAL1_2 @@ -157,24 +148,22 @@ UnknownScript_0x19c104: ; 0x19c104 reloadmap iftrue UnknownScript_0x19c11a jump UnknownScript_0x19c126 -; 0x19c11a -UnknownScript_0x19c11a: ; 0x19c11a +UnknownScript_0x19c11a: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x19c608 closetext loadmovesprites jump UnknownScript_0x19c12f -; 0x19c126 -UnknownScript_0x19c126: ; 0x19c126 +UnknownScript_0x19c126: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x19c59e closetext loadmovesprites -UnknownScript_0x19c12f: ; 0x19c12f +UnknownScript_0x19c12f: playsound SFX_TACKLE applymovement $0, MovementData_0x19c1d4 spriteface $0, $2 @@ -184,9 +173,8 @@ UnknownScript_0x19c12f: ; 0x19c12f special Functionc658 playmapmusic end -; 0x19c146 -TeacherScript_0x19c146: ; 0x19c146 +TeacherScript_0x19c146: faceplayer loadfont checkflag $0001 @@ -195,16 +183,14 @@ TeacherScript_0x19c146: ; 0x19c146 closetext loadmovesprites end -; 0x19c154 -UnknownScript_0x19c154: ; 0x19c154 +UnknownScript_0x19c154: writetext UnknownText_0x19c6a8 closetext loadmovesprites end -; 0x19c15a -YoungsterScript_0x19c15a: ; 0x19c15a +YoungsterScript_0x19c15a: faceplayer loadfont checkflag $000b @@ -213,16 +199,14 @@ YoungsterScript_0x19c15a: ; 0x19c15a closetext loadmovesprites end -; 0x19c168 -UnknownScript_0x19c168: ; 0x19c168 +UnknownScript_0x19c168: writetext UnknownText_0x19c701 closetext loadmovesprites end -; 0x19c16e -MysticWaterGuy: ; 0x19c16e +MysticWaterGuy: faceplayer loadfont checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE @@ -232,37 +216,34 @@ MysticWaterGuy: ; 0x19c16e verbosegiveitem MYSTIC_WATER, 1 iffalse UnknownScript_0x19c187 setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE -UnknownScript_0x19c183: ; 0x19c183 +UnknownScript_0x19c183: writetext UnknownText_0x19c7c1 closetext -UnknownScript_0x19c187: ; 0x19c187 +UnknownScript_0x19c187: loadmovesprites end -; 0x19c189 CherrygroveCitySign: jumptext CherrygroveCitySignText -GuideGentsHouseSign: ; 0x19c18c +GuideGentsHouseSign: jumptext GuideGentsHouseSignText -; 0x19c18f CherrygroveCityPokeCenterSign: jumpstd pokecentersign -CherrygroveCityMartSign: ; 0x19c192 +CherrygroveCityMartSign: jumpstd martsign -MovementData_0x19c195: ; 0x19c195 +MovementData_0x19c195: step_left step_left step_up step_left turn_head_up step_end -; 0x19c19b -MovementData_0x19c19b: ; 0x19c19b +MovementData_0x19c19b: step_left step_left step_left @@ -271,9 +252,8 @@ MovementData_0x19c19b: ; 0x19c19b step_left turn_head_up step_end -; 0x19c1a3 -MovementData_0x19c1a3: ; 0x19c1a3 +MovementData_0x19c1a3: step_left step_left step_left @@ -283,9 +263,8 @@ MovementData_0x19c1a3: ; 0x19c1a3 step_left turn_head_up step_end -; 0x19c1ac -MovementData_0x19c1ac: ; 0x19c1ac +MovementData_0x19c1ac: step_left step_left step_left @@ -296,9 +275,8 @@ MovementData_0x19c1ac: ; 0x19c1ac step_down turn_head_left step_end -; 0x19c1b6 -MovementData_0x19c1b6: ; 0x19c1b6 +MovementData_0x19c1b6: step_down step_down step_right @@ -320,36 +298,31 @@ MovementData_0x19c1b6: ; 0x19c1b6 step_right turn_head_up step_end -; 0x19c1cb -MovementData_0x19c1cb: ; 0x19c1cb +MovementData_0x19c1cb: step_up step_up step_end -; 0x19c1ce -MovementData_0x19c1ce: ; 0x19c1ce +MovementData_0x19c1ce: step_left step_left step_left step_left step_left step_end -; 0x19c1d4 -MovementData_0x19c1d4: ; 0x19c1d4 +MovementData_0x19c1d4: big_step_down turn_head_up step_end -; 0x19c1d7 -MovementData_0x19c1d7: ; 0x19c1d7 +MovementData_0x19c1d7: step_left turn_head_down step_end -; 0x19c1da -MovementData_0x19c1da: ; 0x19c1da +MovementData_0x19c1da: big_step_left big_step_left big_step_left @@ -457,7 +430,7 @@ GuideGentNoText: line "when you like." done -UnknownText_0x19c4e2: ; 0x19c4e2 +UnknownText_0x19c4e2: text $56, " ", $56, " ", $56 para "You got a #MON" @@ -477,15 +450,13 @@ UnknownText_0x19c4e2: ; 0x19c4e2 para "I'll show you" line "what I mean!" done -; 0x19c57f -UnknownText_0x19c57f: ; 0x19c57f +UnknownText_0x19c57f: text "Humph. Are you" line "happy you won?" done -; 0x19c59e -UnknownText_0x19c59e: ; 0x19c59e +UnknownText_0x19c59e: text $56, " ", $56, " ", $56 para "My name's ???." @@ -495,15 +466,13 @@ UnknownText_0x19c59e: ; 0x19c59e cont "est #MON" cont "trainer." done -; 0x19c5e6 -UnknownText_0x19c5e6: ; 0x19c5e6 +UnknownText_0x19c5e6: text "Humph. That was a" line "waste of time." done -; 0x19c608 -UnknownText_0x19c608: ; 0x19c608 +UnknownText_0x19c608: text $56, " ", $56, " ", $56 para "My name's ???." @@ -513,9 +482,8 @@ UnknownText_0x19c608: ; 0x19c608 cont "est #MON" cont "trainer." done -; 0x19c650 -UnknownText_0x19c650: ; 0x19c650 +UnknownText_0x19c650: text "Did you talk to" line "the old man by the" cont "#MON CENTER?" @@ -524,23 +492,20 @@ UnknownText_0x19c650: ; 0x19c650 line "JOHTO on your" cont "#GEAR." done -; 0x19c6a8 -UnknownText_0x19c6a8: ; 0x19c6a8 +UnknownText_0x19c6a8: text "When you're with" line "#MON, going" cont "anywhere is fun." done -; 0x19c6d6 -UnknownText_0x19c6d6: ; 0x19c6d6 +UnknownText_0x19c6d6: text "MR.#MON's house" line "is still farther" cont "up ahead." done -; 0x19c701 -UnknownText_0x19c701: ; 0x19c701 +UnknownText_0x19c701: text "I battled the" line "trainers on the" cont "road." @@ -551,9 +516,8 @@ UnknownText_0x19c701: ; 0x19c701 para "must take them to" line "a #MON CENTER." done -; 0x19c766 -UnknownText_0x19c766: ; 0x19c766 +UnknownText_0x19c766: text "A #MON I caught" line "had an item." @@ -563,28 +527,24 @@ UnknownText_0x19c766: ; 0x19c766 para "I don't need it," line "so do you want it?" done -; 0x19c7c1 -UnknownText_0x19c7c1: ; 0x19c7c1 +UnknownText_0x19c7c1: text "Back to fishing" line "for me, then." done -; 0x19c7e0 -CherrygroveCitySignText: ; 0x19c7e0 +CherrygroveCitySignText: text "CHERRYGROVE CITY" para "The City of Cute," line "Fragrant Flowers" done -; 0x19c815 -GuideGentsHouseSignText: ; 0x19c815 +GuideGentsHouseSignText: text "GUIDE GENT'S HOUSE" done -; 0x19c829 -CherrygroveCity_MapEventHeader: ; 0x19c829 +CherrygroveCity_MapEventHeader: ; filler db 0, 0 @@ -615,4 +575,3 @@ CherrygroveCity_MapEventHeader: ; 0x19c829 person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, $ffff person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, $ffff person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, $ffff -; 0x19c8ad diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 6b0fa2125..ced71f656 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,38 +1,33 @@ -CianwoodCity_MapScriptHeader: ; 0x1a0000 +CianwoodCity_MapScriptHeader: ; trigger count db 2 ; triggers - dw UnknownScript_0x1a000d, $0000 - dw UnknownScript_0x1a000e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks + dbw 5, .FlyPointAndSuicune - dbw 5, UnknownScript_0x1a000f -; 0x1a000d - -UnknownScript_0x1a000d: ; 0x1a000d +.Trigger1 end -; 0x1a000e -UnknownScript_0x1a000e: ; 0x1a000e +.Trigger2 end -; 0x1a000f -UnknownScript_0x1a000f: ; 0x1a000f - setflag $0045 +.FlyPointAndSuicune + setflag ENGINE_FLYPOINT_CIANWOOD setevent $07aa checkevent $0333 iffalse UnknownScript_0x1a001d disappear $c -UnknownScript_0x1a001d: ; 0x1a001d +UnknownScript_0x1a001d: return -; 0x1a001e -UnknownScript_0x1a001e: ; 0x1a001e +UnknownScript_0x1a001e: spriteface $0, $1 showemote $0, $0, 15 pause 15 @@ -74,11 +69,10 @@ UnknownScript_0x1a001e: ; 0x1a001e special Functionc48f playmapmusic pause 10 -UnknownScript_0x1a0083: ; 0x1a0083 +UnknownScript_0x1a0083: end -; 0x1a0084 -PokefanFScript_0x1a0084: ; 0x1a0084 +PokefanFScript_0x1a0084: faceplayer loadfont checkevent EVENT_GOT_HM02_FLY @@ -91,9 +85,8 @@ PokefanFScript_0x1a0084: ; 0x1a0084 closetext loadmovesprites end -; 0x1a009c -UnknownScript_0x1a009c: ; 0x1a009c +UnknownScript_0x1a009c: writetext UnknownText_0x1a01e3 keeptextopen verbosegiveitem HM_02, 1 @@ -101,27 +94,23 @@ UnknownScript_0x1a009c: ; 0x1a009c setevent EVENT_GOT_HM02_FLY writetext UnknownText_0x1a021d keeptextopen -UnknownScript_0x1a00ad: ; 0x1a00ad +UnknownScript_0x1a00ad: writetext UnknownText_0x1a0277 closetext -UnknownScript_0x1a00b1: ; 0x1a00b1 +UnknownScript_0x1a00b1: loadmovesprites end -; 0x1a00b3 -StandingYoungsterScript_0x1a00b3: ; 0x1a00b3 +StandingYoungsterScript_0x1a00b3: jumptextfaceplayer UnknownText_0x1a02df -; 0x1a00b6 -PokefanMScript_0x1a00b6: ; 0x1a00b6 +PokefanMScript_0x1a00b6: jumptextfaceplayer UnknownText_0x1a0319 -; 0x1a00b9 -LassScript_0x1a00b9: ; 0x1a00b9 +LassScript_0x1a00b9: jumptextfaceplayer UnknownText_0x1a0394 -; 0x1a00bc -UnknownScript_0x1a00bc: ; 0x1a00bc +UnknownScript_0x1a00bc: jumptextfaceplayer UnknownText_0x1a03cc CianwoodCitySign: @@ -153,16 +142,15 @@ MapCianwoodCitySignpostItem7: dw $00b3 db MAX_ETHER -MovementData_0x1a00da: ; 0x1a00da +MovementData_0x1a00da: db $39 ; movement fast_jump_step_down fast_jump_step_down fast_jump_step_right db $38 ; movement step_end -; 0x1a00e0 -MovementData_0x1a00e0: ; 0x1a00e0 +MovementData_0x1a00e0: db $39 ; movement fast_jump_step_right fast_jump_step_up @@ -170,25 +158,22 @@ MovementData_0x1a00e0: ; 0x1a00e0 fast_jump_step_right db $38 ; movement step_end -; 0x1a00e7 -MovementData_0x1a00e7: ; 0x1a00e7 +MovementData_0x1a00e7: step_up step_up step_up step_up step_end -; 0x1a00ec -MovementData_0x1a00ec: ; 0x1a00ec +MovementData_0x1a00ec: step_down step_down step_down step_down step_end -; 0x1a00f1 -UnknownText_0x1a00f1: ; 0x1a00f1 +UnknownText_0x1a00f1: text "You crossed the" line "sea to get here?" @@ -201,9 +186,8 @@ UnknownText_0x1a00f1: ; 0x1a00f1 para "#MON knew how" line "to FLY…" done -; 0x1a0163 -UnknownText_0x1a0163: ; 0x1a0163 +UnknownText_0x1a0163: text "But you can't use" line "FLY without this" cont "city's GYM BADGE." @@ -215,18 +199,16 @@ UnknownText_0x1a0163: ; 0x1a0163 para "I'll have a nice" line "gift for you." done -; 0x1a01e3 -UnknownText_0x1a01e3: ; 0x1a01e3 +UnknownText_0x1a01e3: text "That's CIANWOOD's" line "GYM BADGE!" para "Then you should" line "take this HM." done -; 0x1a021d -UnknownText_0x1a021d: ; 0x1a021d +UnknownText_0x1a021d: text "Teach FLY to your" line "#MON." @@ -236,9 +218,8 @@ UnknownText_0x1a021d: ; 0x1a021d para "to anywhere you " line "have visited." done -; 0x1a0277 -UnknownText_0x1a0277: ; 0x1a0277 +UnknownText_0x1a0277: text "My husband lost to" line "you, so he needs" cont "to train harder." @@ -247,18 +228,16 @@ UnknownText_0x1a0277: ; 0x1a0277 line "he was getting a" cont "little chubby." done -; 0x1a02df -UnknownText_0x1a02df: ; 0x1a02df +UnknownText_0x1a02df: text "If you use FLY," line "you can get back" para "to OLIVINE in-" line "stantly." done -; 0x1a0319 -UnknownText_0x1a0319: ; 0x1a0319 +UnknownText_0x1a0319: text "Boulders to the" line "north of town can" cont "be crushed." @@ -270,19 +249,17 @@ UnknownText_0x1a0319: ; 0x1a0319 line "use ROCK SMASH to" cont "break them." done -; 0x1a0394 -UnknownText_0x1a0394: ; 0x1a0394 +UnknownText_0x1a0394: text "CHUCK, the GYM" line "LEADER, spars with" para "his fighting #-" line "MON." done -; 0x1a03cc ; possibly unused -UnknownText_0x1a03cc: ; 0x1a03cc +UnknownText_0x1a03cc: text "There are several" line "islands between" cont "here and OLIVINE." @@ -291,9 +268,8 @@ UnknownText_0x1a03cc: ; 0x1a03cc line "creature supposed-" cont "ly lives there." done -; 0x1a0433 -UnknownText_0x1a0433: ; 0x1a0433 +UnknownText_0x1a0433: text "EUSINE: Yo," line $52, "." @@ -330,15 +306,13 @@ UnknownText_0x1a0433: ; 0x1a0433 para "Come on, ", $52, "." line "Let's battle now!" done -; 0x1a05a1 -UnknownText_0x1a05a1: ; 0x1a05a1 +UnknownText_0x1a05a1: text "I hate to admit" line "it, but you win." done -; 0x1a05c3 -UnknownText_0x1a05c3: ; 0x1a05c3 +UnknownText_0x1a05c3: text "You're amazing," line $52, "!" @@ -441,4 +415,3 @@ CianwoodCity_MapEventHeader: person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, $ffff person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, $07ad person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, $07ae -; 0x1a0867 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index e1430a538..d04089abc 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -6,11 +6,10 @@ CinnabarIsland_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1ac9ac - -UnknownScript_0x1ac9ac: - setflag $003f +.FlyPoint + setflag ENGINE_FLYPOINT_CINNABAR return CinnabarIslandBlue: diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index dbf8638f8..34070ced2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -6,11 +6,10 @@ EcruteakCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a4005 - -UnknownScript_0x1a4005: - setflag $0048 +.FlyPoint + setflag ENGINE_FLYPOINT_ECRUTEAK return GrampsScript_0x1a4009: diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 407927daa..d44b5b188 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -6,11 +6,10 @@ FuchsiaCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x194b1e - -UnknownScript_0x194b1e: - setflag $003e +.FlyPoint + setflag ENGINE_FLYPOINT_FUCHSIA return YoungsterScript_0x194b22: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index abef2f98e..6042ed76c 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -6,37 +6,35 @@ GoldenrodCity_MapScriptHeader: db 2 ; callbacks - - dbw 5, UnknownScript_0x1988d8 - - dbw 2, UnknownScript_0x1988e8 - -UnknownScript_0x1988d8: - setflag $0046 - setflag $0016 - checkevent $00b9 - iftrue UnknownScript_0x1988e7 - clearevent $0769 -UnknownScript_0x1988e7: + dbw 5, .FlyPointAndFloria + dbw 2, .MoveTutor + +.FlyPointAndFloria + setflag ENGINE_FLYPOINT_GOLDENROD + setflag ENGINE_16 + checkevent EVENT_MET_FLORIA + iftrue .FloriaDone + clearevent EVENT_FLORIA_AT_SUDOWOODO +.FloriaDone return -UnknownScript_0x1988e8: +.MoveTutor checkevent EVENT_BEAT_ELITE_FOUR - iffalse UnknownScript_0x198908 + iffalse .MoveTutorDone checkitem COIN_CASE - iffalse UnknownScript_0x1988fd + iffalse .MoveTutorDisappear checkcode $b - if_equal WEDNESDAY, UnknownScript_0x198900 - if_equal SATURDAY, UnknownScript_0x198900 -UnknownScript_0x1988fd: + if_equal WEDNESDAY, .MoveTutorAppear + if_equal SATURDAY, .MoveTutorAppear +.MoveTutorDisappear disappear $10 return -UnknownScript_0x198900: - checkflag $005e - iftrue UnknownScript_0x198908 +.MoveTutorAppear + checkflag ENGINE_5E + iftrue .MoveTutorDone appear $10 -UnknownScript_0x198908: +.MoveTutorDone return MoveTutor: @@ -131,7 +129,7 @@ UnknownScript_0x1989ca: playsound SFX_ENTER_DOOR disappear $10 clearevent $076b - setflag $005e + setflag ENGINE_5E waitbutton end diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 2e8fa2357..0de3018f3 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -11,7 +11,7 @@ TeacherScript_0x5535d: ; 0x5535d iftrue UnknownScript_0x5538f checkevent EVENT_GOT_SQUIRTBOTTLE iftrue UnknownScript_0x55399 - checkevent $00b9 + checkevent EVENT_MET_FLORIA iffalse UnknownScript_0x5539f checkevent $00ba iffalse UnknownScript_0x5538f @@ -24,7 +24,7 @@ TeacherScript_0x5535d: ; 0x5535d verbosegiveitem SQUIRTBOTTLE, 1 setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites - setevent $0769 + setevent EVENT_FLORIA_AT_SUDOWOODO clearevent $0768 end ; 0x5538f @@ -62,7 +62,7 @@ LassScript_0x553a2: ; 0x553a2 loadmovesprites setevent $00ba setevent $0768 - clearevent $0769 + clearevent EVENT_FLORIA_AT_SUDOWOODO end ; 0x553bf diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 5128f33e3..1a54b2de5 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -24,7 +24,7 @@ UnknownScript_0x56c0e: ; 0x56c0e ; 0x56c11 UnknownScript_0x56c11: ; 0x56c11 - checkflag $005e + checkflag ENGINE_5E iftrue UnknownScript_0x56c19 disappear $d UnknownScript_0x56c19: ;0x56c19 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 0fcec1fb2..231f8c6f8 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -1,34 +1,30 @@ -LakeofRage_MapScriptHeader: ; 0x70000 +LakeofRage_MapScriptHeader: ; trigger count db 2 ; triggers - dw UnknownScript_0x70010, $0000 - dw UnknownScript_0x70011, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 2 ; callbacks - dbw 5, UnknownScript_0x70012 + dbw 5, .FlyPoint + dbw 2, .Wesley - dbw 2, WesleyCallback - -UnknownScript_0x70010: ; 0x70010 +.Trigger1 end -; 0x70011 -UnknownScript_0x70011: ; 0x70011 +.Trigger2 end -; 0x70012 -UnknownScript_0x70012: ; 0x70012 - setflag $004a +.FlyPoint + setflag ENGINE_FLYPOINT_LAKE_OF_RAGE return -; 0x70016 -WesleyCallback: +.Wesley checkcode $b if_equal WEDNESDAY, .WesleyAppears disappear $b @@ -38,7 +34,7 @@ WesleyCallback: appear $b return -LanceScript_0x70022: ; 0x70022 +LanceScript_0x70022: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue UnknownScript_0x70057 loadfont @@ -48,7 +44,7 @@ LanceScript_0x70022: ; 0x70022 writetext UnknownText_0x701b4 yesorno iffalse UnknownScript_0x7004e -UnknownScript_0x70035: ; 0x70035 +UnknownScript_0x70035: writetext UnknownText_0x702c6 closetext loadmovesprites @@ -59,26 +55,23 @@ UnknownScript_0x70035: ; 0x70035 setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end -; 0x7004e -UnknownScript_0x7004e: ; 0x7004e +UnknownScript_0x7004e: writetext UnknownText_0x70371 closetext loadmovesprites setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE end -; 0x70057 -UnknownScript_0x70057: ; 0x70057 +UnknownScript_0x70057: faceplayer loadfont writetext UnknownText_0x703a5 yesorno iffalse UnknownScript_0x7004e jump UnknownScript_0x70035 -; 0x70063 -GyaradosScript_0x70063: ; 0x70063 +GyaradosScript_0x70063: loadfont writetext UnknownText_0x703cb pause 15 @@ -89,7 +82,7 @@ GyaradosScript_0x70063: ; 0x70063 startbattle if_equal $1, UnknownScript_0x7007a disappear $a -UnknownScript_0x7007a: ; 0x7007a +UnknownScript_0x7007a: returnafterbattle loadfont giveitem RED_SCALE, $1 @@ -102,9 +95,8 @@ UnknownScript_0x7007a: ; 0x7007a dotrigger $0 appear $2 end -; 0x7008e -GrampsScript_0x7008e: ; 0x7008e +GrampsScript_0x7008e: faceplayer loadfont checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -113,28 +105,23 @@ GrampsScript_0x7008e: ; 0x7008e closetext loadmovesprites end -; 0x7009c -UnknownScript_0x7009c: ; 0x7009c +UnknownScript_0x7009c: writetext UnknownText_0x70421 closetext loadmovesprites end -; 0x700a2 -SuperNerdScript_0x700a2: ; 0x700a2 +SuperNerdScript_0x700a2: jumptextfaceplayer UnknownText_0x70444 -; 0x700a5 -CooltrainerFScript_0x700a5: ; 0x700a5 +CooltrainerFScript_0x700a5: jumptextfaceplayer UnknownText_0x704bb -; 0x700a8 -MapLakeofRageSignpost0Script: ; 0x700a8 +MapLakeofRageSignpost0Script: jumptext UnknownText_0x708d7 -; 0x700ab -MapLakeofRageSignpost1Script: ; 0x700ab +MapLakeofRageSignpost1Script: loadfont writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -142,16 +129,14 @@ MapLakeofRageSignpost1Script: ; 0x700ab closetext loadmovesprites end -; 0x700b8 -UnknownScript_0x700b8: ; 0x700b8 +UnknownScript_0x700b8: keeptextopen special Functionfbcd2 loadmovesprites end -; 0x700be -TrainerFisherAndre: ; 0x700be +TrainerFisherAndre: ; bit/flag number dw $455 @@ -169,18 +154,16 @@ TrainerFisherAndre: ; 0x700be ; script when talk again dw FisherAndreScript -; 0x700ca -FisherAndreScript: ; 0x700ca +FisherAndreScript: talkaftercancel loadfont writetext UnknownText_0x7058f closetext loadmovesprites end -; 0x700d2 -TrainerFisherRaymond: ; 0x700d2 +TrainerFisherRaymond: ; bit/flag number dw $456 @@ -198,18 +181,16 @@ TrainerFisherRaymond: ; 0x700d2 ; script when talk again dw FisherRaymondScript -; 0x700de -FisherRaymondScript: ; 0x700de +FisherRaymondScript: talkaftercancel loadfont writetext UnknownText_0x70611 closetext loadmovesprites end -; 0x700e6 -TrainerCooltrainermAaron: ; 0x700e6 +TrainerCooltrainermAaron: ; bit/flag number dw $549 @@ -227,18 +208,16 @@ TrainerCooltrainermAaron: ; 0x700e6 ; script when talk again dw CooltrainermAaronScript -; 0x700f2 -CooltrainermAaronScript: ; 0x700f2 +CooltrainermAaronScript: talkaftercancel loadfont writetext UnknownText_0x7069c closetext loadmovesprites end -; 0x700fa -TrainerCooltrainerfLois: ; 0x700fa +TrainerCooltrainerfLois: ; bit/flag number dw $55c @@ -256,16 +235,14 @@ TrainerCooltrainerfLois: ; 0x700fa ; script when talk again dw CooltrainerfLoisScript -; 0x70106 -CooltrainerfLoisScript: ; 0x70106 +CooltrainerfLoisScript: talkaftercancel loadfont writetext UnknownText_0x70752 closetext loadmovesprites end -; 0x7010e WesleyScript: faceplayer @@ -303,38 +280,32 @@ WesleyNotWednesdayScript: loadmovesprites end -ItemFragment_0x70148: ; 0x70148 +ItemFragment_0x70148: db ELIXER, 1 -; 0x7014a -ItemFragment_0x7014a: ; 0x7014a +ItemFragment_0x7014a: db TM_43, 1 -; 0x7014c -MapLakeofRageSignpostItem2: ; 0x7014c +MapLakeofRageSignpostItem2: dw $00b5 db FULL_RESTORE -; 0x7014f -MapLakeofRageSignpostItem3: ; 0x7014f +MapLakeofRageSignpostItem3: dw $00b6 db RARE_CANDY -; 0x70152 -MapLakeofRageSignpostItem4: ; 0x70152 +MapLakeofRageSignpostItem4: dw $00b7 db MAX_POTION -; 0x70155 -MovementData_0x70155: ; 0x70155 +MovementData_0x70155: teleport_from step_end -; 0x70157 -UnknownText_0x70157: ; 0x70157 +UnknownText_0x70157: text "This lake is full" line "of GYARADOS but" cont "nothing else…" @@ -343,9 +314,8 @@ UnknownText_0x70157: ; 0x70157 line "are being forced" cont "to evolve…" done -; 0x701b4 -UnknownText_0x701b4: ; 0x701b4 +UnknownText_0x701b4: text "Did you come here" line "because of the" cont "rumors?" @@ -372,9 +342,8 @@ UnknownText_0x701b4: ; 0x701b4 line "could you help me" cont "investigate?" done -; 0x702c6 -UnknownText_0x702c6: ; 0x702c6 +UnknownText_0x702c6: text "LANCE: Excellent!" para "It seems that the" @@ -392,47 +361,40 @@ UnknownText_0x702c6: ; 0x702c6 para "I'll be waiting" line "for you, ", $14, "." done -; 0x70371 -UnknownText_0x70371: ; 0x70371 +UnknownText_0x70371: text "Oh… Well, if you" line "change your mind," cont "please help me." done -; 0x703a5 -UnknownText_0x703a5: ; 0x703a5 +UnknownText_0x703a5: text "LANCE: Hm? Are you" line "going to help me?" done -; 0x703cb -UnknownText_0x703cb: ; 0x703cb +UnknownText_0x703cb: text "GYARADOS: Gyashaa!" done -; 0x703df -UnknownText_0x703df: ; 0x703df +UnknownText_0x703df: text $52, " obtained a" line "RED SCALE." done -; 0x703f8 -UnknownText_0x703f8: ; 0x703f8 +UnknownText_0x703f8: text "The GYARADOS are" line "angry!" para "It's a bad omen!" done -; 0x70421 -UnknownText_0x70421: ; 0x70421 +UnknownText_0x70421: text "Hahah! The MAGI-" line "KARP are biting!" done -; 0x70444 -UnknownText_0x70444: ; 0x70444 +UnknownText_0x70444: text "I heard this lake" line "was made by ram-" cont "paging GYARADOS." @@ -443,9 +405,8 @@ UnknownText_0x70444: ; 0x70444 para "to their mass out-" line "break now?" done -; 0x704bb -UnknownText_0x704bb: ; 0x704bb +UnknownText_0x704bb: text "Did my eyes de-" line "ceive me? I saw a" @@ -456,53 +417,46 @@ UnknownText_0x704bb: ; 0x704bb line "GYARADOS were" cont "usually blue?" done -; 0x70522 -FisherAndreSeenText: ; 0x70522 +FisherAndreSeenText: text "Let me battle with" line "the #MON I just" cont "caught!" done -; 0x7054e -FisherAndreBeatenText: ; 0x7054e +FisherAndreBeatenText: text "I might be an ex-" line "pert angler, but" para "I stink as a #-" line "MON trainer…" done -; 0x7058f -UnknownText_0x7058f: ; 0x7058f +UnknownText_0x7058f: text "I won't lose as an" line "angler! I catch" cont "#MON all day." done -; 0x705c0 -FisherRaymondSeenText: ; 0x705c0 +FisherRaymondSeenText: text "No matter what I" line "do, all I catch" para "are the same #-" line "MON…" done -; 0x705f7 -FisherRaymondBeatenText: ; 0x705f7 +FisherRaymondBeatenText: text "My line's all" line "tangled up…" done -; 0x70611 -UnknownText_0x70611: ; 0x70611 +UnknownText_0x70611: text "Why can't I catch" line "any good #MON?" done -; 0x70632 -CooltrainermAaronSeenText: ; 0x70632 +CooltrainermAaronSeenText: text "If a trainer spots" line "another trainer," @@ -512,24 +466,21 @@ CooltrainermAaronSeenText: ; 0x70632 para "That is our" line "destiny." done -; 0x70688 -CooltrainermAaronBeatenText: ; 0x70688 +CooltrainermAaronBeatenText: text "Whew…" line "Good battle." done -; 0x7069c -UnknownText_0x7069c: ; 0x7069c +UnknownText_0x7069c: text "#MON and their" line "trainer become" para "powerful through" line "constant battling." done -; 0x706df -CooltrainerfLoisSeenText: ; 0x706df +CooltrainerfLoisSeenText: text "What happened to" line "the red GYARADOS?" @@ -541,19 +492,16 @@ CooltrainerfLoisSeenText: ; 0x706df para "I know--let's" line "battle!" done -; 0x70745 -CooltrainerfLoisBeatenText: ; 0x70745 +CooltrainerfLoisBeatenText: text "Good going!" done -; 0x70752 -UnknownText_0x70752: ; 0x70752 +UnknownText_0x70752: text "Come to think of" line "it, I've seen a" cont "pink BUTTERFREE." done -; 0x70784 MeetWesleyText: text "WESLEY: Well, how" @@ -595,20 +543,18 @@ WesleyNotWednesdayText: cont "That's too bad." done -UnknownText_0x708d7: ; 0x708d7 +UnknownText_0x708d7: text "LAKE OF RAGE," line "also known as" cont "GYARADOS LAKE." done -; 0x70903 -UnknownText_0x70903: ; 0x70903 +UnknownText_0x70903: text "FISHING GURU'S" line "HOUSE" done -; 0x70919 -LakeofRage_MapEventHeader: ; 0x70919 +LakeofRage_MapEventHeader: ; filler db 0, 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 06711d250..05f6dc376 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -6,11 +6,10 @@ LavenderTown_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1ad6e0 - -UnknownScript_0x1ad6e0: - setflag $003b +.FlyPoint + setflag ENGINE_FLYPOINT_LAVENDER return PokefanMScript_0x1ad6e4: diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 70211bb87..534a6cffb 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -3,24 +3,23 @@ MahoganyTown_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x19000d, $0000 - dw UnknownScript_0x19000e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x19000f - -UnknownScript_0x19000d: +.Trigger1 end -UnknownScript_0x19000e: +.Trigger2 end -UnknownScript_0x19000f: - setflag $0049 +.FlyPoint + setflag ENGINE_FLYPOINT_MAHOGANY return UnknownScript_0x190013: diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 67b912e8b..48204c7f4 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,34 +1,29 @@ -NewBarkTown_MapScriptHeader: ; 0x1a8000 +NewBarkTown_MapScriptHeader: ; trigger count db 2 ; triggers - dw UnknownScript_0x1a800d, $0000 - dw UnknownScript_0x1a800e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a800f -; 0x1a800d - -UnknownScript_0x1a800d: ; 0x1a800d +.Trigger1 end -; 0x1a800e -UnknownScript_0x1a800e: ; 0x1a800e +.Trigger2 end -; 0x1a800f -UnknownScript_0x1a800f: ; 0x1a800f - setflag $0041 +.FlyPoint + setflag ENGINE_FLYPOINT_NEW_BARK clearevent $0076 return -; 0x1a8016 -UnknownScript_0x1a8016: ; 0x1a8016 +UnknownScript_0x1a8016: playmusic MUSIC_MOM spriteface $2, $2 loadfont @@ -50,9 +45,8 @@ UnknownScript_0x1a8016: ; 0x1a8016 loadmovesprites special RestartMapMusic end -; 0x1a8041 -UnknownScript_0x1a8041: ; 0x1a8041 +UnknownScript_0x1a8041: playmusic MUSIC_MOM spriteface $2, $2 loadfont @@ -75,9 +69,8 @@ UnknownScript_0x1a8041: ; 0x1a8041 loadmovesprites special RestartMapMusic end -; 0x1a806f -TeacherScript_0x1a806f: ; 0x1a806f +TeacherScript_0x1a806f: faceplayer loadfont checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST @@ -90,34 +83,29 @@ TeacherScript_0x1a806f: ; 0x1a806f closetext loadmovesprites end -; 0x1a8089 -UnknownScript_0x1a8089: ; 0x1a8089 +UnknownScript_0x1a8089: writetext UnknownText_0x1a81c4 closetext loadmovesprites end -; 0x1a808f -UnknownScript_0x1a808f: ; 0x1a808f +UnknownScript_0x1a808f: writetext UnknownText_0x1a81f2 closetext loadmovesprites end -; 0x1a8095 -UnknownScript_0x1a8095: ; 0x1a8095 +UnknownScript_0x1a8095: writetext UnknownText_0x1a8236 closetext loadmovesprites end -; 0x1a809b -FisherScript_0x1a809b: ; 0x1a809b +FisherScript_0x1a809b: jumptextfaceplayer UnknownText_0x1a8274 -; 0x1a809e -SilverScript_0x1a809e: ; 0x1a809e +SilverScript_0x1a809e: loadfont writetext UnknownText_0x1a82a6 closetext @@ -137,33 +125,27 @@ SilverScript_0x1a809e: ; 0x1a809e applymovement $0, MovementData_0x1a80f0 applymovement $4, MovementData_0x1a80f5 end -; 0x1a80c8 -MapNewBarkTownSignpost0Script: ; 0x1a80c8 +MapNewBarkTownSignpost0Script: jumptext UnknownText_0x1a82e8 -; 0x1a80cb -MapNewBarkTownSignpost1Script: ; 0x1a80cb +MapNewBarkTownSignpost1Script: jumptext UnknownText_0x1a8328 -; 0x1a80ce -MapNewBarkTownSignpost2Script: ; 0x1a80ce +MapNewBarkTownSignpost2Script: jumptext UnknownText_0x1a8332 -; 0x1a80d1 -MapNewBarkTownSignpost3Script: ; 0x1a80d1 +MapNewBarkTownSignpost3Script: jumptext UnknownText_0x1a8340 -; 0x1a80d4 -MovementData_0x1a80d4: ; 0x1a80d4 +MovementData_0x1a80d4: step_left step_left step_left step_left step_end -; 0x1a80d9 -MovementData_0x1a80d9: ; 0x1a80d9 +MovementData_0x1a80d9: step_left step_left step_left @@ -171,18 +153,16 @@ MovementData_0x1a80d9: ; 0x1a80d9 step_left turn_head_down step_end -; 0x1a80e0 -MovementData_0x1a80e0: ; 0x1a80e0 +MovementData_0x1a80e0: step_right step_right step_right step_right turn_head_left step_end -; 0x1a80e6 -MovementData_0x1a80e6: ; 0x1a80e6 +MovementData_0x1a80e6: step_right step_right step_right @@ -190,48 +170,41 @@ MovementData_0x1a80e6: ; 0x1a80e6 step_right turn_head_left step_end -; 0x1a80ed -MovementData_0x1a80ed: ; 0x1a80ed +MovementData_0x1a80ed: turn_head_up step_down step_end -; 0x1a80f0 -MovementData_0x1a80f0: ; 0x1a80f0 +MovementData_0x1a80f0: turn_head_up fix_facing jump_step_down remove_fixed_facing step_end -; 0x1a80f5 -MovementData_0x1a80f5: ; 0x1a80f5 +MovementData_0x1a80f5: step_right step_end -; 0x1a80f7 -UnknownText_0x1a80f7: ; 0x1a80f7 +UnknownText_0x1a80f7: text "Wow, your #GEAR" line "is impressive!" para "Did your mom get" line "it for you?" done -; 0x1a8134 -UnknownText_0x1a8134: ; 0x1a8134 +UnknownText_0x1a8134: text "Wait, ", $14, "!" done -; 0x1a813e -UnknownText_0x1a813e: ; 0x1a813e +UnknownText_0x1a813e: text "What do you think" line "you're doing?" done -; 0x1a815e -UnknownText_0x1a815e: ; 0x1a815e +UnknownText_0x1a815e: text "It's dangerous to" line "go out without a" cont "#MON!" @@ -242,16 +215,14 @@ UnknownText_0x1a815e: ; 0x1a815e para "grass on the way" line "to the next town." done -; 0x1a81c4 -UnknownText_0x1a81c4: ; 0x1a81c4 +UnknownText_0x1a81c4: text "Oh! Your #MON" line "is adorable!" cont "I wish I had one!" done -; 0x1a81f2 -UnknownText_0x1a81f2: ; 0x1a81f2 +UnknownText_0x1a81f2: text "Hi, ", $14, "!" line "Leaving again?" @@ -259,66 +230,57 @@ UnknownText_0x1a81f2: ; 0x1a81f2 line "your mom if you" cont "are leaving." done -; 0x1a8236 -UnknownText_0x1a8236: ; 0x1a8236 +UnknownText_0x1a8236: text "Call your mom on" line "your #GEAR to" para "let her know how" line "you're doing." done -; 0x1a8274 -UnknownText_0x1a8274: ; 0x1a8274 +UnknownText_0x1a8274: text "Yo, ", $52, "!" para "I hear PROF.ELM" line "discovered some" cont "new #MON." done -; 0x1a82a6 -UnknownText_0x1a82a6: ; 0x1a82a6 +UnknownText_0x1a82a6: text $56 para "So this is the" line "famous ELM #MON" cont "LAB…" done -; 0x1a82cd -UnknownText_0x1a82cd: ; 0x1a82cd +UnknownText_0x1a82cd: text "…What are you" line "staring at?" done -; 0x1a82e8 -UnknownText_0x1a82e8: ; 0x1a82e8 +UnknownText_0x1a82e8: text "NEW BARK TOWN" para "The Town Where the" line "Winds of a New" cont "Beginning Blow" done -; 0x1a8328 -UnknownText_0x1a8328: ; 0x1a8328 +UnknownText_0x1a8328: text $52, "'s House" done -; 0x1a8332 -UnknownText_0x1a8332: ; 0x1a8332 +UnknownText_0x1a8332: text "ELM #MON LAB" done -; 0x1a8340 -UnknownText_0x1a8340: ; 0x1a8340 +UnknownText_0x1a8340: text "ELM'S HOUSE" done -; 0x1a834d -NewBarkTown_MapEventHeader: ; 0x1a834d +NewBarkTown_MapEventHeader: ; filler db 0, 0 @@ -346,4 +308,3 @@ NewBarkTown_MapEventHeader: ; 0x1a834d person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, $ffff person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, $ffff person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, $06bd -; 0x1a83b2 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 7991207ba..c2fc5448f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -3,24 +3,23 @@ OlivineCity_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1a882d, $0000 - dw UnknownScript_0x1a882e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a882f - -UnknownScript_0x1a882d: +.Trigger1 end -UnknownScript_0x1a882e: +.Trigger2 end -UnknownScript_0x1a882f: - setflag $0047 +.FlyPoint + setflag ENGINE_FLYPOINT_OLIVINE return UnknownScript_0x1a8833: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 3d24bcd10..be633dac0 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,4 +1,4 @@ -PalletTown_MapScriptHeader: ; 0x1ac6cc +PalletTown_MapScriptHeader: ; trigger count db 0 @@ -6,49 +6,39 @@ PalletTown_MapScriptHeader: ; 0x1ac6cc db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1ac6d1 -; 0x1ac6d1 - -UnknownScript_0x1ac6d1: ; 0x1ac6d1 - setflag $0035 +.FlyPoint + setflag ENGINE_FLYPOINT_PALLET return -; 0x1ac6d5 -TeacherScript_0x1ac6d5: ; 0x1ac6d5 +TeacherScript_0x1ac6d5: jumptextfaceplayer UnknownText_0x1ac6e7 -; 0x1ac6d8 -FisherScript_0x1ac6d8: ; 0x1ac6d8 +FisherScript_0x1ac6d8: jumptextfaceplayer UnknownText_0x1ac720 -; 0x1ac6db -MapPalletTownSignpost0Script: ; 0x1ac6db - jumptext UnknownText_0x1ac76b -; 0x1ac6de +PalletTownSign: + jumptext PalletTownSignText -MapPalletTownSignpost1Script: ; 0x1ac6de - jumptext UnknownText_0x1ac79d -; 0x1ac6e1 +RedsHouseSign: + jumptext RedsHouseSignText -MapPalletTownSignpost2Script: ; 0x1ac6e1 - jumptext UnknownText_0x1ac7aa -; 0x1ac6e4 +OaksLabSign: + jumptext OaksLabSignText -MapPalletTownSignpost3Script: ; 0x1ac6e4 - jumptext UnknownText_0x1ac7c1 -; 0x1ac6e7 +BluesHouseSign: + jumptext BluesHouseSignText -UnknownText_0x1ac6e7: ; 0x1ac6e7 +UnknownText_0x1ac6e7: text "I'm raising #-" line "MON too." para "They serve as my" line "private guards." done -; 0x1ac720 -UnknownText_0x1ac720: ; 0x1ac720 +UnknownText_0x1ac720: text "Technology is" line "incredible!" @@ -56,33 +46,28 @@ UnknownText_0x1ac720: ; 0x1ac720 line "#MON across" cont "time like e-mail." done -; 0x1ac76b -UnknownText_0x1ac76b: ; 0x1ac76b +PalletTownSignText: text "PALLET TOWN" para "A Tranquil Setting" line "of Peace & Purity" done -; 0x1ac79d -UnknownText_0x1ac79d: ; 0x1ac79d +RedsHouseSignText: text "RED'S HOUSE" done -; 0x1ac7aa -UnknownText_0x1ac7aa: ; 0x1ac7aa +OaksLabSignText: text "OAK #MON" line "RESEARCH LAB" done -; 0x1ac7c1 -UnknownText_0x1ac7c1: ; 0x1ac7c1 +BluesHouseSignText: text "BLUE'S HOUSE" done -; 0x1ac7cf -PalletTown_MapEventHeader: ; 0x1ac7cf +PalletTown_MapEventHeader: ; filler db 0, 0 @@ -97,13 +82,12 @@ PalletTown_MapEventHeader: ; 0x1ac7cf ; signposts db 4 - signpost 9, 7, $0, MapPalletTownSignpost0Script - signpost 5, 3, $0, MapPalletTownSignpost1Script - signpost 13, 13, $0, MapPalletTownSignpost2Script - signpost 5, 11, $0, MapPalletTownSignpost3Script + signpost 9, 7, $0, PalletTownSign + signpost 5, 3, $0, RedsHouseSign + signpost 13, 13, $0, OaksLabSign + signpost 5, 11, $0, BluesHouseSign ; people-events db 2 person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, $ffff person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, $ffff -; 0x1ac812 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 409a7d614..808936031 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,11 +6,10 @@ PewterCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x18c005 - -UnknownScript_0x18c005: - setflag $0037 +.FlyPoint + setflag ENGINE_FLYPOINT_PEWTER return CooltrainerFScript_0x18c009: diff --git a/maps/Route23.asm b/maps/Route23.asm index 44e524fe2..81304151e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,4 +1,4 @@ -Route23_MapScriptHeader: ; 0x1ae52e +Route23_MapScriptHeader: ; trigger count db 0 @@ -6,20 +6,16 @@ Route23_MapScriptHeader: ; 0x1ae52e db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1ae533 -; 0x1ae533 - -UnknownScript_0x1ae533: ; 0x1ae533 - setflag $0040 +.FlyPoint + setflag ENGINE_FLYPOINT_INDIGO_PLATEAU return -; 0x1ae537 -MapRoute23Signpost0Script: ; 0x1ae537 - jumptext UnknownText_0x1ae53a -; 0x1ae53a +IndigoPlateauSign: + jumptext IndigoPlateauSignText -UnknownText_0x1ae53a: ; 0x1ae53a +IndigoPlateauSignText: text "INDIGO PLATEAU" para "The Ultimate Goal" @@ -27,9 +23,8 @@ UnknownText_0x1ae53a: ; 0x1ae53a para "#MON LEAGUE HQ" done -; 0x1ae579 -Route23_MapEventHeader: ; 0x1ae579 +Route23_MapEventHeader: ; filler db 0, 0 @@ -45,8 +40,7 @@ Route23_MapEventHeader: ; 0x1ae579 ; signposts db 1 - signpost 7, 11, $0, MapRoute23Signpost0Script + signpost 7, 11, $0, IndigoPlateauSign ; people-events db 0 -; 0x1ae598 diff --git a/maps/Route36.asm b/maps/Route36.asm index 2ebbcb7cb..555dd5ca3 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -106,7 +106,7 @@ LassScript_0x19408c: ; 0x19408c loadfont checkevent $00ba iftrue UnknownScript_0x1940b3 - setevent $00b9 + setevent EVENT_MET_FLORIA writetext UnknownText_0x1942f1 closetext loadmovesprites @@ -786,5 +786,5 @@ Route36_MapEventHeader: ; 0x194a66 person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, $ffff person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, $ffff person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, $075a - person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, $0769 + person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b0 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 7c09fe1c1..6179555a4 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -6,11 +6,10 @@ SaffronCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x199326 - -UnknownScript_0x199326: - setflag $003c +.FlyPoint + setflag ENGINE_FLYPOINT_SAFFRON return LassScript_0x19932a: diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index fb273ae09..290c17977 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -6,11 +6,10 @@ SilverCaveOutside_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1b2047 - -UnknownScript_0x1b2047: - setflag $004c +.FlyPoint + setflag ENGINE_FLYPOINT_SILVER_CAVE return MtSilverPokeCenterSign: diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index ac86d4d42..007fe2aa1 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -6,11 +6,10 @@ VermilionCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1aa97f - -UnknownScript_0x1aa97f: - setflag $003a +.FlyPoint + setflag ENGINE_FLYPOINT_VERMILION return TeacherScript_0x1aa983: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 54df2da79..f01546648 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,34 +1,29 @@ -VermilionPort_MapScriptHeader: ; 0x74d90 +VermilionPort_MapScriptHeader: ; trigger count db 2 ; triggers - dw UnknownScript_0x74d9d, $0000 - dw UnknownScript_0x74d9e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x74da2 -; 0x74d9d - -UnknownScript_0x74d9d: ; 0x74d9d +.Trigger1 end -; 0x74d9e -UnknownScript_0x74d9e: ; 0x74d9e +.Trigger2 priorityjump UnknownScript_0x74da6 end -; 0x74da2 -UnknownScript_0x74da2: ; 0x74da2 - setflag $003a +.FlyPoint + setflag ENGINE_FLYPOINT_VERMILION return -; 0x74da6 -UnknownScript_0x74da6: ; 0x74da6 +UnknownScript_0x74da6: applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 @@ -40,9 +35,8 @@ UnknownScript_0x74da6: ; 0x74da6 setevent $0000 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end -; 0x74dc4 -SailorScript_0x74dc4: ; 0x74dc4 +SailorScript_0x74dc4: faceplayer loadfont checkevent $0000 @@ -76,16 +70,14 @@ SailorScript_0x74dc4: ; 0x74dc4 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 end -; 0x74e1a -UnknownScript_0x74e1a: ; 0x74e1a +UnknownScript_0x74e1a: writetext UnknownText_0x74f31 closetext loadmovesprites end -; 0x74e20 -UnknownScript_0x74e20: ; 0x74e20 +UnknownScript_0x74e20: spriteface $3, $3 checkevent $0000 iftrue UnknownScript_0x74e86 @@ -112,52 +104,45 @@ UnknownScript_0x74e20: ; 0x74e20 setevent $0001 applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 -; 0x74e68 -UnknownScript_0x74e68: ; 0x74e68 +UnknownScript_0x74e68: writetext UnknownText_0x74ff2 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 end -; 0x74e72 -UnknownScript_0x74e72: ; 0x74e72 +UnknownScript_0x74e72: writetext UnknownText_0x75059 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 end -; 0x74e7c -UnknownScript_0x74e7c: ; 0x74e7c +UnknownScript_0x74e7c: writetext UnknownText_0x75080 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 end -; 0x74e86 -UnknownScript_0x74e86: ; 0x74e86 +UnknownScript_0x74e86: end -; 0x74e87 -UnknownScript_0x74e87: ; 0x74e87 +UnknownScript_0x74e87: writetext UnknownText_0x74fa7 closetext loadmovesprites end -; 0x74e8d -UnknownScript_0x74e8d: ; 0x74e8d +UnknownScript_0x74e8d: writetext UnknownText_0x74fa7 closetext loadmovesprites applymovement $0, MovementData_0x74ef5 end -; 0x74e97 -SailorScript_0x74e97: ; 0x74e97 +SailorScript_0x74e97: faceplayer loadfont checkevent $0000 @@ -181,70 +166,60 @@ SailorScript_0x74e97: ; 0x74e97 setevent $0001 applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 -; 0x74ed4 -UnknownScript_0x74ed4: ; 0x74ed4 +UnknownScript_0x74ed4: writetext UnknownText_0x74ff2 closetext loadmovesprites end -; 0x74eda -UnknownScript_0x74eda: ; 0x74eda +UnknownScript_0x74eda: writetext UnknownText_0x75059 closetext loadmovesprites end -; 0x74ee0 -UnknownScript_0x74ee0: ; 0x74ee0 +UnknownScript_0x74ee0: writetext UnknownText_0x75080 closetext loadmovesprites end -; 0x74ee6 -SuperNerdScript_0x74ee6: ; 0x74ee6 +SuperNerdScript_0x74ee6: faceplayer loadfont writetext UnknownText_0x750a6 closetext loadmovesprites end -; 0x74eee -MapVermilionPortSignpostItem0: ; 0x74eee +MapVermilionPortSignpostItem0: dw $00eb db IRON -; 0x74ef1 -MovementData_0x74ef1: ; 0x74ef1 +MovementData_0x74ef1: step_down step_end -; 0x74ef3 -MovementData_0x74ef3: ; 0x74ef3 +MovementData_0x74ef3: step_up step_end -; 0x74ef5 -MovementData_0x74ef5: ; 0x74ef5 +MovementData_0x74ef5: step_right turn_head_left step_end -; 0x74ef8 -MovementData_0x74ef8: ; 0x74ef8 +MovementData_0x74ef8: step_down step_down step_down step_down step_down step_end -; 0x74efe -MovementData_0x74efe: ; 0x74efe +MovementData_0x74efe: step_right step_down step_down @@ -253,52 +228,45 @@ MovementData_0x74efe: ; 0x74efe step_down step_down step_end -; 0x74f06 -UnknownText_0x74f06: ; 0x74f06 +UnknownText_0x74f06: text "We're departing" line "soon. Please get" cont "on board." done -; 0x74f31 -UnknownText_0x74f31: ; 0x74f31 +UnknownText_0x74f31: text "Sorry. You can't" line "board now." done -; 0x74f4d -UnknownText_0x74f4d: ; 0x74f4d +UnknownText_0x74f4d: text "Welcome to FAST" line "SHIP S.S.AQUA." para "Will you be board-" line "ing today?" done -; 0x74f8b -UnknownText_0x74f8b: ; 0x74f8b +UnknownText_0x74f8b: text "May I see your" line "S.S.TICKET?" done -; 0x74fa7 -UnknownText_0x74fa7: ; 0x74fa7 +UnknownText_0x74fa7: text "We hope to see you" line "again!" done -; 0x74fc2 -UnknownText_0x74fc2: ; 0x74fc2 +UnknownText_0x74fc2: text $52, " flashed" line "the S.S.TICKET." para "That's it." line "Thank you!" done -; 0x74ff2 -UnknownText_0x74ff2: ; 0x74ff2 +UnknownText_0x74ff2: text $52, " tried to" line "show the S.S." cont "TICKET…" @@ -311,21 +279,18 @@ UnknownText_0x74ff2: ; 0x74ff2 para "if you have an" line "S.S.TICKET." done -; 0x75059 -UnknownText_0x75059: ; 0x75059 +UnknownText_0x75059: text "The FAST SHIP will" line "sail on Wednesday." done -; 0x75080 -UnknownText_0x75080: ; 0x75080 +UnknownText_0x75080: text "The FAST SHIP will" line "sail next Sunday." done -; 0x750a6 -UnknownText_0x750a6: ; 0x750a6 +UnknownText_0x750a6: text "You came from" line "JOHTO?" @@ -333,9 +298,8 @@ UnknownText_0x750a6: ; 0x750a6 line "#MON live over" cont "there." done -; 0x750e3 -VermilionPort_MapEventHeader: ; 0x750e3 +VermilionPort_MapEventHeader: ; filler db 0, 0 @@ -357,4 +321,3 @@ VermilionPort_MapEventHeader: ; 0x750e3 person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, $072b person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, $ffff person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, $ffff -; 0x75127 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index cdd0258c6..f3769cc7c 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -6,11 +6,10 @@ VioletCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a83b7 - -UnknownScript_0x1a83b7: - setflag $0043 +.FlyPoint + setflag ENGINE_FLYPOINT_VIOLET return FisherScript_0x1a83bb: diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index a67644788..418418a42 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -6,11 +6,10 @@ ViridianCity_MapScriptHeader: db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a9a48 - -UnknownScript_0x1a9a48: - setflag $0036 +.FlyPoint + setflag ENGINE_FLYPOINT_VIRIDIAN return GrampsScript_0x1a9a4c: |