diff options
Diffstat (limited to 'maps')
393 files changed, 3237 insertions, 6043 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 511d52473..64f90b38a 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -59,11 +59,11 @@ UnknownScript_0x18ec73: ; 0x18ec73 ; 0x18ec7c UnknownScript_0x18ec7c: ; 0x18ec7c - jumpstd $0012 + jumpstd goldenrodrockets ; 0x18ec7f UnknownScript_0x18ec7f: ; 0x18ec7f - jumpstd $0013 + jumpstd radiotowerrockets ; 0x18ec82 TrainerTwinsAmyandmay1: ; 0x18ec82 @@ -229,16 +229,13 @@ AzaleaGymGuyScript: ; 0x18ece6 end ; 0x18ecfb -MapAzaleaGymSignpost1Script: ; 0x18ecfb - checkflag $001c - iftrue UnknownScript_0x18ed04 - jumpstd $002d -; 0x18ed04 - -UnknownScript_0x18ed04: ; 0x18ed04 +AzaleaGymStatue: + checkflag ENGINE_HIVEBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext BUGSY, 1, $1 - jumpstd $002e -; 0x18ed0b + jumpstd gymstatue2 UnknownText_0x18ed0b: ; 0x18ed0b text "I'm BUGSY!" @@ -489,8 +486,8 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc ; signposts db 2 - signpost 13, 3, $0, MapAzaleaGymSignpost1Script - signpost 13, 6, $0, MapAzaleaGymSignpost1Script + signpost 13, 3, $0, AzaleaGymStatue + signpost 13, 6, $0, AzaleaGymStatue ; people-events db 7 @@ -502,6 +499,3 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff ; 0x18f441 - - - diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index b363bf8d4..ef1f03dd7 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -67,4 +67,3 @@ AzaleaMart_MapEventHeader: ; 0x18e118 person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff ; 0x18e14f - diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 0f4313331..6dd246dd5 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -14,7 +14,7 @@ UnknownScript_0x18db27: ; 0x18db27 ; 0x18db28 NurseScript_0x18db28: ; 0x18db28 - jumpstd $0000 + jumpstd pokecenternurse ; 0x18db2b GentlemanScript_0x18db2b: ; 0x18db2b @@ -105,4 +105,3 @@ AzaleaPokeCenter1F_MapEventHeader: ; 0x18dccf person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, $ffff person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, $ffff ; 0x18dd18 - diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index d24362744..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,51 +172,40 @@ KurtOutsideScript_0x19810c: ; 0x19810c spriteface $d, $2 loadmovesprites end -; 0x198117 -MapAzaleaTownSignpost0Script: ; 0x198117 - jumptext UnknownText_0x19865a -; 0x19811a +AzaleaTownSign: + jumptext AzaleaTownSignText -MapAzaleaTownSignpost1Script: ; 0x19811a - jumptext UnknownText_0x198693 -; 0x19811d +KurtsHouseSign: + jumptext KurtsHouseSignText -MapAzaleaTownSignpost2Script: ; 0x19811d - jumptext UnknownText_0x1986a1 -; 0x198120 +AzaleaGymSign: + jumptext AzaleaGymSignText -MapAzaleaTownSignpost3Script: ; 0x198120 - jumptext UnknownText_0x1986e7 -; 0x198123 +SlowpokeWellSign: + jumptext SlowpokeWellSignText -MapAzaleaTownSignpost4Script: ; 0x198123 - jumptext UnknownText_0x19878d -; 0x198126 +CharcoalKilnSign: + jumptext CharcoalKilnSignText -MapAzaleaTownSignpost7Script: ; 0x198126 - jumptext UnknownText_0x19879c -; 0x198129 +AzaleaTownIlextForestSign: + jumptext AzaleaTownIlexForestSignText -MapAzaleaTownSignpost5Script: ; 0x198129 - jumpstd $0010 -; 0x19812c +AzaleaTownPokeCenterSign: + jumpstd pokecentersign -MapAzaleaTownSignpost6Script: ; 0x19812c - jumpstd $0011 -; 0x19812f +AzaleaTownMartSign: + jumpstd martsign -FruitTreeScript_0x19812f: ; 0x19812f +WhiteApricornTree: fruittree $14 -; 0x198131 -MapAzaleaTownSignpostItem8: ; 0x198131 +MapAzaleaTownSignpostItem8: dw $00b1 db FULL_HEAL -; 0x198134 -MovementData_0x198134: ; 0x198134 +MovementData_0x198134: step_left step_left step_left @@ -245,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 @@ -256,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." @@ -289,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!" @@ -301,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." @@ -332,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." @@ -348,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!" @@ -358,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…" @@ -369,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." @@ -381,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?" @@ -391,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." @@ -408,61 +364,52 @@ 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 -UnknownText_0x19865a: ; 0x19865a +AzaleaTownSignText: text "AZALEA TOWN" line "Where People and" para "#MON Live in" line "Happy Harmony" done -; 0x198693 -UnknownText_0x198693: ; 0x198693 +KurtsHouseSignText: text "KURT'S HOUSE" done -; 0x1986a1 -UnknownText_0x1986a1: ; 0x1986a1 +AzaleaGymSignText: text "AZALEA TOWN" line "#MON GYM" cont "LEADER: BUGSY" @@ -471,9 +418,8 @@ UnknownText_0x1986a1: ; 0x1986a1 line "Bug #MON" cont "Encyclopedia" done -; 0x1986e7 -UnknownText_0x1986e7: ; 0x1986e7 +SlowpokeWellSignText: text "SLOWPOKE WELL" para "Also known as the" @@ -489,22 +435,19 @@ UnknownText_0x1986e7: ; 0x1986e7 para "ended a drought" line "400 years ago." done -; 0x19878d -UnknownText_0x19878d: ; 0x19878d +CharcoalKilnSignText: text "CHARCOAL KILN" done -; 0x19879c -UnknownText_0x19879c: ; 0x19879c +AzaleaTownIlexForestSignText: text "ILEX FOREST" para "Enter through the" line "gate." done -; 0x1987c1 -AzaleaTown_MapEventHeader: ; 0x1987c1 +AzaleaTown_MapEventHeader: ; filler db 0, 0 @@ -527,14 +470,14 @@ AzaleaTown_MapEventHeader: ; 0x1987c1 ; signposts db 9 - signpost 9, 19, $0, MapAzaleaTownSignpost0Script - signpost 9, 10, $0, MapAzaleaTownSignpost1Script - signpost 15, 14, $0, MapAzaleaTownSignpost2Script - signpost 7, 29, $0, MapAzaleaTownSignpost3Script - signpost 13, 19, $0, MapAzaleaTownSignpost4Script - signpost 9, 16, $0, MapAzaleaTownSignpost5Script - signpost 5, 22, $0, MapAzaleaTownSignpost6Script - signpost 9, 3, $0, MapAzaleaTownSignpost7Script + signpost 9, 19, $0, AzaleaTownSign + signpost 9, 10, $0, KurtsHouseSign + signpost 15, 14, $0, AzaleaGymSign + signpost 7, 29, $0, SlowpokeWellSign + signpost 13, 19, $0, CharcoalKilnSign + signpost 9, 16, $0, AzaleaTownPokeCenterSign + signpost 5, 22, $0, AzaleaTownMartSign + signpost 9, 3, $0, AzaleaTownIlextForestSign signpost 6, 31, $7, MapAzaleaTownSignpostItem8 ; people-events @@ -547,9 +490,7 @@ AzaleaTown_MapEventHeader: ; 0x1987c1 person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 - person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19812f, $ffff + person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, $ffff 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/BattleTower1F.asm b/maps/BattleTower1F.asm index 5d65fd6bb..e03946cb1 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -109,7 +109,7 @@ UnknownScript_0x9e44e: ; 0x9e44e writebyte $8 special Function170687 UnknownScript_0x9e454: ; 0x9e454 - musicfadeout $0000, $8 + musicfadeout MUSIC_NONE, $8 domaptrigger GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM, $0 domaptrigger GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR, $0 domaptrigger GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY, $0 @@ -852,4 +852,3 @@ BattleTower1F_MapEventHeader: ; 0x9f3b4 person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, $ffff person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, $ffff ; 0x9f40f - diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index e16feb3e8..a69d56865 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -168,4 +168,3 @@ BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791 person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff ; 0x9f558 - diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 900d01c7b..3bb3b469d 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -68,4 +68,3 @@ BattleTowerElevator_MapEventHeader: ; 0x9f594 db 1 person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff ; 0x9f5b1 - diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 1ac5939bb..33bde1837 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -109,4 +109,3 @@ BattleTowerHallway_MapEventHeader: ; 0x9f62f db 1 person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff ; 0x9f660 - diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 68db0320e..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,6 +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/BillsHouse.asm b/maps/BillsHouse.asm index 886430c50..22f2ddff5 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -404,4 +404,3 @@ BillsHouse_MapEventHeader: ; 0x189b42 db 1 person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff ; 0x189b5f - diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index bac02795d..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 @@ -127,35 +114,28 @@ SantosNotSaturdayScript: loadmovesprites end -MapBlackthornCitySignpost0Script: ; 0x1a4765 - jumptext UnknownText_0x1a4b67 -; 0x1a4768 +BlackthornCitySign: + jumptext BlackthornCitySignText -MapBlackthornCitySignpost1Script: ; 0x1a4768 - jumptext UnknownText_0x1a4b91 -; 0x1a476b +BlackthornGymSign: + jumptext BlackthornGymSignText -MapBlackthornCitySignpost2Script: ; 0x1a476b - jumptext UnknownText_0x1a4bd9 -; 0x1a476e +MoveDeletersHouseSign: + jumptext MoveDeletersHouseSignText -MapBlackthornCitySignpost3Script: ; 0x1a476e - jumptext UnknownText_0x1a4bef -; 0x1a4771 +DragonDensSign: + jumptext DragonDensSignText -MapBlackthornCitySignpost4Script: ; 0x1a4771 - jumptext UnknownText_0x1a4c03 -; 0x1a4774 +BlackthornCityTrainerTips: + jumptext BlackthornCityTrainerTipsText -MapBlackthornCitySignpost6Script: ; 0x1a4774 - jumpstd $0010 -; 0x1a4777 +BlackthornCityPokeCenterSign: + jumpstd pokecentersign -MapBlackthornCitySignpost5Script: ; 0x1a4777 - jumpstd $0011 -; 0x1a477a +BlackthornCityMartSign: + jumpstd martsign -UnknownText_0x1a477a: ; 0x1a477a +UnknownText_0x1a477a: text "I am sorry." para "CLAIR, our GYM" @@ -168,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." @@ -181,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?" @@ -195,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" @@ -214,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: …" @@ -286,7 +257,7 @@ SantosNotSaturdayText: line "not Saturday…" done -UnknownText_0x1a4b1e: ; 0x1a4b1e +UnknownText_0x1a4b1e: text "Wow, you came" line "through the ICE" cont "PATH?" @@ -294,17 +265,15 @@ UnknownText_0x1a4b1e: ; 0x1a4b1e para "You must be a real" line "hotshot trainer!" done -; 0x1a4b67 -UnknownText_0x1a4b67: ; 0x1a4b67 +BlackthornCitySignText: text "BLACKTHORN CITY" para "A Quiet Mountain" line "Retreat" done -; 0x1a4b91 -UnknownText_0x1a4b91: ; 0x1a4b91 +BlackthornGymSignText: text "BLACKTHORN CITY" line "#MON GYM" cont "LEADER: CLAIR" @@ -312,21 +281,18 @@ UnknownText_0x1a4b91: ; 0x1a4b91 para "The Blessed User" line "of Dragon #MON" done -; 0x1a4bd9 -UnknownText_0x1a4bd9: ; 0x1a4bd9 +MoveDeletersHouseSignText: text "MOVE DELETER'S" line "HOUSE" done -; 0x1a4bef -UnknownText_0x1a4bef: ; 0x1a4bef +DragonDensSignText: text "DRAGON'S DEN" line "AHEAD" done -; 0x1a4c03 -UnknownText_0x1a4c03: ; 0x1a4c03 +BlackthornCityTrainerTipsText: text "TRAINER TIPS" para "A #MON holding" @@ -336,9 +302,8 @@ UnknownText_0x1a4c03: ; 0x1a4c03 line "of any status" cont "problem." done -; 0x1a4c57 -BlackthornCity_MapEventHeader: ; 0x1a4c57 +BlackthornCity_MapEventHeader: ; filler db 0, 0 @@ -358,13 +323,13 @@ BlackthornCity_MapEventHeader: ; 0x1a4c57 ; signposts db 7 - signpost 24, 34, $0, MapBlackthornCitySignpost0Script - signpost 13, 17, $0, MapBlackthornCitySignpost1Script - signpost 31, 7, $0, MapBlackthornCitySignpost2Script - signpost 3, 21, $0, MapBlackthornCitySignpost3Script - signpost 25, 5, $0, MapBlackthornCitySignpost4Script - signpost 29, 16, $0, MapBlackthornCitySignpost5Script - signpost 29, 22, $0, MapBlackthornCitySignpost6Script + signpost 24, 34, $0, BlackthornCitySign + signpost 13, 17, $0, BlackthornGymSign + signpost 31, 7, $0, MoveDeletersHouseSign + signpost 3, 21, $0, DragonDensSign + signpost 25, 5, $0, BlackthornCityTrainerTips + signpost 29, 16, $0, BlackthornCityMartSign + signpost 29, 22, $0, BlackthornCityPokeCenterSign ; people-events db 9 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 79a316008..c848d2c30 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -4,20 +4,17 @@ BlackthornDodrioTradeHouse_MapScriptHeader: ; 0x195a28 ; callback count db 0 -; 0x195a2a -LassScript_0x195a2a: ; 0x195a2a +Emy: faceplayer loadfont trade $3 closetext loadmovesprites end -; 0x195a31 -MapBlackthornDodrioTradeHouseSignpost1Script: ; 0x195a31 - jumpstd $0003 -; 0x195a34 +EmysHouseBookshelf: + jumpstd magazinebookshelf BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34 ; filler @@ -33,11 +30,10 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34 ; signposts db 2 - signpost 1, 0, $0, MapBlackthornDodrioTradeHouseSignpost1Script - signpost 1, 1, $0, MapBlackthornDodrioTradeHouseSignpost1Script + signpost 1, 0, $0, EmysHouseBookshelf + signpost 1, 1, $0, EmysHouseBookshelf ; people-events db 1 - person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff + person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, $ffff ; 0x195a5b - diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 2b6047b2f..f852da0b8 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -64,4 +64,3 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; 0x1959fe person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, $ffff person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, $ffff ; 0x195a28 - diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b3f9e61fc..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,20 +183,16 @@ BlackthornGymGuyScript: ; 0x194ed6 closetext loadmovesprites end -; 0x194eea - -MapBlackthornGym1FSignpost1Script: ; 0x194eea - checkflag $0022 - iftrue UnknownScript_0x194ef3 - jumpstd $002d -; 0x194ef3 -UnknownScript_0x194ef3: ; 0x194ef3 +BlackthornGymStatue: + checkflag ENGINE_RISINGBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext CLAIR, 1, $1 - jumpstd $002e -; 0x194efa + jumpstd gymstatue2 -UnknownText_0x194efa: ; 0x194efa +UnknownText_0x194efa: text "I am CLAIR." para "The world's best" @@ -234,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." @@ -279,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." @@ -315,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" @@ -353,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." @@ -413,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!" @@ -451,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!" @@ -465,9 +428,8 @@ BlackthornGymGuyWinText: ; 0x195632 line "to becoming the" cont "#MON CHAMPION!" done -; 0x1956ae -BlackthornGym1F_MapEventHeader: ; 0x1956ae +BlackthornGym1F_MapEventHeader: ; filler db 0, 0 @@ -486,8 +448,8 @@ BlackthornGym1F_MapEventHeader: ; 0x1956ae ; signposts db 2 - signpost 15, 3, $0, MapBlackthornGym1FSignpost1Script - signpost 15, 6, $0, MapBlackthornGym1FSignpost1Script + signpost 15, 3, $0, BlackthornGymStatue + signpost 15, 6, $0, BlackthornGymStatue ; people-events db 5 @@ -496,5 +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 77618b808..b82264200 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ -BlackthornGym2F_MapScriptHeader: ; 0x195722 +BlackthornGym2F_MapScriptHeader: ; trigger count db 0 @@ -6,70 +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 -BoulderScript_0x19575e: ; 0x19575e - jumpstd $000e -; 0x195761 +BlackthornGymBoulder: + jumpstd strengthboulder -TrainerCooltrainermCody: ; 0x195761 +TrainerCooltrainermCody: ; bit/flag number dw $54b @@ -87,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 @@ -116,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" @@ -150,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!" @@ -160,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 @@ -201,11 +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, BoulderScript_0x19575e, $0706 - person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0707 - person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0708 - person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff - person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff - person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff -; 0x195947 - + 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/BlackthornMart.asm b/maps/BlackthornMart.asm index 35d664937..641aedb38 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -68,4 +68,3 @@ BlackthornMart_MapEventHeader: ; 0x195b40 person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, $ffff person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, $ffff ; 0x195b77 - diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index f56d721a9..cc70b0841 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -7,7 +7,7 @@ BlackthornPokeCenter1F_MapScriptHeader: ; 0x195b77 ; 0x195b79 NurseScript_0x195b79: ; 0x195b79 - jumpstd $0000 + jumpstd pokecenternurse ; 0x195b7c GentlemanScript_0x195b7c: ; 0x195b7c @@ -73,4 +73,3 @@ BlackthornPokeCenter1F_MapEventHeader: ; 0x195c69 person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, $ffff person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, $ffff ; 0x195cb2 - diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index aab29be8f..dfc68e96b 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -175,4 +175,3 @@ BluesHouse_MapEventHeader: ; 0x19b3a8 db 1 person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff ; 0x19b3c5 - diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9101547f0..348800279 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -158,4 +158,3 @@ BrunosRoom_MapEventHeader: ; 0x180b88 db 1 person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff ; 0x180baf - diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 356dfcb81..06e4e526e 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -137,9 +137,8 @@ MortyScript_0x185cbf: ; 0x185cbf jumptextfaceplayer UnknownText_0x186002 ; 0x185cc2 -RockScript_0x185cc2: ; 0x185cc2 - jumpstd $000f -; 0x185cc5 +BurnedTower1FRock: + jumpstd smashrock MapBurnedTower1FSignpostItem0: ; 0x185cc5 dw $0080 @@ -339,10 +338,9 @@ BurnedTower1F_MapEventHeader: ; 0x1860b2 ; people-events db 5 - person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, RockScript_0x185cc2, $ffff + person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, $ffff person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, $0765 person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5 person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764 person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656 ; 0x186151 - diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 67dd1bd7a..c97adb11d 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -123,9 +123,8 @@ ItemFragment_0x186231: ; 0x186231 db TM_20, 1 ; 0x186233 -BoulderScript_0x186233: ; 0x186233 - jumpstd $000e -; 0x186236 +BurnedTowerB1FBoulder: + jumpstd strengthboulder MovementData_0x186236: ; 0x186236 db $39 ; movement @@ -269,7 +268,7 @@ BurnedTowerB1F_MapEventHeader: ; 0x1863de ; people-events db 9 - person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x186233, $ffff + person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, $ffff person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, $074a person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, $074a person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, $074a @@ -279,6 +278,3 @@ BurnedTowerB1F_MapEventHeader: ; 0x1863de person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657 person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, $07aa ; 0x18647f - - - diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 844fde007..e31136c60 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -87,40 +87,36 @@ UnknownScript_0x7309a: ; 0x7309a end ; 0x730ad -MapCeladonCafeSignpost0Script: ; 0x730ad - jumptext UnknownText_0x73285 -; 0x730b0 +EatathonContestPoster: + jumptext EatathonContestPosterText -MapCeladonCafeSignpost1Script: ; 0x730b0 +CeladonCafeTrashcan: checkevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE - iftrue UnknownScript_0x730db + iftrue .TrashEmpty giveitem LEFTOVERS, $1 - iffalse UnknownScript_0x730cd + iffalse .PackFull loadfont itemtotext LEFTOVERS, $0 - writetext UnknownText_0x732e7 + writetext FoundLeftoversText playsound SFX_ITEM waitbutton itemnotify loadmovesprites setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE end -; 0x730cd -UnknownScript_0x730cd: ; 0x730cd +.PackFull loadfont itemtotext LEFTOVERS, $0 - writetext UnknownText_0x732e7 + writetext FoundLeftoversText keeptextopen - writetext UnknownText_0x732f7 + writetext NoRoomForLeftoversText closetext loadmovesprites end -; 0x730db -UnknownScript_0x730db: ; 0x730db - jumpstd $000d -; 0x730de +.TrashEmpty + jumpstd trashcan UnknownText_0x730de: ; 0x730de text "Hi!" @@ -199,7 +195,7 @@ UnknownText_0x73278: ; 0x73278 done ; 0x73285 -UnknownText_0x73285: ; 0x73285 +EatathonContestPosterText: text "Eatathon Contest!" line "No time limit!" @@ -209,21 +205,18 @@ UnknownText_0x73285: ; 0x73285 para "muncher gets it" line "all for free!" done -; 0x732e7 -UnknownText_0x732e7: ; 0x732e7 +FoundLeftoversText: text $52, " found" line "@" text_from_ram StringBuffer3 text "!" done -; 0x732f7 -UnknownText_0x732f7: ; 0x732f7 +NoRoomForLeftoversText: text "But ", $52, " can't" line "hold another item…" done -; 0x73316 CeladonCafe_MapEventHeader: ; 0x73316 ; filler @@ -239,8 +232,8 @@ CeladonCafe_MapEventHeader: ; 0x73316 ; signposts db 2 - signpost 0, 5, $0, MapCeladonCafeSignpost0Script - signpost 1, 7, $0, MapCeladonCafeSignpost1Script + signpost 0, 5, $0, EatathonContestPoster + signpost 1, 7, $0, CeladonCafeTrashcan ; people-events db 5 @@ -249,5 +242,3 @@ CeladonCafe_MapEventHeader: ; 0x73316 person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, $ffff person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff -; 0x73371 - diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 27623e8ea..4641777b4 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ -CeladonCity_MapScriptHeader: ; 0x1a9f3a +CeladonCity_MapScriptHeader: ; trigger count db 0 @@ -6,91 +6,70 @@ CeladonCity_MapScriptHeader: ; 0x1a9f3a db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a9f3f -; 0x1a9f3f - -UnknownScript_0x1a9f3f: ; 0x1a9f3f - setflag $003d +.FlyPoint + setflag ENGINE_FLYPOINT_CELADON return -; 0x1a9f43 -FisherScript_0x1a9f43: ; 0x1a9f43 +FisherScript_0x1a9f43: jumptextfaceplayer UnknownText_0x1a9f7d -; 0x1a9f46 -PoliwagScript_0x1a9f46: ; 0x1a9f46 +CeladonCityPoliwrath: loadfont - writetext UnknownText_0x1a9fcb + writetext CeladonCityPoliwrathText cry POLIWRATH closetext loadmovesprites end -; 0x1a9f50 -TeacherScript_0x1a9f50: ; 0x1a9f50 +TeacherScript_0x1a9f50: jumptextfaceplayer UnknownText_0x1a9fde -; 0x1a9f53 -GrampsScript_0x1a9f53: ; 0x1a9f53 +GrampsScript_0x1a9f53: jumptextfaceplayer UnknownText_0x1aa043 -; 0x1a9f56 -GrampsScript_0x1a9f56: ; 0x1a9f56 +GrampsScript_0x1a9f56: jumptextfaceplayer UnknownText_0x1aa0dc -; 0x1a9f59 -YoungsterScript_0x1a9f59: ; 0x1a9f59 +YoungsterScript_0x1a9f59: jumptextfaceplayer UnknownText_0x1aa115 -; 0x1a9f5c -YoungsterScript_0x1a9f5c: ; 0x1a9f5c +YoungsterScript_0x1a9f5c: jumptextfaceplayer UnknownText_0x1aa155 -; 0x1a9f5f -TeacherScript_0x1a9f5f: ; 0x1a9f5f +TeacherScript_0x1a9f5f: jumptextfaceplayer UnknownText_0x1aa1bd -; 0x1a9f62 -LassScript_0x1a9f62: ; 0x1a9f62 +LassScript_0x1a9f62: jumptextfaceplayer UnknownText_0x1aa306 -; 0x1a9f65 -MapCeladonCitySignpost0Script: ; 0x1a9f65 - jumptext UnknownText_0x1aa340 -; 0x1a9f68 +CeladonCitySign: + jumptext CeladonCitySignText -MapCeladonCitySignpost1Script: ; 0x1a9f68 - jumptext UnknownText_0x1aa369 -; 0x1a9f6b +CeladonGymSign: + jumptext CeladonGymSignText -MapCeladonCitySignpost2Script: ; 0x1a9f6b - jumptext UnknownText_0x1aa3a9 -; 0x1a9f6e +CeladonCityDeptStoreSign: + jumptext CeladonCityDeptStoreSignText -MapCeladonCitySignpost3Script: ; 0x1a9f6e - jumptext UnknownText_0x1aa3d4 -; 0x1a9f71 +CeladonCityMansionSign: + jumptext CeladonCityMansionSignText -MapCeladonCitySignpost4Script: ; 0x1a9f71 - jumptext UnknownText_0x1aa3e5 -; 0x1a9f74 +CeladonCityGameCornerSign: + jumptext CeladonCityGameCornerSignText -MapCeladonCitySignpost5Script: ; 0x1a9f74 - jumptext UnknownText_0x1aa418 -; 0x1a9f77 +CeladonCityTrainerTips: + jumptext CeladonCityTrainerTipsText -MapCeladonCitySignpost6Script: ; 0x1a9f77 - jumpstd $0010 -; 0x1a9f7a +CeladonCityPokeCenterSign: + jumpstd pokecentersign -MapCeladonCitySignpostItem7: ; 0x1a9f7a +MapCeladonCitySignpostItem7: dw $00fd db PP_UP - -; 0x1a9f7d -UnknownText_0x1a9f7d: ; 0x1a9f7d +UnknownText_0x1a9f7d: text "This POLIWRATH is" line "my partner." @@ -98,14 +77,12 @@ UnknownText_0x1a9f7d: ; 0x1a9f7d line "ever evolve into a" cont "frog #MON." done -; 0x1a9fcb -UnknownText_0x1a9fcb: ; 0x1a9fcb +CeladonCityPoliwrathText: text "POLIWRATH: Croak!" done -; 0x1a9fde -UnknownText_0x1a9fde: ; 0x1a9fde +UnknownText_0x1a9fde: text "I lost at the slot" line "machines again…" @@ -115,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." @@ -131,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?" @@ -150,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." @@ -161,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" @@ -179,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!" @@ -199,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 -UnknownText_0x1aa340: ; 0x1aa340 +CeladonCitySignText: text "CELADON CITY" para "The City of" line "Rainbow Dreams" done -; 0x1aa369 -UnknownText_0x1aa369: ; 0x1aa369 +CeladonGymSignText: text "CELADON CITY" line "#MON GYM" cont "LEADER: ERIKA" @@ -226,28 +194,24 @@ UnknownText_0x1aa369: ; 0x1aa369 para "The Nature-Loving" line "Princess" done -; 0x1aa3a9 -UnknownText_0x1aa3a9: ; 0x1aa3a9 +CeladonCityDeptStoreSignText: text "Find What You" line "Need at CELADON" cont "DEPT.STORE!" done -; 0x1aa3d4 -UnknownText_0x1aa3d4: ; 0x1aa3d4 +CeladonCityMansionSignText: text "CELADON MANSION" done -; 0x1aa3e5 -UnknownText_0x1aa3e5: ; 0x1aa3e5 +CeladonCityGameCornerSignText: text "The Playground for" line "Everybody--CELADON" cont "GAME CORNER" done -; 0x1aa418 -UnknownText_0x1aa418: ; 0x1aa418 +CeladonCityTrainerTipsText: text "TRAINER TIPS" para "GUARD SPEC." @@ -261,9 +225,8 @@ UnknownText_0x1aa418: ; 0x1aa418 line "CELADON DEPT." cont "STORE!" done -; 0x1aa497 -CeladonCity_MapEventHeader: ; 0x1aa497 +CeladonCity_MapEventHeader: ; filler db 0, 0 @@ -284,19 +247,19 @@ CeladonCity_MapEventHeader: ; 0x1aa497 ; signposts db 8 - signpost 21, 23, $0, MapCeladonCitySignpost0Script - signpost 31, 11, $0, MapCeladonCitySignpost1Script - signpost 9, 6, $0, MapCeladonCitySignpost2Script - signpost 9, 13, $0, MapCeladonCitySignpost3Script - signpost 21, 19, $0, MapCeladonCitySignpost4Script - signpost 21, 29, $0, MapCeladonCitySignpost5Script - signpost 9, 30, $0, MapCeladonCitySignpost6Script + signpost 21, 23, $0, CeladonCitySign + signpost 31, 11, $0, CeladonGymSign + signpost 9, 6, $0, CeladonCityDeptStoreSign + signpost 9, 13, $0, CeladonCityMansionSign + signpost 21, 19, $0, CeladonCityGameCornerSign + signpost 21, 29, $0, CeladonCityTrainerTips + signpost 9, 30, $0, CeladonCityPokeCenterSign signpost 21, 37, $7, MapCeladonCitySignpostItem7 ; people-events db 9 person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, $ffff - person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, PoliwagScript_0x1a9f46, $ffff + person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, $ffff person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, $ffff person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, $ffff person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, $ffff @@ -304,5 +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/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index e8fe87f30..0d3d1a31f 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,32 +1,26 @@ -CeladonDeptStore1F_MapScriptHeader: ; 0x709de +CeladonDeptStore1F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x709e0 -ReceptionistScript_0x709e0: ; 0x709e0 +ReceptionistScript_0x709e0: jumptextfaceplayer UnknownText_0x709ef -; 0x709e3 -GentlemanScript_0x709e3: ; 0x709e3 +GentlemanScript_0x709e3: jumptextfaceplayer UnknownText_0x70a35 -; 0x709e6 -TeacherScript_0x709e6: ; 0x709e6 +TeacherScript_0x709e6: jumptextfaceplayer UnknownText_0x70aa9 -; 0x709e9 -MapCeladonDeptStore1FSignpost0Script: ; 0x709e9 - jumptext UnknownText_0x70aea -; 0x709ec +CeladonDeptStore1FDirectory: + jumptext CeladonDeptStore1FDirectoryText -MapCeladonDeptStore6FSignpost1Script: ; 0x709ec - jumpstd $0014 -; 0x709ef +CeladonDeptStore1FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x709ef: ; 0x709ef +UnknownText_0x709ef: text "Hello! Welcome to" line "CELADON DEPT." cont "STORE!" @@ -34,9 +28,8 @@ UnknownText_0x709ef: ; 0x709ef para "The directory is" line "on the wall." done -; 0x70a35 -UnknownText_0x70a35: ; 0x70a35 +UnknownText_0x70a35: text "This DEPT.STORE is" line "part of the same" @@ -47,9 +40,8 @@ UnknownText_0x70a35: ; 0x70a35 line "renovated at the" cont "same time." done -; 0x70aa9 -UnknownText_0x70aa9: ; 0x70aa9 +UnknownText_0x70aa9: text "This is my first" line "time here." @@ -58,9 +50,8 @@ UnknownText_0x70aa9: ; 0x70aa9 para "I'm afraid I'll" line "get lost." done -; 0x70aea -UnknownText_0x70aea: ; 0x70aea +CeladonDeptStore1FDirectoryText: text "1F: SERVICE" line " COUNTER" @@ -76,9 +67,8 @@ UnknownText_0x70aea: ; 0x70aea para "6F: ROOFTOP" line " SQUARE" done -; 0x70b60 -CeladonDeptStore1F_MapEventHeader: ; 0x70b60 +CeladonDeptStore1F_MapEventHeader: ; filler db 0, 0 @@ -94,13 +84,11 @@ CeladonDeptStore1F_MapEventHeader: ; 0x70b60 ; signposts db 2 - signpost 0, 14, $0, MapCeladonDeptStore1FSignpost0Script - signpost 0, 3, $0, MapCeladonDeptStore6FSignpost1Script + signpost 0, 14, $0, CeladonDeptStore1FDirectory + signpost 0, 3, $0, CeladonDeptStore1FElevatorButton ; people-events db 3 person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, $ffff person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff -; 0x70bab - diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index a36d03d3c..5378a834e 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,44 +1,37 @@ -CeladonDeptStore2F_MapScriptHeader: ; 0x70bab +CeladonDeptStore2F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x70bad -ClerkScript_0x70bad: ; 0x70bad +ClerkScript_0x70bad: faceplayer loadfont pokemart $0, $0017 loadmovesprites end -; 0x70bb5 -ClerkScript_0x70bb5: ; 0x70bb5 +ClerkScript_0x70bb5: faceplayer loadfont pokemart $0, $0018 loadmovesprites end -; 0x70bbd -PokefanMScript_0x70bbd: ; 0x70bbd +PokefanMScript_0x70bbd: jumptextfaceplayer UnknownText_0x70bc9 -; 0x70bc0 -YoungsterScript_0x70bc0: ; 0x70bc0 +YoungsterScript_0x70bc0: jumptextfaceplayer UnknownText_0x70c3e -; 0x70bc3 -MapCeladonDeptStore2FSignpost0Script: ; 0x70bc3 - jumptext UnknownText_0x70c9c -; 0x70bc6 +CeladonDeptStore2FDirectory: + jumptext CeladonDeptStore2FDirectoryText -MapCeladonDeptStore2FSignpost1Script: ; 0x70bc6 - jumpstd $0014 -; 0x70bc9 +CeladonDeptStore2FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x70bc9: ; 0x70bc9 +UnknownText_0x70bc9: text "I just recently" line "became a trainer." @@ -49,9 +42,8 @@ UnknownText_0x70bc9: ; 0x70bc9 line "the selection of" cont "convenient items." done -; 0x70c3e -UnknownText_0x70c3e: ; 0x70c3e +UnknownText_0x70c3e: text "My dad's having a" line "hard time learning" @@ -61,18 +53,16 @@ UnknownText_0x70c3e: ; 0x70c3e para "supposed to be" line "used…" done -; 0x70c9c -UnknownText_0x70c9c: ; 0x70c9c +CeladonDeptStore2FDirectoryText: text "Top Grade Items" line "for Trainers!" para "2F: TRAINER'S" line " MARKET" done -; 0x70cd4 -CeladonDeptStore2F_MapEventHeader: ; 0x70cd4 +CeladonDeptStore2F_MapEventHeader: ; filler db 0, 0 @@ -87,8 +77,8 @@ CeladonDeptStore2F_MapEventHeader: ; 0x70cd4 ; signposts db 2 - signpost 0, 14, $0, MapCeladonDeptStore2FSignpost0Script - signpost 0, 3, $0, MapCeladonDeptStore2FSignpost1Script + signpost 0, 14, $0, CeladonDeptStore2FDirectory + signpost 0, 3, $0, CeladonDeptStore2FElevatorButton ; people-events db 4 @@ -96,5 +86,3 @@ CeladonDeptStore2F_MapEventHeader: ; 0x70cd4 person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, $ffff person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, $ffff person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, $ffff -; 0x70d27 - diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index be4a3b5bf..10a537f9e 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,24 +1,21 @@ -CeladonDeptStore3F_MapScriptHeader: ; 0x70d27 +CeladonDeptStore3F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x70d29 -ClerkScript_0x70d29: ; 0x70d29 +ClerkScript_0x70d29: faceplayer loadfont pokemart $0, $0019 loadmovesprites end -; 0x70d31 -YoungsterScript_0x70d31: ; 0x70d31 +YoungsterScript_0x70d31: jumptextfaceplayer UnknownText_0x70d53 -; 0x70d34 -GameboyKidScript_0x70d34: ; 0x70d34 +GameboyKidScript_0x70d34: faceplayer loadfont writetext UnknownText_0x70d86 @@ -26,9 +23,8 @@ GameboyKidScript_0x70d34: ; 0x70d34 loadmovesprites spriteface $4, $0 end -; 0x70d3f -GameboyKidScript_0x70d3f: ; 0x70d3f +GameboyKidScript_0x70d3f: faceplayer loadfont writetext UnknownText_0x70dc7 @@ -36,39 +32,33 @@ GameboyKidScript_0x70d3f: ; 0x70d3f loadmovesprites spriteface $5, $0 end -; 0x70d4a -SuperNerdScript_0x70d4a: ; 0x70d4a +SuperNerdScript_0x70d4a: jumptextfaceplayer UnknownText_0x70e61 -; 0x70d4d -MapCeladonDeptStore3FSignpost1Script: ; 0x70d4d - jumpstd $0014 -; 0x70d50 +CeladonDeptStore3FElevatorButton: + jumpstd elevatorbutton -MapCeladonDeptStore3FSignpost0Script: ; 0x70d50 - jumptext UnknownText_0x70e85 -; 0x70d53 +CeladonDeptStore3FDirectory: + jumptext CeladonDeptStore3FDirectoryText -UnknownText_0x70d53: ; 0x70d53 +UnknownText_0x70d53: text "I can't decide" line "which #MON I" para "should use this TM" line "on…" done -; 0x70d86 -UnknownText_0x70d86: ; 0x70d86 +UnknownText_0x70d86: text "Uh-oh! I traded my" line "#MON without" para "removing the UP-" line "GRADE from it." done -; 0x70dc7 -UnknownText_0x70dc7: ; 0x70dc7 +UnknownText_0x70dc7: text "Yeah! I'm finally" line "getting a PORYGON!" @@ -84,23 +74,20 @@ UnknownText_0x70dc7: ; 0x70dc7 line "turned into a dif-" cont "ferent #MON!" done -; 0x70e61 -UnknownText_0x70e61: ; 0x70e61 +UnknownText_0x70e61: text "The TM SHOP sells" line "some rare moves." done -; 0x70e85 -UnknownText_0x70e85: ; 0x70e85 +CeladonDeptStore3FDirectoryText: text "3F: TM SHOP" para "Make Your #MON" line "Stronger!" done -; 0x70eab -CeladonDeptStore3F_MapEventHeader: ; 0x70eab +CeladonDeptStore3F_MapEventHeader: ; filler db 0, 0 @@ -115,8 +102,8 @@ CeladonDeptStore3F_MapEventHeader: ; 0x70eab ; signposts db 2 - signpost 0, 14, $0, MapCeladonDeptStore3FSignpost0Script - signpost 0, 3, $0, MapCeladonDeptStore3FSignpost1Script + signpost 0, 14, $0, CeladonDeptStore3FDirectory + signpost 0, 3, $0, CeladonDeptStore3FElevatorButton ; people-events db 5 @@ -125,5 +112,3 @@ CeladonDeptStore3F_MapEventHeader: ; 0x70eab person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, $ffff person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, $ffff person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, $ffff -; 0x70f0b - diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index c60a9def4..1602522fd 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,60 +1,51 @@ -CeladonDeptStore4F_MapScriptHeader: ; 0x70f0b +CeladonDeptStore4F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x70f0d -ClerkScript_0x70f0d: ; 0x70f0d +ClerkScript_0x70f0d: faceplayer loadfont pokemart $0, $001a loadmovesprites end -; 0x70f15 -SuperNerdScript_0x70f15: ; 0x70f15 +SuperNerdScript_0x70f15: jumptextfaceplayer UnknownText_0x70f21 -; 0x70f18 -YoungsterScript_0x70f18: ; 0x70f18 +YoungsterScript_0x70f18: jumptextfaceplayer UnknownText_0x70f55 -; 0x70f1b -MapCeladonDeptStore4FSignpost0Script: ; 0x70f1b - jumptext UnknownText_0x70f8c -; 0x70f1e +CeladonDeptStore4FDirectory: + jumptext CeladonDeptStore4FDirectoryText -MapCeladonDeptStore4FSignpost1Script: ; 0x70f1e - jumpstd $0014 -; 0x70f21 +CeladonDeptStore4FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x70f21: ; 0x70f21 +UnknownText_0x70f21: text "I'm here to buy" line "SURF MAIL to send" cont "to my girlfriend." done -; 0x70f55 -UnknownText_0x70f55: ; 0x70f55 +UnknownText_0x70f55: text "This is the only" line "place where you" para "can buy LOVELY" line "MAIL." done -; 0x70f8c -UnknownText_0x70f8c: ; 0x70f8c +CeladonDeptStore4FDirectoryText: text "Express Yourself" line "With Gifts!" para "4F: WISEMAN GIFTS" done -; 0x70fbc -CeladonDeptStore4F_MapEventHeader: ; 0x70fbc +CeladonDeptStore4F_MapEventHeader: ; filler db 0, 0 @@ -69,13 +60,11 @@ CeladonDeptStore4F_MapEventHeader: ; 0x70fbc ; signposts db 2 - signpost 0, 14, $0, MapCeladonDeptStore4FSignpost0Script - signpost 0, 3, $0, MapCeladonDeptStore4FSignpost1Script + signpost 0, 14, $0, CeladonDeptStore4FDirectory + signpost 0, 3, $0, CeladonDeptStore4FElevatorButton ; people-events db 3 person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, $ffff person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, $ffff person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, $ffff -; 0x71002 - diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 5cf0cf639..67f8c85c8 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,48 +1,40 @@ -CeladonDeptStore5F_MapScriptHeader: ; 0x71002 +CeladonDeptStore5F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x71004 -ClerkScript_0x71004: ; 0x71004 +ClerkScript_0x71004: faceplayer loadfont pokemart $0, $001b loadmovesprites end -; 0x7100c -ClerkScript_0x7100c: ; 0x7100c +ClerkScript_0x7100c: faceplayer loadfont pokemart $0, $001c loadmovesprites end -; 0x71014 -GentlemanScript_0x71014: ; 0x71014 +GentlemanScript_0x71014: jumptextfaceplayer UnknownText_0x71023 -; 0x71017 -SailorScript_0x71017: ; 0x71017 +SailorScript_0x71017: jumptextfaceplayer UnknownText_0x71072 -; 0x7101a -TeacherScript_0x7101a: ; 0x7101a +TeacherScript_0x7101a: jumptextfaceplayer UnknownText_0x710b6 -; 0x7101d -MapCeladonDeptStore5FSignpost0Script: ; 0x7101d - jumptext UnknownText_0x71100 -; 0x71020 +CeladonDeptStore5FDirectory: + jumptext CeladonDeptStore5FDirectoryText -MapCeladonDeptStore5FSignpost1Script: ; 0x71020 - jumpstd $0014 -; 0x71023 +CeladonDeptStore5FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x71023: ; 0x71023 +UnknownText_0x71023: text "I want to buy some" line "items that raise" @@ -50,18 +42,16 @@ UnknownText_0x71023: ; 0x71023 line "I don't have" cont "enough money…" done -; 0x71072 -UnknownText_0x71072: ; 0x71072 +UnknownText_0x71072: text "I want PP UP, so I" line "can raise the PP" para "of moves. But you" line "can't buy it…" done -; 0x710b6 -UnknownText_0x710b6: ; 0x710b6 +UnknownText_0x710b6: text "Using items on" line "them makes #-" cont "MON happy." @@ -69,14 +59,12 @@ UnknownText_0x710b6: ; 0x710b6 para "They hate certain" line "items, though…" done -; 0x71100 -UnknownText_0x71100: ; 0x71100 +CeladonDeptStore5FDirectoryText: text "5F: DRUG STORE" done -; 0x71110 -CeladonDeptStore5F_MapEventHeader: ; 0x71110 +CeladonDeptStore5F_MapEventHeader: ; filler db 0, 0 @@ -91,8 +79,8 @@ CeladonDeptStore5F_MapEventHeader: ; 0x71110 ; signposts db 2 - signpost 0, 14, $0, MapCeladonDeptStore5FSignpost0Script - signpost 0, 3, $0, MapCeladonDeptStore5FSignpost1Script + signpost 0, 14, $0, CeladonDeptStore5FDirectory + signpost 0, 3, $0, CeladonDeptStore5FElevatorButton ; people-events db 5 @@ -101,5 +89,3 @@ CeladonDeptStore5F_MapEventHeader: ; 0x71110 person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, $ffff person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff -; 0x71170 - diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index b7e4a0b59..bd51b073f 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,4 +1,4 @@ -CeladonDeptStore6F_MapScriptHeader: ; 0x71170 +CeladonDeptStore6F_MapScriptHeader: ; trigger count db 0 @@ -8,121 +8,104 @@ CeladonDeptStore6F_MapScriptHeader: ; 0x71170 ; callbacks dbw 1, UnknownScript_0x71175 -; 0x71175 -UnknownScript_0x71175: ; 0x71175 +UnknownScript_0x71175: changeblock $c, $0, $3 return -; 0x7117a -SuperNerdScript_0x7117a: ; 0x7117a +SuperNerdScript_0x7117a: jumptextfaceplayer UnknownText_0x712c7 -; 0x7117d -YoungsterScript_0x7117d: ; 0x7117d +YoungsterScript_0x7117d: jumptextfaceplayer UnknownText_0x71310 -; 0x71180 -MapCeladonDeptStore6FSignpost5Script: ; 0x71180 +CeladonVendingMachine: loadfont - writetext UnknownText_0x71250 -UnknownScript_0x71184: ; 0x71184 + writetext CeladonVendingText +.Start special Function24ae8 - loadmenudata MenuDataHeader_0x71203 + loadmenudata .MenuData interpretmenu2 writebackup - if_equal $1, UnknownScript_0x7119a - if_equal $2, UnknownScript_0x711b4 - if_equal $3, UnknownScript_0x711ce + if_equal $1, .FreshWater + if_equal $2, .SodaPop + if_equal $3, .Lemonade loadmovesprites end -; 0x7119a -UnknownScript_0x7119a: ; 0x7119a +.FreshWater checkmoney $0, 200 - if_equal $2, UnknownScript_0x711f5 + if_equal $2, .NotEnoughMoney giveitem FRESH_WATER, $1 - iffalse UnknownScript_0x711fc + iffalse .NotEnoughSpace takemoney $0, 200 itemtotext FRESH_WATER, $0 - jump UnknownScript_0x711e8 -; 0x711b4 + jump .VendItem -UnknownScript_0x711b4: ; 0x711b4 +.SodaPop checkmoney $0, 300 - if_equal $2, UnknownScript_0x711f5 + if_equal $2, .NotEnoughMoney giveitem SODA_POP, $1 - iffalse UnknownScript_0x711fc + iffalse .NotEnoughSpace takemoney $0, 300 itemtotext SODA_POP, $0 - jump UnknownScript_0x711e8 -; 0x711ce + jump .VendItem -UnknownScript_0x711ce: ; 0x711ce +.Lemonade checkmoney $0, 350 - if_equal $2, UnknownScript_0x711f5 + if_equal $2, .NotEnoughMoney giveitem LEMONADE, $1 - iffalse UnknownScript_0x711fc + iffalse .NotEnoughSpace takemoney $0, 350 itemtotext LEMONADE, $0 - jump UnknownScript_0x711e8 -; 0x711e8 + jump .VendItem -UnknownScript_0x711e8: ; 0x711e8 +.VendItem pause 10 playsound SFX_ENTER_DOOR - writetext UnknownText_0x71274 + writetext CeladonClangText keeptextopen itemnotify - jump UnknownScript_0x71184 -; 0x711f5 + jump .Start -UnknownScript_0x711f5: ; 0x711f5 - writetext UnknownText_0x7128e +.NotEnoughMoney + writetext CeladonVendingNoMoneyText closetext - jump UnknownScript_0x71184 -; 0x711fc + jump .Start -UnknownScript_0x711fc: ; 0x711fc - writetext UnknownText_0x712a7 +.NotEnoughSpace + writetext CeladonVendingNoSpaceText closetext - jump UnknownScript_0x71184 -; 0x71203 + jump .Start - -MenuDataHeader_0x71203: ; 0x71203 +.MenuData db $40 ; flags db 02, 00 ; start coords db 11, 19 ; end coords - dw MenuData2_0x7120b + dw .MenuData2 db 1 ; default option -; 0x7120b -MenuData2_0x7120b: ; 0x7120b +.MenuData2 db $80 ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" db "LEMONADE ¥350@" db "CANCEL@" -; 0x71249 -MapCeladonDeptStore6FSignpost0Script: ; 0x7124a - jumptext UnknownText_0x7133e -; 0x7124d +CeladonDeptStore6FDirectory: + jumptext CeladonDeptStore6FDirectoryText -UnknownScript_0x7124d: ; 0x7124d - jumpstd $0014 -; 0x71250 +UnknownScript_0x7124d: + jumpstd elevatorbutton -UnknownText_0x71250: ; 0x71250 +CeladonVendingText: text "A vending machine!" line "Here's the menu." done -; 0x71274 -UnknownText_0x71274: ; 0x71274 +CeladonClangText: text "Clang!" para "@" @@ -130,21 +113,18 @@ UnknownText_0x71274: ; 0x71274 db $0 line "popped out." done -; 0x7128e -UnknownText_0x7128e: ; 0x7128e +CeladonVendingNoMoneyText: text "Oops, not enough" line "money…" done -; 0x712a7 -UnknownText_0x712a7: ; 0x712a7 +CeladonVendingNoSpaceText: text "There's no more" line "room for stuff…" done -; 0x712c7 -UnknownText_0x712c7: ; 0x712c7 +UnknownText_0x712c7: text "A vending machine" line "with a prize rou-" cont "lette…" @@ -152,23 +132,20 @@ UnknownText_0x712c7: ; 0x712c7 para "You never see" line "those anymore." done -; 0x71310 -UnknownText_0x71310: ; 0x71310 +UnknownText_0x71310: text "Aww! There's no" line "games here!" para "I wanted to play…" done -; 0x7133e -UnknownText_0x7133e: ; 0x7133e +CeladonDeptStore6FDirectoryText: text "6F: ROOFTOP SQUARE" line "VENDING MACHINES" done -; 0x71363 -CeladonDeptStore6F_MapEventHeader: ; 0x71363 +CeladonDeptStore6F_MapEventHeader: ; filler db 0, 0 @@ -182,16 +159,14 @@ CeladonDeptStore6F_MapEventHeader: ; 0x71363 ; signposts db 6 - signpost 0, 14, $0, MapCeladonDeptStore6FSignpost0Script - signpost 0, 3, $0, MapCeladonDeptStore6FSignpost1Script - signpost 1, 8, $1, MapCeladonDeptStore6FSignpost5Script - signpost 1, 9, $1, MapCeladonDeptStore6FSignpost5Script - signpost 1, 10, $1, MapCeladonDeptStore6FSignpost5Script - signpost 1, 11, $1, MapCeladonDeptStore6FSignpost5Script + signpost 0, 14, $0, CeladonDeptStore6FDirectory + signpost 0, 3, $0, CeladonDeptStore1FElevatorButton + signpost 1, 8, $1, CeladonVendingMachine + signpost 1, 9, $1, CeladonVendingMachine + signpost 1, 10, $1, CeladonVendingMachine + signpost 1, 11, $1, CeladonVendingMachine ; people-events db 2 person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, $ffff person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, $ffff -; 0x713ab - diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 5d45c7bb8..abe31164f 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -51,4 +51,3 @@ CeladonDeptStoreElevator_MapEventHeader: ; 0x713d8 ; people-events db 0 ; 0x713ed - diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 119543cb5..f841c3769 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -370,4 +370,3 @@ CeladonGameCorner_MapEventHeader: ; 0x725a4 person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, $ffff person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, $ffff ; 0x726e7 - diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 87af10d63..bc0233cd9 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -318,4 +318,3 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; 0x72a34 person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, $ffff person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, $ffff ; 0x72a68 - diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 0c1456fdc..bf78f9085 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -188,16 +188,13 @@ TwinsJoandzoe2Script: ; 0x72b10 end ; 0x72b18 -MapCeladonGymSignpost1Script: ; 0x72b18 - checkflag $0026 - iftrue UnknownScript_0x72b21 - jumpstd $002d -; 0x72b21 - -UnknownScript_0x72b21: ; 0x72b21 +CeladonGymStatue: + checkflag ENGINE_RAINBOWBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext ERIKA, 1, $1 - jumpstd $002e -; 0x72b28 + jumpstd gymstatue2 UnknownText_0x72b28: ; 0x72b28 text "ERIKA: Hello…" @@ -388,8 +385,8 @@ CeladonGym_MapEventHeader: ; 0x72fdf ; signposts db 2 - signpost 15, 3, $0, MapCeladonGymSignpost1Script - signpost 15, 6, $0, MapCeladonGymSignpost1Script + signpost 15, 3, $0, CeladonGymStatue + signpost 15, 6, $0, CeladonGymStatue ; people-events db 6 @@ -400,4 +397,3 @@ CeladonGym_MapEventHeader: ; 0x72fdf person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff ; 0x73047 - diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 6f529443d..d27e7db89 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -6,46 +6,40 @@ CeladonMansion1F_MapScriptHeader: ; 0x713ed db 0 ; 0x713ef -GrannyScript_0x713ef: ; 0x713ef - jumptextfaceplayer UnknownText_0x71416 -; 0x713f2 +CeladonMansionManager: + jumptextfaceplayer CeladonMansionManagerText -GrowlitheScript_0x713f2: ; 0x713f2 +CeladonMansion1FMeowth: loadfont - writetext UnknownText_0x71470 + writetext CeladonMansion1FMeowthText cry MEOWTH closetext loadmovesprites end -; 0x713fc -ClefairyScript_0x713fc: ; 0x713fc +CeladonMansion1FClefairy: loadfont - writetext UnknownText_0x7147f + writetext CeladonMansion1FClefairyText cry CLEFAIRY closetext loadmovesprites end -; 0x71406 -GrowlitheScript_0x71406: ; 0x71406 +CeladonMansion1FNidoranF: loadfont - writetext UnknownText_0x71496 + writetext CeladonMansion1FNidoranFText cry NIDORAN_F closetext loadmovesprites end -; 0x71410 -MapCeladonMansion1FSignpost0Script: ; 0x71410 - jumptext UnknownText_0x714ab -; 0x71413 +CeladonMansionManagersSuiteSign: + jumptext CeladonMansionManagersSuiteSignText -MapCeladonMansion1FSignpost2Script: ; 0x71413 - jumpstd $0002 -; 0x71416 +CeladonMansion1fBookshelf: + jumpstd picturebookshelf -UnknownText_0x71416: ; 0x71416 +CeladonMansionManagerText: text "My dear #MON" line "keep me company," @@ -55,30 +49,25 @@ UnknownText_0x71416: ; 0x71416 para "MEOWTH even brings" line "money home." done -; 0x71470 -UnknownText_0x71470: ; 0x71470 +CeladonMansion1FMeowthText: text "MEOWTH: Meow!" done -; 0x7147f -UnknownText_0x7147f: ; 0x7147f +CeladonMansion1FClefairyText: text "CLEFAIRY: Clef" line "cleff!" done -; 0x71496 -UnknownText_0x71496: ; 0x71496 +CeladonMansion1FNidoranFText: text "NIDORAN: Kya" line "kyaoo!" done -; 0x714ab -UnknownText_0x714ab: ; 0x714ab +CeladonMansionManagersSuiteSignText: text "CELADON MANSION" line "MANAGER'S SUITE" done -; 0x714cc CeladonMansion1F_MapEventHeader: ; 0x714cc ; filler @@ -97,15 +86,13 @@ CeladonMansion1F_MapEventHeader: ; 0x714cc ; signposts db 3 - signpost 8, 5, $1, MapCeladonMansion1FSignpost0Script - signpost 3, 0, $0, MapCeladonMansion1FSignpost2Script - signpost 3, 2, $0, MapCeladonMansion1FSignpost2Script + signpost 8, 5, $1, CeladonMansionManagersSuiteSign + signpost 3, 0, $0, CeladonMansion1fBookshelf + signpost 3, 2, $0, CeladonMansion1fBookshelf ; people-events db 4 - person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, GrannyScript_0x713ef, $ffff - person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x713f2, $ffff - person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, ClefairyScript_0x713fc, $ffff - person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x71406, $ffff -; 0x7152e - + person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, $ffff + person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, $ffff + person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, $ffff + person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, $ffff diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e5f4169b1..e8807b446 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,24 +1,20 @@ -CeladonMansion2F_MapScriptHeader: ; 0x7152e +CeladonMansion2F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x71530 -MapCeladonMansion2FSignpost0Script: ; 0x71530 - jumptext UnknownText_0x71539 -; 0x71533 +CeladonMansion2FComputer: + jumptext CeladonMansion2FComputerText -MapCeladonMansion2FSignpost1Script: ; 0x71533 - jumptext UnknownText_0x7162c -; 0x71536 +CeladonMansion2FSign: + jumptext CeladonMansion2FSignText -MapCeladonMansion2FSignpost2Script: ; 0x71536 - jumpstd $0001 -; 0x71539 +CeladonMansion2FBookshelf: + jumpstd difficultbookshelf -UnknownText_0x71539: ; 0x71539 +CeladonMansion2FComputerText: text $52, " turned on" line "the PC." @@ -47,15 +43,13 @@ UnknownText_0x71539: ; 0x71539 para "…" done -; 0x7162c -UnknownText_0x7162c: ; 0x7162c +CeladonMansion2FSignText: text "GAME FREAK" line "MEETING ROOM" done -; 0x71645 -CeladonMansion2F_MapEventHeader: ; 0x71645 +CeladonMansion2F_MapEventHeader: ; filler db 0, 0 @@ -71,11 +65,9 @@ CeladonMansion2F_MapEventHeader: ; 0x71645 ; signposts db 3 - signpost 3, 0, $0, MapCeladonMansion2FSignpost0Script - signpost 8, 5, $1, MapCeladonMansion2FSignpost1Script - signpost 3, 2, $0, MapCeladonMansion2FSignpost2Script + signpost 3, 0, $0, CeladonMansion2FComputer + signpost 8, 5, $1, CeladonMansion2FSign + signpost 3, 2, $0, CeladonMansion2FBookshelf ; people-events db 0 -; 0x7166e - diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 6051e4a49..5905b347f 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -238,4 +238,3 @@ CeladonMansion3F_MapEventHeader: ; 0x719d5 person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, $ffff person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, $ffff ; 0x71a37 - diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 4059b437d..26b47114b 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -56,4 +56,3 @@ CeladonMansionRoof_MapEventHeader: ; 0x71ad4 db 1 person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, $ffff ; 0x71afb - diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 5408a3c2a..2553a7134 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -13,7 +13,7 @@ PharmacistScript_0x71afd: ; 0x71afd iftrue UnknownScript_0x71b21 writetext UnknownText_0x71b27 keeptextopen - checktime $4 + checknite iftrue UnknownScript_0x71b14 writetext UnknownText_0x71b4a closetext @@ -139,4 +139,3 @@ CeladonMansionRoofHouse_MapEventHeader: ; 0x71e03 db 1 person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, $ffff ; 0x71e20 - diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index be868698b..905f65f75 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -7,7 +7,7 @@ CeladonPokeCenter1F_MapScriptHeader: ; 0x71e20 ; 0x71e22 NurseScript_0x71e22: ; 0x71e22 - jumpstd $0000 + jumpstd pokecenternurse ; 0x71e25 GentlemanScript_0x71e25: ; 0x71e25 @@ -177,4 +177,3 @@ CeladonPokeCenter1F_MapEventHeader: ; 0x720b8 person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, $ffff person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, $07b7 ; 0x7210e - diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index ea799b308..79e8690ed 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ CeladonPokeCenter2FBeta_MapEventHeader: ; 0x72110 ; people-events db 0 ; 0x7211b - diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 23f3cbfca..b6da8e22f 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ -CeruleanCity_MapScriptHeader: ; 0x184000 +CeruleanCity_MapScriptHeader: ; trigger count db 0 @@ -6,16 +6,13 @@ CeruleanCity_MapScriptHeader: ; 0x184000 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x184005 -; 0x184005 - -UnknownScript_0x184005: ; 0x184005 - setflag $0038 +.FlyPoint + setflag ENGINE_FLYPOINT_CERULEAN return -; 0x184009 -CooltrainerMScript_0x184009: ; 0x184009 +CooltrainerMScript_0x184009: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART @@ -24,29 +21,25 @@ CooltrainerMScript_0x184009: ; 0x184009 closetext loadmovesprites end -; 0x184017 -UnknownScript_0x184017: ; 0x184017 +UnknownScript_0x184017: writetext UnknownText_0x184144 closetext loadmovesprites end -; 0x18401d -SuperNerdScript_0x18401d: ; 0x18401d +SuperNerdScript_0x18401d: jumptextfaceplayer UnknownText_0x1841a8 -; 0x184020 -SlowpokeScript_0x184020: ; 0x184020 +CeruleanCitySlowbro: loadfont - writetext UnknownText_0x1841e9 + writetext CeruleanCitySlowbroText cry SLOWBRO closetext loadmovesprites end -; 0x18402a -CooltrainerFScript_0x18402a: ; 0x18402a +CooltrainerFScript_0x18402a: faceplayer loadfont writetext UnknownText_0x1841fa @@ -58,7 +51,7 @@ CooltrainerFScript_0x18402a: ; 0x18402a closetext loadmovesprites loadfont - writetext UnknownText_0x1841e9 + writetext CeruleanCitySlowbroText cry SLOWBRO closetext loadmovesprites @@ -67,30 +60,27 @@ CooltrainerFScript_0x18402a: ; 0x18402a closetext loadmovesprites end -; 0x18404a -FisherScript_0x18404a: ; 0x18404a +FisherScript_0x18404a: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184058 checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM iftrue UnknownScript_0x18405e -UnknownScript_0x184058: ; 0x184058 +UnknownScript_0x184058: writetext UnknownText_0x18424e closetext loadmovesprites end -; 0x18405e -UnknownScript_0x18405e: ; 0x18405e +UnknownScript_0x18405e: writetext UnknownText_0x184275 closetext loadmovesprites end -; 0x184064 -YoungsterScript_0x184064: ; 0x184064 +YoungsterScript_0x184064: faceplayer loadfont writetext UnknownText_0x1842a9 @@ -99,9 +89,8 @@ YoungsterScript_0x184064: ; 0x184064 checkevent $00fa iffalse UnknownScript_0x184072 end -; 0x184072 -UnknownScript_0x184072: ; 0x184072 +UnknownScript_0x184072: waitbutton playsound SFX_SECOND_PART_OF_ITEMFINDER waitbutton @@ -126,47 +115,36 @@ UnknownScript_0x184072: ; 0x184072 closetext loadmovesprites end -; 0x1840a1 -MapCeruleanCitySignpost0Script: ; 0x1840a1 - jumptext UnknownText_0x184312 -; 0x1840a4 +CeruleanCitySign: + jumptext CeruleanCitySignText -MapCeruleanCitySignpost1Script: ; 0x1840a4 - jumptext UnknownText_0x184345 -; 0x1840a7 +CeruleanGymSign: + jumptext CeruleanGymSignText -MapCeruleanCitySignpost2Script: ; 0x1840a7 - jumptext UnknownText_0x184381 -; 0x1840aa +CeruleanBikeShopSign: + jumptext CeruleanBikeShopSignText -MapCeruleanCitySignpost3Script: ; 0x1840aa - jumptext UnknownText_0x1843cc -; 0x1840ad +CeruleanPoliceSign: + jumptext CeruleanPoliceSignText -MapCeruleanCitySignpost4Script: ; 0x1840ad - jumptext UnknownText_0x18443b -; 0x1840b0 +CeruleanCapeSign: + jumptext CeruleanCapeSignText -MapCeruleanCitySignpost5Script: ; 0x1840b0 - jumptext UnknownText_0x184450 -; 0x1840b3 +CeruleanLockedDoor: + jumptext CeruleanLockedDoorText -MapCeruleanCitySignpost6Script: ; 0x1840b3 - jumpstd $0010 -; 0x1840b6 +CeruleanCityPokeCenterSign: + jumpstd pokecentersign -MapCeruleanCitySignpost7Script: ; 0x1840b6 - jumpstd $0011 -; 0x1840b9 +CeruleanCityMartSign: + jumpstd martsign -MapCeruleanCitySignpostItem8: ; 0x1840b9 +MapCeruleanCitySignpostItem8: dw $00fa db BERSERK_GENE - -; 0x1840bc -UnknownText_0x1840bc: ; 0x1840bc +UnknownText_0x1840bc: text "KANTO's POWER" line "PLANT?" @@ -180,9 +158,8 @@ UnknownText_0x1840bc: ; 0x1840bc line "an accident of" cont "some sort there." done -; 0x184144 -UnknownText_0x184144: ; 0x184144 +UnknownText_0x184144: text "You're collecting" line "every single kind" cont "of #MON?" @@ -191,80 +168,69 @@ UnknownText_0x184144: ; 0x184144 line "a challenge, but" cont "it sounds fun too." done -; 0x1841a8 -UnknownText_0x1841a8: ; 0x1841a8 +UnknownText_0x1841a8: text "The CAPE in the" line "north is a good" para "place for dates." line "Girls like it!" done -; 0x1841e9 -UnknownText_0x1841e9: ; 0x1841e9 +CeruleanCitySlowbroText: text "SLOWBRO: Yarah?" done -; 0x1841fa -UnknownText_0x1841fa: ; 0x1841fa +UnknownText_0x1841fa: text "My SLOWBRO and I" line "make an awesome" cont "combination!" done -; 0x184229 -UnknownText_0x184229: ; 0x184229 +UnknownText_0x184229: text "SLOWBRO, show me" line "your CONFUSION!" done -; 0x18424b -UnknownText_0x18424b: ; 0x18424b +UnknownText_0x18424b: text "…" done -; 0x18424e -UnknownText_0x18424e: ; 0x18424e +UnknownText_0x18424e: text "I'm a huge fan of" line "CERULEAN GYM's" cont "MISTY." done -; 0x184275 -UnknownText_0x184275: ; 0x184275 +UnknownText_0x184275: text "I saw this shady" line "guy go off toward" cont "CERULEAN's CAPE." done -; 0x1842a9 -UnknownText_0x1842a9: ; 0x1842a9 +UnknownText_0x1842a9: text "There used to be a" line "cave here that had" para "horribly powerful" line "#MON in it." done -; 0x1842ee -UnknownText_0x1842ee: ; 0x1842ee +UnknownText_0x1842ee: text "Ayuh?" para "My ITEMFINDER is" line "responding…" done -; 0x184312 -UnknownText_0x184312: ; 0x184312 +CeruleanCitySignText: text "CERULEAN CITY" para "A Mysterious Blue" line "Aura Surrounds It" done -; 0x184345 -UnknownText_0x184345: ; 0x184345 +CeruleanGymSignText: text "CERULEAN CITY" line "#MON GYM" cont "LEADER: MISTY" @@ -272,9 +238,8 @@ UnknownText_0x184345: ; 0x184345 para "The Tomboyish" line "Mermaid" done -; 0x184381 -UnknownText_0x184381: ; 0x184381 +CeruleanBikeShopSignText: text "There's a notice" line "here…" @@ -282,9 +247,8 @@ UnknownText_0x184381: ; 0x184381 line "moved to GOLDENROD" cont "CITY in JOHTO…" done -; 0x1843cc -UnknownText_0x1843cc: ; 0x1843cc +CeruleanPoliceSignText: text "There's a notice" line "here…" @@ -296,20 +260,17 @@ UnknownText_0x1843cc: ; 0x1843cc para "CERULEAN POLICE" done -; 0x18443b -UnknownText_0x18443b: ; 0x18443b +CeruleanCapeSignText: text "CERULEAN CAPE" line "AHEAD" done -; 0x184450 -UnknownText_0x184450: ; 0x184450 +CeruleanLockedDoorText: text "It's locked…" done -; 0x18445d -CeruleanCity_MapEventHeader: ; 0x18445d +CeruleanCity_MapEventHeader: ; filler db 0, 0 @@ -327,23 +288,21 @@ CeruleanCity_MapEventHeader: ; 0x18445d ; signposts db 9 - signpost 23, 23, $0, MapCeruleanCitySignpost0Script - signpost 25, 27, $0, MapCeruleanCitySignpost1Script - signpost 29, 11, $0, MapCeruleanCitySignpost2Script - signpost 17, 25, $0, MapCeruleanCitySignpost3Script - signpost 7, 23, $0, MapCeruleanCitySignpost4Script - signpost 29, 14, $0, MapCeruleanCitySignpost5Script - signpost 21, 20, $0, MapCeruleanCitySignpost6Script - signpost 29, 26, $0, MapCeruleanCitySignpost7Script + signpost 23, 23, $0, CeruleanCitySign + signpost 25, 27, $0, CeruleanGymSign + signpost 29, 11, $0, CeruleanBikeShopSign + signpost 17, 25, $0, CeruleanPoliceSign + signpost 7, 23, $0, CeruleanCapeSign + signpost 29, 14, $0, CeruleanLockedDoor + signpost 21, 20, $0, CeruleanCityPokeCenterSign + signpost 29, 26, $0, CeruleanCityMartSign signpost 12, 2, $7, MapCeruleanCitySignpostItem8 ; people-events db 6 person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, $ffff person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, $ffff - person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x184020, $ffff + person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, $ffff person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, $ffff person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, $ffff person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, $ffff -; 0x1844fc - diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index c208c8094..b279a4310 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -194,36 +194,31 @@ MapCeruleanGymSignpostItem0: ; 0x1884b6 ; 0x1884b9 -MapCeruleanGymSignpost1Script: ; 0x1884b9 - checkevent $076f - iffalse UnknownScript_0x1884d3 +CeruleanGymStatue1: + checkevent EVENT_TRAINERS_IN_CERULEAN_GYM + iffalse CeruleanGymStatue loadfont - writetext UnknownText_0x188610 + writetext CeruleanGymNote1 closetext loadmovesprites end -; 0x1884c6 -MapCeruleanGymSignpost2Script: ; 0x1884c6 - checkevent $076f - iffalse UnknownScript_0x1884d3 +CeruleanGymStatue2: + checkevent EVENT_TRAINERS_IN_CERULEAN_GYM + iffalse CeruleanGymStatue loadfont - writetext UnknownText_0x188642 + writetext CeruleanGymNote2 closetext loadmovesprites end -; 0x1884d3 -UnknownScript_0x1884d3: ; 0x1884d3 - checkflag $0024 - iftrue UnknownScript_0x1884dc - jumpstd $002d -; 0x1884dc - -UnknownScript_0x1884dc: ; 0x1884dc +CeruleanGymStatue: + checkflag ENGINE_CASCADEBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext MISTY, 1, $1 - jumpstd $002e -; 0x1884e3 + jumpstd gymstatue2 MovementData_0x1884e3: ; 0x1884e3 big_step_down @@ -298,19 +293,17 @@ UnknownText_0x1885a5: ; 0x1885a5 done ; 0x188610 -UnknownText_0x188610: ; 0x188610 +CeruleanGymNote1: text "Sorry, I'll be out" line "for a while." cont "MISTY, GYM LEADER" done -; 0x188642 -UnknownText_0x188642: ; 0x188642 +CeruleanGymNote2: text "Since MISTY's out," line "we'll be away too." cont "GYM TRAINERS" done -; 0x188674 UnknownText_0x188674: ; 0x188674 text "MISTY: I was ex-" @@ -464,16 +457,14 @@ CeruleanGym_MapEventHeader: ; 0x188a51 ; signposts db 3 signpost 8, 3, $7, MapCeruleanGymSignpostItem0 - signpost 13, 2, $0, MapCeruleanGymSignpost1Script - signpost 13, 6, $0, MapCeruleanGymSignpost2Script + signpost 13, 2, $0, CeruleanGymStatue1 + signpost 13, 6, $0, CeruleanGymStatue2 ; people-events db 6 person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $076d - person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, $076f - person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, $076f - person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, $076f - person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, $076f - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, $076f -; 0x188abe - + person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index e20db6593..ae149ebc7 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -35,4 +35,3 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; 0x18802b db 1 person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, $ffff ; 0x188048 - diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 297f34949..2a067019a 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -67,4 +67,3 @@ CeruleanMart_MapEventHeader: ; 0x188b9b person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, $ffff person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, $ffff ; 0x188bd2 - diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 16a4f36f4..ff6f73607 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -7,7 +7,7 @@ CeruleanPokeCenter1F_MapScriptHeader: ; 0x18820d ; 0x18820f NurseScript_0x18820f: ; 0x18820f - jumpstd $0000 + jumpstd pokecenternurse ; 0x188212 SuperNerdScript_0x188212: ; 0x188212 @@ -87,4 +87,3 @@ CeruleanPokeCenter1F_MapEventHeader: ; 0x188386 person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, $ffff person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, $ffff ; 0x1883c2 - diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index 664d1e5f1..666eabb2d 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ CeruleanPokeCenter2FBeta_MapEventHeader: ; 0x1883c4 ; people-events db 0 ; 0x1883cf - diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 530600e51..e9b0de73a 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -66,4 +66,3 @@ CeruleanPoliceStation_MapEventHeader: ; 0x1880fa person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, $ffff person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, $ffff ; 0x188131 - diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 3ad42c785..2efba93ad 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -78,4 +78,3 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; 0x1881c9 person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, $ffff person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, $ffff ; 0x18820d - diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 5df7072ab..c823a712e 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,88 +1,78 @@ -CharcoalKiln_MapScriptHeader: ; 0x18dd18 +CharcoalKiln_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x18dd1a -BlackBeltScript_0x18dd1a: ; 0x18dd1a +CharcoalKilnBoss: faceplayer loadfont checkevent EVENT_GOT_HM01_CUT - iftrue UnknownScript_0x18dd34 + iftrue .GotCut checkevent EVENT_CLEARED_SLOWPOKE_WELL - iftrue UnknownScript_0x18dd2e - writetext UnknownText_0x18dd74 + iftrue .SavedSlowpoke + writetext CharcoalKilnBossText1 closetext loadmovesprites end -; 0x18dd2e -UnknownScript_0x18dd2e: ; 0x18dd2e - writetext UnknownText_0x18ddfd +.SavedSlowpoke + writetext CharcoalKilnBossText2 closetext loadmovesprites end -; 0x18dd34 -UnknownScript_0x18dd34: ; 0x18dd34 - writetext UnknownText_0x18de73 +.GotCut + writetext CharcoalKilnBossText3 closetext loadmovesprites end -; 0x18dd3a -YoungsterScript_0x18dd3a: ; 0x18dd3a +CharcoalKilnApprentice: faceplayer loadfont checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN - iftrue UnknownScript_0x18dd5d + iftrue .YoureTheCoolest checkevent EVENT_GOT_HM01_CUT - iftrue UnknownScript_0x18dd4e - writetext UnknownText_0x18dee0 + iftrue .Thanks + writetext CharcoalKilnApprenticeText1 closetext loadmovesprites end -; 0x18dd4e -UnknownScript_0x18dd4e: ; 0x18dd4e - writetext UnknownText_0x18df25 +.Thanks + writetext CharcoalKilnApprenticeText2 keeptextopen verbosegiveitem CHARCOAL, 1 - iffalse UnknownScript_0x18dd61 + iffalse .Done setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN loadmovesprites end -; 0x18dd5d -UnknownScript_0x18dd5d: ; 0x18dd5d - writetext UnknownText_0x18df93 +.YoureTheCoolest + writetext CharcoalKilnApprenticeText3 closetext -UnknownScript_0x18dd61: ; 0x18dd61 +.Done loadmovesprites end -; 0x18dd63 -MoltresScript_0x18dd63: ; 0x18dd63 +CharcoalKilnFarfetchd: faceplayer loadfont - writetext UnknownText_0x18dfe5 + writetext FarfetchdText cry FARFETCH_D closetext loadmovesprites end -; 0x18dd6e -MapCharcoalKilnSignpost1Script: ; 0x18dd6e - jumpstd $0003 -; 0x18dd71 +CharcoalKilnBookshelf: + jumpstd magazinebookshelf -MapCharcoalKilnSignpost2Script: ; 0x18dd71 - jumpstd $000c -; 0x18dd74 +CharcoalKilnRadio: + jumpstd radio2 -UnknownText_0x18dd74: ; 0x18dd74 +CharcoalKilnBossText1: text "All the SLOWPOKE" line "have disappeared" cont "from the town." @@ -95,9 +85,8 @@ UnknownText_0x18dd74: ; 0x18dd74 line "omen. We should" cont "stay in." done -; 0x18ddfd -UnknownText_0x18ddfd: ; 0x18ddfd +CharcoalKilnBossText2: text "The SLOWPOKE have" line "returned…" @@ -108,9 +97,8 @@ UnknownText_0x18ddfd: ; 0x18ddfd para "Where in the world" line "is that lazy guy?" done -; 0x18de73 -UnknownText_0x18de73: ; 0x18de73 +CharcoalKilnBossText3: text "You chased off" line "TEAM ROCKET and" @@ -121,18 +109,16 @@ UnknownText_0x18de73: ; 0x18de73 line "I like that. Come" cont "train with us." done -; 0x18dee0 -UnknownText_0x18dee0: ; 0x18dee0 +CharcoalKilnApprenticeText1: text "Where have all the" line "SLOWPOKE gone?" para "Are they out play-" line "ing somewhere?" done -; 0x18df25 -UnknownText_0x18df25: ; 0x18df25 +CharcoalKilnApprenticeText2: text "I'm sorry--I for-" line "got to thank you." @@ -143,9 +129,8 @@ UnknownText_0x18df25: ; 0x18df25 line "would be happy to" cont "hold that." done -; 0x18df93 -UnknownText_0x18df93: ; 0x18df93 +CharcoalKilnApprenticeText3: text "The SLOWPOKE came" line "back, and you even" cont "found FARFETCH'D." @@ -153,12 +138,10 @@ UnknownText_0x18df93: ; 0x18df93 para "You're the cool-" line "est, man!" done -; 0x18dfe5 -UnknownText_0x18dfe5: ; 0x18dfe5 +FarfetchdText: text "FARFETCH'D: Kwaa!" done -; 0x18dff8 CharcoalKiln_MapEventHeader: ; 0x18dff8 ; filler @@ -174,14 +157,12 @@ CharcoalKiln_MapEventHeader: ; 0x18dff8 ; signposts db 3 - signpost 1, 0, $0, MapCharcoalKilnSignpost1Script - signpost 1, 1, $0, MapCharcoalKilnSignpost1Script - signpost 1, 7, $0, MapCharcoalKilnSignpost2Script + signpost 1, 0, $0, CharcoalKilnBookshelf + signpost 1, 1, $0, CharcoalKilnBookshelf + signpost 1, 7, $0, CharcoalKilnRadio ; people-events db 3 - person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x18dd1a, $06f7 - person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, YoungsterScript_0x18dd3a, $06f6 - person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, MoltresScript_0x18dd63, $06f5 -; 0x18e03e - + person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, $06f7 + person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, $06f6 + person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, $06f5 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 2575965f8..0b2b1cf2f 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,68 +1,61 @@ -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 -GrampsScript_0x19c013: ; 0x19c013 +CherrygroveCityGuideGent: faceplayer loadfont - writetext UnknownText_0x19c1e3 + writetext GuideGentIntroText yesorno - iffalse UnknownScript_0x19c0a4 - jump UnknownScript_0x19c01f -; 0x19c01f - -UnknownScript_0x19c01f: ; 0x19c01f - writetext UnknownText_0x19c26f + iffalse .No + jump .Yes +.Yes + writetext GuideGentTourText1 closetext loadmovesprites playmusic MUSIC_SHOW_ME_AROUND follow $2, $0 applymovement $2, MovementData_0x19c195 loadfont - writetext UnknownText_0x19c285 + writetext GuideGentPokeCenterText closetext loadmovesprites applymovement $2, MovementData_0x19c19b spriteface $0, $1 loadfont - writetext UnknownText_0x19c304 + writetext GuideGentMartText closetext loadmovesprites applymovement $2, MovementData_0x19c1a3 spriteface $0, $1 loadfont - writetext UnknownText_0x19c359 + writetext GuideGentRoute30Text closetext loadmovesprites applymovement $2, MovementData_0x19c1ac spriteface $0, $2 loadfont - writetext UnknownText_0x19c3a7 + writetext GuideGentSeaText closetext loadmovesprites applymovement $2, MovementData_0x19c1b6 @@ -71,14 +64,14 @@ UnknownScript_0x19c01f: ; 0x19c01f spriteface $2, $2 spriteface $0, $3 loadfont - writetext UnknownText_0x19c3ec + writetext GuideGentGiftText keeptextopen stringtotext .mapcardname, $1 scall .UnknownScript_0x19c097 setflag $0001 - writetext UnknownText_0x19c438 + writetext GotMapCardText keeptextopen - writetext UnknownText_0x19c451 + writetext GuideGentPokegearText closetext loadmovesprites stopfollow @@ -91,26 +84,23 @@ UnknownScript_0x19c01f: ; 0x19c01f waitbutton end -.UnknownScript_0x19c097 ; 0x19c097 +.UnknownScript_0x19c097 jumpstd $002f end -.mapcardname ; 0x19c09b +.mapcardname db "MAP CARD@" -; 0x19c0a4 -UnknownScript_0x19c0a4: ; 0x19c0a4 - writetext UnknownText_0x19c49f +.No + writetext GuideGentNoText closetext loadmovesprites end -; 0x19c0aa -UnknownScript_0x19c0aa: ; 0x19c0aa +UnknownScript_0x19c0aa: moveperson $3, $27, $7 -; 0x19c0ae -UnknownScript_0x19c0ae: ; 0x19c0ae +UnknownScript_0x19c0ae: spriteface $0, $3 showemote $0, $0, 15 special Functionc48f @@ -136,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 @@ -148,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 @@ -160,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 @@ -187,9 +173,8 @@ UnknownScript_0x19c12f: ; 0x19c12f special Functionc658 playmapmusic end -; 0x19c146 -TeacherScript_0x19c146: ; 0x19c146 +TeacherScript_0x19c146: faceplayer loadfont checkflag $0001 @@ -198,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 @@ -216,16 +199,14 @@ YoungsterScript_0x19c15a: ; 0x19c15a closetext loadmovesprites end -; 0x19c168 -UnknownScript_0x19c168: ; 0x19c168 +UnknownScript_0x19c168: writetext UnknownText_0x19c701 closetext loadmovesprites end -; 0x19c16e -FisherScript_0x19c16e: ; 0x19c16e +MysticWaterGuy: faceplayer loadfont checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE @@ -235,40 +216,34 @@ FisherScript_0x19c16e: ; 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 -MapCherrygroveCitySignpost0Script: ; 0x19c189 - jumptext UnknownText_0x19c7e0 -; 0x19c18c +CherrygroveCitySign: + jumptext CherrygroveCitySignText -MapCherrygroveCitySignpost1Script: ; 0x19c18c - jumptext UnknownText_0x19c815 -; 0x19c18f +GuideGentsHouseSign: + jumptext GuideGentsHouseSignText -MapCherrygroveCitySignpost3Script: ; 0x19c18f - jumpstd $0010 -; 0x19c192 +CherrygroveCityPokeCenterSign: + jumpstd pokecentersign -MapCherrygroveCitySignpost2Script: ; 0x19c192 - jumpstd $0011 -; 0x19c195 +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 @@ -277,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 @@ -289,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 @@ -302,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 @@ -326,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 @@ -365,9 +332,8 @@ MovementData_0x19c1da: ; 0x19c1da big_step_left big_step_left step_end -; 0x19c1e3 -UnknownText_0x19c1e3: ; 0x19c1e3 +GuideGentIntroText: text "You're a rookie" line "trainer, aren't" cont "you? I can tell!" @@ -380,15 +346,13 @@ UnknownText_0x19c1e3: ; 0x19c1e3 line "can teach you a" cont "few things." done -; 0x19c26f -UnknownText_0x19c26f: ; 0x19c26f +GuideGentTourText1: text "OK, then!" line "Follow me!" done -; 0x19c285 -UnknownText_0x19c285: ; 0x19c285 +GuideGentPokeCenterText: text "This is a #MON" line "CENTER. They heal" @@ -401,9 +365,8 @@ UnknownText_0x19c285: ; 0x19c285 para "you better learn" line "about them." done -; 0x19c304 -UnknownText_0x19c304: ; 0x19c304 +GuideGentMartText: text "This is a #MON" line "MART." @@ -413,9 +376,8 @@ UnknownText_0x19c304: ; 0x19c304 para "#MON and other" line "useful items." done -; 0x19c359 -UnknownText_0x19c359: ; 0x19c359 +GuideGentRoute30Text: text "ROUTE 30 is out" line "this way." @@ -425,9 +387,8 @@ UnknownText_0x19c359: ; 0x19c359 para "prized #MON" line "there." done -; 0x19c3a7 -UnknownText_0x19c3a7: ; 0x19c3a7 +GuideGentSeaText: text "This is the sea," line "as you can see." @@ -435,9 +396,8 @@ UnknownText_0x19c3a7: ; 0x19c3a7 line "found only in" cont "water." done -; 0x19c3ec -UnknownText_0x19c3ec: ; 0x19c3ec +GuideGentGiftText: text "Here…" para "It's my house!" @@ -447,15 +407,13 @@ UnknownText_0x19c3ec: ; 0x19c3ec para "Let me give you a" line "small gift." done -; 0x19c438 -UnknownText_0x19c438: ; 0x19c438 +GotMapCardText: text $52, "'s #GEAR" line "now has a MAP!" done -; 0x19c451 -UnknownText_0x19c451: ; 0x19c451 +GuideGentPokegearText: text "#GEAR becomes" line "more useful as you" cont "add CARDS." @@ -463,18 +421,16 @@ UnknownText_0x19c451: ; 0x19c451 para "I wish you luck on" line "your journey!" done -; 0x19c49f -UnknownText_0x19c49f: ; 0x19c49f +GuideGentNoText: text "Oh… It's something" line "I enjoy doing…" para "Fine. Come see me" line "when you like." done -; 0x19c4e2 -UnknownText_0x19c4e2: ; 0x19c4e2 +UnknownText_0x19c4e2: text $56, " ", $56, " ", $56 para "You got a #MON" @@ -494,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 ???." @@ -512,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 ???." @@ -530,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?" @@ -541,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." @@ -568,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." @@ -580,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 -UnknownText_0x19c7e0: ; 0x19c7e0 +CherrygroveCitySignText: text "CHERRYGROVE CITY" para "The City of Cute," line "Fragrant Flowers" done -; 0x19c815 -UnknownText_0x19c815: ; 0x19c815 +GuideGentsHouseSignText: text "GUIDE GENT'S HOUSE" done -; 0x19c829 -CherrygroveCity_MapEventHeader: ; 0x19c829 +CherrygroveCity_MapEventHeader: ; filler db 0, 0 @@ -620,17 +563,15 @@ CherrygroveCity_MapEventHeader: ; 0x19c829 ; signposts db 4 - signpost 8, 30, $0, MapCherrygroveCitySignpost0Script - signpost 9, 23, $0, MapCherrygroveCitySignpost1Script - signpost 3, 24, $0, MapCherrygroveCitySignpost2Script - signpost 3, 30, $0, MapCherrygroveCitySignpost3Script + signpost 8, 30, $0, CherrygroveCitySign + signpost 9, 23, $0, GuideGentsHouseSign + signpost 3, 24, $0, CherrygroveCityMartSign + signpost 3, 30, $0, CherrygroveCityPokeCenterSign ; people-events db 5 - person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, GrampsScript_0x19c013, $06fe + person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, $06fe person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, $06be 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, FisherScript_0x19c16e, $ffff -; 0x19c8ad - + person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, $ffff diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index a40236ab3..94ad1cf91 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -22,9 +22,8 @@ LassScript_0x196cb9: ; 0x196cb9 end ; 0x196cc0 -MapCherrygroveEvolutionSpeechHouseSignpost1Script: ; 0x196cc0 - jumpstd $0003 -; 0x196cc3 +CherrygroveEvolutionSpeechHouseBookshelf: + jumpstd magazinebookshelf UnknownText_0x196cc3: ; 0x196cc3 text "#MON gain expe-" @@ -57,12 +56,11 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; 0x196d2e ; signposts db 2 - signpost 1, 0, $0, MapCherrygroveEvolutionSpeechHouseSignpost1Script - signpost 1, 1, $0, MapCherrygroveEvolutionSpeechHouseSignpost1Script + signpost 1, 0, $0, CherrygroveEvolutionSpeechHouseBookshelf + signpost 1, 1, $0, CherrygroveEvolutionSpeechHouseBookshelf ; people-events db 2 person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, $ffff person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, $ffff ; 0x196d62 - diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index c8d0d5855..95df5f8e6 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -14,9 +14,8 @@ BugCatcherScript_0x196ae4: ; 0x196ae4 jumptextfaceplayer UnknownText_0x196b65 ; 0x196ae7 -MapCherrygroveGymSpeechHouseSignpost1Script: ; 0x196ae7 - jumpstd $0002 -; 0x196aea +CherrygroveGymSpeechHouseBookshelf: + jumpstd picturebookshelf UnknownText_0x196aea: ; 0x196aea text "You're trying to" @@ -60,12 +59,11 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; 0x196bd1 ; signposts db 2 - signpost 1, 0, $0, MapCherrygroveGymSpeechHouseSignpost1Script - signpost 1, 1, $0, MapCherrygroveGymSpeechHouseSignpost1Script + signpost 1, 0, $0, CherrygroveGymSpeechHouseBookshelf + signpost 1, 1, $0, CherrygroveGymSpeechHouseBookshelf ; people-events db 2 person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, $ffff person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, $ffff ; 0x196c05 - diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 72edd8524..b971bb8bd 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -96,4 +96,3 @@ CherrygroveMart_MapEventHeader: ; 0x196934 person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, $ffff person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, $ffff ; 0x19696b - diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index a88a9cba6..402f1ff1c 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -7,7 +7,7 @@ CherrygrovePokeCenter1F_MapScriptHeader: ; 0x19696b ; 0x19696d NurseScript_0x19696d: ; 0x19696d - jumpstd $0000 + jumpstd pokecenternurse ; 0x196970 FisherScript_0x196970: ; 0x196970 @@ -95,4 +95,3 @@ CherrygrovePokeCenter1F_MapEventHeader: ; 0x196a96 person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, $ffff person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, $ffff ; 0x196adf - diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 855557b5a..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,80 +94,63 @@ 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 -; 0x1a00bf -MapCianwoodCitySignpost0Script: ; 0x1a00bf - jumptext UnknownText_0x1a0660 -; 0x1a00c2 +CianwoodCitySign: + jumptext CianwoodCitySignText -MapCianwoodCitySignpost1Script: ; 0x1a00c2 - jumptext UnknownText_0x1a068f -; 0x1a00c5 +CianwoodGymSign: + jumptext CianwoodGymSignText -MapCianwoodCitySignpost3Script: ; 0x1a00c5 - jumptext UnknownText_0x1a06d6 -; 0x1a00c8 +CianwoodPharmacySign: + jumptext CianwoodPharmacySignText -MapCianwoodCitySignpost4Script: ; 0x1a00c8 - jumptext UnknownText_0x1a0725 -; 0x1a00cb +CianwoodPhotoStudioSign: + jumptext CianwoodPhotoStudioSignText -MapCianwoodCitySignpost5Script: ; 0x1a00cb - jumptext UnknownText_0x1a0760 -; 0x1a00ce +CianwoodPokeSeerSign: + jumptext CianwoodPokeSeerSignText -MapCianwoodCitySignpost2Script: ; 0x1a00ce - jumpstd $0010 -; 0x1a00d1 +CianwoodPokeCenterSign: + jumpstd pokecentersign -RockScript_0x1a00d1: ; 0x1a00d1 - jumpstd $000f -; 0x1a00d4 +CianwoodCityRock: + jumpstd smashrock -MapCianwoodCitySignpostItem6: ; 0x1a00d4 +MapCianwoodCitySignpostItem6: dw $00b2 db REVIVE - -; 0x1a00d7 -MapCianwoodCitySignpostItem7: ; 0x1a00d7 +MapCianwoodCitySignpostItem7: dw $00b3 db MAX_ETHER - -; 0x1a00da -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 @@ -182,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?" @@ -213,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." @@ -227,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." @@ -248,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." @@ -259,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." @@ -282,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." @@ -303,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, "." @@ -342,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, "!" @@ -368,17 +330,15 @@ UnknownText_0x1a05c3: ; 0x1a05c3 para "See you around!" done -; 0x1a0660 -UnknownText_0x1a0660: ; 0x1a0660 +CianwoodCitySignText: text "CIANWOOD CITY" para "A Port Surrounded" line "by Rough Seas" done -; 0x1a068f -UnknownText_0x1a068f: ; 0x1a068f +CianwoodGymSignText: text "CIANWOOD CITY" line "#MON GYM" @@ -387,9 +347,8 @@ UnknownText_0x1a068f: ; 0x1a068f para "His Roaring Fists" line "Do the Talking" done -; 0x1a06d6 -UnknownText_0x1a06d6: ; 0x1a06d6 +CianwoodPharmacySignText: text "500 Years of" line "Tradition" @@ -399,24 +358,21 @@ UnknownText_0x1a06d6: ; 0x1a06d6 para "We Await Your" line "Medicinal Queries" done -; 0x1a0725 -UnknownText_0x1a0725: ; 0x1a0725 +CianwoodPhotoStudioSignText: text "CIANWOOD CITY" line "PHOTO STUDIO" para "Take a Snapshot as" line "a Keepsake!" done -; 0x1a0760 -UnknownText_0x1a0760: ; 0x1a0760 +CianwoodPokeSeerSignText: text "THE # SEER" line "AHEAD" done -; 0x1a0772 -CianwoodCity_MapEventHeader: ; 0x1a0772 +CianwoodCity_MapEventHeader: ; filler db 0, 0 @@ -436,12 +392,12 @@ CianwoodCity_MapEventHeader: ; 0x1a0772 ; signposts db 8 - signpost 34, 20, $0, MapCianwoodCitySignpost0Script - signpost 45, 7, $0, MapCianwoodCitySignpost1Script - signpost 43, 24, $0, MapCianwoodCitySignpost2Script - signpost 47, 19, $0, MapCianwoodCitySignpost3Script - signpost 32, 8, $0, MapCianwoodCitySignpost4Script - signpost 24, 8, $0, MapCianwoodCitySignpost5Script + signpost 34, 20, $0, CianwoodCitySign + signpost 45, 7, $0, CianwoodGymSign + signpost 43, 24, $0, CianwoodPokeCenterSign + signpost 47, 19, $0, CianwoodPharmacySign + signpost 32, 8, $0, CianwoodPhotoStudioSign + signpost 24, 8, $0, CianwoodPokeSeerSign signpost 19, 4, $7, MapCianwoodCitySignpostItem6 signpost 29, 5, $7, MapCianwoodCitySignpostItem7 @@ -450,14 +406,12 @@ CianwoodCity_MapEventHeader: ; 0x1a0772 person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, $ffff person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, $ffff person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, $ffff - person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff - person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff - person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff - person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff - person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff - person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff + person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff + person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff + person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff + person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff + person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, $ffff 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/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 6ad10d62f..ecd5b0b85 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -70,4 +70,3 @@ CianwoodCityPhotoStudio_MapEventHeader: ; 0x9e191 db 1 person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff ; 0x9e1ae - diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 38f63f49f..e924cf219 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -74,11 +74,11 @@ UnknownScript_0x9d681: ; 0x9d681 ; 0x9d68a UnknownScript_0x9d68a: ; 0x9d68a - jumpstd $0012 + jumpstd goldenrodrockets ; 0x9d68d UnknownScript_0x9d68d: ; 0x9d68d - jumpstd $0013 + jumpstd radiotowerrockets ; 0x9d690 TrainerBlackbeltYoshi: ; 0x9d690 @@ -197,20 +197,16 @@ BlackbeltLungScript: ; 0x9d6d8 end ; 0x9d6e0 -BoulderScript_0x9d6e0: ; 0x9d6e0 - jumpstd $000e -; 0x9d6e3 +CianwoodGymBoulder: + jumpstd strengthboulder -MapCianwoodGymSignpost1Script: ; 0x9d6e3 - checkflag $0020 - iftrue UnknownScript_0x9d6ec - jumpstd $002d -; 0x9d6ec - -UnknownScript_0x9d6ec: ; 0x9d6ec +CianwoodGymStatue: + checkflag ENGINE_STORMBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext CHUCK, 1, $1 - jumpstd $002e -; 0x9d6f3 + jumpstd gymstatue2 MovementData_0x9d6f3: ; 0x9d6f3 db $39 ; movement @@ -411,8 +407,8 @@ CianwoodGym_MapEventHeader: ; 0x9db3e ; signposts db 2 - signpost 15, 3, $0, MapCianwoodGymSignpost1Script - signpost 15, 6, $0, MapCianwoodGymSignpost1Script + signpost 15, 3, $0, CianwoodGymStatue + signpost 15, 6, $0, CianwoodGymStatue ; people-events db 9 @@ -421,9 +417,7 @@ CianwoodGym_MapEventHeader: ; 0x9db3e person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, $ffff person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, $ffff person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, $ffff - person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff - person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff - person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff - person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff -; 0x9dbcd - + person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff + person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff + person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff + person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, $ffff diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index b6974294f..1f042b2dd 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -18,9 +18,8 @@ TwinScript_0x9e1b6: ; 0x9e1b6 jumptextfaceplayer UnknownText_0x9e2a9 ; 0x9e1b9 -MapCianwoodLugiaSpeechHouseSignpost1Script: ; 0x9e1b9 - jumpstd $0002 -; 0x9e1bc +CianwoodLugiaSpeechHouseBookshelf: + jumpstd picturebookshelf UnknownText_0x9e1bc: ; 0x9e1bc text "You came from" @@ -78,8 +77,8 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; 0x9e32b ; signposts db 2 - signpost 1, 0, $0, MapCianwoodLugiaSpeechHouseSignpost1Script - signpost 1, 1, $0, MapCianwoodLugiaSpeechHouseSignpost1Script + signpost 1, 0, $0, CianwoodLugiaSpeechHouseBookshelf + signpost 1, 1, $0, CianwoodLugiaSpeechHouseBookshelf ; people-events db 3 @@ -87,4 +86,3 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; 0x9e32b person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, $ffff person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, $ffff ; 0x9e36c - diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 2b014c571..7b0cc838f 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,50 +1,45 @@ -CianwoodPharmacy_MapScriptHeader: ; 0x9df97 +CianwoodPharmacy_MapScriptHeader: ; trigger count db 1 ; triggers - dw UnknownScript_0x9df9d, $0000 + dw CianwoodPharmacyTrigger, $0000 ; callback count db 0 -; 0x9df9d -UnknownScript_0x9df9d: ; 0x9df9d +CianwoodPharmacyTrigger: end -; 0x9df9e -PharmacistScript_0x9df9e: ; 0x9df9e +CianwoodPharmacist: faceplayer loadfont checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY - iftrue UnknownScript_0x9dfc4 + iftrue .Mart checkevent $0037 - iffalse UnknownScript_0x9dfc4 - writetext UnknownText_0x9dfcd + iffalse .Mart + writetext PharmacistGiveSecretpotionText keeptextopen giveitem SECRETPOTION, $1 - writetext UnknownText_0x9e056 + writetext ReceivedSecretpotionText playsound SFX_KEY_ITEM waitbutton itemnotify setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY - writetext UnknownText_0x9e070 + writetext PharmacistDescribeSecretpotionText closetext loadmovesprites end -; 0x9dfc4 -UnknownScript_0x9dfc4: ; 0x9dfc4 +.Mart pokemart $3, $0004 loadmovesprites end -; 0x9dfca -MapCianwoodPharmacySignpost1Script: ; 0x9dfca - jumpstd $0001 -; 0x9dfcd +CianwoodPharmacyBookshelf: + jumpstd difficultbookshelf -UnknownText_0x9dfcd: ; 0x9dfcd +PharmacistGiveSecretpotionText: text "Your #MON ap-" line "pear to be fine." @@ -62,24 +57,21 @@ UnknownText_0x9dfcd: ; 0x9dfcd para "This ought to do" line "the trick." done -; 0x9e056 -UnknownText_0x9e056: ; 0x9e056 +ReceivedSecretpotionText: text $52, " received" line "SECRETPOTION." done -; 0x9e070 -UnknownText_0x9e070: ; 0x9e070 +PharmacistDescribeSecretpotionText: text "My SECRETPOTION is" line "a tad too strong." para "I only offer it in" line "an emergency." done -; 0x9e0b7 -CianwoodPharmacy_MapEventHeader: ; 0x9e0b7 +CianwoodPharmacy_MapEventHeader: ; filler db 0, 0 @@ -93,11 +85,9 @@ CianwoodPharmacy_MapEventHeader: ; 0x9e0b7 ; signposts db 2 - signpost 1, 0, $0, MapCianwoodPharmacySignpost1Script - signpost 1, 1, $0, MapCianwoodPharmacySignpost1Script + signpost 1, 0, $0, CianwoodPharmacyBookshelf + signpost 1, 1, $0, CianwoodPharmacyBookshelf ; people-events db 1 - person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, PharmacistScript_0x9df9e, $ffff -; 0x9e0de - + person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, $ffff diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index dbdcfbc3b..07e896cca 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -7,7 +7,7 @@ CianwoodPokeCenter1F_MapScriptHeader: ; 0x9dbcd ; 0x9dbcf NurseScript_0x9dbcf: ; 0x9dbcf - jumpstd $0000 + jumpstd pokecenternurse ; 0x9dbd2 LassScript_0x9dbd2: ; 0x9dbd2 @@ -159,4 +159,3 @@ CianwoodPokeCenter1F_MapEventHeader: ; 0x9df4e person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, $ffff person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, $ffff ; 0x9df97 - diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 5ff8bbeb2..d04089abc 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,4 +1,4 @@ -CinnabarIsland_MapScriptHeader: ; 0x1ac9a7 +CinnabarIsland_MapScriptHeader: ; trigger count db 0 @@ -6,52 +6,42 @@ CinnabarIsland_MapScriptHeader: ; 0x1ac9a7 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1ac9ac -; 0x1ac9ac - -UnknownScript_0x1ac9ac: ; 0x1ac9ac - setflag $003f +.FlyPoint + setflag ENGINE_FLYPOINT_CINNABAR return -; 0x1ac9b0 -BlueScript_0x1ac9b0: ; 0x1ac9b0 +CinnabarIslandBlue: faceplayer loadfont - writetext UnknownText_0x1ac9d2 + writetext CinnabarIslandBlueText closetext loadmovesprites playsound SFX_WARP_TO - applymovement $2, MovementData_0x1ac9d0 + applymovement $2, CinnabarIslandBlueTeleport disappear $2 clearevent $0776 end -; 0x1ac9c4 -MapCinnabarIslandSignpost1Script: ; 0x1ac9c4 - jumptext UnknownText_0x1acc73 -; 0x1ac9c7 +CinnabarIslandGymSign: + jumptext CinnabarIslandGymSignText -MapCinnabarIslandSignpost2Script: ; 0x1ac9c7 - jumptext UnknownText_0x1accc2 -; 0x1ac9ca +CinnabarIslandSign: + jumptext CinnabarIslandSignText -MapCinnabarIslandSignpost0Script: ; 0x1ac9ca - jumpstd $0010 -; 0x1ac9cd +CinnabarIslandPokeCenterSign: + jumpstd pokecentersign -MapCinnabarIslandSignpostItem3: ; 0x1ac9cd +MapCinnabarIslandSignpostItem3: dw $00fe db RARE_CANDY - -; 0x1ac9d0 -MovementData_0x1ac9d0: ; 0x1ac9d0 +CinnabarIslandBlueTeleport: teleport_from step_end -; 0x1ac9d2 -UnknownText_0x1ac9d2: ; 0x1ac9d2 +CinnabarIslandBlueText: text "Who are you?" para "Well, it's plain" @@ -118,9 +108,8 @@ UnknownText_0x1ac9d2: ; 0x1ac9d2 para "I'll take you on" line "then." done -; 0x1acc73 -UnknownText_0x1acc73: ; 0x1acc73 +CinnabarIslandGymSignText: text "There's a notice" line "here…" @@ -130,17 +119,15 @@ UnknownText_0x1acc73: ; 0x1acc73 para "BLAINE" done -; 0x1accc2 -UnknownText_0x1accc2: ; 0x1accc2 +CinnabarIslandSignText: text "CINNABAR ISLAND" para "The Fiery Town of" line "Burning Desire" done -; 0x1accf4 -CinnabarIsland_MapEventHeader: ; 0x1accf4 +CinnabarIsland_MapEventHeader: ; filler db 0, 0 @@ -153,13 +140,11 @@ CinnabarIsland_MapEventHeader: ; 0x1accf4 ; signposts db 4 - signpost 11, 12, $0, MapCinnabarIslandSignpost0Script - signpost 11, 9, $0, MapCinnabarIslandSignpost1Script - signpost 7, 7, $0, MapCinnabarIslandSignpost2Script + signpost 11, 12, $0, CinnabarIslandPokeCenterSign + signpost 11, 9, $0, CinnabarIslandGymSign + signpost 7, 7, $0, CinnabarIslandSign signpost 1, 9, $7, MapCinnabarIslandSignpostItem3 ; people-events db 1 - person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, BlueScript_0x1ac9b0, $0775 -; 0x1acd20 - + person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, CinnabarIslandBlue, $0775 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index bb3346dcf..8662da1d8 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -7,7 +7,7 @@ CinnabarPokeCenter1F_MapScriptHeader: ; 0x1ab32a ; 0x1ab32c NurseScript_0x1ab32c: ; 0x1ab32c - jumpstd $0000 + jumpstd pokecenternurse ; 0x1ab32f CooltrainerFScript_0x1ab32f: ; 0x1ab32f @@ -57,4 +57,3 @@ CinnabarPokeCenter1F_MapEventHeader: ; 0x1ab3ab person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, $ffff person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, $ffff ; 0x1ab3e7 - diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index 31155e7c7..9efbed5bc 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ CinnabarPokeCenter2FBeta_MapEventHeader: ; 0x1ab3e9 ; people-events db 0 ; 0x1ab3f4 - diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 23ce0ae36..df7131bd6 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -97,4 +97,3 @@ Colosseum_MapEventHeader: ; 0x1934b7 person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x1934eb - diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 19874e184..160a25629 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -98,4 +98,3 @@ CopycatsHouse1F_MapEventHeader: ; 0x18ae5e person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, $ffff person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, $ffff ; 0x18ae9a - diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index e102c651e..510cd5c5a 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -7,69 +7,63 @@ CopycatsHouse2F_MapScriptHeader: ; 0x18ae9a ; callbacks - dbw 2, UnknownScript_0x18ae9f + dbw 2, CopycatsHouse2FCallback ; 0x18ae9f -UnknownScript_0x18ae9f: ; 0x18ae9f +CopycatsHouse2FCallback: checkflag $0063 - iftrue UnknownScript_0x18aeac + iftrue .Part1 disappear $7 appear $2 - jump UnknownScript_0x18aeb0 -; 0x18aeac - -UnknownScript_0x18aeac: ; 0x18aeac + jump .Done +.Part1 disappear $2 appear $7 -UnknownScript_0x18aeb0: ; 0x18aeb0 +.Done return -; 0x18aeb1 -CopycatScript_0x18aeb1: ; 0x18aeb1 +Copycat: faceplayer checkevent EVENT_GOT_PASS_FROM_COPYCAT - iftrue UnknownScript_0x18af6f + iftrue .Part15 checkevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT - iftrue UnknownScript_0x18af5b + iftrue .Part13 checkitem LOST_ITEM - iftrue UnknownScript_0x18af4a + iftrue .Part12 checkflag $0063 - iftrue UnknownScript_0x18aed4 + iftrue .Part1 applymovement $2, MovementData_0x18afd0 faceplayer variablesprite $b, $1 - jump UnknownScript_0x18aedc -; 0x18aed4 + jump .Part2 -UnknownScript_0x18aed4: ; 0x18aed4 +.Part1 applymovement $7, MovementData_0x18afd0 faceplayer variablesprite $b, $60 -UnknownScript_0x18aedc: ; 0x18aedc +.Part2 special Function14209 checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x18af16 + iftrue .Part7 loadfont checkflag $0063 - iftrue UnknownScript_0x18aef2 + iftrue .Part3 writetext UnknownText_0x18afda - jump UnknownScript_0x18aef5 -; 0x18aef2 + jump .Part4 -UnknownScript_0x18aef2: ; 0x18aef2 +.Part3 writetext UnknownText_0x18b316 -UnknownScript_0x18aef5: ; 0x18aef5 +.Part4 closetext loadmovesprites checkflag $0063 - iftrue UnknownScript_0x18af04 + iftrue .Part5 applymovement $2, MovementData_0x18afd0 - jump UnknownScript_0x18af08 -; 0x18af04 + jump .Part6 -UnknownScript_0x18af04: ; 0x18af04 +.Part5 applymovement $7, MovementData_0x18afd0 -UnknownScript_0x18af08: ; 0x18af08 +.Part6 faceplayer variablesprite $b, $28 special Function14209 @@ -78,30 +72,27 @@ UnknownScript_0x18af08: ; 0x18af08 closetext loadmovesprites end -; 0x18af16 -UnknownScript_0x18af16: ; 0x18af16 +.Part7 loadfont checkflag $0063 - iftrue UnknownScript_0x18af23 + iftrue .Part8 writetext UnknownText_0x18b064 - jump UnknownScript_0x18af26 -; 0x18af23 + jump .Part9 -UnknownScript_0x18af23: ; 0x18af23 +.Part8 writetext UnknownText_0x18b366 -UnknownScript_0x18af26: ; 0x18af26 +.Part9 closetext loadmovesprites checkflag $0063 - iftrue UnknownScript_0x18af35 + iftrue .Part10 applymovement $2, MovementData_0x18afd0 - jump UnknownScript_0x18af39 -; 0x18af35 + jump .Part11 -UnknownScript_0x18af35: ; 0x18af35 +.Part10 applymovement $7, MovementData_0x18afd0 -UnknownScript_0x18af39: ; 0x18af39 +.Part11 faceplayer variablesprite $b, $28 special Function14209 @@ -111,99 +102,87 @@ UnknownScript_0x18af39: ; 0x18af39 loadmovesprites setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM end -; 0x18af4a -UnknownScript_0x18af4a: ; 0x18af4a +.Part12 loadfont writetext UnknownText_0x18b17f keeptextopen takeitem LOST_ITEM, 1 setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearevent $0773 - jump UnknownScript_0x18af5c -; 0x18af5b + jump .Part14 -UnknownScript_0x18af5b: ; 0x18af5b +.Part13 loadfont -UnknownScript_0x18af5c: ; 0x18af5c +.Part14 writetext UnknownText_0x18b1e2 keeptextopen verbosegiveitem PASS, 1 - iffalse UnknownScript_0x18afba + iffalse .Part22 setevent EVENT_GOT_PASS_FROM_COPYCAT writetext UnknownText_0x18b214 closetext loadmovesprites end -; 0x18af6f -UnknownScript_0x18af6f: ; 0x18af6f +.Part15 checkflag $0063 - iftrue UnknownScript_0x18af80 + iftrue .Part16 applymovement $2, MovementData_0x18afd0 faceplayer variablesprite $b, $1 - jump UnknownScript_0x18af88 -; 0x18af80 + jump .Part17 -UnknownScript_0x18af80: ; 0x18af80 +.Part16 applymovement $7, MovementData_0x18afd0 faceplayer variablesprite $b, $60 -UnknownScript_0x18af88: ; 0x18af88 +.Part17 special Function14209 loadfont checkflag $0063 - iftrue UnknownScript_0x18af98 + iftrue .Part18 writetext UnknownText_0x18b298 - jump UnknownScript_0x18af9b -; 0x18af98 + jump .Part19 -UnknownScript_0x18af98: ; 0x18af98 +.Part18 writetext UnknownText_0x18b415 -UnknownScript_0x18af9b: ; 0x18af9b +.Part19 closetext loadmovesprites checkflag $0063 - iftrue UnknownScript_0x18afaa + iftrue .Part20 applymovement $2, MovementData_0x18afd0 - jump UnknownScript_0x18afae -; 0x18afaa + jump .Part21 -UnknownScript_0x18afaa: ; 0x18afaa +.Part20 applymovement $7, MovementData_0x18afd0 -UnknownScript_0x18afae: ; 0x18afae +.Part21 faceplayer variablesprite $b, $28 special Function14209 loadfont writetext UnknownText_0x18b2f5 closetext -UnknownScript_0x18afba: ; 0x18afba +.Part22 loadmovesprites end -; 0x18afbc -MoltresScript_0x18afbc: ; 0x18afbc +CopycatsDodrio: loadfont - writetext UnknownText_0x18b476 + writetext CopycatsDodrioText1 cry DODRIO keeptextopen - writetext UnknownText_0x18b489 + writetext CopycatsDodrioText2 closetext loadmovesprites end -; 0x18afca -FairyScript_0x18afca: -MonsterScript_0x18afca: -BirdScript_0x18afca: ; 0x18afca - jumptext UnknownText_0x18b4c4 -; 0x18afcd +CopycatsHouse2FDoll: + jumptext CopycatsHouse2FDollText -MapCopycatsHouse2FSignpost1Script: ; 0x18afcd - jumpstd $0002 -; 0x18afd0 +CopycatsHouse2FBookshelf: + jumpstd picturebookshelf MovementData_0x18afd0: ; 0x18afd0 turn_head_down @@ -371,12 +350,12 @@ UnknownText_0x18b415: ; 0x18b415 done ; 0x18b476 -UnknownText_0x18b476: ; 0x18b476 +CopycatsDodrioText1: ; 0x18b476 text "DODRIO: Gii giii!" done ; 0x18b489 -UnknownText_0x18b489: ; 0x18b489 +CopycatsDodrioText2: ; 0x18b489 text "MIRROR, MIRROR ON" line "THE WALL, WHO'S" @@ -385,13 +364,12 @@ UnknownText_0x18b489: ; 0x18b489 done ; 0x18b4c4 -UnknownText_0x18b4c4: ; 0x18b4c4 +CopycatsHouse2FDollText: text "This is a rare" line "#MON! Huh?" para "It's only a doll…" done -; 0x18b4f0 CopycatsHouse2F_MapEventHeader: ; 0x18b4f0 ; filler @@ -406,16 +384,15 @@ CopycatsHouse2F_MapEventHeader: ; 0x18b4f0 ; signposts db 2 - signpost 1, 0, $0, MapCopycatsHouse2FSignpost1Script - signpost 1, 1, $0, MapCopycatsHouse2FSignpost1Script + signpost 1, 0, $0, CopycatsHouse2FBookshelf + signpost 1, 1, $0, CopycatsHouse2FBookshelf ; people-events db 6 - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, CopycatScript_0x18aeb1, $06ee - person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x18afbc, $ffff - person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, FairyScript_0x18afca, $0773 - person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, MonsterScript_0x18afca, $ffff - person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, BirdScript_0x18afca, $ffff - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, CopycatScript_0x18aeb1, $06ef + person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, $06ee + person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, $ffff + person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, $0773 + person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, $ffff + person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, $ffff + person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, $06ef ; 0x18b553 - diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index eb2ca6311..830766e38 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -480,4 +480,3 @@ DanceTheatre_MapEventHeader: ; 0x99baa person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, $ffff person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, $ffff ; 0x99c39 - diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index a3a3a794f..e4682818f 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -83,4 +83,3 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; 0x18c83d person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, $06a1 person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, $06a2 ; 0x18c874 - diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 06b3fdf27..865b034e9 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -22,9 +22,8 @@ ItemFragment_0x18c694: ; 0x18c694 db DIRE_HIT, 1 ; 0x18c696 -RockScript_0x18c696: ; 0x18c696 - jumpstd $000f -; 0x18c699 +DarkCaveVioletEntranceRock: + jumpstd smashrock MapDarkCaveVioletEntranceSignpostItem0: ; 0x18c699 dw $009d @@ -52,12 +51,11 @@ DarkCaveVioletEntrance_MapEventHeader: ; 0x18c69c ; people-events db 8 person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, $069e - person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff - person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff - person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff - person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff + person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff + person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff + person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff + person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, $069f person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0 person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce ; 0x18c71e - diff --git a/maps/DayCare.asm b/maps/DayCare.asm index eda851c11..d48f629b1 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -79,9 +79,8 @@ UnknownScript_0x62fd1: ; 0x62fd1 end ; 0x62fd7 -MapDayCareSignpost1Script: ; 0x62fd7 - jumpstd $0001 -; 0x62fda +DayCareBookshelf: + jumpstd difficultbookshelf UnknownText_0x62fda: ; 0x62fda text "Gramps was looking" @@ -186,13 +185,11 @@ DayCare_MapEventHeader: ; 0x63250 ; signposts db 2 - signpost 1, 0, $0, MapDayCareSignpost1Script - signpost 1, 1, $0, MapDayCareSignpost1Script + signpost 1, 0, $0, DayCareBookshelf + signpost 1, 1, $0, DayCareBookshelf ; people-events db 2 person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, $06e5 person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, $ffff ; 0x6328e - - diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 1fdb07f2d..14a5e3c10 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -49,4 +49,3 @@ DiglettsCave_MapEventHeader: ; 0x74049 db 1 person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff ; 0x7407f - diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index db020759b..0cfec0681 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -747,4 +747,3 @@ DragonShrine_MapEventHeader: ; 0x18dabc person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, $0000 person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, $0790 ; 0x18db00 - diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 1ed9cc415..5e13d911c 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -26,4 +26,3 @@ DragonsDen1F_MapEventHeader: ; 0x18c876 ; people-events db 0 ; 0x18c890 - diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 520e406d8..c5e8344c8 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -547,4 +547,3 @@ DragonsDenB1F_MapEventHeader: ; 0x18cf73 person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 ; 0x18d014 - diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 4707f4184..6f5e7492c 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -4,34 +4,31 @@ EarlsPokemonAcademy_MapScriptHeader: ; 0x68a5a ; callback count db 0 -; 0x68a5c -FisherScript_0x68a5c: ; 0x68a5c +AcademyEarl: applymovement $2, MovementData_0x68b2d faceplayer loadfont writetext UnknownText_0x68b3b yesorno - iffalse UnknownScript_0x68a70 + iffalse .Part1 writetext UnknownText_0x68bbd yesorno - iffalse UnknownScript_0x68a7d -UnknownScript_0x68a70: ; 0x68a70 + iffalse .Done +.Part1 writetext UnknownText_0x68c51 yesorno - iffalse UnknownScript_0x68a7d + iffalse .Done writetext UnknownText_0x68c7b closetext loadmovesprites end -; 0x68a7d -UnknownScript_0x68a7d: ; 0x68a7d +.Done writetext UnknownText_0x68d31 closetext loadmovesprites end -; 0x68a83 YoungsterScript_0x68a83: ; 0x68a83 jumptextfaceplayer UnknownText_0x68d80 @@ -61,104 +58,91 @@ YoungsterScript_0x68a9c: ; 0x68a9c jumptextfaceplayer UnknownText_0x68e39 ; 0x68a9f -MapEarlsPokemonAcademySignpost3Script: ; 0x68a9f +AcademyBlackboard: loadfont - writetext UnknownText_0x68eb2 -UnknownScript_0x68aa3: ; 0x68aa3 - loadmenudata MenuDataHeader_0x68ae1 + writetext AcademyBlackboardText +.Loop + loadmenudata .MenuHeader interpretmenu writebackup - if_equal $1, UnknownScript_0x68abe - if_equal $2, UnknownScript_0x68ac5 - if_equal $3, UnknownScript_0x68acc - if_equal $4, UnknownScript_0x68ad3 - if_equal $5, UnknownScript_0x68ada + if_equal $1, .Poison + if_equal $2, .Paralysis + if_equal $3, .Sleep + if_equal $4, .Burn + if_equal $5, .Freeze loadmovesprites end -; 0x68abe -UnknownScript_0x68abe: ; 0x68abe - writetext UnknownText_0x68efe +.Poison + writetext AcademyPoisonText closetext - jump UnknownScript_0x68aa3 -; 0x68ac5 + jump .Loop -UnknownScript_0x68ac5: ; 0x68ac5 - writetext UnknownText_0x68f80 +.Paralysis + writetext AcademyParalysisText closetext - jump UnknownScript_0x68aa3 -; 0x68acc + jump .Loop -UnknownScript_0x68acc: ; 0x68acc - writetext UnknownText_0x68fe2 +.Sleep + writetext AcademySleepText closetext - jump UnknownScript_0x68aa3 -; 0x68ad3 + jump .Loop -UnknownScript_0x68ad3: ; 0x68ad3 - writetext UnknownText_0x69055 +.Burn + writetext AcademyBurnText closetext - jump UnknownScript_0x68aa3 -; 0x68ada + jump .Loop -UnknownScript_0x68ada: ; 0x68ada - writetext UnknownText_0x690cb +.Freeze: + writetext AcademyFreezeText closetext - jump UnknownScript_0x68aa3 -; 0x68ae1 + jump .Loop - -MenuDataHeader_0x68ae1: ; 0x68ae1 +.MenuHeader db $40 ; flags db 00, 00 ; start coords db 08, 11 ; end coords - dw MenuData2_0x68ae9 + dw .Data db 1 ; default option -; 0x68ae9 -MenuData2_0x68ae9: ; 0x68ae9 +.Data db $80 ; flags dn 3, 2 ; rows, columns db 5 ; spacing - dbw BANK(UnknownText_0x68af2), UnknownText_0x68af2 + dbw BANK(.Text), .Text dbw $1a, $0000 -; 0x68af2 -UnknownText_0x68af2: ; 0x68af2 +.Text db "PSN@" db "PAR@" db "SLP@" db "BRN@" db "FRZ@" db "QUIT@" -; 0x68b0b - -PokedexScript_0x68b0b: ; 0x68b0b +AcademyNotebook: loadfont - writetext UnknownText_0x69136 + writetext AcademyNotebookText yesorno - iffalse UnknownScript_0x68b25 - writetext UnknownText_0x69197 + iffalse .Done + writetext AcademyNotebookText1 yesorno - iffalse UnknownScript_0x68b25 - writetext UnknownText_0x69207 + iffalse .Done + writetext AcademyNotebookText2 yesorno - iffalse UnknownScript_0x68b25 - writetext UnknownText_0x69287 + iffalse .Done + writetext AcademyNotebookText3 closetext -UnknownScript_0x68b25: ; 0x68b25 +.Done loadmovesprites end -; 0x68b27 -UnknownScript_0x68b27: ; 0x68b27 - jumptext UnknownText_0x69344 -; 0x68b2a +AcademyStickerMachine: +; unused + jumptext AcademyStickerMachineText -MapEarlsPokemonAcademySignpost1Script: ; 0x68b2a - jumpstd $0001 -; 0x68b2d +AcademyBookshelf: + jumpstd difficultbookshelf MovementData_0x68b2d: ; 0x68b2d turn_head_down @@ -288,21 +272,20 @@ UnknownText_0x68e39: ; 0x68e39 done ; 0x68eb2 -UnknownText_0x68eb2: ; 0x68eb2 +AcademyBlackboardText: text "The blackboard" line "describes #MON" para "status changes in" line "battle." done -; 0x68eeb -UnknownText_0x68eeb: ; 0x68eeb +AcademyBlackboardText2: +; unused text "Read which topic?" done -; 0x68efe -UnknownText_0x68efe: ; 0x68efe +AcademyPoisonText: text "If poisoned, a" line "#MON steadily" cont "loses HP." @@ -316,9 +299,8 @@ UnknownText_0x68efe: ; 0x68efe para "To cure it, use an" line "ANTIDOTE." done -; 0x68f80 -UnknownText_0x68f80: ; 0x68f80 +AcademyParalysisText: text "Paralysis reduces" line "speed and may" cont "prevent movement." @@ -327,9 +309,8 @@ UnknownText_0x68f80: ; 0x68f80 line "battle, so use" cont "a PARLYZ HEAL." done -; 0x68fe2 -UnknownText_0x68fe2: ; 0x68fe2 +AcademySleepText: text "If asleep, your" line "#MON can't make" cont "a move." @@ -341,9 +322,8 @@ UnknownText_0x68fe2: ; 0x68fe2 para "Wake it up with" line "an AWAKENING." done -; 0x69055 -UnknownText_0x69055: ; 0x69055 +AcademyBurnText: text "A burn steadily" line "consumes HP." @@ -356,9 +336,8 @@ UnknownText_0x69055: ; 0x69055 para "Use a BURN HEAL as" line "the cure." done -; 0x690cb -UnknownText_0x690cb: ; 0x690cb +AcademyFreezeText: text "If your #MON is" line "frozen, it can't" cont "do a thing." @@ -369,9 +348,8 @@ UnknownText_0x690cb: ; 0x690cb para "Thaw it out with" line "an ICE HEAL." done -; 0x69136 -UnknownText_0x69136: ; 0x69136 +AcademyNotebookText: text "It's this kid's" line "notebook…" @@ -383,9 +361,8 @@ UnknownText_0x69136: ; 0x69136 para "Keep reading?" done -; 0x69197 -UnknownText_0x69197: ; 0x69197 +AcademyNotebookText1: text "Before throwing a" line "# BALL, weaken" cont "the target first." @@ -396,9 +373,8 @@ UnknownText_0x69197: ; 0x69197 para "Keep reading?" done -; 0x69207 -UnknownText_0x69207: ; 0x69207 +AcademyNotebookText2: text "Some moves may" line "cause confusion." @@ -412,9 +388,8 @@ UnknownText_0x69207: ; 0x69207 para "Keep reading?" done -; 0x69287 -UnknownText_0x69287: ; 0x69287 +AcademyNotebookText3: text "People who catch" line "and use #MON" @@ -435,15 +410,13 @@ UnknownText_0x69287: ; 0x69287 para "I haven't written" line "anymore…" done -; 0x69344 -UnknownText_0x69344: ; 0x69344 +AcademyStickerMachineText: text "This super machine" line "prints data out as" para "stickers!" done -; 0x69375 EarlsPokemonAcademy_MapEventHeader: ; 0x69375 ; filler @@ -459,18 +432,17 @@ EarlsPokemonAcademy_MapEventHeader: ; 0x69375 ; signposts db 4 - signpost 1, 0, $0, MapEarlsPokemonAcademySignpost1Script - signpost 1, 1, $0, MapEarlsPokemonAcademySignpost1Script - signpost 0, 3, $0, MapEarlsPokemonAcademySignpost3Script - signpost 0, 4, $0, MapEarlsPokemonAcademySignpost3Script + signpost 1, 0, $0, AcademyBookshelf + signpost 1, 1, $0, AcademyBookshelf + signpost 0, 3, $0, AcademyBlackboard + signpost 0, 4, $0, AcademyBlackboard ; people-events db 6 - person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, FisherScript_0x68a5c, $06cb + person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, $06cb person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, $ffff person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, $ffff person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, $ffff person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, $ffff - person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, PokedexScript_0x68b0b, $ffff + person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, $ffff ; 0x693e7 - diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b55ad3494..34070ced2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ -EcruteakCity_MapScriptHeader: ; 0x1a4000 +EcruteakCity_MapScriptHeader: ; trigger count db 0 @@ -6,32 +6,25 @@ EcruteakCity_MapScriptHeader: ; 0x1a4000 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a4005 -; 0x1a4005 - -UnknownScript_0x1a4005: ; 0x1a4005 - setflag $0048 +.FlyPoint + setflag ENGINE_FLYPOINT_ECRUTEAK return -; 0x1a4009 -GrampsScript_0x1a4009: ; 0x1a4009 +GrampsScript_0x1a4009: jumptextfaceplayer UnknownText_0x1a4105 -; 0x1a400c -GrampsScript_0x1a400c: ; 0x1a400c +GrampsScript_0x1a400c: jumptextfaceplayer UnknownText_0x1a4147 -; 0x1a400f -GrampsScript_0x1a400f: ; 0x1a400f +GrampsScript_0x1a400f: jumptextfaceplayer UnknownText_0x1a43cb -; 0x1a4012 -LassScript_0x1a4012: ; 0x1a4012 +LassScript_0x1a4012: jumptextfaceplayer UnknownText_0x1a41db -; 0x1a4015 -LassScript_0x1a4015: ; 0x1a4015 +LassScript_0x1a4015: faceplayer loadfont checkevent EVENT_RELEASED_THE_BEASTS @@ -40,16 +33,14 @@ LassScript_0x1a4015: ; 0x1a4015 closetext loadmovesprites end -; 0x1a4023 -UnknownScript_0x1a4023: ; 0x1a4023 +UnknownScript_0x1a4023: writetext UnknownText_0x1a4269 closetext loadmovesprites end -; 0x1a4029 -FisherScript_0x1a4029: ; 0x1a4029 +FisherScript_0x1a4029: faceplayer loadfont checkevent EVENT_JASMINE_RETURNED_TO_GYM @@ -58,54 +49,42 @@ FisherScript_0x1a4029: ; 0x1a4029 closetext loadmovesprites end -; 0x1a4037 -UnknownScript_0x1a4037: ; 0x1a4037 +UnknownScript_0x1a4037: writetext UnknownText_0x1a4325 closetext loadmovesprites end -; 0x1a403d -YoungsterScript_0x1a403d: ; 0x1a403d +YoungsterScript_0x1a403d: jumptextfaceplayer UnknownText_0x1a4386 -; 0x1a4040 -MapEcruteakCitySignpost0Script: ; 0x1a4040 - jumptext UnknownText_0x1a44d1 -; 0x1a4043 +EcruteakCitySign: + jumptext EcruteakCitySignText -MapEcruteakCitySignpost1Script: ; 0x1a4043 - jumptext UnknownText_0x1a4513 -; 0x1a4046 +TinTowerSign: + jumptext TinTowerSignText -MapEcruteakCitySignpost2Script: ; 0x1a4046 - jumptext UnknownText_0x1a4548 -; 0x1a4049 +EcruteakGymSign: + jumptext EcruteakGymSignText -MapEcruteakCitySignpost3Script: ; 0x1a4049 - jumptext UnknownText_0x1a458c -; 0x1a404c +EcruteakDanceTheaterSign: + jumptext EcruteakDanceTheaterSignText -MapEcruteakCitySignpost4Script: ; 0x1a404c - jumptext UnknownText_0x1a45a4 -; 0x1a404f +BurnedTowerSign: + jumptext BurnedTowerSignText -MapEcruteakCitySignpost5Script: ; 0x1a404f - jumpstd $0010 -; 0x1a4052 +EcruteakCityPokeCenterSign: + jumpstd pokecentersign -MapEcruteakCitySignpost6Script: ; 0x1a4052 - jumpstd $0011 -; 0x1a4055 +EcruteakCityMartSign: + jumpstd martsign -MapEcruteakCitySignpostItem7: ; 0x1a4055 +MapEcruteakCitySignpostItem7: dw $00b4 db HYPER_POTION - -; 0x1a4058 -UnusedMissingDaughterText: ; 0x1a4058 +UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. text "Oh, no. Oh, no…" @@ -126,16 +105,15 @@ UnusedMissingDaughterText: ; 0x1a4058 line "do…?" done -UnknownText_0x1a4105: ; 0x1a4105 +UnknownText_0x1a4105: text "ECRUTEAK used to" line "have two towers:" para "one each in the" line "east and west." done -; 0x1a4147 -UnknownText_0x1a4147: ; 0x1a4147 +UnknownText_0x1a4147: text "Ah, child." line "Have you learned" @@ -149,18 +127,16 @@ UnknownText_0x1a4147: ; 0x1a4147 line "give you something" cont "nice, I hear." done -; 0x1a41db -UnknownText_0x1a41db: ; 0x1a41db +UnknownText_0x1a41db: text "I'm going to prac-" line "tice at the DANCE" para "THEATER. Care to" line "join me?" done -; 0x1a421a -UnknownText_0x1a421a: ; 0x1a421a +UnknownText_0x1a421a: text "The tower that" line "used to be here…" @@ -168,17 +144,15 @@ UnknownText_0x1a421a: ; 0x1a421a line "it used to be much" cont "taller." done -; 0x1a4269 -UnknownText_0x1a4269: ; 0x1a4269 +UnknownText_0x1a4269: text "Three big #MON" line "ran off in differ-" cont "ent directions." cont "What were they?" done -; 0x1a42ac -UnknownText_0x1a42ac: ; 0x1a42ac +UnknownText_0x1a42ac: text "I heard a rumor" line "about OLIVINE" cont "LIGHTHOUSE." @@ -190,9 +164,8 @@ UnknownText_0x1a42ac: ; 0x1a42ac line "Sounds like they" cont "are in trouble." done -; 0x1a4325 -UnknownText_0x1a4325: ; 0x1a4325 +UnknownText_0x1a4325: text "The #MON at" line "OLIVINE LIGHTHOUSE" cont "has been cured." @@ -201,18 +174,16 @@ UnknownText_0x1a4325: ; 0x1a4325 line "sail out to sea at" cont "night again." done -; 0x1a4386 -UnknownText_0x1a4386: ; 0x1a4386 +UnknownText_0x1a4386: text "I hear #MON are" line "rampaging at the" para "LAKE OF RAGE. I'd" line "like to see that." done -; 0x1a43cb -UnknownText_0x1a43cb: ; 0x1a43cb +UnknownText_0x1a43cb: text "In the distant" line "past…" @@ -240,27 +211,24 @@ UnknownText_0x1a43cb: ; 0x1a43cb line "way back when." cont "Hohoho!" done -; 0x1a44d1 -UnknownText_0x1a44d1: ; 0x1a44d1 +EcruteakCitySignText: text "ECRUTEAK CITY" line "A Historical City" para "Where the Past" line "Meets the Present" done -; 0x1a4513 -UnknownText_0x1a4513: ; 0x1a4513 +TinTowerSignText: text "TIN TOWER" para "A legendary #-" line "MON is said to" cont "roost here." done -; 0x1a4548 -UnknownText_0x1a4548: ; 0x1a4548 +EcruteakGymSignText: text "ECRUTEAK CITY" line "#MON GYM" cont "LEADER: MORTY" @@ -268,15 +236,13 @@ UnknownText_0x1a4548: ; 0x1a4548 para "The Mystic Seer of" line "the Future" done -; 0x1a458c -UnknownText_0x1a458c: ; 0x1a458c +EcruteakDanceTheaterSignText: text "ECRUTEAK DANCE" line "THEATER" done -; 0x1a45a4 -UnknownText_0x1a45a4: ; 0x1a45a4 +BurnedTowerSignText: text "BURNED TOWER" para "It was destroyed" @@ -286,9 +252,8 @@ UnknownText_0x1a45a4: ; 0x1a45a4 para "Please stay away," line "as it is unsafe." done -; 0x1a45fc -EcruteakCity_MapEventHeader: ; 0x1a45fc +EcruteakCity_MapEventHeader: ; filler db 0, 0 @@ -315,13 +280,13 @@ EcruteakCity_MapEventHeader: ; 0x1a45fc ; signposts db 8 - signpost 21, 15, $0, MapEcruteakCitySignpost0Script - signpost 10, 38, $0, MapEcruteakCitySignpost1Script - signpost 28, 8, $0, MapEcruteakCitySignpost2Script - signpost 21, 21, $0, MapEcruteakCitySignpost3Script - signpost 10, 2, $0, MapEcruteakCitySignpost4Script - signpost 27, 24, $0, MapEcruteakCitySignpost5Script - signpost 21, 30, $0, MapEcruteakCitySignpost6Script + signpost 21, 15, $0, EcruteakCitySign + signpost 10, 38, $0, TinTowerSign + signpost 28, 8, $0, EcruteakGymSign + signpost 21, 21, $0, EcruteakDanceTheaterSign + signpost 10, 2, $0, BurnedTowerSign + signpost 27, 24, $0, EcruteakCityPokeCenterSign + signpost 21, 30, $0, EcruteakCityMartSign signpost 14, 23, $7, MapEcruteakCitySignpostItem7 ; people-events @@ -333,5 +298,3 @@ EcruteakCity_MapEventHeader: ; 0x1a45fc person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, $ffff person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, $ffff person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, $07a9 -; 0x1a46d0 - diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index fe33080fa..1454da7f9 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -75,11 +75,11 @@ UnknownScript_0x99db7: ; 0x99db7 ; 0x99dc0 UnknownScript_0x99dc0: ; 0x99dc0 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x99dc3 UnknownScript_0x99dc3: ; 0x99dc3 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x99dc6 UnknownScript_0x99dc6: ; 0x99dc6 @@ -232,16 +232,13 @@ EcruteakGymGuyScript: ; 0x99e39 end ; 0x99e4d -MapEcruteakGymSignpost1Script: ; 0x99e4d - checkflag $001e - iftrue UnknownScript_0x99e56 - jumpstd $002d -; 0x99e56 - -UnknownScript_0x99e56: ; 0x99e56 +EcruteakGymStatue: + checkflag ENGINE_FOGBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext MORTY, 1, $1 - jumpstd $002e -; 0x99e5d + jumpstd gymstatue2 MovementData_0x99e5d: ; 0x99e5d step_up @@ -533,8 +530,8 @@ EcruteakGym_MapEventHeader: ; 0x9a4e9 ; signposts db 2 - signpost 15, 3, $0, MapEcruteakGymSignpost1Script - signpost 15, 6, $0, MapEcruteakGymSignpost1Script + signpost 15, 3, $0, EcruteakGymStatue + signpost 15, 6, $0, EcruteakGymStatue ; people-events db 7 @@ -546,4 +543,3 @@ EcruteakGym_MapEventHeader: ; 0x9a4e9 person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, $ffff person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, $07a8 ; 0x9a5f9 - diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 75339c82a..68c27410a 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -332,4 +332,3 @@ EcruteakHouse_MapEventHeader: ; 0x98502 person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, $07b1 person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, $07b1 ; 0x98565 - diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 3c79bfeac..4fbee4a98 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -56,9 +56,8 @@ UnknownScript_0x9a633: ; 0x9a633 end ; 0x9a639 -MapEcruteakItemfinderHouseSignpost0Script: ; 0x9a639 - jumpstd $000c -; 0x9a63c +ItemFinderHouseRadio: + jumpstd radio2 UnknownText_0x9a63c: ; 0x9a63c text "Ah. You're on an" @@ -186,11 +185,10 @@ EcruteakItemfinderHouse_MapEventHeader: ; 0x9a9f5 ; signposts db 1 - signpost 1, 2, $0, MapEcruteakItemfinderHouseSignpost0Script + signpost 1, 2, $0, ItemFinderHouseRadio ; people-events db 2 person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, $ffff person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, $ffff ; 0x9aa24 - diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index ddf8cc814..561982b80 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -14,9 +14,8 @@ YoungsterScript_0x99337: ; 0x99337 jumptextfaceplayer UnknownText_0x993ec ; 0x9933a -MapEcruteakLugiaSpeechHouseSignpost0Script: ; 0x9933a - jumpstd $000c -; 0x9933d +LugiaSpeechHouseRadio: + jumpstd radio2 UnknownText_0x9933d: ; 0x9933d text "This happened when" @@ -60,11 +59,10 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; 0x99431 ; signposts db 1 - signpost 1, 2, $0, MapEcruteakLugiaSpeechHouseSignpost0Script + signpost 1, 2, $0, LugiaSpeechHouseRadio ; people-events db 2 person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, $ffff person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, $ffff ; 0x99460 - diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 66c55da4c..1a02bab9f 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -67,4 +67,3 @@ EcruteakMart_MapEventHeader: ; 0x99d12 person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, $ffff person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, $ffff ; 0x99d49 - diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index dcce7b399..3c5b9ec41 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -58,7 +58,7 @@ UnknownScript_0x98e95: ; 0x98e95 ; 0x98eb0 NurseScript_0x98eb0: ; 0x98eb0 - jumpstd $0000 + jumpstd pokecenternurse ; 0x98eb3 PokefanMScript_0x98eb3: ; 0x98eb3 @@ -244,4 +244,3 @@ EcruteakPokeCenter1F_MapEventHeader: ; 0x992dc person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, $ffff person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, $0713 ; 0x99332 - diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 936c66ff7..7e5212f40 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,28 +1,23 @@ -ElmsHouse_MapScriptHeader: ; 0x7aee9 +ElmsHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x7aeeb -TeacherScript_0x7aeeb: ; 0x7aeeb - jumptextfaceplayer UnknownText_0x7aef7 -; 0x7aeee +ElmsWife: + jumptextfaceplayer ElmsWifeText -BugCatcherScript_0x7aeee: ; 0x7aeee - jumptextfaceplayer UnknownText_0x7af6b -; 0x7aef1 +ElmsSon: + jumptextfaceplayer ElmsSonText -MapElmsHouseSignpost0Script: ; 0x7aef1 - jumptext UnknownText_0x7b01b -; 0x7aef4 +ElmsHousePC: + jumptext ElmsHousePCText -MapElmsHouseSignpost2Script: ; 0x7aef4 - jumpstd $0001 -; 0x7aef7 +ElmsHouseBookshelf: + jumpstd difficultbookshelf -UnknownText_0x7aef7: ; 0x7aef7 +ElmsWifeText: text "Hi, ", $14, "! My" line "husband's always" @@ -35,9 +30,8 @@ UnknownText_0x7aef7: ; 0x7aef7 para "research, he even" line "forgets to eat." done -; 0x7af6b -UnknownText_0x7af6b: ; 0x7af6b +ElmsSonText: text "When I grow up," line "I'm going to help" cont "my dad!" @@ -46,23 +40,22 @@ UnknownText_0x7af6b: ; 0x7af6b line "great #MON" cont "professor!" done -; 0x7afbc -UnknownText_0x7afbc: ; 0x7afbc +ElmsHouseLabFoodText: +; unused text "There's some food" line "here. It must be" cont "for the LAB." done -; 0x7afec -UnknownText_0x7afec: ; 0x7afec +ElmsHousePokemonFoodText: +; unused text "There's some food" line "here. This must be" cont "for #MON." done -; 0x7b01b -UnknownText_0x7b01b: ; 0x7b01b +ElmsHousePCText: text "#MON. Where do" line "they come from? " @@ -85,9 +78,8 @@ UnknownText_0x7b01b: ; 0x7b01b line "PROF.ELM's re-" cont "search papers." done -; 0x7b0ea -ElmsHouse_MapEventHeader: ; 0x7b0ea +ElmsHouse_MapEventHeader: ; filler db 0, 0 @@ -101,13 +93,11 @@ ElmsHouse_MapEventHeader: ; 0x7b0ea ; signposts db 3 - signpost 1, 0, $0, MapElmsHouseSignpost0Script - signpost 1, 6, $0, MapElmsHouseSignpost2Script - signpost 1, 7, $0, MapElmsHouseSignpost2Script + signpost 1, 0, $0, ElmsHousePC + signpost 1, 6, $0, ElmsHouseBookshelf + signpost 1, 7, $0, ElmsHouseBookshelf ; people-events db 2 - person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, TeacherScript_0x7aeeb, $ffff - person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, BugCatcherScript_0x7aeee, $ffff -; 0x7b123 - + person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, $ffff + person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, $ffff diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 502fb1ab1..f75441d63 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -100,7 +100,7 @@ ProfElmScript: ; 0x78be0 loadfont checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue UnknownScript_0x78bee - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue ElmGiveTicketScript UnknownScript_0x78bee: ; 0x78bee checkevent EVENT_GOT_MASTER_BALL_FROM_ELM @@ -309,18 +309,17 @@ LookAtElmPokeBallScript: ; 0x78d6d end ; 0x78d74 -MapElmsLabSignpost0Script: ; 0x78d74 +ElmsLabHealingMachine: loadfont checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue UnknownScript_0x78d81 - writetext UnknownText_0x79690 + iftrue .CanHeal + writetext ElmsLabHealingMachineText1 closetext loadmovesprites end -; 0x78d81 -UnknownScript_0x78d81: ; 0x78d81 - writetext UnknownText_0x796aa +.CanHeal + writetext ElmsLabHealingMachineText2 yesorno iftrue UnknownScript_0x78d8a loadmovesprites @@ -595,7 +594,6 @@ UnknownScript_0x78f0c: ; 0x78f0c UnknownScript_0x78f12: ; 0x78f12 applymovement $0, MovementData_0x78f72 -; 0x78f16 MeetCopScript: ; 0x78f16 applymovement $0, MovementData_0x78f74 @@ -614,60 +612,53 @@ CopScript: ; 0x78f1a end ; 0x78f33 -MapElmsLabSignpost14Script: ; 0x78f33 +ElmsLabWindow: loadfont checkflag $0043 - iftrue UnknownScript_0x78f49 + iftrue .Normal checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON - iftrue UnknownScript_0x78f43 - jump UnknownScript_0x78f49 -; 0x78f43 + iftrue .BreakIn + jump .Normal -UnknownScript_0x78f43: ; 0x78f43 - writetext UnknownText_0x7a231 +.BreakIn + writetext ElmsLabWindowText2 closetext loadmovesprites end ; 0x78f49 -UnknownScript_0x78f49: ; 0x78f49 - writetext UnknownText_0x7a1fd +.Normal + writetext ElmsLabWindowText1 closetext loadmovesprites end ; 0x78f4f -MapElmsLabSignpost5Script: ; 0x78f4f - jumptext UnknownText_0x7a24c -; 0x78f52 +ElmsLabTravelTip1: + jumptext ElmsLabTravelTip1Text -MapElmsLabSignpost6Script: ; 0x78f52 - jumptext UnknownText_0x7a28a -; 0x78f55 +ElmsLabTravelTip2: + jumptext ElmsLabTravelTip2Text -MapElmsLabSignpost7Script: ; 0x78f55 - jumptext UnknownText_0x7a2c6 -; 0x78f58 +ElmsLabTravelTip3: + jumptext ElmsLabTravelTip3Text -MapElmsLabSignpost8Script: ; 0x78f58 - jumptext UnknownText_0x7a315 -; 0x78f5b +ElmsLabTravelTip4: + jumptext ElmsLabTravelTip4Text -MapElmsLabSignpost13Script: ; 0x78f5b - jumptext UnknownText_0x7a370 -; 0x78f5e +ElmsLabTrashcan: + jumptext ElmsLabTrashcanText -MapElmsLabSignpost15Script: ; 0x78f5e - jumptext UnknownText_0x7a3a6 +ElmsLabPC: ; 0x78f5e + jumptext ElmsLabPCText ; 0x78f61 -UnknownScript_0x78f61: ; 0x78f61 - jumpstd $000d -; 0x78f64 +ElmsLabTrashcan2: +; unused + jumpstd trashcan -MapElmsLabSignpost12Script: ; 0x78f64 - jumpstd $0001 -; 0x78f67 +ElmsLabBookshelf: + jumpstd difficultbookshelf MovementData_0x78f67: ; 0x78f67 step_up @@ -1008,7 +999,6 @@ ElmDirectionsText1: ; 0x794c0 para "number. Call me if" line "anything comes up!" done -; 0x79581 ElmDirectionsText2: ; 0x79581 text "If your #MON is" @@ -1020,19 +1010,16 @@ ElmDirectionsText2: ; 0x79581 para "Feel free to use" line "it anytime." done -; 0x795db ElmDirectionsText3: ; 0x795db text $14, ", I'm" line "counting on you!" done -; 0x795f3 GotElmsNumberText: ; 0x795f3 text $52, " got ELM's" line "phone number." done -; 0x7960d ElmDescribesMrPokemonText: ; 0x7960d text "MR.#MON goes" @@ -1043,26 +1030,22 @@ ElmDescribesMrPokemonText: ; 0x7960d line "just rare and" cont "not very useful…" done -; 0x79668 ElmPokeBallText: ; 0x79668 text "It contains a" line "#MON caught by" cont "PROF.ELM." done -; 0x79690 -UnknownText_0x79690: ; 0x79690 +ElmsLabHealingMachineText1: text "I wonder what this" line "does?" done -; 0x796aa -UnknownText_0x796aa: ; 0x796aa +ElmsLabHealingMachineText2: text "Would you like to" line "heal your #MON?" done -; 0x796cd ElmAfterTheftText1: ; 0x796cd text "ELM: ", $14, ", this" @@ -1429,21 +1412,19 @@ UnknownText_0x7a1c0: ; 0x7a1c0 done ; 0x7a1fd -UnknownText_0x7a1fd: ; 0x7a1fd +ElmsLabWindowText1: text "The window's open." para "A pleasant breeze" line "is blowing in." done -; 0x7a231 -UnknownText_0x7a231: ; 0x7a231 +ElmsLabWindowText2: text "He broke in" line "through here!" done -; 0x7a24c -UnknownText_0x7a24c: ; 0x7a24c +ElmsLabTravelTip1Text: text $52, " opened a" line "book." @@ -1452,9 +1433,8 @@ UnknownText_0x7a24c: ; 0x7a24c para "Press START to" line "open the MENU." done -; 0x7a28a -UnknownText_0x7a28a: ; 0x7a28a +ElmsLabTravelTip2Text: text $52, " opened a" line "book." @@ -1463,9 +1443,8 @@ UnknownText_0x7a28a: ; 0x7a28a para "Record your trip" line "with SAVE!" done -; 0x7a2c6 -UnknownText_0x7a2c6: ; 0x7a2c6 +ElmsLabTravelTip3Text: text $52, " opened a" line "book." @@ -1475,9 +1454,8 @@ UnknownText_0x7a2c6: ; 0x7a2c6 line "press SELECT to" cont "move items." done -; 0x7a315 -UnknownText_0x7a315: ; 0x7a315 +ElmsLabTravelTip4Text: text $52, " opened a" line "book." @@ -1489,23 +1467,20 @@ UnknownText_0x7a315: ; 0x7a315 para "A Button to switch" line "moves." done -; 0x7a370 -UnknownText_0x7a370: ; 0x7a370 +ElmsLabTrashcanText: text "The wrapper from" line "the snack PROF.ELM" cont "ate is in there…" done -; 0x7a3a6 -UnknownText_0x7a3a6: ; 0x7a3a6 +ElmsLabPCText: text "OBSERVATIONS ON" line "#MON EVOLUTION" para "…It says on the" line "screen…" done -; 0x7a3de ElmsLab_MapEventHeader: ; 0x7a3de ; filler @@ -1529,22 +1504,22 @@ ElmsLab_MapEventHeader: ; 0x7a3de ; signposts db 16 - signpost 1, 2, $0, MapElmsLabSignpost0Script - signpost 1, 6, $0, MapElmsLabSignpost12Script - signpost 1, 7, $0, MapElmsLabSignpost12Script - signpost 1, 8, $0, MapElmsLabSignpost12Script - signpost 1, 9, $0, MapElmsLabSignpost12Script - signpost 7, 0, $0, MapElmsLabSignpost5Script - signpost 7, 1, $0, MapElmsLabSignpost6Script - signpost 7, 2, $0, MapElmsLabSignpost7Script - signpost 7, 3, $0, MapElmsLabSignpost8Script - signpost 7, 6, $0, MapElmsLabSignpost12Script - signpost 7, 7, $0, MapElmsLabSignpost12Script - signpost 7, 8, $0, MapElmsLabSignpost12Script - signpost 7, 9, $0, MapElmsLabSignpost12Script - signpost 3, 9, $0, MapElmsLabSignpost13Script - signpost 0, 5, $0, MapElmsLabSignpost14Script - signpost 5, 3, $2, MapElmsLabSignpost15Script + signpost 1, 2, $0, ElmsLabHealingMachine + signpost 1, 6, $0, ElmsLabBookshelf + signpost 1, 7, $0, ElmsLabBookshelf + signpost 1, 8, $0, ElmsLabBookshelf + signpost 1, 9, $0, ElmsLabBookshelf + signpost 7, 0, $0, ElmsLabTravelTip1 + signpost 7, 1, $0, ElmsLabTravelTip2 + signpost 7, 2, $0, ElmsLabTravelTip3 + signpost 7, 3, $0, ElmsLabTravelTip4 + signpost 7, 6, $0, ElmsLabBookshelf + signpost 7, 7, $0, ElmsLabBookshelf + signpost 7, 8, $0, ElmsLabBookshelf + signpost 7, 9, $0, ElmsLabBookshelf + signpost 3, 9, $0, ElmsLabTrashcan + signpost 0, 5, $0, ElmsLabWindow + signpost 5, 3, $2, ElmsLabPC ; people-events db 6 @@ -1554,5 +1529,3 @@ ElmsLab_MapEventHeader: ; 0x7a3de person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641 person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642 person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, $0702 -; 0x7a4cc - diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index e0090fbc6..6f8f2c513 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -352,4 +352,3 @@ FastShip1F_MapEventHeader: ; 0x754f1 person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, $ffff person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, $072c ; 0x75577 - diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 4942bb957..0c185838c 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -382,9 +382,8 @@ SchoolboyRickyScript: ; 0x76866 end ; 0x7686e -MapFastShipB1FSignpost0Script: ; 0x7686e - jumpstd $000d -; 0x76871 +FashShipB1FTrashcan: + jumpstd trashcan MovementData_0x76871: ; 0x76871 fix_facing @@ -681,7 +680,7 @@ FastShipB1F_MapEventHeader: ; 0x76ee9 ; signposts db 1 - signpost 9, 27, $0, MapFastShipB1FSignpost0Script + signpost 9, 27, $0, FashShipB1FTrashcan ; people-events db 12 @@ -698,4 +697,3 @@ FastShipB1F_MapEventHeader: ; 0x76ee9 person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, $073b person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, $073b ; 0x76faa - diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm deleted file mode 100644 index 6ba34a780..000000000 --- a/maps/FastShipCabins.asm +++ /dev/null @@ -1,660 +0,0 @@ -FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: ; 0x75ea4 - ; trigger count - db 0 - - ; callback count - db 0 -; 0x75ea6 - -UnknownScript_0x75ea6: ; 0x75ea6 - end -; 0x75ea7 - -CaptainScript_0x75ea7: ; 0x75ea7 - faceplayer - loadfont - checkevent $0030 - iftrue UnknownScript_0x75eb5 - writetext UnknownText_0x76012 - closetext - loadmovesprites - end -; 0x75eb5 - -UnknownScript_0x75eb5: ; 0x75eb5 - writetext UnknownText_0x76064 - closetext - loadmovesprites - end -; 0x75ebb - -TwinScript_0x75ebb: ; 0x75ebb - spriteface $5, $3 - loadfont - writetext UnknownText_0x761e0 - closetext - loadmovesprites - faceplayer - loadfont - writetext UnknownText_0x7621f - closetext - loadmovesprites - special Function8c0b6 - special Functiond91 - disappear $5 - applymovement $0, MovementData_0x76004 - moveperson $4, $3, $13 - appear $4 - spriteface $0, $1 - spriteface $4, $1 - special Function8c0ab - spriteface $3, $0 - showemote $0, $3, 15 - applymovement $4, MovementData_0x7600c - spriteface $3, $3 - checkflag $0063 - iftrue UnknownScript_0x75f03 - loadfont - writetext UnknownText_0x76284 - closetext - loadmovesprites - jump UnknownScript_0x75f09 -; 0x75f03 - -UnknownScript_0x75f03: ; 0x75f03 - loadfont - writetext UnknownText_0x762c6 - closetext - loadmovesprites -UnknownScript_0x75f09: ; 0x75f09 - spriteface $5, $0 - applymovement $3, MovementData_0x76010 - loadfont - writetext UnknownText_0x76143 - keeptextopen - setevent $072b - domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 - jump UnknownScript_0x75f37 -; 0x75f1f - -GentlemanScript_0x75f1f: ; 0x75f1f - faceplayer - loadfont - checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA - iftrue UnknownScript_0x75f67 - checkevent $0732 - iftrue UnknownScript_0x75f58 - writetext UnknownText_0x760ae - closetext - loadmovesprites - domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 - end -; 0x75f37 - -UnknownScript_0x75f37: ; 0x75f37 - writetext UnknownText_0x7619b - keeptextopen - verbosegiveitem METAL_COAT, 1 - iffalse UnknownScript_0x75f44 - setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA -UnknownScript_0x75f44: ; 0x75f44 - loadmovesprites - waitbutton - playsound SFX_ELEVATOR_END - pause 30 - loadfont - writetext UnknownText_0x76645 - closetext - setevent $0031 - setevent $0032 - loadmovesprites - end -; 0x75f58 - -UnknownScript_0x75f58: ; 0x75f58 - writetext UnknownText_0x7619b - keeptextopen - verbosegiveitem METAL_COAT, 1 - iffalse UnknownScript_0x75f65 - setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA -UnknownScript_0x75f65: ; 0x75f65 - loadmovesprites - end -; 0x75f67 - -UnknownScript_0x75f67: ; 0x75f67 - writetext UnknownText_0x761be - closetext - loadmovesprites - end -; 0x75f6d - -TwinScript_0x75f6d: ; 0x75f6d - faceplayer - loadfont - writetext UnknownText_0x7630d - closetext - loadmovesprites - end -; 0x75f75 - -TrainerPokefanmColin: ; 0x75f75 - ; bit/flag number - dw $4d5 - - ; trainer group && trainer id - db POKEFANM, COLIN - - ; text when seen - dw PokefanmColinSeenText - - ; text when trainer beaten - dw PokefanmColinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmColinScript -; 0x75f81 - -PokefanmColinScript: ; 0x75f81 - talkaftercancel - loadfont - writetext UnknownText_0x7635b - closetext - loadmovesprites - end -; 0x75f89 - -TrainerTwinsMegandpeg1: ; 0x75f89 - ; bit/flag number - dw $46a - - ; trainer group && trainer id - db TWINS, MEGANDPEG1 - - ; text when seen - dw TwinsMegandpeg1SeenText - - ; text when trainer beaten - dw TwinsMegandpeg1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsMegandpeg1Script -; 0x75f95 - -TwinsMegandpeg1Script: ; 0x75f95 - talkaftercancel - loadfont - writetext UnknownText_0x763c2 - closetext - loadmovesprites - end -; 0x75f9d - -TrainerTwinsMegandpeg2: ; 0x75f9d - ; bit/flag number - dw $46a - - ; trainer group && trainer id - db TWINS, MEGANDPEG2 - - ; text when seen - dw TwinsMegandpeg2SeenText - - ; text when trainer beaten - dw TwinsMegandpeg2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsMegandpeg2Script -; 0x75fa9 - -TwinsMegandpeg2Script: ; 0x75fa9 - talkaftercancel - loadfont - writetext UnknownText_0x76428 - closetext - loadmovesprites - end -; 0x75fb1 - -TrainerPsychicRodney: ; 0x75fb1 - ; bit/flag number - dw $445 - - ; trainer group && trainer id - db PSYCHIC_T, RODNEY - - ; text when seen - dw PsychicRodneySeenText - - ; text when trainer beaten - dw PsychicRodneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicRodneyScript -; 0x75fbd - -PsychicRodneyScript: ; 0x75fbd - talkaftercancel - loadfont - writetext UnknownText_0x76497 - closetext - loadmovesprites - end -; 0x75fc5 - -TrainerPokefanmJeremy: ; 0x75fc5 - ; bit/flag number - dw $4d4 - - ; trainer group && trainer id - db POKEFANM, JEREMY - - ; text when seen - dw PokefanmJeremySeenText - - ; text when trainer beaten - dw PokefanmJeremyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmJeremyScript -; 0x75fd1 - -PokefanmJeremyScript: ; 0x75fd1 - talkaftercancel - loadfont - writetext UnknownText_0x7651c - closetext - loadmovesprites - end -; 0x75fd9 - -TrainerPokefanfGeorgia: ; 0x75fd9 - ; bit/flag number - dw $4dd - - ; trainer group && trainer id - db POKEFANF, GEORGIA - - ; text when seen - dw PokefanfGeorgiaSeenText - - ; text when trainer beaten - dw PokefanfGeorgiaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanfGeorgiaScript -; 0x75fe5 - -PokefanfGeorgiaScript: ; 0x75fe5 - talkaftercancel - loadfont - writetext UnknownText_0x76596 - closetext - loadmovesprites - end -; 0x75fed - -TrainerSupernerdShawn: ; 0x75fed - ; bit/flag number - dw $589 - - ; trainer group && trainer id - db SUPER_NERD, SHAWN - - ; text when seen - dw SupernerdShawnSeenText - - ; text when trainer beaten - dw SupernerdShawnBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdShawnScript -; 0x75ff9 - -SupernerdShawnScript: ; 0x75ff9 - talkaftercancel - loadfont - writetext UnknownText_0x7660f - closetext - loadmovesprites - end -; 0x76001 - -MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001 - jumpstd $000d -; 0x76004 - -MovementData_0x76004: ; 0x76004 - big_step_right - big_step_up - big_step_up - big_step_up - big_step_up - big_step_up - big_step_up - step_end -; 0x7600c - -MovementData_0x7600c: ; 0x7600c - step_up - step_up - turn_head_left - step_end -; 0x76010 - -MovementData_0x76010: ; 0x76010 - step_down - step_end -; 0x76012 - -UnknownText_0x76012: ; 0x76012 - text "Whew! Thanks for" - line "coming along." - - para "Keeping that lit-" - line "tle girl amused" - cont "was exhausting." - done -; 0x76064 - -UnknownText_0x76064: ; 0x76064 - text "How do you like" - line "S.S.AQUA's ride?" - - para "She practically" - line "skates across the" - cont "waves." - done -; 0x760ae - -UnknownText_0x760ae: ; 0x760ae - text "Oh, hello…" - - para "I still can't find" - line "my granddaughter." - - para "If she's on the" - line "ship, that's OK." - - para "She's an energetic" - line "child, so she may" - - para "be bugging some-" - line "one. I'm worried…" - done -; 0x76143 - -UnknownText_0x76143: ; 0x76143 - text $14, ", was it?" - line "I heard you enter-" - cont "tained my grand-" - cont "daughter." - - para "I want to thank" - line "you for that." - done -; 0x7619b - -UnknownText_0x7619b: ; 0x7619b - text "I know! I'd like" - line "you to have this!" - done -; 0x761be - -UnknownText_0x761be: ; 0x761be - text "We're traveling" - line "around the world." - done -; 0x761e0 - -UnknownText_0x761e0: ; 0x761e0 - text "CAPTAIN, play with" - line "me, please?" - - para "I'm bored! I want" - line "to play more!" - done -; 0x7621f - -UnknownText_0x7621f: ; 0x7621f - text "Hi! Will you play" - line "with me?" - - para "…Oh!" - - para "Grandpa's worried" - line "about me?" - - para "I have to go!" - - para "I have to go find" - line "Grandpa!" - done -; 0x76284 - -UnknownText_0x76284: ; 0x76284 - text "Grandpa, here I" - line "am! I was playing" - - para "with the CAPTAIN" - line "and this guy!" - done -; 0x762c6 - -UnknownText_0x762c6: ; 0x762c6 - text "Grandpa, here I" - line "am! I was playing" - - para "with the CAPTAIN" - line "and this big girl!" - done -; 0x7630d - -UnknownText_0x7630d: ; 0x7630d - text "I had lots of fun" - line "playing!" - done -; 0x76329 - -PokefanmColinSeenText: ; 0x76329 - text "Hey, kid! Want to" - line "battle with me?" - done -; 0x7634c - -PokefanmColinBeatenText: ; 0x7634c - text "You're strong!" - done -; 0x7635b - -UnknownText_0x7635b: ; 0x7635b - text "You're traveling" - line "all alone?" - - para "Isn't your mom" - line "worried?" - done -; 0x7638e - -TwinsMegandpeg1SeenText: ; 0x7638e - text "You think I'm a" - line "baby?" - cont "That's not fair!" - done -; 0x763b4 - -TwinsMegandpeg1BeatenText: ; 0x763b4 - text "Oh! We lost!" - done -; 0x763c2 - -UnknownText_0x763c2: ; 0x763c2 - text "Baby is a rude" - line "name to call us" - cont "girls!" - done -; 0x763e9 - -TwinsMegandpeg2SeenText: ; 0x763e9 - text "I'm not a baby!" - - para "That's not nice to" - line "say to a lady!" - done -; 0x7641a - -TwinsMegandpeg2BeatenText: ; 0x7641a - text "Oh! We lost!" - done -; 0x76428 - -UnknownText_0x76428: ; 0x76428 - text "Sometimes, kids" - line "are smarter than" - cont "grown-ups!" - done -; 0x76455 - -PsychicRodneySeenText: ; 0x76455 - text "Ssh! My brain is" - line "picking up radio" - cont "signals!" - done -; 0x76481 - -PsychicRodneyBeatenText: ; 0x76481 - text "…I hear some-" - line "thing!" - done -; 0x76497 - -UnknownText_0x76497: ; 0x76497 - text "I get it. You can" - line "hear JOHTO's radio" - cont "on the FAST SHIP." - done -; 0x764ce - -PokefanmJeremySeenText: ; 0x764ce - text "What do you think?" - line "My #MON are" - cont "beautiful, yes?" - done -; 0x764fe - -PokefanmJeremyBeatenText: ; 0x764fe - text "Oh, no! My beauti-" - line "ful #MON!" - done -; 0x7651c - -UnknownText_0x7651c: ; 0x7651c - text "I must go to the" - line "#MON SALON and" - cont "fix them up nice!" - done -; 0x7654f - -PokefanfGeorgiaSeenText: ; 0x7654f - text "I'm going to shop" - line "at the DEPT.STORE" - cont "and then…" - done -; 0x7657d - -PokefanfGeorgiaBeatenText: ; 0x7657d - text "What was I going" - line "to do?" - done -; 0x76596 - -UnknownText_0x76596: ; 0x76596 - text "Oh, yes! I have to" - line "get my #MON out" - cont "of DAY-CARE!" - done -; 0x765c7 - -SupernerdShawnSeenText: ; 0x765c7 - text "What kinds of #" - line "BALLS do you have" - cont "with you?" - done -; 0x765f4 - -SupernerdShawnBeatenText: ; 0x765f4 - text "Wait! Stop! Don't!" - line "Please!" - done -; 0x7660f - -UnknownText_0x7660f: ; 0x7660f - text "You should use the" - line "right BALLS to fit" - cont "the situation." - done -; 0x76645 - -UnknownText_0x76645: ; 0x76645 - text "FAST SHIP S.S.AQUA" - line "has arrived in" - cont "VERMILION CITY." - done -; 0x76678 - -FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 - ; filler - db 0, 0 - - ; warps - db 6 - warp_def $7, $2, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $7, $3, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $13, $2, 9, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $13, $3, 9, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $21, $2, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - warp_def $21, $3, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - - ; xy triggers - db 0 - - ; signposts - db 1 - signpost 25, 4, $0, MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script - - ; people-events - db 11 - person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, $ffff - person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, $0730 - person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, $0731 - person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, $0732 - person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, $0739 - person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, $0739 - person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, $0739 - person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, $073a - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b - person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b - person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a -; 0x76730 - diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index cc8879cc5..9d16bd081 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -216,9 +216,8 @@ UnknownScript_0x75629: ; 0x75629 end ; 0x75634 -MapFastShipCabins_NNW_NNE_NESignpost2Script: ; 0x75634 - jumpstd $000d -; 0x75637 +FastShipCabins_NNW_NNE_NETrashcan: + jumpstd trashcan MovementData_0x75637: ; 0x75637 step_left @@ -407,9 +406,9 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; 0x759ce ; signposts db 3 - signpost 13, 6, $0, MapFastShipCabins_NNW_NNE_NESignpost2Script - signpost 19, 7, $0, MapFastShipCabins_NNW_NNE_NESignpost2Script - signpost 31, 7, $0, MapFastShipCabins_NNW_NNE_NESignpost2Script + signpost 13, 6, $0, FastShipCabins_NNW_NNE_NETrashcan + signpost 19, 7, $0, FastShipCabins_NNW_NNE_NETrashcan + signpost 31, 7, $0, FastShipCabins_NNW_NNE_NETrashcan ; people-events db 7 @@ -421,4 +420,3 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; 0x759ce person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, $073a person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, $073b ; 0x75a4d - diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 6ba34a780..316c9d298 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -341,9 +341,8 @@ SupernerdShawnScript: ; 0x75ff9 end ; 0x76001 -MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script: ; 0x76001 - jumpstd $000d -; 0x76004 +FastShipCaptainsCabinTrashcan: + jumpstd trashcan MovementData_0x76004: ; 0x76004 big_step_right @@ -641,7 +640,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 ; signposts db 1 - signpost 25, 4, $0, MapFastShipCabins_SE_SSE_CaptainsCabinSignpost0Script + signpost 25, 4, $0, FastShipCaptainsCabinTrashcan ; people-events db 11 @@ -656,5 +655,3 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a -; 0x76730 - diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 8af2b9827..ea85b8851 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -132,9 +132,9 @@ UnknownScript_0x75aa5: ; 0x75aa5 end ; 0x75aac -MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac +FastShipBed: loadfont - writetext UnknownText_0x75da4 + writetext FastShipBedText1 closetext loadmovesprites special Function8c0b6 @@ -146,7 +146,7 @@ MapFastShipCabins_SW_SSW_NWSignpost1Script: ; 0x75aac special RestartMapMusic special Function8c0ab loadfont - writetext UnknownText_0x75dc1 + writetext FastShipBedText2 closetext loadmovesprites checkevent $0031 @@ -165,7 +165,7 @@ UnknownScript_0x75ae2: ; 0x75ae2 checkevent $002f iftrue UnknownScript_0x75af7 loadfont - writetext UnknownText_0x75e0f + writetext FastShipArrivedVermilionText closetext loadmovesprites setevent $0031 @@ -174,16 +174,15 @@ UnknownScript_0x75ae2: ; 0x75ae2 UnknownScript_0x75af7: ; 0x75af7 loadfont - writetext UnknownText_0x75dde + writetext FastShipArrivedOlivineText closetext loadmovesprites setevent $0031 end ; 0x75b01 -MapFastShipCabins_SW_SSW_NWSignpost2Script: ; 0x75b01 - jumpstd $000d -; 0x75b04 +FastShipCabinsNorthwestCabinTrashcan: ; 0x75b01 + jumpstd trashcan FirebreatherLyleSeenText: ; 0x75b04 text "I'm going to KANTO" @@ -285,31 +284,27 @@ UnknownText_0x75d65: ; 0x75d65 done ; 0x75da4 -UnknownText_0x75da4: ; 0x75da4 +FastShipBedText1: text "A comfy bed!" line "Time to sleep…" done -; 0x75dc1 -UnknownText_0x75dc1: ; 0x75dc1 +FastShipBedText2: text "Ah, refreshed and" line "restored!" done -; 0x75dde -UnknownText_0x75dde: ; 0x75dde +FastShipArrivedOlivineText: text "FAST SHIP S.S.AQUA" line "has arrived in" cont "OLIVINE CITY." done -; 0x75e0f -UnknownText_0x75e0f: ; 0x75e0f +FastShipArrivedVermilionText: text "FAST SHIP S.S.AQUA" line "has arrived in" cont "VERMILION CITY." done -; 0x75e42 FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42 ; filler @@ -328,9 +323,9 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42 ; signposts db 3 - signpost 1, 7, $0, MapFastShipCabins_SW_SSW_NWSignpost1Script - signpost 2, 7, $0, MapFastShipCabins_SW_SSW_NWSignpost1Script - signpost 7, 7, $0, MapFastShipCabins_SW_SSW_NWSignpost2Script + signpost 1, 7, $0, FastShipBed + signpost 2, 7, $0, FastShipBed + signpost 7, 7, $0, FastShipCabinsNorthwestCabinTrashcan ; people-events db 4 @@ -339,4 +334,3 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42 person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, $073a person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, $073b ; 0x75ea4 - diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 585d85427..e4d16f123 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -68,4 +68,3 @@ FightingDojo_MapEventHeader: ; 0x189bf8 person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, $ffff person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d ; 0x189c2c - diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 580ec5569..5bf6bca47 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -48,4 +48,3 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; 0x196428 person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, $ffff person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, $ffff ; 0x196452 - diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 0d55cc5cd..d44b5b188 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,4 +1,4 @@ -FuchsiaCity_MapScriptHeader: ; 0x194b19 +FuchsiaCity_MapScriptHeader: ; trigger count db 0 @@ -6,73 +6,57 @@ FuchsiaCity_MapScriptHeader: ; 0x194b19 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x194b1e -; 0x194b1e - -UnknownScript_0x194b1e: ; 0x194b1e - setflag $003e +.FlyPoint + setflag ENGINE_FLYPOINT_FUCHSIA return -; 0x194b22 -YoungsterScript_0x194b22: ; 0x194b22 +YoungsterScript_0x194b22: jumptextfaceplayer UnknownText_0x194b45 -; 0x194b25 -PokefanMScript_0x194b25: ; 0x194b25 +PokefanMScript_0x194b25: jumptextfaceplayer UnknownText_0x194b83 -; 0x194b28 -TeacherScript_0x194b28: ; 0x194b28 +TeacherScript_0x194b28: jumptextfaceplayer UnknownText_0x194bd3 -; 0x194b2b -MapFuchsiaCitySignpost0Script: ; 0x194b2b - jumptext UnknownText_0x194c22 -; 0x194b2e +FuchsiaCitySign: + jumptext FuchsiaCitySignText -MapFuchsiaCitySignpost1Script: ; 0x194b2e - jumptext UnknownText_0x194c4a -; 0x194b31 +FuchsiaGymSign: + jumptext FuchsiaGymSignText -MapFuchsiaCitySignpost2Script: ; 0x194b31 - jumptext UnknownText_0x194c8b -; 0x194b34 +SafariZoneOfficeSign: + jumptext SafariZoneOfficeSignText -MapFuchsiaCitySignpost3Script: ; 0x194b34 - jumptext UnknownText_0x194cd5 -; 0x194b37 +WardensHomeSign: + jumptext WardensHomeSignText -MapFuchsiaCitySignpost4Script: ; 0x194b37 - jumptext UnknownText_0x194cf0 -; 0x194b3a +SafariZoneClosedSign: + jumptext SafariZoneClosedSignText -MapFuchsiaCitySignpost5Script: ; 0x194b3a - jumptext UnknownText_0x194d37 -; 0x194b3d +NoLitteringSign: + jumptext NoLitteringSignText -MapFuchsiaCitySignpost6Script: ; 0x194b3d - jumpstd $0010 -; 0x194b40 +FuchsiaCityPokeCenterSign: + jumpstd pokecentersign -MapFuchsiaCitySignpost7Script: ; 0x194b40 - jumpstd $0011 -; 0x194b43 +FuchsiaCityMartSign: + jumpstd martsign -FruitTreeScript_0x194b43: ; 0x194b43 +FruitTreeScript_0x194b43: fruittree $1e -; 0x194b45 -UnknownText_0x194b45: ; 0x194b45 +UnknownText_0x194b45: text "One of the ELITE" line "FOUR used to be" para "the LEADER of" line "FUCHSIA's GYM." done -; 0x194b83 -UnknownText_0x194b83: ; 0x194b83 +UnknownText_0x194b83: text "KOGA's daughter" line "succeeded him as" @@ -80,9 +64,8 @@ UnknownText_0x194b83: ; 0x194b83 line "after he joined" cont "the ELITE FOUR." done -; 0x194bd3 -UnknownText_0x194bd3: ; 0x194bd3 +UnknownText_0x194bd3: text "The SAFARI ZONE is" line "closed… It's sad," @@ -90,17 +73,15 @@ UnknownText_0x194bd3: ; 0x194bd3 line "FUCHSIA's main" cont "attraction." done -; 0x194c22 -UnknownText_0x194c22: ; 0x194c22 +FuchsiaCitySignText: text "FUCHSIA CITY" para "Behold! It's" line "Passion Pink!" done -; 0x194c4a -UnknownText_0x194c4a: ; 0x194c4a +FuchsiaGymSignText: text "FUCHSIA CITY" line "#MON GYM" cont "LEADER: JANINE" @@ -108,9 +89,8 @@ UnknownText_0x194c4a: ; 0x194c4a para "The Poisonous" line "Ninja Master" done -; 0x194c8b -UnknownText_0x194c8b: ; 0x194c8b +SafariZoneOfficeSignText: text "There's a notice" line "here…" @@ -118,15 +98,13 @@ UnknownText_0x194c8b: ; 0x194c8b line "is closed until" cont "further notice." done -; 0x194cd5 -UnknownText_0x194cd5: ; 0x194cd5 +WardensHomeSignText: text "SAFARI ZONE" line "WARDEN'S HOME" done -; 0x194cf0 -UnknownText_0x194cf0: ; 0x194cf0 +SafariZoneClosedSignText: text "The WARDEN is" line "traveling abroad." @@ -134,17 +112,15 @@ UnknownText_0x194cf0: ; 0x194cf0 line "SAFARI ZONE is" cont "closed." done -; 0x194d37 -UnknownText_0x194d37: ; 0x194d37 +NoLitteringSignText: text "No littering." para "Please take your" line "waste with you." done -; 0x194d67 -FuchsiaCity_MapEventHeader: ; 0x194d67 +FuchsiaCity_MapEventHeader: ; filler db 0, 0 @@ -167,14 +143,14 @@ FuchsiaCity_MapEventHeader: ; 0x194d67 ; signposts db 8 - signpost 15, 21, $0, MapFuchsiaCitySignpost0Script - signpost 29, 5, $0, MapFuchsiaCitySignpost1Script - signpost 15, 25, $0, MapFuchsiaCitySignpost2Script - signpost 29, 27, $0, MapFuchsiaCitySignpost3Script - signpost 5, 17, $0, MapFuchsiaCitySignpost4Script - signpost 15, 13, $0, MapFuchsiaCitySignpost5Script - signpost 27, 20, $0, MapFuchsiaCitySignpost6Script - signpost 13, 6, $0, MapFuchsiaCitySignpost7Script + signpost 15, 21, $0, FuchsiaCitySign + signpost 29, 5, $0, FuchsiaGymSign + signpost 15, 25, $0, SafariZoneOfficeSign + signpost 29, 27, $0, WardensHomeSign + signpost 5, 17, $0, SafariZoneClosedSign + signpost 15, 13, $0, NoLitteringSign + signpost 27, 20, $0, FuchsiaCityPokeCenterSign + signpost 13, 6, $0, FuchsiaCityMartSign ; people-events db 4 @@ -182,5 +158,3 @@ FuchsiaCity_MapEventHeader: ; 0x194d67 person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, $ffff person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, $ffff person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, $ffff -; 0x194e00 - diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 6899bc821..163e06c13 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -220,16 +220,13 @@ FuchsiaGymGuyScript: ; 0x195f03 end ; 0x195f17 -MapFuchsiaGymSignpost1Script: ; 0x195f17 - checkflag $0027 - iftrue UnknownScript_0x195f20 - jumpstd $002d -; 0x195f20 - -UnknownScript_0x195f20: ; 0x195f20 +FuchsiaGymStatue: + checkflag ENGINE_SOULBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext JANINE, 1, $1 - jumpstd $002e -; 0x195f27 + jumpstd gymstatue2 MovementData_0x195f27: ; 0x195f27 turn_head_down @@ -426,8 +423,8 @@ FuchsiaGym_MapEventHeader: ; 0x196353 ; signposts db 2 - signpost 15, 3, $0, MapFuchsiaGymSignpost1Script - signpost 15, 6, $0, MapFuchsiaGymSignpost1Script + signpost 15, 3, $0, FuchsiaGymStatue + signpost 15, 6, $0, FuchsiaGymStatue ; people-events db 6 @@ -438,4 +435,3 @@ FuchsiaGym_MapEventHeader: ; 0x196353 person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, $ffff ; 0x1963bb - diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 3b503d643..ee4794410 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -59,4 +59,3 @@ FuchsiaMart_MapEventHeader: ; 0x195d6e person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, $ffff person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, $ffff ; 0x195da5 - diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 49ee101da..71f037610 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -14,7 +14,7 @@ UnknownScript_0x196458: ; 0x196458 ; 0x196459 NurseScript_0x196459: ; 0x196459 - jumpstd $0000 + jumpstd pokecenternurse ; 0x19645c CooltrainerMScript_0x19645c: ; 0x19645c @@ -118,4 +118,3 @@ FuchsiaPokeCenter1F_MapEventHeader: ; 0x19656e person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, $ffff person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, $ffff ; 0x1965b7 - diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 4cae1173c..182ee7465 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ FuchsiaPokeCenter2FBeta_MapEventHeader: ; 0x1965b9 ; people-events db 0 ; 0x1965c4 - diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index f895f5f46..0e7dc59df 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -140,4 +140,3 @@ GoldenrodBikeShop_MapEventHeader: ; 0x54907 db 1 person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, $ffff ; 0x54951 - diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 359e69e15..959b73bb8 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -6,7 +6,7 @@ GoldenrodBillsHouse_MapScriptHeader: ; 0x54be2 db 0 ; 0x54be4 -BillScript_0x54be4: ; 0x54be4 +BillsHouseBill: faceplayer loadfont checkevent EVENT_GOT_EEVEE @@ -51,7 +51,7 @@ UnknownScript_0x54c1f: ; 0x54c1f end ; 0x54c25 -PokefanFScript_0x54c25: ; 0x54c25 +BillsMom: ; 0x54c25 faceplayer loadfont checkevent $0712 @@ -69,7 +69,7 @@ UnknownScript_0x54c33: ; 0x54c33 end ; 0x54c39 -TwinScript_0x54c39: ; 0x54c39 +BillsSister: faceplayer loadfont checkcellnum $3 @@ -104,17 +104,14 @@ UnknownScript_0x54c64: ; 0x54c64 jump UnknownScript_0x54c5e ; 0x54c6b -MapGoldenrodBillsHouseSignpost1Script: ; 0x54c6b - jumpstd $0002 -; 0x54c6e +BillsHouseBookshelf1: + jumpstd picturebookshelf -MapGoldenrodBillsHouseSignpost0Script: ; 0x54c6e - jumpstd $0003 -; 0x54c71 +BillsHouseBookshelf2: + jumpstd magazinebookshelf -MapGoldenrodBillsHouseSignpost2Script: ; 0x54c71 - jumpstd $000c -; 0x54c74 +BillsHouseRadio: + jumpstd radio2 UnknownText_0x54c74: ; 0x54c74 text "BILL: Hi, ", $52, "!" @@ -278,14 +275,13 @@ GoldenrodBillsHouse_MapEventHeader: ; 0x5509f ; signposts db 3 - signpost 1, 0, $0, MapGoldenrodBillsHouseSignpost0Script - signpost 1, 1, $0, MapGoldenrodBillsHouseSignpost1Script - signpost 1, 7, $0, MapGoldenrodBillsHouseSignpost2Script + signpost 1, 0, $0, BillsHouseBookshelf2 + signpost 1, 1, $0, BillsHouseBookshelf1 + signpost 1, 7, $0, BillsHouseRadio ; people-events db 3 - person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillScript_0x54be4, $0712 - person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x54c25, $ffff - person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, TwinScript_0x54c39, $ffff + person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, $0712 + person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, $ffff + person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, $ffff ; 0x550e5 - diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 8927ecc67..6042ed76c 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ -GoldenrodCity_MapScriptHeader: ; 0x1988d0 +GoldenrodCity_MapScriptHeader: ; trigger count db 0 @@ -6,44 +6,38 @@ GoldenrodCity_MapScriptHeader: ; 0x1988d0 db 2 ; callbacks - - dbw 5, UnknownScript_0x1988d8 - - dbw 2, UnknownScript_0x1988e8 -; 0x1988d8 - -UnknownScript_0x1988d8: ; 0x1988d8 - setflag $0046 - setflag $0016 - checkevent $00b9 - iftrue UnknownScript_0x1988e7 - clearevent $0769 -UnknownScript_0x1988e7: ; 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 -; 0x1988e8 -UnknownScript_0x1988e8: ; 0x1988e8 - checkevent $0044 - iffalse UnknownScript_0x198908 +.MoveTutor + checkevent EVENT_BEAT_ELITE_FOUR + iffalse .MoveTutorDone checkitem COIN_CASE - iffalse UnknownScript_0x1988fd + iffalse .MoveTutorDisappear checkcode $b - if_equal WEDNESDAY, UnknownScript_0x198900 - if_equal SATURDAY, UnknownScript_0x198900 -UnknownScript_0x1988fd: ; 0x1988fd + if_equal WEDNESDAY, .MoveTutorAppear + if_equal SATURDAY, .MoveTutorAppear +.MoveTutorDisappear disappear $10 return -; 0x198900 -UnknownScript_0x198900: ; 0x198900 - checkflag $005e - iftrue UnknownScript_0x198908 +.MoveTutorAppear + checkflag ENGINE_5E + iftrue .MoveTutorDone appear $10 -UnknownScript_0x198908: ; 0x198908 +.MoveTutorDone return -; 0x198909 -PokefanMScript_0x198909: ; 0x198909 +MoveTutor: faceplayer loadfont writetext UnknownText_0x199042 @@ -63,66 +57,58 @@ PokefanMScript_0x198909: ; 0x198909 if_equal $2, UnknownScript_0x198949 if_equal $3, UnknownScript_0x198958 jump UnknownScript_0x1989d7 -; 0x19893a -UnknownScript_0x19893a: ; 0x19893a +UnknownScript_0x19893a: writebyte $1 writetext UnknownText_0x1991cf special Function4925b if_equal $0, UnknownScript_0x1989a6 jump UnknownScript_0x1989d7 -; 0x198949 -UnknownScript_0x198949: ; 0x198949 +UnknownScript_0x198949: writebyte $2 writetext UnknownText_0x1991cf special Function4925b if_equal $0, UnknownScript_0x1989a6 jump UnknownScript_0x1989d7 -; 0x198958 -UnknownScript_0x198958: ; 0x198958 +UnknownScript_0x198958: writebyte $3 writetext UnknownText_0x1991cf special Function4925b if_equal $0, UnknownScript_0x1989a6 jump UnknownScript_0x1989d7 -; 0x198967 -MenuDataHeader_0x198967: ; 0x198967 +MenuDataHeader_0x198967: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw MenuData2_0x19896f db 1 ; default option -; 0x19896f -MenuData2_0x19896f: ; 0x19896f +MenuData2_0x19896f: db $80 ; flags db 4 ; items db "FLAMETHROWER@" db "THUNDERBOLT@" db "ICE BEAM@" db "CANCEL@" -; 0x19899a -UnknownScript_0x19899a: ; 0x19899a +UnknownScript_0x19899a: writetext UnknownText_0x1990b4 closetext loadmovesprites end -; 0x1989a0 -UnknownScript_0x1989a0: ; 0x1989a0 +UnknownScript_0x1989a0: writetext UnknownText_0x199107 closetext loadmovesprites end -; 0x1989a6 -UnknownScript_0x1989a6: ; 0x1989a6 +UnknownScript_0x1989a6: writetext UnknownText_0x19913a keeptextopen takecoins 4000 @@ -136,42 +122,36 @@ UnknownScript_0x1989a6: ; 0x1989a6 if_equal $2, UnknownScript_0x1989c6 applymovement $10, MovementData_0x198a5f jump UnknownScript_0x1989ca -; 0x1989c6 -UnknownScript_0x1989c6: ; 0x1989c6 +UnknownScript_0x1989c6: applymovement $10, MovementData_0x198a63 -UnknownScript_0x1989ca: ; 0x1989ca +UnknownScript_0x1989ca: playsound SFX_ENTER_DOOR disappear $10 clearevent $076b - setflag $005e + setflag ENGINE_5E waitbutton end -; 0x1989d7 -UnknownScript_0x1989d7: ; 0x1989d7 +UnknownScript_0x1989d7: writetext UnknownText_0x1991a4 closetext loadmovesprites end -; 0x1989dd -UnknownScript_0x1989dd: ; 0x1989dd +UnknownScript_0x1989dd: writetext UnknownText_0x1991ac closetext loadmovesprites end -; 0x1989e3 -PokefanMScript_0x1989e3: ; 0x1989e3 +PokefanMScript_0x1989e3: jumptextfaceplayer UnknownText_0x198a69 -; 0x1989e6 -YoungsterScript_0x1989e6: ; 0x1989e6 +YoungsterScript_0x1989e6: jumptextfaceplayer UnknownText_0x198aa9 -; 0x1989e9 -CooltrainerFScript_0x1989e9: ; 0x1989e9 +CooltrainerFScript_0x1989e9: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER @@ -180,16 +160,14 @@ CooltrainerFScript_0x1989e9: ; 0x1989e9 closetext loadmovesprites end -; 0x1989f7 -UnknownScript_0x1989f7: ; 0x1989f7 +UnknownScript_0x1989f7: writetext UnknownText_0x198b2d closetext loadmovesprites end -; 0x1989fd -CooltrainerFScript_0x1989fd: ; 0x1989fd +CooltrainerFScript_0x1989fd: faceplayer loadfont checkflag $0000 @@ -198,28 +176,23 @@ CooltrainerFScript_0x1989fd: ; 0x1989fd closetext loadmovesprites end -; 0x198a0b -UnknownScript_0x198a0b: ; 0x198a0b +UnknownScript_0x198a0b: writetext UnknownText_0x198c14 closetext loadmovesprites end -; 0x198a11 -YoungsterScript_0x198a11: ; 0x198a11 +YoungsterScript_0x198a11: jumptextfaceplayer UnknownText_0x198c36 -; 0x198a14 -LassScript_0x198a14: ; 0x198a14 +LassScript_0x198a14: jumptextfaceplayer UnknownText_0x198c83 -; 0x198a17 -GrampsScript_0x198a17: ; 0x198a17 +GrampsScript_0x198a17: jumptextfaceplayer UnknownText_0x198ccf -; 0x198a1a -RocketScript_0x198a1a: ; 0x198a1a +RocketScript_0x198a1a: loadfont writetext UnknownText_0x198d0d keeptextopen @@ -229,133 +202,108 @@ RocketScript_0x198a1a: ; 0x198a1a loadmovesprites spriteface $9, $1 end -; 0x198a29 -RocketScript_0x198a29: ; 0x198a29 +RocketScript_0x198a29: jumptextfaceplayer UnknownText_0x198d4e -; 0x198a2c -RocketScript_0x198a2c: ; 0x198a2c +RocketScript_0x198a2c: jumptextfaceplayer UnknownText_0x198d6d -; 0x198a2f -RocketScript_0x198a2f: ; 0x198a2f +RocketScript_0x198a2f: jumptextfaceplayer UnknownText_0x198daa -; 0x198a32 -RocketScript_0x198a32: ; 0x198a32 +RocketScript_0x198a32: jumptextfaceplayer UnknownText_0x198de2 -; 0x198a35 -RocketScript_0x198a35: ; 0x198a35 +RocketScript_0x198a35: jumptextfaceplayer UnknownText_0x198e1f -; 0x198a38 -RocketScript_0x198a38: ; 0x198a38 +RocketScript_0x198a38: jumptextfaceplayer UnknownText_0x198e4b -; 0x198a3b -MapGoldenrodCitySignpost0Script: ; 0x198a3b - jumptext UnknownText_0x198e77 -; 0x198a3e +GoldenrodCityStationSign: + jumptext GoldenrodCityStationSignText -MapGoldenrodCitySignpost1Script: ; 0x198a3e - jumptext UnknownText_0x198e8f -; 0x198a41 +GoldenrodCityRadioTowerSign: + jumptext GoldenrodCityRadioTowerSignText -MapGoldenrodCitySignpost2Script: ; 0x198a41 - jumptext UnknownText_0x198eab -; 0x198a44 +GoldenrodDeptStoreSign: + jumptext GoldenrodDeptStoreSignText -MapGoldenrodCitySignpost3Script: ; 0x198a44 - jumptext UnknownText_0x198ee4 -; 0x198a47 +GoldenrodGymSign: + jumptext GoldenrodGymSignText -MapGoldenrodCitySignpost4Script: ; 0x198a47 - jumptext UnknownText_0x198f29 -; 0x198a4a +GoldenrodCitySign: + jumptext GoldenrodCitySignText -MapGoldenrodCitySignpost5Script: ; 0x198a4a - jumptext UnknownText_0x198f5b -; 0x198a4d +GoldenrodCityBikeShopSign: + jumptext GoldenrodCityBikeShopSignText -MapGoldenrodCitySignpost6Script: ; 0x198a4d - jumptext UnknownText_0x198f81 -; 0x198a50 +GoldenrodCityGameCornerSign: + jumptext GoldenrodCityGameCornerSignText -MapGoldenrodCitySignpost7Script: ; 0x198a50 - jumptext UnknownText_0x198fae -; 0x198a53 +GoldenrodCityNameRaterSign: + jumptext GoldenrodCityNameRaterSignText -MapGoldenrodCitySignpost8Script: ; 0x198a53 - jumptext UnknownText_0x198fd8 -; 0x198a56 +GoldenrodCityUndergroundSignNorth: + jumptext GoldenrodCityUndergroundSignNorthText -MapGoldenrodCitySignpost9Script: ; 0x198a56 - jumptext UnknownText_0x198fee -; 0x198a59 +GoldenrodCityUndergroundSignSouth: + jumptext GoldenrodCityUndergroundSignSouthText -MapGoldenrodCitySignpost10Script: ; 0x198a59 - jumpstd $0010 -; 0x198a5c +GoldenrodCityPokeCenterSign: + jumpstd pokecentersign -MapGoldenrodCitySignpost11Script: ; 0x198a5c - jumptext UnknownText_0x199022 -; 0x198a5f +GoldenrodCityFlowerShopSign: + jumptext GoldenrodCityFlowerShopSignText -MovementData_0x198a5f: ; 0x198a5f +MovementData_0x198a5f: step_right step_right step_up step_end -; 0x198a63 -MovementData_0x198a63: ; 0x198a63 +MovementData_0x198a63: step_down step_right step_right step_up step_up step_end -; 0x198a69 -UnknownText_0x198a69: ; 0x198a69 +UnknownText_0x198a69: text "They built the new" line "RADIO TOWER to" para "replace the old," line "creaky one." done -; 0x198aa9 -UnknownText_0x198aa9: ; 0x198aa9 +UnknownText_0x198aa9: text "I know there's a" line "new BIKE SHOP, but" para "I can't find it" line "anywhere." done -; 0x198ae6 -UnknownText_0x198ae6: ; 0x198ae6 +UnknownText_0x198ae6: text "Is that man in" line "black dressed up" para "like a TEAM ROCKET" line "member? How silly!" done -; 0x198b2d -UnknownText_0x198b2d: ; 0x198b2d +UnknownText_0x198b2d: text "Was that man in" line "black really part" para "of TEAM ROCKET? I" line "can't believe it!" done -; 0x198b73 -UnknownText_0x198b73: ; 0x198b73 +UnknownText_0x198b73: text "The RADIO TOWER in" line "GOLDENROD CITY is" cont "a landmark." @@ -370,15 +318,13 @@ UnknownText_0x198b73: ; 0x198b73 para "so it can also" line "serve as a radio." done -; 0x198c14 -UnknownText_0x198c14: ; 0x198c14 +UnknownText_0x198c14: text "Oh, your #GEAR" line "works as a radio!" done -; 0x198c36 -UnknownText_0x198c36: ; 0x198c36 +UnknownText_0x198c36: text "E-he-he-he…" para "I got in trouble" @@ -387,9 +333,8 @@ UnknownText_0x198c36: ; 0x198c36 para "basement of the" line "DEPT.STORE." done -; 0x198c83 -UnknownText_0x198c83: ; 0x198c83 +UnknownText_0x198c83: text "The man at that" line "house rates your" cont "#MON names." @@ -397,98 +342,85 @@ UnknownText_0x198c83: ; 0x198c83 para "He can even rename" line "your #MON." done -; 0x198ccf -UnknownText_0x198ccf: ; 0x198ccf +UnknownText_0x198ccf: text "Whew! This is one" line "big town. I don't" para "know where any-" line "thing is." done -; 0x198d0d -UnknownText_0x198d0d: ; 0x198d0d +UnknownText_0x198d0d: text "So this is the" line "RADIO TOWER…" done -; 0x198d2a -UnknownText_0x198d2a: ; 0x198d2a +UnknownText_0x198d2a: text "What do you want," line "you pest? Scram!" done -; 0x198d4e -UnknownText_0x198d4e: ; 0x198d4e +UnknownText_0x198d4e: text "Stay out of the" line "way! Beat it!" done -; 0x198d6d -UnknownText_0x198d6d: ; 0x198d6d +UnknownText_0x198d6d: text "Take over the" line "RADIO TOWER…" para "What? It's none of" line "your business!" done -; 0x198daa -UnknownText_0x198daa: ; 0x198daa +UnknownText_0x198daa: text "#MON? They're" line "nothing more than" para "tools for making" line "money!" done -; 0x198de2 -UnknownText_0x198de2: ; 0x198de2 +UnknownText_0x198de2: text "Our dream will" line "soon come true…" para "It was such a long" line "struggle…" done -; 0x198e1f -UnknownText_0x198e1f: ; 0x198e1f +UnknownText_0x198e1f: text "Hey, brat! You" line "don't belong here!" cont "Get lost!" done -; 0x198e4b -UnknownText_0x198e4b: ; 0x198e4b +UnknownText_0x198e4b: text "Come taste the" line "true terror of" cont "TEAM ROCKET!" done -; 0x198e77 -UnknownText_0x198e77: ; 0x198e77 +GoldenrodCityStationSignText: text "GOLDENROD CITY" line "STATION" done -; 0x198e8f -UnknownText_0x198e8f: ; 0x198e8f +GoldenrodCityRadioTowerSignText: text "GOLDENROD CITY" line "RADIO TOWER" done -; 0x198eab -UnknownText_0x198eab: ; 0x198eab +GoldenrodDeptStoreSignText: text "Full Selection of" line "#MON Goods!" para "GOLDENROD CITY" line "DEPT.STORE" done -; 0x198ee4 -UnknownText_0x198ee4: ; 0x198ee4 +GoldenrodGymSignText: text "GOLDENROD CITY" line "#MON GYM" cont "LEADER: WHITNEY" @@ -496,64 +428,56 @@ UnknownText_0x198ee4: ; 0x198ee4 para "The Incredibly" line "Pretty Girl!" done -; 0x198f29 -UnknownText_0x198f29: ; 0x198f29 +GoldenrodCitySignText: text "GOLDENROD CITY" para "The Festive City" line "of Opulent Charm" done -; 0x198f5b -UnknownText_0x198f5b: ; 0x198f5b +GoldenrodCityBikeShopSignText: text "The World is a" line "Cycle Path!" cont "BIKE SHOP" done -; 0x198f81 -UnknownText_0x198f81: ; 0x198f81 +GoldenrodCityGameCornerSignText: text "Your Playground!" para "GOLDENROD CITY" line "GAME CORNER" done -; 0x198fae -UnknownText_0x198fae: ; 0x198fae +GoldenrodCityNameRaterSignText: text "NAME RATER" para "Get Your #MON" line "Nicknames Rated" done -; 0x198fd8 -UnknownText_0x198fd8: ; 0x198fd8 +GoldenrodCityUndergroundSignNorthText: text "UNDERGROUND" line "ENTRANCE" done -; 0x198fee -UnknownText_0x198fee: ; 0x198fee +GoldenrodCityUndergroundSignSouthText: text "UNDERGROUND" line "ENTRANCE" done -; 0x199004 -UnknownText_0x199004: ; 0x199004 +PokeComCenterSignText: +; unused in the english version text "For Mobile Tips!" line "#COM CENTER" done -; 0x199022 -UnknownText_0x199022: ; 0x199022 +GoldenrodCityFlowerShopSignText: text "Blooming Beautiful" line "FLOWER SHOP" done -; 0x199042 -UnknownText_0x199042: ; 0x199042 +UnknownText_0x199042: text "I can teach your" line "#MON amazing" @@ -563,37 +487,32 @@ UnknownText_0x199042: ; 0x199042 para "Should I teach a" line "new move?" done -; 0x199090 -UnknownText_0x199090: ; 0x199090 +UnknownText_0x199090: text "It will cost you" line "4000 coins. Okay?" done -; 0x1990b4 -UnknownText_0x1990b4: ; 0x1990b4 +UnknownText_0x1990b4: text "Aww… But they're" line "amazing…" done -; 0x1990ce -UnknownText_0x1990ce: ; 0x1990ce +UnknownText_0x1990ce: text "Wahahah! You won't" line "regret it!" para "Which move should" line "I teach?" done -; 0x199107 -UnknownText_0x199107: ; 0x199107 +UnknownText_0x199107: text "Hm, too bad. I'll" line "have to get some" cont "cash from home…" done -; 0x19913a -UnknownText_0x19913a: ; 0x19913a +UnknownText_0x19913a: text "If you understand" line "what's so amazing" @@ -601,30 +520,25 @@ UnknownText_0x19913a: ; 0x19913a line "you've made it as" cont "a trainer." done -; 0x19918b -UnknownText_0x19918b: ; 0x19918b +UnknownText_0x19918b: text "Wahahah!" line "Farewell, kid!" done -; 0x1991a4 -UnknownText_0x1991a4: ; 0x1991a4 +UnknownText_0x1991a4: text "B-but…" done -; 0x1991ac -UnknownText_0x1991ac: ; 0x1991ac +UnknownText_0x1991ac: text "…You don't have" line "enough coins here…" done -; 0x1991cf -UnknownText_0x1991cf: ; 0x1991cf +UnknownText_0x1991cf: db $0, $57 -; 0x1991d1 -GoldenrodCity_MapEventHeader: ; 0x1991d1 +GoldenrodCity_MapEventHeader: ; filler db 0, 0 @@ -651,18 +565,18 @@ GoldenrodCity_MapEventHeader: ; 0x1991d1 ; signposts db 12 - signpost 14, 10, $0, MapGoldenrodCitySignpost0Script - signpost 17, 4, $0, MapGoldenrodCitySignpost1Script - signpost 27, 26, $0, MapGoldenrodCitySignpost2Script - signpost 9, 26, $0, MapGoldenrodCitySignpost3Script - signpost 18, 22, $0, MapGoldenrodCitySignpost4Script - signpost 30, 28, $0, MapGoldenrodCitySignpost5Script - signpost 22, 16, $0, MapGoldenrodCitySignpost6Script - signpost 7, 12, $0, MapGoldenrodCitySignpost7Script - signpost 6, 8, $0, MapGoldenrodCitySignpost8Script - signpost 30, 12, $0, MapGoldenrodCitySignpost9Script - signpost 27, 16, $1, MapGoldenrodCitySignpost10Script - signpost 6, 30, $0, MapGoldenrodCitySignpost11Script + signpost 14, 10, $0, GoldenrodCityStationSign + signpost 17, 4, $0, GoldenrodCityRadioTowerSign + signpost 27, 26, $0, GoldenrodDeptStoreSign + signpost 9, 26, $0, GoldenrodGymSign + signpost 18, 22, $0, GoldenrodCitySign + signpost 30, 28, $0, GoldenrodCityBikeShopSign + signpost 22, 16, $0, GoldenrodCityGameCornerSign + signpost 7, 12, $0, GoldenrodCityNameRaterSign + signpost 6, 8, $0, GoldenrodCityUndergroundSignNorth + signpost 30, 12, $0, GoldenrodCityUndergroundSignSouth + signpost 27, 16, $1, GoldenrodCityPokeCenterSign + signpost 6, 30, $0, GoldenrodCityFlowerShopSign ; people-events db 15 @@ -680,6 +594,4 @@ GoldenrodCity_MapEventHeader: ; 0x1991d1 person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, $06ce person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, $06ce person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, $06ce - person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, PokefanMScript_0x198909, $076a -; 0x199321 - + person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, MoveTutor, $076a diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index e683073ab..0545b0641 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,42 +1,34 @@ -GoldenrodDeptStore1F_MapScriptHeader: ; 0x5597f +GoldenrodDeptStore1F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x55981 -ReceptionistScript_0x55981: ; 0x55981 +ReceptionistScript_0x55981: jumptextfaceplayer UnknownText_0x55993 -; 0x55984 -GentlemanScript_0x55984: ; 0x55984 +GentlemanScript_0x55984: jumptextfaceplayer UnknownText_0x559b7 -; 0x55987 -PokefanFScript_0x55987: ; 0x55987 +PokefanFScript_0x55987: jumptextfaceplayer UnknownText_0x55a1a -; 0x5598a -BugCatcherScript_0x5598a: ; 0x5598a +BugCatcherScript_0x5598a: jumptextfaceplayer UnknownText_0x55a3a -; 0x5598d -MapGoldenrodDeptStore1FSignpost0Script: ; 0x5598d - jumptext UnknownText_0x55a80 -; 0x55990 +GoldenrodDeptStore1FDirectory: + jumptext GoldenrodDeptStore1FDirectoryText -MapGoldenrodDeptStore1FSignpost1Script: ; 0x55990 - jumpstd $0014 -; 0x55993 +GoldenrodDeptStore1FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x55993: ; 0x55993 +UnknownText_0x55993: text "Welcome to GOLDEN-" line "ROD DEPT.STORE." done -; 0x559b7 -UnknownText_0x559b7: ; 0x559b7 +UnknownText_0x559b7: text "The DEPT.STORE" line "has a decent se-" cont "lection." @@ -47,15 +39,13 @@ UnknownText_0x559b7: ; 0x559b7 para "as GAME CORNER" line "prizes." done -; 0x55a1a -UnknownText_0x55a1a: ; 0x55a1a +UnknownText_0x55a1a: text "I'm raring to shop" line "again today!" done -; 0x55a3a -UnknownText_0x55a3a: ; 0x55a3a +UnknownText_0x55a3a: text "Mom's good at" line "bargain hunting." @@ -63,9 +53,8 @@ UnknownText_0x55a3a: ; 0x55a3a line "stuff at lower" cont "prices." done -; 0x55a80 -UnknownText_0x55a80: ; 0x55a80 +GoldenrodDeptStore1FDirectoryText: text "1F SERVICE COUNTER" para "2F TRAINER'S" @@ -82,9 +71,8 @@ UnknownText_0x55a80: ; 0x55a80 para "ROOFTOP LOOKOUT" done -; 0x55b03 -GoldenrodDeptStore1F_MapEventHeader: ; 0x55b03 +GoldenrodDeptStore1F_MapEventHeader: ; filler db 0, 0 @@ -100,8 +88,8 @@ GoldenrodDeptStore1F_MapEventHeader: ; 0x55b03 ; signposts db 2 - signpost 0, 14, $0, MapGoldenrodDeptStore1FSignpost0Script - signpost 0, 3, $0, MapGoldenrodDeptStore1FSignpost1Script + signpost 0, 14, $0, GoldenrodDeptStore1FDirectory + signpost 0, 3, $0, GoldenrodDeptStore1FElevatorButton ; people-events db 4 @@ -109,5 +97,3 @@ GoldenrodDeptStore1F_MapEventHeader: ; 0x55b03 person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, $ffff person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, $ffff person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, $ffff -; 0x55b5b - diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 96ca37a4d..f1a0089f6 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,49 +1,41 @@ -GoldenrodDeptStore2F_MapScriptHeader: ; 0x55b5b +GoldenrodDeptStore2F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x55b5d -ClerkScript_0x55b5d: ; 0x55b5d +ClerkScript_0x55b5d: faceplayer loadfont pokemart $0, $0005 loadmovesprites end -; 0x55b65 -ClerkScript_0x55b65: ; 0x55b65 +ClerkScript_0x55b65: faceplayer loadfont pokemart $0, $0006 loadmovesprites end -; 0x55b6d -YoungsterScript_0x55b6d: ; 0x55b6d +YoungsterScript_0x55b6d: jumptextfaceplayer UnknownText_0x55c25 -; 0x55b70 -CooltrainerFScript_0x55b70: ; 0x55b70 +CooltrainerFScript_0x55b70: jumptextfaceplayer UnknownText_0x55c7b -; 0x55b73 -GentlemanScript_0x55b73: ; 0x55b73 +GentlemanScript_0x55b73: jumptextfaceplayer UnknownText_0x55cb7 -; 0x55b76 -MapGoldenrodDeptStore2FSignpost0Script: ; 0x55b76 - jumptext UnknownText_0x55d28 -; 0x55b79 +GoldenrodDeptStore2FDirectory: + jumptext GoldenrodDeptStore2FDirectoryText -MapGoldenrodDeptStore2FSignpost1Script: ; 0x55b79 - jumpstd $0014 -; 0x55b7c +GoldenrodDeptStore2FElevatorButton: + jumpstd elevatorbutton ; possibly unused -UnknownText_0x55b7c: ; 0x55b7c +UnknownText_0x55b7c: text "We intend to sell" line "items for #MON" cont "to hold." @@ -52,10 +44,9 @@ UnknownText_0x55b7c: ; 0x55b7c line "gift. Have a #-" cont "MON hold it." done -; 0x55bd3 ; possibly unused -UnknownText_0x55bd3: ; 0x55bd3 +UnknownText_0x55bd3: text "By giving #MON" line "items to hold, I" @@ -63,9 +54,8 @@ UnknownText_0x55bd3: ; 0x55bd3 line "develop new battle" cont "techniques." done -; 0x55c25 -UnknownText_0x55c25: ; 0x55c25 +UnknownText_0x55c25: text "#GEAR can store" line "up to ten phone" cont "numbers." @@ -74,18 +64,16 @@ UnknownText_0x55c25: ; 0x55c25 line "cide which numbers" cont "to keep." done -; 0x55c7b -UnknownText_0x55c7b: ; 0x55c7b +UnknownText_0x55c7b: text "I got my ABRA at" line "the GAME CORNER." para "Now it's my best" line "partner." done -; 0x55cb7 -UnknownText_0x55cb7: ; 0x55cb7 +UnknownText_0x55cb7: text "This DEPT.STORE" line "makes me realize" @@ -96,18 +84,16 @@ UnknownText_0x55cb7: ; 0x55cb7 line "is unmatched any-" cont "where else." done -; 0x55d28 -UnknownText_0x55d28: ; 0x55d28 +GoldenrodDeptStore2FDirectoryText: text "Your Travel" line "Companion" para "2F TRAINER'S" line " MARKET" done -; 0x55d56 -GoldenrodDeptStore2F_MapEventHeader: ; 0x55d56 +GoldenrodDeptStore2F_MapEventHeader: ; filler db 0, 0 @@ -122,8 +108,8 @@ GoldenrodDeptStore2F_MapEventHeader: ; 0x55d56 ; signposts db 2 - signpost 0, 14, $0, MapGoldenrodDeptStore2FSignpost0Script - signpost 0, 3, $0, MapGoldenrodDeptStore2FSignpost1Script + signpost 0, 14, $0, GoldenrodDeptStore2FDirectory + signpost 0, 3, $0, GoldenrodDeptStore2FElevatorButton ; people-events db 5 @@ -132,5 +118,3 @@ GoldenrodDeptStore2F_MapEventHeader: ; 0x55d56 person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, $ffff person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, $ffff person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, $ffff -; 0x55db6 - diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index f406849ac..77a01a9c6 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,36 +1,30 @@ -GoldenrodDeptStore3F_MapScriptHeader: ; 0x55db6 +GoldenrodDeptStore3F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x55db8 -ClerkScript_0x55db8: ; 0x55db8 +ClerkScript_0x55db8: faceplayer loadfont pokemart $0, $0007 loadmovesprites end -; 0x55dc0 -SuperNerdScript_0x55dc0: ; 0x55dc0 +SuperNerdScript_0x55dc0: jumptextfaceplayer UnknownText_0x55dcc -; 0x55dc3 -RockerScript_0x55dc3: ; 0x55dc3 +RockerScript_0x55dc3: jumptextfaceplayer UnknownText_0x55e15 -; 0x55dc6 -MapGoldenrodDeptStore3FSignpost0Script: ; 0x55dc6 - jumptext UnknownText_0x55e74 -; 0x55dc9 +GoldenrodDeptStore3FDirectory: + jumptext GoldenrodDeptStore3FDirectoryText -MapGoldenrodDeptStore3FSignpost1Script: ; 0x55dc9 - jumpstd $0014 -; 0x55dcc +GoldenrodDeptStore3FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x55dcc: ; 0x55dcc +UnknownText_0x55dcc: text "I, I, I'm really" line "impatient!" @@ -38,9 +32,8 @@ UnknownText_0x55dcc: ; 0x55dcc line "battle to speed up" cont "my #MON." done -; 0x55e15 -UnknownText_0x55e15: ; 0x55e15 +UnknownText_0x55e15: text "Hey! When you bat-" line "tle, do you use X" cont "SPECIAL?" @@ -49,18 +42,16 @@ UnknownText_0x55e15: ; 0x55e15 line "really jacks up" cont "SPECIAL ATTACK!" done -; 0x55e74 -UnknownText_0x55e74: ; 0x55e74 +GoldenrodDeptStore3FDirectoryText: text "For Victory" line "Seekers" para "3F BATTLE" line " COLLECTION" done -; 0x55ea1 -GoldenrodDeptStore3F_MapEventHeader: ; 0x55ea1 +GoldenrodDeptStore3F_MapEventHeader: ; filler db 0, 0 @@ -75,13 +66,11 @@ GoldenrodDeptStore3F_MapEventHeader: ; 0x55ea1 ; signposts db 2 - signpost 0, 14, $0, MapGoldenrodDeptStore3FSignpost0Script - signpost 0, 3, $0, MapGoldenrodDeptStore3FSignpost1Script + signpost 0, 14, $0, GoldenrodDeptStore3FDirectory + signpost 0, 3, $0, GoldenrodDeptStore3FElevatorButton ; people-events db 3 person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, $ffff person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, $ffff person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, $ffff -; 0x55ee7 - diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index d3113cdd0..6f3eef57d 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,28 +1,24 @@ -GoldenrodDeptStore4F_MapScriptHeader: ; 0x55ee7 +GoldenrodDeptStore4F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x55ee9 -ClerkScript_0x55ee9: ; 0x55ee9 +ClerkScript_0x55ee9: faceplayer loadfont pokemart $0, $0008 loadmovesprites end -; 0x55ef1 -CooltrainerMScript_0x55ef1: ; 0x55ef1 +CooltrainerMScript_0x55ef1: jumptextfaceplayer UnknownText_0x55f08 -; 0x55ef4 -BugCatcherScript_0x55ef4: ; 0x55ef4 +BugCatcherScript_0x55ef4: jumptextfaceplayer UnknownText_0x55f52 -; 0x55ef7 -GameboyKidScript_0x55ef7: ; 0x55ef7 +GameboyKidScript_0x55ef7: faceplayer loadfont writetext UnknownText_0x55f74 @@ -30,17 +26,14 @@ GameboyKidScript_0x55ef7: ; 0x55ef7 loadmovesprites spriteface $5, $0 end -; 0x55f02 -MapGoldenrodDeptStore4FSignpost0Script: ; 0x55f02 - jumptext UnknownText_0x5600d -; 0x55f05 +GoldenrodDeptStore4FDirectory: + jumptext GoldenrodDeptStore4FDirectoryText -MapGoldenrodDeptStore4FSignpost1Script: ; 0x55f05 - jumpstd $0014 -; 0x55f08 +GoldenrodDeptStore4FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x55f08: ; 0x55f08 +UnknownText_0x55f08: text "Hey. I love strong" line "#MON." @@ -48,15 +41,13 @@ UnknownText_0x55f08: ; 0x55f08 line "TEIN to crank up" cont "their ATTACK." done -; 0x55f52 -UnknownText_0x55f52: ; 0x55f52 +UnknownText_0x55f52: text "IRON adds to your" line "#MON's DEFENSE." done -; 0x55f74 -UnknownText_0x55f74: ; 0x55f74 +UnknownText_0x55f74: text "Some #MON" line "evolve only by" @@ -72,17 +63,15 @@ UnknownText_0x55f74: ; 0x55f74 para "I heard there are" line "others too." done -; 0x5600d -UnknownText_0x5600d: ; 0x5600d +GoldenrodDeptStore4FDirectoryText: text "Let Us Pump Up" line "Your #MON!" para "4F MEDICINE BOX" done -; 0x56038 -GoldenrodDeptStore4F_MapEventHeader: ; 0x56038 +GoldenrodDeptStore4F_MapEventHeader: ; filler db 0, 0 @@ -97,8 +86,8 @@ GoldenrodDeptStore4F_MapEventHeader: ; 0x56038 ; signposts db 2 - signpost 0, 14, $0, MapGoldenrodDeptStore4FSignpost0Script - signpost 0, 3, $0, MapGoldenrodDeptStore4FSignpost1Script + signpost 0, 14, $0, GoldenrodDeptStore4FDirectory + signpost 0, 3, $0, GoldenrodDeptStore4FElevatorButton ; people-events db 4 @@ -106,5 +95,3 @@ GoldenrodDeptStore4F_MapEventHeader: ; 0x56038 person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, $ffff person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, $ffff person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, $ffff -; 0x5608b - diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 417638a38..934aef251 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ -GoldenrodDeptStore5F_MapScriptHeader: ; 0x5608b +GoldenrodDeptStore5F_MapScriptHeader: ; trigger count db 0 @@ -8,21 +8,18 @@ GoldenrodDeptStore5F_MapScriptHeader: ; 0x5608b ; callbacks dbw 2, UnknownScript_0x56090 -; 0x56090 -UnknownScript_0x56090: ; 0x56090 +UnknownScript_0x56090: checkcode $b if_equal SUNDAY, UnknownScript_0x56099 disappear $7 return -; 0x56099 -UnknownScript_0x56099: ; 0x56099 +UnknownScript_0x56099: appear $7 return -; 0x5609c -ClerkScript_0x5609c: ; 0x5609c +ClerkScript_0x5609c: faceplayer loadfont checkevent EVENT_GOT_TM02_HEADBUTT @@ -30,39 +27,33 @@ ClerkScript_0x5609c: ; 0x5609c checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c2 jump UnknownScript_0x560b6 -; 0x560ad -UnknownScript_0x560ad: ; 0x560ad +UnknownScript_0x560ad: checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x560c8 jump UnknownScript_0x560bc -; 0x560b6 -UnknownScript_0x560b6: ; 0x560b6 +UnknownScript_0x560b6: pokemart $0, $0009 loadmovesprites end -; 0x560bc -UnknownScript_0x560bc: ; 0x560bc +UnknownScript_0x560bc: pokemart $0, $000a loadmovesprites end -; 0x560c2 -UnknownScript_0x560c2: ; 0x560c2 +UnknownScript_0x560c2: pokemart $0, $000b loadmovesprites end -; 0x560c8 -UnknownScript_0x560c8: ; 0x560c8 +UnknownScript_0x560c8: pokemart $0, $000c loadmovesprites end -; 0x560ce -ReceptionistScript_0x560ce: ; 0x560ce +ReceptionistScript_0x560ce: faceplayer loadfont checkcode $b @@ -75,9 +66,8 @@ ReceptionistScript_0x560ce: ; 0x560ce if_greater_than $95, UnknownScript_0x560ee if_greater_than $31, UnknownScript_0x560fd jump UnknownScript_0x56103 -; 0x560ee -UnknownScript_0x560ee: ; 0x560ee +UnknownScript_0x560ee: writetext UnknownText_0x5615a keeptextopen verbosegiveitem TM_27, 1 @@ -85,16 +75,14 @@ UnknownScript_0x560ee: ; 0x560ee setflag $005b loadmovesprites end -; 0x560fd -UnknownScript_0x560fd: ; 0x560fd +UnknownScript_0x560fd: writetext UnknownText_0x561a6 closetext loadmovesprites end -; 0x56103 -UnknownScript_0x56103: ; 0x56103 +UnknownScript_0x56103: writetext UnknownText_0x561d8 keeptextopen verbosegiveitem TM_21, 1 @@ -102,17 +90,15 @@ UnknownScript_0x56103: ; 0x56103 setflag $005b loadmovesprites end -; 0x56112 -UnknownScript_0x56112: ; 0x56112 +UnknownScript_0x56112: writetext UnknownText_0x56202 closetext -UnknownScript_0x56116: ; 0x56116 +UnknownScript_0x56116: loadmovesprites end -; 0x56118 -TwinScript_0x56118: ; 0x56118 +TwinScript_0x56118: faceplayer loadfont special SpecialGameboyCheck @@ -122,47 +108,39 @@ TwinScript_0x56118: ; 0x56118 loadmovesprites special Function1050b9 end -; 0x5612a -UnknownScript_0x5612a: ; 0x5612a +UnknownScript_0x5612a: writetext UnknownText_0x56279 closetext loadmovesprites end -; 0x56130 -LassScript_0x56130: ; 0x56130 +LassScript_0x56130: jumptextfaceplayer UnknownText_0x562ad -; 0x56133 -CooltrainerMScript_0x56133: ; 0x56133 +CooltrainerMScript_0x56133: faceplayer loadfont trade $0 closetext loadmovesprites end -; 0x5613a -PokefanMScript_0x5613a: ; 0x5613a +PokefanMScript_0x5613a: jumptextfaceplayer UnknownText_0x562f3 -; 0x5613d -MapGoldenrodDeptStore5FSignpost0Script: ; 0x5613d - jumptext UnknownText_0x56364 -; 0x56140 +GoldenrodDeptStore5FDirectory: + jumptext GoldenrodDeptStore5FDirectoryText -MapGoldenrodDeptStore5FSignpost1Script: ; 0x56140 - jumpstd $0014 -; 0x56143 +GoldenrodDeptStore5FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x56143: ; 0x56143 +UnknownText_0x56143: text "Hello. Oh, your" line "#MON…" done -; 0x5615a -UnknownText_0x5615a: ; 0x5615a +UnknownText_0x5615a: text "It's very attached" line "to you." @@ -170,49 +148,43 @@ UnknownText_0x5615a: ; 0x5615a line "be perfect for a" cont "pair like you." done -; 0x561a6 -UnknownText_0x561a6: ; 0x561a6 +UnknownText_0x561a6: text "It's adorable!" para "You should teach" line "it good TM moves." done -; 0x561d8 -UnknownText_0x561d8: ; 0x561d8 +UnknownText_0x561d8: text "It looks evil. How" line "about this TM for" cont "it?" done -; 0x56202 -UnknownText_0x56202: ; 0x56202 +UnknownText_0x56202: text "There are sure to" line "be TMs that are" para "just perfect for" line "your #MON." done -; 0x56241 -UnknownText_0x56241: ; 0x56241 +UnknownText_0x56241: text "MYSTERY GIFT." para "With just a" line "little beep, you" cont "get a gift." done -; 0x56279 -UnknownText_0x56279: ; 0x56279 +UnknownText_0x56279: text "The MYSTERY GIFT" line "option requires a" cont "Game Boy Color." done -; 0x562ad -UnknownText_0x562ad: ; 0x562ad +UnknownText_0x562ad: text "On Sundays, a lady" line "comes to check out" cont "#MON." @@ -220,9 +192,8 @@ UnknownText_0x562ad: ; 0x562ad para "She even gives" line "away TMs!" done -; 0x562f3 -UnknownText_0x562f3: ; 0x562f3 +UnknownText_0x562f3: text "You can't rename a" line "#MON you get in" cont "a trade." @@ -233,17 +204,15 @@ UnknownText_0x562f3: ; 0x562f3 para "original trainer's" line "feelings for it." done -; 0x56364 -UnknownText_0x56364: ; 0x56364 +GoldenrodDeptStore5FDirectoryText: text "Customize Your" line "#MON" para "5F TM CORNER" done -; 0x56386 -GoldenrodDeptStore5F_MapEventHeader: ; 0x56386 +GoldenrodDeptStore5F_MapEventHeader: ; filler db 0, 0 @@ -258,8 +227,8 @@ GoldenrodDeptStore5F_MapEventHeader: ; 0x56386 ; signposts db 2 - signpost 0, 14, $0, MapGoldenrodDeptStore5FSignpost0Script - signpost 0, 3, $0, MapGoldenrodDeptStore5FSignpost1Script + signpost 0, 14, $0, GoldenrodDeptStore5FDirectory + signpost 0, 3, $0, GoldenrodDeptStore5FElevatorButton ; people-events db 6 @@ -269,5 +238,3 @@ GoldenrodDeptStore5F_MapEventHeader: ; 0x56386 person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, $ffff person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, $ffff person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, $0763 -; 0x563f3 - diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 9554a576a..54dd4770c 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,140 +1,121 @@ -GoldenrodDeptStore6F_MapScriptHeader: ; 0x563f3 +GoldenrodDeptStore6F_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x563f5 -MapGoldenrodDeptStore6FSignpost5Script: ; 0x563f5 +GoldenrodVendingMachine: loadfont - writetext UnknownText_0x564cb -UnknownScript_0x563f9: ; 0x563f9 + writetext GoldenrodVendingText +.Start special Function24ae8 - loadmenudata MenuDataHeader_0x56478 + loadmenudata .MenuData interpretmenu2 writebackup - if_equal $1, UnknownScript_0x5640f - if_equal $2, UnknownScript_0x56429 - if_equal $3, UnknownScript_0x56443 + if_equal $1, .FreshWater + if_equal $2, .SodaPop + if_equal $3, .Lemonade loadmovesprites end -; 0x5640f -UnknownScript_0x5640f: ; 0x5640f +.FreshWater checkmoney $0, 200 - if_equal $2, UnknownScript_0x5646a + if_equal $2, .NotEnoughMoney giveitem FRESH_WATER, $1 - iffalse UnknownScript_0x56471 + iffalse .NotEnoughSpace takemoney $0, 200 itemtotext FRESH_WATER, $0 - jump UnknownScript_0x5645d -; 0x56429 + jump .VendItem -UnknownScript_0x56429: ; 0x56429 +.SodaPop checkmoney $0, 300 - if_equal $2, UnknownScript_0x5646a + if_equal $2, .NotEnoughMoney giveitem SODA_POP, $1 - iffalse UnknownScript_0x56471 + iffalse .NotEnoughSpace takemoney $0, 300 itemtotext SODA_POP, $0 - jump UnknownScript_0x5645d -; 0x56443 + jump .VendItem -UnknownScript_0x56443: ; 0x56443 +.Lemonade checkmoney $0, 350 - if_equal $2, UnknownScript_0x5646a + if_equal $2, .NotEnoughMoney giveitem LEMONADE, $1 - iffalse UnknownScript_0x56471 + iffalse .NotEnoughSpace takemoney $0, 350 itemtotext LEMONADE, $0 - jump UnknownScript_0x5645d -; 0x5645d + jump .VendItem -UnknownScript_0x5645d: ; 0x5645d +.VendItem pause 10 playsound SFX_ENTER_DOOR - writetext UnknownText_0x564ef + writetext GoldenrodClangText keeptextopen itemnotify - jump UnknownScript_0x563f9 -; 0x5646a + jump .Start -UnknownScript_0x5646a: ; 0x5646a - writetext UnknownText_0x56512 +.NotEnoughMoney + writetext GoldenrodVendingNoMoneyText closetext - jump UnknownScript_0x563f9 -; 0x56471 + jump .Start -UnknownScript_0x56471: ; 0x56471 - writetext UnknownText_0x5652b +.NotEnoughSpace + writetext GoldenrodVendingNoSpaceText closetext - jump UnknownScript_0x563f9 -; 0x56478 + jump .Start - -MenuDataHeader_0x56478: ; 0x56478 +.MenuData db $40 ; flags db 02, 00 ; start coords db 11, 19 ; end coords - dw MenuData2_0x56480 + dw .MenuData2 db 1 ; default option -; 0x56480 -MenuData2_0x56480: ; 0x56480 +.MenuData2 db $80 ; flags db 4 ; items db "FRESH WATER ¥200@" db "SODA POP ¥300@" db "LEMONADE ¥350@" db "CANCEL@" -; 0x564bf -LassScript_0x564bf: ; 0x564bf +LassScript_0x564bf: jumptextfaceplayer UnknownText_0x5654b -; 0x564c2 -SuperNerdScript_0x564c2: ; 0x564c2 +SuperNerdScript_0x564c2: jumptextfaceplayer UnknownText_0x565ca -; 0x564c5 -MapGoldenrodDeptStore6FSignpost0Script: ; 0x564c5 - jumptext UnknownText_0x5661a -; 0x564c8 +GoldenrodDeptStore6FDirectory: + jumptext GoldenrodDeptStore6FDirectoryText -MapGoldenrodDeptStore6FSignpost1Script: ; 0x564c8 - jumpstd $0014 -; 0x564cb +GoldenrodDeptStore6FElevatorButton: + jumpstd elevatorbutton -UnknownText_0x564cb: ; 0x564cb +GoldenrodVendingText: text "A vending machine!" line "Here's the menu." done -; 0x564ef -UnknownText_0x564ef: ; 0x564ef +GoldenrodClangText: text "Clang! A can of" line "@" text_from_ram StringBuffer3 text $55 db "popped out!" done -; 0x56512 -UnknownText_0x56512: ; 0x56512 +GoldenrodVendingNoMoneyText: text "Oops, not enough" line "money." done -; 0x5652b -UnknownText_0x5652b: ; 0x5652b +GoldenrodVendingNoSpaceText: text "There's no more" line "room for stuff." done -; 0x5654b -UnknownText_0x5654b: ; 0x5654b +UnknownText_0x5654b: text "Do you listen to" line "LUCKY CHANNEL?" @@ -147,9 +128,8 @@ UnknownText_0x5654b: ; 0x5654b para "get different ID" line "numbers." done -; 0x565ca -UnknownText_0x565ca: ; 0x565ca +UnknownText_0x565ca: text "If you're tired," line "try the vending" cont "machine's drinks." @@ -157,17 +137,15 @@ UnknownText_0x565ca: ; 0x565ca para "Your #MON will" line "love them too." done -; 0x5661a -UnknownText_0x5661a: ; 0x5661a +GoldenrodDeptStore6FDirectoryText: text "Take a Break from" line "Shopping!" para "6F TRANQUIL SQUARE" done -; 0x5664a -GoldenrodDeptStore6F_MapEventHeader: ; 0x5664a +GoldenrodDeptStore6F_MapEventHeader: ; filler db 0, 0 @@ -182,16 +160,14 @@ GoldenrodDeptStore6F_MapEventHeader: ; 0x5664a ; signposts db 6 - signpost 0, 14, $0, MapGoldenrodDeptStore6FSignpost0Script - signpost 0, 3, $0, MapGoldenrodDeptStore6FSignpost1Script - signpost 1, 8, $1, MapGoldenrodDeptStore6FSignpost5Script - signpost 1, 9, $1, MapGoldenrodDeptStore6FSignpost5Script - signpost 1, 10, $1, MapGoldenrodDeptStore6FSignpost5Script - signpost 1, 11, $1, MapGoldenrodDeptStore6FSignpost5Script + signpost 0, 14, $0, GoldenrodDeptStore6FDirectory + signpost 0, 3, $0, GoldenrodDeptStore6FElevatorButton + signpost 1, 8, $1, GoldenrodVendingMachine + signpost 1, 9, $1, GoldenrodVendingMachine + signpost 1, 10, $1, GoldenrodVendingMachine + signpost 1, 11, $1, GoldenrodVendingMachine ; people-events db 2 person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, $ffff person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, $ffff -; 0x56697 - diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7e6da9a2b..161625236 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -149,4 +149,3 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; 0x7d8ce person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, $ffff person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, $ffff ; 0x7d94b - diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 8182801b1..84e5280b3 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -81,4 +81,3 @@ GoldenrodDeptStoreElevator_MapEventHeader: ; 0x566fe ; people-events db 0 ; 0x56713 - diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index bc39da5c7..e6348490e 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -263,4 +263,3 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; 0x56b6d person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, $06f0 person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, $06f0 ; 0x56bf4 - diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 73a568818..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 @@ -80,17 +80,17 @@ UnknownScript_0x553c5: ; 0x553c5 end ; 0x553cb -UnknownScript_0x553cb: ; 0x553cb - jumpstd $0002 -; 0x553ce +FlowerShopShelf1: +; unused + jumpstd picturebookshelf -UnknownScript_0x553ce: ; 0x553ce - jumpstd $0003 -; 0x553d1 +FlowerShopShelf2: +; unused + jumpstd magazinebookshelf -UnknownScript_0x553d1: ; 0x553d1 - jumpstd $000c -; 0x553d4 +FlowerShopRadio: +; unused + jumpstd radio2 UnknownText_0x553d4: ; 0x553d4 text "Have you seen that" @@ -192,4 +192,3 @@ GoldenrodFlowerShop_MapEventHeader: ; 0x5561e person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, $ffff person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, $0768 ; 0x55648 - diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 5605f8fef..1a54b2de5 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -11,7 +11,7 @@ GoldenrodGameCorner_MapScriptHeader: ; 0x56bf4 ; 0x56bf9 UnknownScript_0x56bf9: ; 0x56bf9 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iffalse UnknownScript_0x56c19 checkitem COIN_CASE iffalse UnknownScript_0x56c0e @@ -24,7 +24,7 @@ UnknownScript_0x56c0e: ; 0x56c0e ; 0x56c11 UnknownScript_0x56c11: ; 0x56c11 - checkflag $005e + checkflag ENGINE_5E iftrue UnknownScript_0x56c19 disappear $d UnknownScript_0x56c19: ;0x56c19 @@ -543,6 +543,3 @@ GoldenrodGameCorner_MapEventHeader: ; 0x571db person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, $ffff person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, $076b ; 0x57322 - - - diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index bf11bc30b..c11adf2ea 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -88,11 +88,11 @@ UnknownScript_0x5407d: ; 0x5407d ; 0x54086 UnknownScript_0x54086: ; 0x54086 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x54089 UnknownScript_0x54089: ; 0x54089 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x5408c TrainerLassCarrie: ; 0x5408c @@ -243,16 +243,13 @@ GoldenrodGymGuyScript: ; 0x540f7 end ; 0x5410c -MapGoldenrodGymSignpost1Script: ; 0x5410c - checkflag $001d - iftrue UnknownScript_0x54115 - jumpstd $002d -; 0x54115 - -UnknownScript_0x54115: ; 0x54115 +GoldenrodGymStatue: + checkflag ENGINE_PLAINBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext WHITNEY, 1, $1 - jumpstd $002e -; 0x5411c + jumpstd gymstatue2 BridgetWalksUpMovement: ; 0x5411c step_left @@ -499,8 +496,8 @@ GoldenrodGym_MapEventHeader: ; 0x546dd ; signposts db 2 - signpost 15, 1, $0, MapGoldenrodGymSignpost1Script - signpost 15, 4, $0, MapGoldenrodGymSignpost1Script + signpost 15, 1, $0, GoldenrodGymStatue + signpost 15, 4, $0, GoldenrodGymStatue ; people-events db 6 @@ -511,4 +508,3 @@ GoldenrodGym_MapEventHeader: ; 0x546dd person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, $ffff person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, $ffff ; 0x5474d - diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index a714c7e54..0a121da5f 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -70,13 +70,11 @@ TwinScript_0x5499a: ; 0x5499a jumptextfaceplayer UnknownText_0x54b67 ; 0x5499d -MapGoldenrodHappinessRaterSignpost1Script: ; 0x5499d - jumpstd $0001 -; 0x549a0 +HappinessRatersHouseBookshelf: + jumpstd difficultbookshelf -MapGoldenrodHappinessRaterSignpost2Script: ; 0x549a0 - jumpstd $000c -; 0x549a3 +HappinessRatersHouseRadio: + jumpstd radio2 UnknownText_0x549a3: ; 0x549a3 text "If you treat your" @@ -166,9 +164,9 @@ GoldenrodHappinessRater_MapEventHeader: ; 0x54b9c ; signposts db 3 - signpost 1, 0, $0, MapGoldenrodHappinessRaterSignpost1Script - signpost 1, 1, $0, MapGoldenrodHappinessRaterSignpost1Script - signpost 1, 7, $0, MapGoldenrodHappinessRaterSignpost2Script + signpost 1, 0, $0, HappinessRatersHouseBookshelf + signpost 1, 1, $0, HappinessRatersHouseBookshelf + signpost 1, 7, $0, HappinessRatersHouseRadio ; people-events db 3 @@ -176,4 +174,3 @@ GoldenrodHappinessRater_MapEventHeader: ; 0x54b9c person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, $ffff person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, $ffff ; 0x54be2 - diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index b26bb421d..0bc171372 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -205,4 +205,3 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; 0x5531f person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, $ffff person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, $0749 ; 0x5535b - diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 760e88084..f51814227 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -15,13 +15,11 @@ GentlemanScript_0x5577c: ; 0x5577c end ; 0x55784 -MapGoldenrodNameRatersHouseSignpost1Script: ; 0x55784 - jumpstd $0001 -; 0x55787 +GoldenrodNameRatersHouseBookshelf: + jumpstd difficultbookshelf -MapGoldenrodNameRatersHouseSignpost2Script: ; 0x55787 - jumpstd $000c -; 0x5578a +GoldenrodNameRatersHouseRadio: + jumpstd radio2 INCLUDE "text/sweethoney.asm" @@ -39,12 +37,11 @@ GoldenrodNameRatersHouse_MapEventHeader: ; 0x55953 ; signposts db 3 - signpost 1, 0, $0, MapGoldenrodNameRatersHouseSignpost1Script - signpost 1, 1, $0, MapGoldenrodNameRatersHouseSignpost1Script - signpost 1, 7, $0, MapGoldenrodNameRatersHouseSignpost2Script + signpost 1, 0, $0, GoldenrodNameRatersHouseBookshelf + signpost 1, 1, $0, GoldenrodNameRatersHouseBookshelf + signpost 1, 7, $0, GoldenrodNameRatersHouseRadio ; people-events db 1 person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, $ffff ; 0x5597f - diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index c587f07ea..8aeb6511f 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -14,17 +14,14 @@ LassScript_0x5564d: ; 0x5564d jumptextfaceplayer UnknownText_0x556ca ; 0x55650 -MapGoldenrodPPSpeechHouseSignpost1Script: ; 0x55650 - jumpstd $0001 -; 0x55653 +GoldenrodPPSpeechHouseBookshelf2: + jumpstd difficultbookshelf -MapGoldenrodPPSpeechHouseSignpost0Script: ; 0x55653 - jumpstd $0003 -; 0x55656 +GoldenrodPPSpeechHouseBookshelf1: + jumpstd magazinebookshelf -MapGoldenrodPPSpeechHouseSignpost2Script: ; 0x55656 - jumpstd $000c -; 0x55659 +GoldenrodPPSpeechHouseRadio: + jumpstd radio2 UnknownText_0x55659: ; 0x55659 text "Once while I was" @@ -69,13 +66,12 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; 0x55741 ; signposts db 3 - signpost 1, 0, $0, MapGoldenrodPPSpeechHouseSignpost0Script - signpost 1, 1, $0, MapGoldenrodPPSpeechHouseSignpost1Script - signpost 1, 7, $0, MapGoldenrodPPSpeechHouseSignpost2Script + signpost 1, 0, $0, GoldenrodPPSpeechHouseBookshelf1 + signpost 1, 1, $0, GoldenrodPPSpeechHouseBookshelf2 + signpost 1, 7, $0, GoldenrodPPSpeechHouseRadio ; people-events db 2 person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, $ffff person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, $ffff ; 0x5577a - diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 45e977bdb..2722dcff2 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -7,7 +7,7 @@ GoldenrodPokeCenter1F_MapScriptHeader: ; 0x60f8f ; 0x60f91 NurseScript_0x60f91: ; 0x60f91 - jumpstd $0000 + jumpstd pokecenternurse ; 0x60f94 UnknownScript_0x60f94: ; 0x60f94 @@ -905,4 +905,3 @@ GoldenrodPokeCenter1F_MapEventHeader: ; 0x62564 person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, $ffff person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, $ffff ; 0x625cf - diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 66d41b20b..0599c64ef 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -314,4 +314,3 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; 0x62c32 person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, $ffff person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, $ffff ; 0x62c78 - diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 7f2a6d81a..886c69898 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,20 +1,17 @@ -GuideGentsHouse_MapScriptHeader: ; 0x196c05 +GuideGentsHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x196c07 -GrampsScript_0x196c07: ; 0x196c07 - jumptextfaceplayer UnknownText_0x196c0d -; 0x196c0a +GuideGentsHouseGuideGent: + jumptextfaceplayer GuideGentsHouseGuideGentText -MapGuideGentsHouseSignpost1Script: ; 0x196c0a - jumpstd $0003 -; 0x196c0d +GuideGentsHouseBookshelf: + jumpstd magazinebookshelf -UnknownText_0x196c0d: ; 0x196c0d +GuideGentsHouseGuideGentText: text "When I was a wee" line "lad, I was a hot-" cont "shot trainer!" @@ -26,9 +23,8 @@ UnknownText_0x196c0d: ; 0x196c0d para "Treat them all" line "with kindness!" done -; 0x196c89 -GuideGentsHouse_MapEventHeader: ; 0x196c89 +GuideGentsHouse_MapEventHeader: ; filler db 0, 0 @@ -42,11 +38,9 @@ GuideGentsHouse_MapEventHeader: ; 0x196c89 ; signposts db 2 - signpost 1, 0, $0, MapGuideGentsHouseSignpost1Script - signpost 1, 1, $0, MapGuideGentsHouseSignpost1Script + signpost 1, 0, $0, GuideGentsHouseBookshelf + signpost 1, 1, $0, GuideGentsHouseBookshelf ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x196c07, $06ff -; 0x196cb0 - + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GuideGentsHouseGuideGent, $06ff diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a44a63546..a80947655 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -34,10 +34,10 @@ UnknownScript_0x181454: ; 0x181454 pause 15 writebyte $2 special Function12324 - setevent $0044 - setevent $077c - setevent $06c4 - clearevent $0762 + setevent EVENT_BEAT_ELITE_FOUR + setevent EVENT_TELEPORT_GUY + setevent EVENT_RIVAL_SPROUT_TOWER + clearevent EVENT_RED_IN_MT_SILVER setevent $0737 clearevent $0738 domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 @@ -135,8 +135,3 @@ HallOfFame_MapEventHeader: ; 0x181678 db 1 person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff ; 0x181695 - - - - - diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index ef1c76b01..7a320793c 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -41,4 +41,3 @@ IcePath1F_MapEventHeader: ; 0x7e478 person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689 person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be ; 0x7e4b9 - diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index c47e5db49..27cf68ba2 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -77,8 +77,8 @@ UnknownScript_0x7e504: ; 0x7e504 ; 0x7e50a -BoulderScript_0x7e50a: ; 0x7e50a - jumpstd $000e +IcePathB1FBoulder: ; 0x7e50a + jumpstd strengthboulder ; 0x7e50d ItemFragment_0x7e50d: ; 0x7e50d @@ -122,10 +122,8 @@ IcePathB1F_MapEventHeader: ; 0x7e52d ; people-events db 5 - person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $0709 - person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070a - person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070b - person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070c + person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $0709 + person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070a + person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070b + person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, $070c person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a -; 0x7e5a1 - diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 8571aace5..53171f4c5 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -36,4 +36,3 @@ IcePathB2FBlackthornSide_MapEventHeader: ; 0x7e64b db 1 person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d ; 0x7e66d - diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index ed6e5d2b4..3af69a5c5 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -59,4 +59,3 @@ IcePathB2FMahoganySide_MapEventHeader: ; 0x7e5cd person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, $068b person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, $068c ; 0x7e644 - diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index c77898e15..aad9b32b3 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -10,9 +10,8 @@ ItemFragment_0x7e66f: ; 0x7e66f db NEVERMELTICE, 1 ; 0x7e671 -RockScript_0x7e671: ; 0x7e671 - jumpstd $000f -; 0x7e674 +IcePathB3FRock: + jumpstd smashrock IcePathB3F_MapEventHeader: ; 0x7e674 ; filler @@ -32,6 +31,5 @@ IcePathB3F_MapEventHeader: ; 0x7e674 ; people-events db 2 person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e - person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, RockScript_0x7e671, $ffff + person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, $ffff ; 0x7e69e - diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d016b73e9..e4fb85aae 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -482,9 +482,9 @@ MapIlexForestSignpostItem3: ; 0x6ee1e db FULL_HEAL ; 0x6ee21 -UnknownScript_0x6ee21: ; 0x6ee21 - jumpstd $000e -; 0x6ee24 +IlexForestBoulder: +; unused + jumpstd strengthboulder MapIlexForestSignpost0Script: ; 0x6ee24 jumptext UnknownText_0x6f2de @@ -1080,6 +1080,3 @@ IlexForest_MapEventHeader: ; 0x6f5e7 person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, $07ba person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, $07bb ; 0x6f6a4 - - - diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index b37d07967..a282247b5 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -53,4 +53,3 @@ IlexForestAzaleaGate_MapEventHeader: ; 0x62cf4 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, $ffff person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, $ffff ; 0x62d28 - diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 656ca2d20..5a8039b27 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -141,7 +141,7 @@ UnknownScript_0x18012b: ; 0x18012b ; 0x18012c NurseScript_0x18012c: ; 0x18012c - jumpstd $0000 + jumpstd pokecenternurse ; 0x18012f ClerkScript_0x18012f: ; 0x18012f @@ -155,13 +155,13 @@ CooltrainerMScript_0x180136: ; 0x180136 jumptextfaceplayer UnknownText_0x180178 ; 0x180139 -GrampsScript_0x180139: ; 0x180139 +TeleportGuyScript: faceplayer loadfont - writetext UnknownText_0x180335 + writetext TeleportGuyText1 yesorno - iffalse UnknownScript_0x180154 - writetext UnknownText_0x1803e7 + iffalse .No + writetext TeleportGuyYesText closetext loadmovesprites playsound SFX_WARP_TO @@ -169,23 +169,20 @@ GrampsScript_0x180139: ; 0x180139 waitbutton warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6 end -; 0x180154 -UnknownScript_0x180154: ; 0x180154 - writetext UnknownText_0x180411 +.No + writetext TeleportGuyNoText closetext loadmovesprites end -; 0x18015a -JynxScript_0x18015a: ; 0x18015a +AbraScript: loadfont - writetext UnknownText_0x180433 + writetext AbraText cry ABRA closetext loadmovesprites end -; 0x180164 MovementData_0x180164: ; 0x180164 step_up @@ -285,7 +282,7 @@ UnknownText_0x1802fd: ; 0x1802fd done ; 0x180335 -UnknownText_0x180335: ; 0x180335 +TeleportGuyText1: text "Ah! You're chal-" line "lenging the ELITE" @@ -304,25 +301,22 @@ UnknownText_0x180335: ; 0x180335 para "Would you like to" line "go home now?" done -; 0x1803e7 -UnknownText_0x1803e7: ; 0x1803e7 +TeleportGuyYesText: text "OK, OK. Picture" line "your house in your" cont "mind…" done -; 0x180411 -UnknownText_0x180411: ; 0x180411 +TeleportGuyNoText: text "OK, OK. The best" line "of luck to you!" done ; 0x180433 -UnknownText_0x180433: ; 0x180433 +AbraText: text "ABRA: Aabra…" done -; 0x180441 IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441 ; filler @@ -349,7 +343,6 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441 person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, $ffff person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, $ffff person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, $077b - person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, GrampsScript_0x180139, $077c - person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, JynxScript_0x18015a, $077c + person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY ; 0x1804b9 - diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index d43428ed0..9bdeee14a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -166,4 +166,3 @@ KarensRoom_MapEventHeader: ; 0x180e05 db 1 person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, $ffff ; 0x180e2c - diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 2bdc7e1a3..7143f7efe 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -163,4 +163,3 @@ KogasRoom_MapEventHeader: ; 0x18095f db 1 person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, $ffff ; 0x180986 - diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index eb57eebb7..f91fed524 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -167,56 +167,49 @@ UnknownScript_0x7a5b8: ; 0x7a5b8 end ; 0x7a5c1 -PokefanFScript_0x7a5c1: ; 0x7a5c1 +NeighborScript: faceplayer loadfont - checktime $1 - iftrue UnknownScript_0x7a5d2 - checktime $2 - iftrue UnknownScript_0x7a5d9 - checktime $4 - iftrue UnknownScript_0x7a5e0 -UnknownScript_0x7a5d2: ; 0x7a5d2 - writetext UnknownText_0x7a97d + checkmorn + iftrue .MornScript + checkday + iftrue .DayScript + checknite + iftrue .NiteScript + +.MornScript + writetext NeighborMornIntroText keeptextopen - jump UnknownScript_0x7a5e7 -; 0x7a5d9 + jump .Main -UnknownScript_0x7a5d9: ; 0x7a5d9 - writetext UnknownText_0x7a99c +.DayScript + writetext NeighborDayIntroText keeptextopen - jump UnknownScript_0x7a5e7 -; 0x7a5e0 + jump .Main -UnknownScript_0x7a5e0: ; 0x7a5e0 - writetext UnknownText_0x7a9b4 +.NiteScript + writetext NeighborNiteIntroText keeptextopen - jump UnknownScript_0x7a5e7 -; 0x7a5e7 + jump .Main -UnknownScript_0x7a5e7: ; 0x7a5e7 - writetext UnknownText_0x7a9d3 +.Main + writetext NeighborText closetext loadmovesprites spriteface $6, $3 end -; 0x7a5f0 -MapKrissHouse1FSignpost3Script: ; 0x7a5f0 - jumptext UnknownText_0x7aad0 -; 0x7a5f3 +TVScript: + jumptext TVText -MapKrissHouse1FSignpost0Script: ; 0x7a5f3 - jumptext UnknownText_0x7aa3a -; 0x7a5f6 +StoveScript: + jumptext StoveText -MapKrissHouse1FSignpost1Script: ; 0x7a5f6 - jumptext UnknownText_0x7aa64 -; 0x7a5f9 +SinkScript: + jumptext SinkText -MapKrissHouse1FSignpost2Script: ; 0x7a5f9 - jumptext UnknownText_0x7aa91 -; 0x7a5fc +FridgeScript: + jumptext FridgeText MovementData_0x7a5fc: ; 0x7a5fc turn_head_right @@ -356,29 +349,26 @@ UnknownText_0x7a957: ; 0x7a957 done ; 0x7a97d -UnknownText_0x7a97d: ; 0x7a97d +NeighborMornIntroText: text "Good morning," line $14, "!" para "I'm visiting!" done -; 0x7a99c -UnknownText_0x7a99c: ; 0x7a99c +NeighborDayIntroText: text "Hello, ", $14, "!" line "I'm visiting!" done -; 0x7a9b4 -UnknownText_0x7a9b4: ; 0x7a9b4 +NeighborNiteIntroText: text "Good evening," line $14, "!" para "I'm visiting!" done -; 0x7a9d3 -UnknownText_0x7a9d3: ; 0x7a9d3 +NeighborText: text $14, ", have you" line "heard?" @@ -391,33 +381,29 @@ UnknownText_0x7a9d3: ; 0x7a9d3 para "She really loves" line "#MON!" done -; 0x7aa3a -UnknownText_0x7aa3a: ; 0x7aa3a +StoveText: text "Mom's specialty!" para "CINNABAR VOLCANO" line "BURGER!" done -; 0x7aa64 -UnknownText_0x7aa64: ; 0x7aa64 +SinkText: text "The sink is spot-" line "less. Mom likes it" cont "clean." done -; 0x7aa91 -UnknownText_0x7aa91: ; 0x7aa91 +FridgeText: text "Let's see what's" line "in the fridge…" para "FRESH WATER and" line "tasty LEMONADE!" done -; 0x7aad0 -UnknownText_0x7aad0: ; 0x7aad0 +TVText: text "There's a movie on" line "TV: Stars dot the" @@ -427,7 +413,6 @@ UnknownText_0x7aad0: ; 0x7aad0 para "I'd better get" line "rolling too!" done -; 0x7ab31 KrissHouse1F_MapEventHeader: ; 0x7ab31 ; filler @@ -446,10 +431,10 @@ KrissHouse1F_MapEventHeader: ; 0x7ab31 ; signposts db 4 - signpost 1, 0, $0, MapKrissHouse1FSignpost0Script - signpost 1, 1, $0, MapKrissHouse1FSignpost1Script - signpost 1, 2, $0, MapKrissHouse1FSignpost2Script - signpost 1, 4, $0, MapKrissHouse1FSignpost3Script + signpost 1, 0, $0, StoveScript + signpost 1, 1, $0, SinkScript + signpost 1, 2, $0, FridgeScript + signpost 1, 4, $0, TVScript ; people-events db 5 @@ -457,6 +442,5 @@ KrissHouse1F_MapEventHeader: ; 0x7ab31 person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, $06c8 person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, $06c8 person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8 - person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, PokefanFScript_0x7a5c1, $0792 + person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, $0792 ; 0x7abab - diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index e50fbd7be..ad0911803 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -21,7 +21,7 @@ UnknownScript_0x7abb4: ; 0x7abb4 setevent $0007 checkevent $0036 iftrue UnknownScript_0x7abc4 - jumpstd $0018 + jumpstd initializeevents return ; 0x7abc4 @@ -38,105 +38,84 @@ UnknownScript_0x7abc5: ; 0x7abc5 db 0, 0, 0 ; filler -Doll1Script_0x7abcc: ; 0x7abcc +Doll1: describedecoration $1 -; 0x7abce -Doll2Script_0x7abce: ; 0x7abce +Doll2: describedecoration $2 -; 0x7abd0 -BigDollScript_0x7abd0: ; 0x7abd0 +BigDoll: describedecoration $3 -; 0x7abd2 -ConsoleScript_0x7abd2: ; 0x7abd2 +GameConsole: describedecoration $4 -; 0x7abd4 -MapKrissHouse2FSignpost4: ; 0x7abd4 +KrissHousePoster: dw $02cc ; event - dw MapKrissHouse2FSignpost4Script -; 0x7abd8 - -MapKrissHouse2FSignpost4Script: ; 0x7abd8 + dw .Script +.Script describedecoration $0 -; 0x7abda -MapKrissHouse2FSignpost2Script: ; 0x7abda +KrissHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue UnknownScript_0x7ac07 - checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE - iftrue UnknownScript_0x7ac0a + iftrue .NormalRadio + checkevent EVENT_LISTENED_TO_INITIAL_RADIO + iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK loadfont - writetext UnknownText_0x7ac24 + writetext KrisRadioText1 pause 45 - writetext UnknownText_0x7ac55 + writetext KrisRadioText2 pause 45 - writetext UnknownText_0x7ac64 + writetext KrisRadioText3 pause 45 - musicfadeout $003c, $10 - writetext UnknownText_0x7ac84 + musicfadeout MUSIC_NEW_BARK_TOWN, $10 + writetext KrisRadioText4 pause 45 loadmovesprites - setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE + setevent EVENT_LISTENED_TO_INITIAL_RADIO end -; 0x7ac07 - -UnknownScript_0x7ac07: ; 0x7ac07 - jumpstd $000b -; 0x7ac0a - -UnknownScript_0x7ac0a: ; 0x7ac0a +.NormalRadio + jumpstd radio1 +.AbbreviatedRadio loadfont - writetext UnknownText_0x7ac84 + writetext KrisRadioText4 pause 45 loadmovesprites end -; 0x7ac12 +KrissHouseBookshelf: + jumpstd picturebookshelf -MapKrissHouse2FSignpost3Script: ; 0x7ac12 - jumpstd $0002 -; 0x7ac15 - -MapKrissHouse2FSignpost0Script: ; 0x7ac15 +KrissHousePC: loadfont special Functionc2e7 - iftrue UnknownScript_0x7ac1e + iftrue .Warp loadmovesprites end -; 0x7ac1e - -UnknownScript_0x7ac1e: ; 0x7ac1e +.Warp warp 0, 0, $0, $0 end -; 0x7ac24 -UnknownText_0x7ac24: ; 0x7ac24 +KrisRadioText1: text "PROF.OAK'S #MON" line "TALK! Please tune" cont "in next time!" done -; 0x7ac55 -UnknownText_0x7ac55: ; 0x7ac55 +KrisRadioText2: text "#MON CHANNEL!" done -; 0x7ac64 -UnknownText_0x7ac64: ; 0x7ac64 +KrisRadioText3: text "This is DJ MARY," line "your co-host!" done -; 0x7ac84 -UnknownText_0x7ac84: ; 0x7ac84 +KrisRadioText4: text "#MON!" line "#MON CHANNEL…" done -; 0x7ac99 KrissHouse2F_MapEventHeader: ; 0x7ac99 ; filler @@ -151,16 +130,14 @@ KrissHouse2F_MapEventHeader: ; 0x7ac99 ; signposts db 4 - signpost 1, 2, $1, MapKrissHouse2FSignpost0Script - signpost 1, 3, $0, MapKrissHouse2FSignpost2Script - signpost 1, 5, $0, MapKrissHouse2FSignpost3Script - signpost 0, 6, $5, MapKrissHouse2FSignpost4 ; 6bd4 + signpost 1, 2, $1, KrissHousePC + signpost 1, 3, $0, KrissHouseRadio + signpost 1, 5, $0, KrissHouseBookshelf + signpost 0, 6, $5, KrissHousePoster ; people-events db 4 - person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, ConsoleScript_0x7abd2, $0741 - person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1Script_0x7abcc, $0742 - person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2Script_0x7abce, $0743 - person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDollScript_0x7abd0, $0744 -; 0x7acec - + person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, GameConsole, $0741 + person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1, $0742 + person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2, $0743 + person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDoll, $0744 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index ed6089e61..5114250c2 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -4,54 +4,45 @@ KrissNeighborsHouse_MapScriptHeader: ; 0x7acec ; callback count db 0 -; 0x7acee -CooltrainerFScript_0x7acee: ; 0x7acee - jumptextfaceplayer UnknownText_0x7ad2f -; 0x7acf1 +KrissNeighborsDaughter: + jumptextfaceplayer KrissNeighborsDaughterText -PokefanFScript_0x7acf1: ; 0x7acf1 - jumptextfaceplayer UnknownText_0x7add4 -; 0x7acf4 +KrissNeighbor: + jumptextfaceplayer KrissNeighborText -MapKrissNeighborsHouseSignpost1Script: ; 0x7acf4 - jumpstd $0003 -; 0x7acf7 +KrissNeighborsHouseBookshelf: + jumpstd magazinebookshelf -MapKrissNeighborsHouseSignpost2Script: ; 0x7acf7 +KrissNeighborsHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue UnknownScript_0x7ad24 - checkevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE - iftrue UnknownScript_0x7ad27 + iftrue .NormalRadio + checkevent EVENT_LISTENED_TO_INITIAL_RADIO + iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK loadfont - writetext UnknownText_0x7ae3b + writetext KrisNeighborRadioText1 pause 45 - writetext UnknownText_0x7ae6c + writetext KrisNeighborRadioText2 pause 45 - writetext UnknownText_0x7ae7b + writetext KrisNeighborRadioText3 pause 45 - musicfadeout $003c, $10 - writetext UnknownText_0x7ae9b + musicfadeout MUSIC_NEW_BARK_TOWN, $10 + writetext KrisNeighborRadioText4 pause 45 loadmovesprites - setevent EVENT_LISTENED_TO_RADIO_IN_NEIGHBORS_HOUSE + setevent EVENT_LISTENED_TO_INITIAL_RADIO end -; 0x7ad24 - -UnknownScript_0x7ad24: ; 0x7ad24 - jumpstd $000b -; 0x7ad27 - -UnknownScript_0x7ad27: ; 0x7ad27 +.NormalRadio + jumpstd radio1 +.AbbreviatedRadio loadfont - writetext UnknownText_0x7ae9b + writetext KrisNeighborRadioText4 pause 45 loadmovesprites end -; 0x7ad2f -UnknownText_0x7ad2f: ; 0x7ad2f +KrissNeighborsDaughterText: text "PIKACHU is an" line "evolved #MON." @@ -69,9 +60,8 @@ UnknownText_0x7ad2f: ; 0x7ad2f line "a researcher like" cont "him…" done -; 0x7add4 -UnknownText_0x7add4: ; 0x7add4 +KrissNeighborText: text "My daughter is" line "adamant about" @@ -83,31 +73,26 @@ UnknownText_0x7add4: ; 0x7add4 para "But then, so do I!" done -; 0x7ae3b -UnknownText_0x7ae3b: ; 0x7ae3b +KrisNeighborRadioText1: text "PROF.OAK'S #MON" line "TALK! Please tune" cont "in next time!" done -; 0x7ae6c -UnknownText_0x7ae6c: ; 0x7ae6c +KrisNeighborRadioText2: text "#MON CHANNEL!" done -; 0x7ae7b -UnknownText_0x7ae7b: ; 0x7ae7b +KrisNeighborRadioText3: text "This is DJ MARY," line "your co-host!" done -; 0x7ae9b -UnknownText_0x7ae9b: ; 0x7ae9b +KrisNeighborRadioText4: text "#MON!" line "#MON CHANNEL…" done -; 0x7aeb0 KrissNeighborsHouse_MapEventHeader: ; 0x7aeb0 ; filler @@ -123,13 +108,12 @@ KrissNeighborsHouse_MapEventHeader: ; 0x7aeb0 ; signposts db 3 - signpost 1, 0, $0, MapKrissNeighborsHouseSignpost1Script - signpost 1, 1, $0, MapKrissNeighborsHouseSignpost1Script - signpost 1, 7, $0, MapKrissNeighborsHouseSignpost2Script + signpost 1, 0, $0, KrissNeighborsHouseBookshelf + signpost 1, 1, $0, KrissNeighborsHouseBookshelf + signpost 1, 7, $0, KrissNeighborsHouseRadio ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, CooltrainerFScript_0x7acee, $ffff - person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, PokefanFScript_0x7acf1, $0793 + person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, $ffff + person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, $0793 ; 0x7aee9 - diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index c0002ea06..cfce2cbf0 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -378,105 +378,93 @@ UnknownScript_0x18e3e0: ; 0x18e3e0 end ; 0x18e3ed -TwinScript_0x18e3ed: ; 0x18e3ed +KurtsGranddaughter1: faceplayer checkevent $0000 - iftrue UnknownScript_0x18e42f + iftrue KurtsGranddaughter2Subscript checkevent $0001 - iftrue UnknownScript_0x18e448 + iftrue KurtsGranddaughterFunScript checkevent $00c0 - iftrue UnknownScript_0x18e420 + iftrue .Lonely checkevent $0030 - iftrue UnknownScript_0x18e427 + iftrue .Dad checkevent EVENT_CLEARED_SLOWPOKE_WELL - iftrue UnknownScript_0x18e419 + iftrue .SlowpokeBack checkevent $06fa - iftrue UnknownScript_0x18e420 + iftrue .Lonely loadfont - writetext UnknownText_0x18e9b5 + writetext KurtsGranddaughterSlowpokeGoneText closetext loadmovesprites end -; 0x18e419 -UnknownScript_0x18e419: ; 0x18e419 +.SlowpokeBack loadfont - writetext UnknownText_0x18ea0f + writetext KurtsGranddaughterSlowpokeBackText closetext loadmovesprites end -; 0x18e420 -UnknownScript_0x18e420: ; 0x18e420 +.Lonely loadfont - writetext UnknownText_0x18e9f1 + writetext KurtsGranddaughterLonelyText closetext loadmovesprites end -; 0x18e427 -UnknownScript_0x18e427: ; 0x18e427 +.Dad loadfont - writetext UnknownText_0x18ea55 + writetext KurtsGranddaughterDadText closetext loadmovesprites end -; 0x18e42e -TwinScript_0x18e42e: ; 0x18e42e +KurtsGranddaughter2: faceplayer -UnknownScript_0x18e42f: ; 0x18e42f +KurtsGranddaughter2Subscript: loadfont checkevent $00bf - iftrue UnknownScript_0x18e43f - writetext UnknownText_0x18eab2 + iftrue .GSBall + writetext KurtsGranddaughterHelpText closetext loadmovesprites spriteface $6, $3 end -; 0x18e43f -UnknownScript_0x18e43f: ; 0x18e43f - writetext UnknownText_0x18eb14 +.GSBall + writetext KurtsGranddaughterGSBallText closetext loadmovesprites spriteface $6, $3 end -; 0x18e448 -UnknownScript_0x18e448: ; 0x18e448 +KurtsGranddaughterFunScript: ; 0x18e448 loadfont - writetext UnknownText_0x18eafc + writetext KurtsGranddaughterFunText closetext loadmovesprites end -; 0x18e44f -SlowpokeScript_0x18e44f: ; 0x18e44f +KurtsHouseSlowpoke: faceplayer loadfont - writetext UnknownText_0x18eb56 + writetext KurtsHouseSlowpokeText cry SLOWPOKE closetext loadmovesprites end -; 0x18e45a -MapKurtsHouseSignpost2Script: ; 0x18e45a - jumptext UnknownText_0x18eb69 -; 0x18e45d +KurtsHouseOakPhoto: + jumptext KurtsHouseOakPhotoText -MapKurtsHouseSignpost6Script: ; 0x18e45d - jumptext UnknownText_0x18eb7e -; 0x18e460 +KurtsHouseCelebiStatue: + jumptext KurtsHouseCelebiStatueText -MapKurtsHouseSignpost5Script: ; 0x18e460 - jumpstd $0001 -; 0x18e463 +KurtsHouseBookshelf: + jumpstd difficultbookshelf -MapKurtsHouseSignpost0Script: ; 0x18e463 - jumpstd $000c -; 0x18e466 +KurtsHouseRadio: + jumpstd radio2 MovementData_0x18e466: ; 0x18e466 big_step_down @@ -666,33 +654,29 @@ UnknownText_0x18e95c: ; 0x18e95c para "There must be" line "something to this!" done -; 0x18e9b5 -UnknownText_0x18e9b5: ; 0x18e9b5 +KurtsGranddaughterSlowpokeGoneText: text "The SLOWPOKE are" line "gone… Were they" para "taken away by bad" line "people?" done -; 0x18e9f1 -UnknownText_0x18e9f1: ; 0x18e9f1 +KurtsGranddaughterLonelyText: text "Grandpa's gone…" line "I'm so lonely…" done -; 0x18ea0f -UnknownText_0x18ea0f: ; 0x18ea0f +KurtsGranddaughterSlowpokeBackText: text "The SLOWPOKE my" line "dad gave me came" para "back! Its TAIL is" line "growing back too!" done -; 0x18ea55 -UnknownText_0x18ea55: ; 0x18ea55 +KurtsGranddaughterDadText: text "Dad works at SILPH" line "where he studies" cont "# BALLS." @@ -701,9 +685,8 @@ UnknownText_0x18ea55: ; 0x18ea55 line "home with Grandpa" cont "and SLOWPOKE." done -; 0x18eab2 -UnknownText_0x18eab2: ; 0x18eab2 +KurtsGranddaughterHelpText: text "I get to help" line "Grandpa now!" @@ -711,41 +694,35 @@ UnknownText_0x18eab2: ; 0x18eab2 line "BALLS for you, so" cont "please wait!" done -; 0x18eafc -UnknownText_0x18eafc: ; 0x18eafc +KurtsGranddaughterFunText: text "It's fun to make" line "BALLS!" done -; 0x18eb14 -UnknownText_0x18eb14: ; 0x18eb14 +KurtsGranddaughterGSBallText: text "Grandpa's checking" line "a BALL right now." para "So I'm waiting" line "till he's done." done -; 0x18eb56 -UnknownText_0x18eb56: ; 0x18eb56 +KurtsHouseSlowpokeText: text "SLOWPOKE: …" line "Yawn?" done -; 0x18eb69 -UnknownText_0x18eb69: ; 0x18eb69 +KurtsHouseOakPhotoText: text "…A young PROF." line "OAK?" done -; 0x18eb7e -UnknownText_0x18eb7e: ; 0x18eb7e +KurtsHouseCelebiStatueText: text "It's a statue of" line "the forest's pro-" cont "tector." done -; 0x18eba8 KurtsHouse_MapEventHeader: ; 0x18eba8 ; filler @@ -761,20 +738,19 @@ KurtsHouse_MapEventHeader: ; 0x18eba8 ; signposts db 7 - signpost 1, 6, $0, MapKurtsHouseSignpost0Script - signpost 0, 8, $0, MapKurtsHouseSignpost2Script - signpost 0, 9, $0, MapKurtsHouseSignpost2Script - signpost 1, 5, $0, MapKurtsHouseSignpost5Script - signpost 1, 2, $0, MapKurtsHouseSignpost5Script - signpost 1, 3, $0, MapKurtsHouseSignpost5Script - signpost 1, 4, $0, MapKurtsHouseSignpost6Script + signpost 1, 6, $0, KurtsHouseRadio + signpost 0, 8, $0, KurtsHouseOakPhoto + signpost 0, 9, $0, KurtsHouseOakPhoto + signpost 1, 5, $0, KurtsHouseBookshelf + signpost 1, 2, $0, KurtsHouseBookshelf + signpost 1, 3, $0, KurtsHouseBookshelf + signpost 1, 4, $0, KurtsHouseCelebiStatue ; people-events db 5 person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, $073e - person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, TwinScript_0x18e3ed, $078c - person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x18e44f, $06fd + person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, KurtsGranddaughter1, $078c + person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, KurtsHouseSlowpoke, $06fd person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, $073f - person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, TwinScript_0x18e42e, $078d + person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, $078d ; 0x18ec1c - 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/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index d2a77186b..cbd14ffb5 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -1,40 +1,35 @@ -LakeofRageHiddenPowerHouse_MapScriptHeader: ; 0x19a525 +LakeofRageHiddenPowerHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x19a527 -FisherScript_0x19a527: ; 0x19a527 +HiddenPowerGuy: faceplayer loadfont checkevent EVENT_GOT_TM10_HIDDEN_POWER - iftrue UnknownScript_0x19a542 - writetext UnknownText_0x19a54b + iftrue .AlreadyGotItem + writetext HiddenPowerGuyText1 keeptextopen verbosegiveitem TM_10, 1 - iffalse UnknownScript_0x19a546 + iffalse .Done setevent EVENT_GOT_TM10_HIDDEN_POWER - writetext UnknownText_0x19a5de + writetext HiddenPowerGuyText2 closetext loadmovesprites end -; 0x19a542 - -UnknownScript_0x19a542: ; 0x19a542 - writetext UnknownText_0x19a673 +.AlreadyGotItem + writetext HiddenPowerGuyText3 closetext -UnknownScript_0x19a546: ; 0x19a546 +.Done loadmovesprites end -; 0x19a548 -MapLakeofRageHiddenPowerHouseSignpost1Script: ; 0x19a548 - jumpstd $0001 -; 0x19a54b +HiddenPowerHouseBookshelf: + jumpstd difficultbookshelf -UnknownText_0x19a54b: ; 0x19a54b +HiddenPowerGuyText1: text "…You have strayed" line "far…" @@ -50,9 +45,8 @@ UnknownText_0x19a54b: ; 0x19a54b para "#MON." line "Take this, child." done -; 0x19a5de -UnknownText_0x19a5de: ; 0x19a5de +HiddenPowerGuyText2: text "Do you see it? It" line "is HIDDEN POWER!" @@ -65,14 +59,12 @@ UnknownText_0x19a5de: ; 0x19a5de cont "pend on the #-" cont "MON using it." done -; 0x19a673 -UnknownText_0x19a673: ; 0x19a673 +HiddenPowerGuyText3: text "I am meditating…" done -; 0x19a685 -LakeofRageHiddenPowerHouse_MapEventHeader: ; 0x19a685 +LakeofRageHiddenPowerHouse_MapEventHeader: ; filler db 0, 0 @@ -86,11 +78,9 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; 0x19a685 ; signposts db 2 - signpost 1, 0, $0, MapLakeofRageHiddenPowerHouseSignpost1Script - signpost 1, 1, $0, MapLakeofRageHiddenPowerHouseSignpost1Script + signpost 1, 0, $0, HiddenPowerHouseBookshelf + signpost 1, 1, $0, HiddenPowerHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, FisherScript_0x19a527, $ffff -; 0x19a6ac - + person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, $ffff diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index b688390bf..6c799ba3c 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -95,9 +95,8 @@ UnknownScript_0x19a728: ; 0x19a728 jumptext UnknownText_0x19aabc ; 0x19a72b -MapLakeofRageMagikarpHouseSignpost1Script: ; 0x19a72b - jumpstd $0001 -; 0x19a72e +MagikarpHouseBookshelf: + jumpstd difficultbookshelf UnknownText_0x19a72e: ; 0x19a72e text "LAKE OF RAGE is" @@ -238,11 +237,10 @@ LakeofRageMagikarpHouse_MapEventHeader: ; 0x19aae2 ; signposts db 2 - signpost 1, 0, $0, MapLakeofRageMagikarpHouseSignpost1Script - signpost 1, 1, $0, MapLakeofRageMagikarpHouseSignpost1Script + signpost 1, 0, $0, MagikarpHouseBookshelf + signpost 1, 1, $0, MagikarpHouseBookshelf ; people-events db 1 person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, $ffff ; 0x19ab09 - diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index c315ad61c..e83e26c7e 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -79,7 +79,7 @@ LanceScript_0x180e7b: ; 0x180e7b reloadmappart loadmovesprites setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - musicfadeout $0038, $10 + musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 pause 30 showemote $0, $2, 15 spriteface $2, $0 @@ -389,4 +389,3 @@ LancesRoom_MapEventHeader: ; 0x1813f4 person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f ; 0x181445 - diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 6c6173c70..6cf12dd93 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -263,4 +263,3 @@ LavRadioTower1F_MapEventHeader: ; 0x7f3b9 person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, $ffff person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, $ffff ; 0x7f414 - diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 0cacfdc92..d26fbf258 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -69,4 +69,3 @@ LavenderMart_MapEventHeader: ; 0x7ec0e person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, $ffff person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, $ffff ; 0x7ec45 - diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 43c3464ba..0b3a9d28a 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,4 +1,4 @@ -LavenderNameRater_MapScriptHeader: ; 0x7eaeb +LavenderNameRater_MapScriptHeader: ; trigger count db 1 @@ -7,26 +7,23 @@ LavenderNameRater_MapScriptHeader: ; 0x7eaeb ; callback count db 0 -; 0x7eaf1 -UnknownScript_0x7eaf1: ; 0x7eaf1 +UnknownScript_0x7eaf1: end -; 0x7eaf2 -GentlemanScript_0x7eaf2: ; 0x7eaf2 +LavenderNameRater: faceplayer loadfont special SpecialNameRater closetext loadmovesprites end -; 0x7eafa -UnknownScript_0x7eafa: ; 0x7eafa - jumpstd $0001 -; 0x7eafd +LavenderNameRaterBookshelf: +; unused + jumpstd difficultbookshelf -LavenderNameRater_MapEventHeader: ; 0x7eafd +LavenderNameRater_MapEventHeader: ; filler db 0, 0 @@ -43,6 +40,4 @@ LavenderNameRater_MapEventHeader: ; 0x7eafd ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, GentlemanScript_0x7eaf2, $ffff -; 0x7eb1a - + person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, $ffff diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 25c1b6f6a..9aa227f5d 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -7,7 +7,7 @@ LavenderPokeCenter1F_MapScriptHeader: ; 0x7e69e ; 0x7e6a0 NurseScript_0x7e6a0: ; 0x7e6a0 - jumpstd $0000 + jumpstd pokecenternurse ; 0x7e6a3 GentlemanScript_0x7e6a3: ; 0x7e6a3 @@ -107,4 +107,3 @@ LavenderPokeCenter1F_MapEventHeader: ; 0x7e872 person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, $ffff person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, $ffff ; 0x7e8bb - diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index cf6ee4e51..a133ad335 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ LavenderPokeCenter2FBeta_MapEventHeader: ; 0x7e8bd ; people-events db 0 ; 0x7e8c8 - diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 68e1244f3..05f6dc376 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,4 +1,4 @@ -LavenderTown_MapScriptHeader: ; 0x1ad6db +LavenderTown_MapScriptHeader: ; trigger count db 0 @@ -6,71 +6,56 @@ LavenderTown_MapScriptHeader: ; 0x1ad6db db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1ad6e0 -; 0x1ad6e0 - -UnknownScript_0x1ad6e0: ; 0x1ad6e0 - setflag $003b +.FlyPoint + setflag ENGINE_FLYPOINT_LAVENDER return -; 0x1ad6e4 -PokefanMScript_0x1ad6e4: ; 0x1ad6e4 +PokefanMScript_0x1ad6e4: jumptextfaceplayer UnknownText_0x1ad702 -; 0x1ad6e7 -TeacherScript_0x1ad6e7: ; 0x1ad6e7 +TeacherScript_0x1ad6e7: jumptextfaceplayer UnknownText_0x1ad73a -; 0x1ad6ea -GrampsScript_0x1ad6ea: ; 0x1ad6ea +GrampsScript_0x1ad6ea: jumptextfaceplayer UnknownText_0x1ad75c -; 0x1ad6ed -YoungsterScript_0x1ad6ed: ; 0x1ad6ed +YoungsterScript_0x1ad6ed: jumptextfaceplayer UnknownText_0x1ad7ac -; 0x1ad6f0 -MapLavenderTownSignpost0Script: ; 0x1ad6f0 - jumptext UnknownText_0x1ad7f7 -; 0x1ad6f3 +LavenderTownSign: + jumptext LavenderTownSignText -MapLavenderTownSignpost1Script: ; 0x1ad6f3 - jumptext UnknownText_0x1ad81c -; 0x1ad6f6 +KantoRadioStationSign: + jumptext KantoRadioStationSignText -MapLavenderTownSignpost2Script: ; 0x1ad6f6 - jumptext UnknownText_0x1ad861 -; 0x1ad6f9 +VolunteerPokemonHouseSign: + jumptext VolunteerPokemonHouseSignText -MapLavenderTownSignpost3Script: ; 0x1ad6f9 - jumptext UnknownText_0x1ad880 -; 0x1ad6fc +SoulHouseSign: + jumptext SoulHouseSignText -MapLavenderTownSignpost4Script: ; 0x1ad6fc - jumpstd $0010 -; 0x1ad6ff +LavenderPokeCenterSignText: + jumpstd pokecentersign -MapLavenderTownSignpost5Script: ; 0x1ad6ff - jumpstd $0011 -; 0x1ad702 +LavenderMartSignText: + jumpstd martsign -UnknownText_0x1ad702: ; 0x1ad702 +UnknownText_0x1ad702: text "That's quite some" line "building, eh?" para "It's KANTO's RADIO" line "TOWER." done -; 0x1ad73a -UnknownText_0x1ad73a: ; 0x1ad73a +UnknownText_0x1ad73a: text "KANTO has many" line "good radio shows." done -; 0x1ad75c -UnknownText_0x1ad75c: ; 0x1ad75c +UnknownText_0x1ad75c: text "People come from" line "all over to pay" @@ -78,9 +63,8 @@ UnknownText_0x1ad75c: ; 0x1ad75c line "the departed souls" cont "of #MON." done -; 0x1ad7ac -UnknownText_0x1ad7ac: ; 0x1ad7ac +UnknownText_0x1ad7ac: text "You need a #" line "FLUTE to wake" cont "sleeping #MON." @@ -88,17 +72,15 @@ UnknownText_0x1ad7ac: ; 0x1ad7ac para "Every trainer has" line "to know that!" done -; 0x1ad7f7 -UnknownText_0x1ad7f7: ; 0x1ad7f7 +LavenderTownSignText: text "LAVENDER TOWN" para "The Noble Purple" line "Town" done -; 0x1ad81c -UnknownText_0x1ad81c: ; 0x1ad81c +KantoRadioStationSignText: text "KANTO RADIO" line "STATION" @@ -106,23 +88,20 @@ UnknownText_0x1ad81c: ; 0x1ad81c line "Programs On-Air" cont "Around the Clock!" done -; 0x1ad861 -UnknownText_0x1ad861: ; 0x1ad861 +VolunteerPokemonHouseSignText: text "LAVENDER VOLUNTEER" line "#MON HOUSE" done -; 0x1ad880 -UnknownText_0x1ad880: ; 0x1ad880 +SoulHouseSignText: text "SOUL HOUSE" para "May the Souls of" line "#MON Rest Easy" done -; 0x1ad8ac -LavenderTown_MapEventHeader: ; 0x1ad8ac +LavenderTown_MapEventHeader: ; filler db 0, 0 @@ -141,12 +120,12 @@ LavenderTown_MapEventHeader: ; 0x1ad8ac ; signposts db 6 - signpost 3, 11, $0, MapLavenderTownSignpost0Script - signpost 7, 15, $0, MapLavenderTownSignpost1Script - signpost 9, 3, $0, MapLavenderTownSignpost2Script - signpost 13, 15, $0, MapLavenderTownSignpost3Script - signpost 5, 6, $0, MapLavenderTownSignpost4Script - signpost 5, 2, $0, MapLavenderTownSignpost5Script + signpost 3, 11, $0, LavenderTownSign + signpost 7, 15, $0, KantoRadioStationSign + signpost 9, 3, $0, VolunteerPokemonHouseSign + signpost 13, 15, $0, SoulHouseSign + signpost 5, 6, $0, LavenderPokeCenterSignText + signpost 5, 2, $0, LavenderMartSignText ; people-events db 4 @@ -154,5 +133,3 @@ LavenderTown_MapEventHeader: ; 0x1ad8ac person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, $ffff person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, $ffff person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, $ffff -; 0x1ad927 - diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 1484304c4..33a5c1ceb 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -10,9 +10,8 @@ PokefanFScript_0x7ea47: ; 0x7ea47 jumptextfaceplayer UnknownText_0x7ea4d ; 0x7ea4a -MapLavenderTownSpeechHouseSignpost1Script: ; 0x7ea4a - jumpstd $0002 -; 0x7ea4d +LavenderTownSpeechHouseBookshelf: + jumpstd picturebookshelf UnknownText_0x7ea4d: ; 0x7ea4d text "LAVENDER is a" @@ -43,11 +42,10 @@ LavenderTownSpeechHouse_MapEventHeader: ; 0x7eac4 ; signposts db 2 - signpost 1, 0, $0, MapLavenderTownSpeechHouseSignpost1Script - signpost 1, 1, $0, MapLavenderTownSpeechHouseSignpost1Script + signpost 1, 0, $0, LavenderTownSpeechHouseBookshelf + signpost 1, 1, $0, LavenderTownSpeechHouseBookshelf ; people-events db 1 person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, $ffff ; 0x7eaeb - diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index d1bf21133..30a7d071d 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -60,11 +60,11 @@ UnknownScript_0x199af6: ; 0x199af6 ; 0x199aff UnknownScript_0x199aff: ; 0x199aff - jumpstd $0012 + jumpstd goldenrodrockets ; 0x199b02 UnknownScript_0x199b02: ; 0x199b02 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x199b05 TrainerSkierRoxanne: ; 0x199b05 @@ -229,16 +229,13 @@ MahoganyGymGuyScript: ; 0x199b69 end ; 0x199b7d -MapMahoganyGymSignpost1Script: ; 0x199b7d - checkflag $0021 - iftrue UnknownScript_0x199b86 - jumpstd $002d -; 0x199b86 - -UnknownScript_0x199b86: ; 0x199b86 +MahoganyGymStatue: + checkflag ENGINE_GLACIERBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext PRYCE, 1, $1 - jumpstd $002e -; 0x199b8d + jumpstd gymstatue2 UnknownText_0x199b8d: ; 0x199b8d text "#MON have many" @@ -500,8 +497,8 @@ MahoganyGym_MapEventHeader: ; 0x19a2df ; signposts db 2 - signpost 15, 3, $0, MapMahoganyGymSignpost1Script - signpost 15, 6, $0, MapMahoganyGymSignpost1Script + signpost 15, 3, $0, MahoganyGymStatue + signpost 15, 6, $0, MahoganyGymStatue ; people-events db 7 @@ -513,4 +510,3 @@ MahoganyGym_MapEventHeader: ; 0x19a2df person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff ; 0x19a354 - diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 3f82fd015..2cb6a8888 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -268,4 +268,3 @@ MahoganyMart1F_MapEventHeader: ; 0x6c5fb person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, $0736 ; 0x6c651 - diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index e6d5740f9..981b9e596 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -7,7 +7,7 @@ MahoganyPokeCenter1F_MapScriptHeader: ; 0x19a354 ; 0x19a356 NurseScript_0x19a356: ; 0x19a356 - jumpstd $0000 + jumpstd pokecenternurse ; 0x19a359 PokefanMScript_0x19a359: ; 0x19a359 @@ -78,4 +78,3 @@ MahoganyPokeCenter1F_MapEventHeader: ; 0x19a46a person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, $ffff person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, $ffff ; 0x19a4b3 - diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 3b71940d9..bdf040941 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -82,4 +82,3 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; 0x199a72 person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, $ffff person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, $ffff ; 0x199a9c - diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 76a582636..534a6cffb 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,33 +1,28 @@ -MahoganyTown_MapScriptHeader: ; 0x190000 +MahoganyTown_MapScriptHeader: ; trigger count 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 -; 0x19000d - -UnknownScript_0x19000d: ; 0x19000d +.Trigger1 end -; 0x19000e -UnknownScript_0x19000e: ; 0x19000e +.Trigger2 end -; 0x19000f -UnknownScript_0x19000f: ; 0x19000f - setflag $0049 +.FlyPoint + setflag ENGINE_FLYPOINT_MAHOGANY return -; 0x190013 -UnknownScript_0x190013: ; 0x190013 +UnknownScript_0x190013: showemote $0, $2, 15 applymovement $2, MovementData_0x1900a9 follow $0, $2 @@ -37,26 +32,23 @@ UnknownScript_0x190013: ; 0x190013 scall UnknownScript_0x19002f applymovement $2, MovementData_0x1900ad end -; 0x19002e -PokefanMScript_0x19002e: ; 0x19002e +PokefanMScript_0x19002e: faceplayer -UnknownScript_0x19002f: ; 0x19002f +UnknownScript_0x19002f: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x190039 scall UnknownScript_0x190040 end -; 0x190039 -UnknownScript_0x190039: ; 0x190039 +UnknownScript_0x190039: loadfont writetext UnknownText_0x1901a6 closetext loadmovesprites end -; 0x190040 -UnknownScript_0x190040: ; 0x190040 +UnknownScript_0x190040: loadfont writetext UnknownText_0x1900b0 special Function24ae8 @@ -74,30 +66,26 @@ UnknownScript_0x190040: ; 0x190040 closetext loadmovesprites end -; 0x19006c -UnknownScript_0x19006c: ; 0x19006c +UnknownScript_0x19006c: writetext UnknownText_0x19015b closetext loadmovesprites end -; 0x190072 -UnknownScript_0x190072: ; 0x190072 +UnknownScript_0x190072: writetext UnknownText_0x190178 closetext loadmovesprites end -; 0x190078 -UnknownScript_0x190078: ; 0x190078 +UnknownScript_0x190078: writetext UnknownText_0x190188 closetext loadmovesprites end -; 0x19007e -GrampsScript_0x19007e: ; 0x19007e +GrampsScript_0x19007e: faceplayer loadfont checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -106,62 +94,51 @@ GrampsScript_0x19007e: ; 0x19007e closetext loadmovesprites end -; 0x19008c -UnknownScript_0x19008c: ; 0x19008c +UnknownScript_0x19008c: writetext UnknownText_0x19021d closetext loadmovesprites end -; 0x190092 -FisherScript_0x190092: ; 0x190092 +FisherScript_0x190092: jumptextfaceplayer UnknownText_0x190276 -; 0x190095 -LassScript_0x190095: ; 0x190095 +LassScript_0x190095: jumptextfaceplayer UnknownText_0x1902f2 -; 0x190098 -MapMahoganyTownSignpost0Script: ; 0x190098 - jumptext UnknownText_0x19032e -; 0x19009b +MahoganyTownSign: + jumptext MahoganyTownSignText -MapMahoganyTownSignpost1Script: ; 0x19009b - jumptext UnknownText_0x19035e -; 0x19009e +MahoganyTownRagecandybarSign: + jumptext MahoganyTownRagecandybarSignText -MapMahoganyTownSignpost2Script: ; 0x19009e - jumptext UnknownText_0x190391 -; 0x1900a1 +MahoganyGymSign: + jumptext MahoganyGymSignText -MapMahoganyTownSignpost3Script: ; 0x1900a1 - jumpstd $0010 -; 0x1900a4 +MahoganyTownPokeCenterSign: + jumpstd pokecentersign -MovementData_0x1900a4: ; 0x1900a4 +MovementData_0x1900a4: step_down big_step_up turn_head_down -MovementData_0x1900a7: ; 0x1900a7 +MovementData_0x1900a7: step_left step_end -; 0x1900a9 -MovementData_0x1900a9: ; 0x1900a9 +MovementData_0x1900a9: step_right step_down turn_head_left step_end -; 0x1900ad -MovementData_0x1900ad: ; 0x1900ad +MovementData_0x1900ad: step_up turn_head_down step_end -; 0x1900b0 -UnknownText_0x1900b0: ; 0x1900b0 +UnknownText_0x1900b0: text "Hiya, kid!" para "I see you're new" @@ -177,31 +154,26 @@ UnknownText_0x1900b0: ; 0x1900b0 line "be yours for just" cont "¥300! Want one?" done -; 0x19014a -UnknownText_0x19014a: ; 0x19014a +UnknownText_0x19014a: text "Good! Savor it!" done -; 0x19015b -UnknownText_0x19015b: ; 0x19015b +UnknownText_0x19015b: text "You don't have" line "enough money." done -; 0x190178 -UnknownText_0x190178: ; 0x190178 +UnknownText_0x190178: text "Oh, fine then…" done -; 0x190188 -UnknownText_0x190188: ; 0x190188 +UnknownText_0x190188: text "You don't have" line "room for this." done -; 0x1901a6 -UnknownText_0x1901a6: ; 0x1901a6 +UnknownText_0x1901a6: text "RAGECANDYBAR's" line "sold out." @@ -209,16 +181,14 @@ UnknownText_0x1901a6: ; 0x1901a6 line "Don't bother me," cont "kiddo." done -; 0x1901e5 -UnknownText_0x1901e5: ; 0x1901e5 +UnknownText_0x1901e5: text "Are you off to see" line "the GYARADOS ram-" cont "page at the LAKE?" done -; 0x19021d -UnknownText_0x19021d: ; 0x19021d +UnknownText_0x19021d: text "MAGIKARP have" line "returned to LAKE" cont "OF RAGE." @@ -227,9 +197,8 @@ UnknownText_0x19021d: ; 0x19021d line "good news for the" cont "anglers there." done -; 0x190276 -UnknownText_0x190276: ; 0x190276 +UnknownText_0x190276: text "Since you came" line "this far, take the" @@ -242,33 +211,29 @@ UnknownText_0x190276: ; 0x190276 para "out LAKE OF RAGE" line "right now." done -; 0x1902f2 -UnknownText_0x1902f2: ; 0x1902f2 +UnknownText_0x1902f2: text "Visit Grandma's" line "shop. She sells" para "stuff that nobody" line "else has." done -; 0x19032e -UnknownText_0x19032e: ; 0x19032e +MahoganyTownSignText: text "MAHOGANY TOWN" para "Welcome to the" line "Home of the Ninja" done -; 0x19035e -UnknownText_0x19035e: ; 0x19035e +MahoganyTownRagecandybarSignText: text "While visiting" line "MAHOGANY TOWN, try" cont "a RAGECANDYBAR!" done -; 0x190391 -UnknownText_0x190391: ; 0x190391 +MahoganyGymSignText: text "MAHOGANY TOWN" line "#MON GYM" cont "LEADER: PRYCE" @@ -276,9 +241,8 @@ UnknownText_0x190391: ; 0x190391 para "The Teacher of" line "Winter's Harshness" done -; 0x1903d8 -MahoganyTown_MapEventHeader: ; 0x1903d8 +MahoganyTown_MapEventHeader: ; filler db 0, 0 @@ -297,10 +261,10 @@ MahoganyTown_MapEventHeader: ; 0x1903d8 ; signposts db 4 - signpost 5, 1, $0, MapMahoganyTownSignpost0Script - signpost 7, 9, $0, MapMahoganyTownSignpost1Script - signpost 13, 3, $0, MapMahoganyTownSignpost2Script - signpost 13, 16, $0, MapMahoganyTownSignpost3Script + signpost 5, 1, $0, MahoganyTownSign + signpost 7, 9, $0, MahoganyTownRagecandybarSign + signpost 13, 3, $0, MahoganyGymSign + signpost 13, 16, $0, MahoganyTownPokeCenterSign ; people-events db 4 @@ -308,5 +272,3 @@ MahoganyTown_MapEventHeader: ; 0x1903d8 person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, $ffff person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, $0757 person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, $0736 -; 0x19044f - diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 854f0665e..d971a0757 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -105,7 +105,7 @@ UnknownScript_0x9d2fa: ; 0x9d2fa ; 0x9d300 UnknownScript_0x9d300: ; 0x9d300 - jumpstd $0002 + jumpstd picturebookshelf ; 0x9d303 UnknownText_0x9d303: ; 0x9d303 @@ -238,4 +238,3 @@ ManiasHouse_MapEventHeader: ; 0x9d5f0 db 1 person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, $ffff ; 0x9d60d - diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 4d9485e37..89c617f06 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -95,6 +95,3 @@ MobileBattleRoom_MapEventHeader: ; 0x193673 ; people-events db 0 ; 0x193688 - - - diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index e32463b4a..a17b47ee6 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -61,4 +61,3 @@ MobileTradeRoomMobile_MapEventHeader: ; 0x1935af ; people-events db 0 ; 0x1935c4 - diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 92760f5a7..73d0cb770 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -197,4 +197,3 @@ MountMoon_MapEventHeader: ; 0x74356 db 1 person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a ; 0x74391 - diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index ecb718423..16e98c135 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -47,4 +47,3 @@ MountMoonGiftShop_MapEventHeader: ; 0x771e7 person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, $ffff person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, $ffff ; 0x7722b - diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index d11a3ae0a..9946ec734 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -34,7 +34,7 @@ UnknownScript_0x7709a: ; 0x7709a iftrue UnknownScript_0x77117 checkcode $b if_not_equal MONDAY, UnknownScript_0x77117 - checktime $4 + checknite iffalse UnknownScript_0x77117 appear $2 appear $3 @@ -91,9 +91,8 @@ MapMountMoonSquareSignpost1Script: ; 0x7711b jumptext UnknownText_0x7713b ; 0x7711e -RockScript_0x7711e: ; 0x7711e - jumpstd $000f -; 0x77121 +MtMoonSquareRock: + jumpstd smashrock MovementData_0x77121: ; 0x77121 step_up @@ -177,6 +176,5 @@ MountMoonSquare_MapEventHeader: ; 0x77158 db 3 person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, RockScript_0x7711e, $0778 + person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, $0778 ; 0x771a6 - diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 9e7f30019..df9888595 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,9 +64,8 @@ SupernerdMarkusScript: ; 0x7de71 end ; 0x7de79 -BoulderScript_0x7de79: ; 0x7de79 - jumpstd $000e -; 0x7de7c +MountMortar1FBoulder: + jumpstd strengthboulder ItemFragment_0x7de7c: ; 0x7de7c db ESCAPE_ROPE, 1 @@ -180,7 +179,7 @@ MountMortar1FInside_MapEventHeader: ; 0x7e01d ; people-events db 10 - person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, BoulderScript_0x7de79, $ffff + person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, $ffff person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, $067d person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, $067e person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, $067f @@ -191,4 +190,3 @@ MountMortar1FInside_MapEventHeader: ; 0x7e01d person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8 person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9 ; 0x7e0c8 - diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 0cf0adb43..125a6b77e 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -48,4 +48,3 @@ MountMortar1FOutside_MapEventHeader: ; 0x7ddfd person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, $067b person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, $067c ; 0x7de4f - diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 5db70563f..fe23e759e 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -114,4 +114,3 @@ MountMortar2FInside_MapEventHeader: ; 0x7e184 person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, $0685 person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, $ffff ; 0x7e1f4 - diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index a0082d803..67be6c58d 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -47,9 +47,8 @@ UnknownScript_0x7e237: ; 0x7e237 end ; 0x7e23d -BoulderScript_0x7e23d: ; 0x7e23d - jumpstd $000e -; 0x7e240 +MountMortarB1FBoulder: + jumpstd strengthboulder ItemFragment_0x7e240: ; 0x7e240 db HYPER_POTION, 1 @@ -163,10 +162,9 @@ MountMortarB1F_MapEventHeader: ; 0x7e400 db 7 person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, $0686 person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, $0687 - person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e23d, $ffff + person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, $ffff person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, $ffff person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, $07ca person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc ; 0x7e470 - diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index b700bdcea..c0844492e 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,25 +1,22 @@ -MoveDeletersHouse_MapScriptHeader: ; 0x195cb2 +MoveDeletersHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x195cb4 -SuperNerdScript_0x195cb4: ; 0x195cb4 +MoveDeleter: faceplayer loadfont - special Function2c547 + special MoveDeletion closetext loadmovesprites end -; 0x195cbc -MapMoveDeletersHouseSignpost1Script: ; 0x195cbc - jumpstd $0001 -; 0x195cbf +MoveDeletersHouseBookshelf: + jumpstd difficultbookshelf -MoveDeletersHouse_MapEventHeader: ; 0x195cbf +MoveDeletersHouse_MapEventHeader: ; filler db 0, 0 @@ -33,11 +30,9 @@ MoveDeletersHouse_MapEventHeader: ; 0x195cbf ; signposts db 2 - signpost 1, 0, $0, MapMoveDeletersHouseSignpost1Script - signpost 1, 1, $0, MapMoveDeletersHouseSignpost1Script + signpost 1, 0, $0, MoveDeletersHouseBookshelf + signpost 1, 1, $0, MoveDeletersHouseBookshelf ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x195cb4, $ffff -; 0x195ce6 - + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, $ffff diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 6b0da4626..6f109c6cf 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -14,36 +14,32 @@ LassScript_0x7e8cd: ; 0x7e8cd jumptextfaceplayer UnknownText_0x7e940 ; 0x7e8d0 -RhydonScript_0x7e8d0: ; 0x7e8d0 +MrFujisPsyduck: loadfont - writetext UnknownText_0x7e9b6 + writetext MrFujisPsyduckText cry PSYDUCK closetext loadmovesprites end -; 0x7e8da -GrowlitheScript_0x7e8da: ; 0x7e8da +MrFujisNidorino: loadfont - writetext UnknownText_0x7e9c9 + writetext MrFujisNidorinoText cry NIDORINO closetext loadmovesprites end -; 0x7e8e4 -MoltresScript_0x7e8e4: ; 0x7e8e4 +MrFujisPidgey: loadfont - writetext UnknownText_0x7e9da + writetext MrFujisPidgeyText cry PIDGEY closetext loadmovesprites end -; 0x7e8ee -MapMrFujisHouseSignpost1Script: ; 0x7e8ee - jumpstd $0001 -; 0x7e8f1 +MrFujisHouseBookshelf: + jumpstd difficultbookshelf UnknownText_0x7e8f1: ; 0x7e8f1 text "MR.FUJI does live" @@ -69,20 +65,17 @@ UnknownText_0x7e940: ; 0x7e940 done ; 0x7e9b6 -UnknownText_0x7e9b6: ; 0x7e9b6 +MrFujisPsyduckText: text "PSYDUCK: Gu-guwa?" done -; 0x7e9c9 -UnknownText_0x7e9c9: ; 0x7e9c9 +MrFujisNidorinoText: text "NIDORINO: Gyun!" done -; 0x7e9da -UnknownText_0x7e9da: ; 0x7e9da +MrFujisPidgeyText: text "PIDGEY: Pijji!" done -; 0x7e9ea MrFujisHouse_MapEventHeader: ; 0x7e9ea ; filler @@ -98,15 +91,13 @@ MrFujisHouse_MapEventHeader: ; 0x7e9ea ; signposts db 2 - signpost 1, 0, $0, MapMrFujisHouseSignpost1Script - signpost 1, 1, $0, MapMrFujisHouseSignpost1Script + signpost 1, 0, $0, MrFujisHouseBookshelf + signpost 1, 1, $0, MrFujisHouseBookshelf ; people-events db 5 person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, $ffff person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, $ffff - person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, RhydonScript_0x7e8d0, $ffff - person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x7e8da, $ffff - person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MoltresScript_0x7e8e4, $ffff -; 0x7ea45 - + person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, $ffff + person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, $ffff + person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, $ffff diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 513385ec9..637a6513a 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -429,4 +429,3 @@ MrPokemonsHouse_MapEventHeader: ; 0x1975ef person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, $ffff person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c9 ; 0x197632 - diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 726cb3274..f3d20a785 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,34 +1,31 @@ -MrPsychicsHouse_MapScriptHeader: ; 0x18a778 +MrPsychicsHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x18a77a -FishingGuruScript_0x18a77a: ; 0x18a77a +MrPsychic: faceplayer loadfont checkevent EVENT_GOT_TM29_PSYCHIC - iftrue UnknownScript_0x18a78f - writetext UnknownText_0x18a798 + iftrue .AlreadyGotItem + writetext MrPsychicText1 keeptextopen verbosegiveitem TM_29, 1 - iffalse UnknownScript_0x18a793 + iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC -UnknownScript_0x18a78f: ; 0x18a78f - writetext UnknownText_0x18a7bb +.AlreadyGotItem + writetext MrPsychicText2 closetext -UnknownScript_0x18a793: ; 0x18a793 +.Done loadmovesprites end -; 0x18a795 -MapMrPsychicsHouseSignpost1Script: ; 0x18a795 - jumpstd $0001 -; 0x18a798 +MrPsychicsHouseBookshelf: + jumpstd difficultbookshelf -UnknownText_0x18a798: ; 0x18a798 +MrPsychicText1: text "…" para "…" @@ -39,17 +36,15 @@ UnknownText_0x18a798: ; 0x18a798 para "You wanted this!" done -; 0x18a7bb -UnknownText_0x18a7bb: ; 0x18a7bb +MrPsychicText2: text "TM29 is PSYCHIC." para "It may lower the" line "target's SPCL.DEF." done -; 0x18a7f0 -MrPsychicsHouse_MapEventHeader: ; 0x18a7f0 +MrPsychicsHouse_MapEventHeader: ; filler db 0, 0 @@ -63,11 +58,9 @@ MrPsychicsHouse_MapEventHeader: ; 0x18a7f0 ; signposts db 2 - signpost 1, 0, $0, MapMrPsychicsHouseSignpost1Script - signpost 1, 1, $0, MapMrPsychicsHouseSignpost1Script + signpost 1, 0, $0, MrPsychicsHouseBookshelf + signpost 1, 1, $0, MrPsychicsHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, FishingGuruScript_0x18a77a, $ffff -; 0x18a817 - + person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, $ffff diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index c665af53b..90ac78de5 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -125,7 +125,7 @@ UnknownScript_0x5c0a7: ; 0x5c0a7 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x5c0f3 UnknownScript_0x5c0ad: ; 0x5c0ad - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x5c0e6 UnknownScript_0x5c0b3: ; 0x5c0b3 checkevent EVENT_CLEARED_RADIO_TOWER @@ -178,37 +178,37 @@ UnknownScript_0x5c0f3: ; 0x5c0f3 ; 0x5c0fc UnknownScript_0x5c0fc: ; 0x5c0fc - jumpstd $0019 + jumpstd asknumber1m end ; 0x5c100 UnknownScript_0x5c100: ; 0x5c100 - jumpstd $001a + jumpstd asknumber2m end ; 0x5c104 UnknownScript_0x5c104: ; 0x5c104 - jumpstd $001b + jumpstd registerednumberm end ; 0x5c108 UnknownScript_0x5c108: ; 0x5c108 - jumpstd $001c + jumpstd numberacceptedm end ; 0x5c10c UnknownScript_0x5c10c: ; 0x5c10c - jumpstd $001d + jumpstd numberdeclinedm end ; 0x5c110 UnknownScript_0x5c110: ; 0x5c110 - jumpstd $001e + jumpstd phonefullm end ; 0x5c114 UnknownScript_0x5c114: ; 0x5c114 - jumpstd $001f + jumpstd rematchm end ; 0x5c118 @@ -311,42 +311,42 @@ UnknownScript_0x5c189: ; 0x5c189 ; 0x5c18f UnknownScript_0x5c18f: ; 0x5c18f - jumpstd $0023 + jumpstd asknumber1f end ; 0x5c193 UnknownScript_0x5c193: ; 0x5c193 - jumpstd $0024 + jumpstd asknumber2f end ; 0x5c197 UnknownScript_0x5c197: ; 0x5c197 - jumpstd $0025 + jumpstd registerednumberf end ; 0x5c19b UnknownScript_0x5c19b: ; 0x5c19b - jumpstd $0026 + jumpstd numberacceptedf end ; 0x5c19f UnknownScript_0x5c19f: ; 0x5c19f - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x5c1a3 UnknownScript_0x5c1a3: ; 0x5c1a3 - jumpstd $0028 + jumpstd phonefullf end ; 0x5c1a7 UnknownScript_0x5c1a7: ; 0x5c1a7 - jumpstd $002a + jumpstd giftf end ; 0x5c1ab UnknownScript_0x5c1ab: ; 0x5c1ab - jumpstd $002b + jumpstd packfullf end ; 0x5c1af @@ -674,4 +674,3 @@ NationalPark_MapEventHeader: ; 0x5c806 person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, $ffff person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, $0659 ; 0x5c8ea - diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index bc6d0f4b4..ed3dce387 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -274,4 +274,3 @@ NationalParkBugContest_MapEventHeader: ; 0x5cc5d person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, $0658 person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, $0659 ; 0x5cd27 - diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 7eeb2d671..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,5 +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/OaksLab.asm b/maps/OaksLab.asm index 30f1d3234..0978f32df 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -10,51 +10,46 @@ UnknownScript_0x19b3c7: ; 0x19b3c7 end ; 0x19b3c8 -OakScript_0x19b3c8: ; 0x19b3c8 +Oak: faceplayer loadfont - checkevent $074f - iftrue UnknownScript_0x19b3ea - checkevent $00e1 - iftrue UnknownScript_0x19b3dd - writetext UnknownText_0x19b427 + checkevent EVENT_OPENED_MT_SILVER + iftrue .CheckPokedex + checkevent EVENT_TALKED_TO_OAK_IN_KANTO + iftrue .CheckBadges + writetext OakWelcomeKantoText keeptextopen - setevent $00e1 -UnknownScript_0x19b3dd: ; 0x19b3dd + setevent EVENT_TALKED_TO_OAK_IN_KANTO +.CheckBadges checkcode $7 - if_equal $10, UnknownScript_0x19b3f7 - if_equal $8, UnknownScript_0x19b401 - jump UnknownScript_0x19b408 -; 0x19b3ea + if_equal 16, .OpenMtSilver + if_equal 8, .Complain + jump .AhGood -UnknownScript_0x19b3ea: ; 0x19b3ea - writetext UnknownText_0x19b4a2 +.CheckPokedex + writetext OakLabDexCheckText closetext special ProfOaksPCBoot - writetext UnknownText_0x19b4c8 + writetext OakLabGoodbyeText closetext loadmovesprites end -; 0x19b3f7 -UnknownScript_0x19b3f7: ; 0x19b3f7 - writetext UnknownText_0x19b4fc +.OpenMtSilver + writetext OakOpenMtSilverText keeptextopen - setevent $074f - jump UnknownScript_0x19b3ea -; 0x19b401 + setevent EVENT_OPENED_MT_SILVER + jump .CheckPokedex -UnknownScript_0x19b401: ; 0x19b401 - writetext UnknownText_0x19b6a2 +.Complain + writetext OakNoKantoBadgesText keeptextopen - jump UnknownScript_0x19b3ea -; 0x19b408 + jump .CheckPokedex -UnknownScript_0x19b408: ; 0x19b408 - writetext UnknownText_0x19b73c +.AhGood + writetext OakYesKantoBadgesText keeptextopen - jump UnknownScript_0x19b3ea -; 0x19b40f + jump .CheckPokedex ScientistScript_0x19b40f: ; 0x19b40f jumptextfaceplayer UnknownText_0x19b7fb @@ -68,27 +63,22 @@ ScientistScript_0x19b415: ; 0x19b415 jumptextfaceplayer UnknownText_0x19b8a7 ; 0x19b418 -MapOaksLabSignpost11Script: ; 0x19b418 - jumpstd $0001 -; 0x19b41b +OaksLabBookshelf: + jumpstd difficultbookshelf -MapOaksLabSignpost12Script: ; 0x19b41b - jumptext UnknownText_0x19b8ea -; 0x19b41e +OaksLabPoster1: + jumptext OaksLabPoster1Text -MapOaksLabSignpost13Script: ; 0x19b41e - jumptext UnknownText_0x19b909 -; 0x19b421 +OaksLabPoster2: + jumptext OaksLabPoster2Text -MapOaksLabSignpost14Script: ; 0x19b421 - jumptext UnknownText_0x19b945 -; 0x19b424 +OaksLabTrashcan: + jumptext OaksLabTrashcanText -MapOaksLabSignpost15Script: ; 0x19b424 - jumptext UnknownText_0x19b95e -; 0x19b427 +OaksLabPC: + jumptext OaksLabPCText -UnknownText_0x19b427: ; 0x19b427 +OakWelcomeKantoText: text "OAK: Ah, ", $14, "!" line "It's good of you" @@ -101,24 +91,21 @@ UnknownText_0x19b427: ; 0x19b427 para "out here?" line "Pretty tough, huh?" done -; 0x19b4a2 -UnknownText_0x19b4a2: ; 0x19b4a2 +OakLabDexCheckText: text "How is your #-" line "DEX coming?" para "Let's see…" done -; 0x19b4c8 -UnknownText_0x19b4c8: ; 0x19b4c8 +OakLabGoodbyeText: text "If you're in the" line "area, I hope you" cont "come visit again." done -; 0x19b4fc -UnknownText_0x19b4fc: ; 0x19b4fc +OakOpenMtSilverText: text "OAK: Wow! That's" line "excellent!" @@ -158,9 +145,8 @@ UnknownText_0x19b4fc: ; 0x19b4fc para "reach MT.SILVER" line "from there." done -; 0x19b6a2 -UnknownText_0x19b6a2: ; 0x19b6a2 +OakNoKantoBadgesText: text "OAK: Hmm? You're" line "not collecting" cont "KANTO GYM BADGES?" @@ -175,9 +161,8 @@ UnknownText_0x19b6a2: ; 0x19b6a2 line "you challenge" cont "them." done -; 0x19b73c -UnknownText_0x19b73c: ; 0x19b73c +OakYesKantoBadgesText: text "OAK: Ah, you're" line "collecting KANTO" cont "GYM BADGES." @@ -197,7 +182,6 @@ UnknownText_0x19b73c: ; 0x19b73c para "Keep trying hard," line $14, "!" done -; 0x19b7fb UnknownText_0x19b7fb: ; 0x19b7fb text "The PROF's #MON" @@ -230,28 +214,25 @@ UnknownText_0x19b8a7: ; 0x19b8a7 done ; 0x19b8ea -UnknownText_0x19b8ea: ; 0x19b8ea +OaksLabPoster1Text: text "Press START to" line "open the MENU." done -; 0x19b909 -UnknownText_0x19b909: ; 0x19b909 +OaksLabPoster2Text: text "The SAVE option is" line "on the MENU." para "Use it in a timely" line "manner." done -; 0x19b945 -UnknownText_0x19b945: ; 0x19b945 +OaksLabTrashcanText text "There's nothing in" line "here…" done -; 0x19b95e -UnknownText_0x19b95e: ; 0x19b95e +OaksLabPCText: text "There's an e-mail" line "message on the PC." @@ -292,30 +273,27 @@ OaksLab_MapEventHeader: ; 0x19ba33 ; signposts db 16 - signpost 1, 6, $0, MapOaksLabSignpost11Script - signpost 1, 7, $0, MapOaksLabSignpost11Script - signpost 1, 8, $0, MapOaksLabSignpost11Script - signpost 1, 9, $0, MapOaksLabSignpost11Script - signpost 7, 0, $0, MapOaksLabSignpost11Script - signpost 7, 1, $0, MapOaksLabSignpost11Script - signpost 7, 2, $0, MapOaksLabSignpost11Script - signpost 7, 3, $0, MapOaksLabSignpost11Script - signpost 7, 6, $0, MapOaksLabSignpost11Script - signpost 7, 7, $0, MapOaksLabSignpost11Script - signpost 7, 8, $0, MapOaksLabSignpost11Script - signpost 7, 9, $0, MapOaksLabSignpost11Script - signpost 0, 4, $0, MapOaksLabSignpost12Script - signpost 0, 5, $0, MapOaksLabSignpost13Script - signpost 3, 9, $0, MapOaksLabSignpost14Script - signpost 1, 0, $0, MapOaksLabSignpost15Script + signpost 1, 6, $0, OaksLabBookshelf + signpost 1, 7, $0, OaksLabBookshelf + signpost 1, 8, $0, OaksLabBookshelf + signpost 1, 9, $0, OaksLabBookshelf + signpost 7, 0, $0, OaksLabBookshelf + signpost 7, 1, $0, OaksLabBookshelf + signpost 7, 2, $0, OaksLabBookshelf + signpost 7, 3, $0, OaksLabBookshelf + signpost 7, 6, $0, OaksLabBookshelf + signpost 7, 7, $0, OaksLabBookshelf + signpost 7, 8, $0, OaksLabBookshelf + signpost 7, 9, $0, OaksLabBookshelf + signpost 0, 4, $0, OaksLabPoster1 + signpost 0, 5, $0, OaksLabPoster2 + signpost 3, 9, $0, OaksLabTrashcan + signpost 1, 0, $0, OaksLabPC ; people-events db 4 - person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, OakScript_0x19b3c8, $ffff + person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, $ffff person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, $ffff person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, $ffff person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, $ffff ; 0x19bac7 - - - diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index dd948ed90..f108b3936 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -102,4 +102,3 @@ OlivineCafe_MapEventHeader: ; 0x9ca8e person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, $ffff person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, $ffff ; 0x9cac5 - diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 714904162..c2fc5448f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,33 +1,28 @@ -OlivineCity_MapScriptHeader: ; 0x1a8820 +OlivineCity_MapScriptHeader: ; trigger count 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 -; 0x1a882d - -UnknownScript_0x1a882d: ; 0x1a882d +.Trigger1 end -; 0x1a882e -UnknownScript_0x1a882e: ; 0x1a882e +.Trigger2 end -; 0x1a882f -UnknownScript_0x1a882f: ; 0x1a882f - setflag $0047 +.FlyPoint + setflag ENGINE_FLYPOINT_OLIVINE return -; 0x1a8833 -UnknownScript_0x1a8833: ; 0x1a8833 +UnknownScript_0x1a8833: spriteface $0, $2 showemote $0, $0, 15 special Functionc48f @@ -50,9 +45,8 @@ UnknownScript_0x1a8833: ; 0x1a8833 variablesprite $5, $31 special Function14209 end -; 0x1a886b -UnknownScript_0x1a886b: ; 0x1a886b +UnknownScript_0x1a886b: spriteface $0, $2 showemote $0, $0, 15 special Functionc48f @@ -75,13 +69,11 @@ UnknownScript_0x1a886b: ; 0x1a886b variablesprite $5, $31 special Function14209 end -; 0x1a88a3 -SailorScript_0x1a88a3: ; 0x1a88a3 +SailorScript_0x1a88a3: jumptextfaceplayer UnknownText_0x1a8a58 -; 0x1a88a6 -StandingYoungsterScript_0x1a88a6: ; 0x1a88a6 +StandingYoungsterScript_0x1a88a6: faceplayer loadfont random $2 @@ -90,63 +82,51 @@ StandingYoungsterScript_0x1a88a6: ; 0x1a88a6 closetext loadmovesprites end -; 0x1a88b4 -UnknownScript_0x1a88b4: ; 0x1a88b4 +UnknownScript_0x1a88b4: writetext UnknownText_0x1a8b41 closetext loadmovesprites end -; 0x1a88ba -SailorScript_0x1a88ba: ; 0x1a88ba +SailorScript_0x1a88ba: jumptextfaceplayer UnknownText_0x1a8b71 -; 0x1a88bd -MapOlivineCitySignpost0Script: ; 0x1a88bd - jumptext UnknownText_0x1a8bd0 -; 0x1a88c0 +OlivineCitySign: + jumptext OlivineCitySignText -MapOlivineCitySignpost1Script: ; 0x1a88c0 - jumptext UnknownText_0x1a8c00 -; 0x1a88c3 +OlivineCityPortSign: + jumptext OlivineCityPortSignText -MapOlivineCitySignpost2Script: ; 0x1a88c3 - jumptext UnknownText_0x1a8c1d -; 0x1a88c6 +OlivineGymSign: + jumptext OlivineGymSignText -MapOlivineCitySignpost3Script: ; 0x1a88c6 - jumptext UnknownText_0x1a8c60 -; 0x1a88c9 +OlivineLighthouseSign: + jumptext OlivineLighthouseSignText -MapOlivineCitySignpost4Script: ; 0x1a88c9 - jumptext UnknownText_0x1a8c99 -; 0x1a88cc +OlivineCityBattleTowerSign: + jumptext OlivineCityBattleTowerSignText -MapOlivineCitySignpost5Script: ; 0x1a88cc - jumpstd $0010 -; 0x1a88cf +OlivineCityPokeCenterSign: + jumpstd pokecentersign -MapOlivineCitySignpost6Script: ; 0x1a88cf - jumpstd $0011 -; 0x1a88d2 +OlivineCityMartSign: + jumpstd martsign -MovementData_0x1a88d2: ; 0x1a88d2 +MovementData_0x1a88d2: step_down step_right step_right step_end -; 0x1a88d6 -MovementData_0x1a88d6: ; 0x1a88d6 +MovementData_0x1a88d6: step_down step_down step_right step_right step_end -; 0x1a88db -MovementData_0x1a88db: ; 0x1a88db +MovementData_0x1a88db: step_right step_right step_right @@ -160,9 +140,8 @@ MovementData_0x1a88db: ; 0x1a88db step_up step_up step_end -; 0x1a88e8 -MovementData_0x1a88e8: ; 0x1a88e8 +MovementData_0x1a88e8: step_right step_right step_right @@ -175,21 +154,18 @@ MovementData_0x1a88e8: ; 0x1a88e8 step_up step_up step_end -; 0x1a88f4 -MovementData_0x1a88f4: ; 0x1a88f4 +MovementData_0x1a88f4: step_down turn_head_up step_end -; 0x1a88f7 -MovementData_0x1a88f7: ; 0x1a88f7 +MovementData_0x1a88f7: step_up turn_head_down step_end -; 0x1a88fa -UnknownText_0x1a88fa: ; 0x1a88fa +UnknownText_0x1a88fa: text "…" para "You again?" @@ -228,9 +204,8 @@ UnknownText_0x1a88fa: ; 0x1a88fa line "make you a bit" cont "less weak!" done -; 0x1a8a58 -UnknownText_0x1a8a58: ; 0x1a8a58 +UnknownText_0x1a8a58: text "Dark roads are" line "dangerous at" cont "night." @@ -247,26 +222,23 @@ UnknownText_0x1a8a58: ; 0x1a8a58 para "to guide it, no" line "ship can sail." done -; 0x1a8b04 -UnknownText_0x1a8b04: ; 0x1a8b04 +UnknownText_0x1a8b04: text "That thing you" line "have--it's a #-" cont "GEAR, right? Wow," cont "that's cool." done -; 0x1a8b41 -UnknownText_0x1a8b41: ; 0x1a8b41 +UnknownText_0x1a8b41: text "Wow, you have a" line "#DEX!" para "That is just so" line "awesome." done -; 0x1a8b71 -UnknownText_0x1a8b71: ; 0x1a8b71 +UnknownText_0x1a8b71: text "The sea is sweet!" para "Sunsets on the sea" @@ -276,23 +248,20 @@ UnknownText_0x1a8b71: ; 0x1a8b71 line "Yo-ho! Blow the" cont "man down!…" done -; 0x1a8bd0 -UnknownText_0x1a8bd0: ; 0x1a8bd0 +OlivineCitySignText: text "OLIVINE CITY" para "The Port Closest" line "to Foreign Lands" done -; 0x1a8c00 -UnknownText_0x1a8c00: ; 0x1a8c00 +OlivineCityPortSignText: text "OLIVINE PORT" line "FAST SHIP PIER" done -; 0x1a8c1d -UnknownText_0x1a8c1d: ; 0x1a8c1d +OlivineGymSignText: text "OLIVINE CITY" line "#MON GYM" cont "LEADER: JASMINE" @@ -300,27 +269,23 @@ UnknownText_0x1a8c1d: ; 0x1a8c1d para "The Steel-Clad" line "Defense Girl" done -; 0x1a8c60 -UnknownText_0x1a8c60: ; 0x1a8c60 +OlivineLighthouseSignText: text "OLIVINE LIGHTHOUSE" line "Also known as the" cont "GLITTER LIGHTHOUSE" done -; 0x1a8c99 -UnknownText_0x1a8c99: ; 0x1a8c99 +OlivineCityBattleTowerSignText: text "BATTLE TOWER AHEAD" line "Opening Now!" done -; 0x1a8cba -UnknownText_0x1a8cba: ; 0x1a8cba +UnknownText_0x1a8cba: text "BATTLE TOWER AHEAD" done -; 0x1a8cce -OlivineCity_MapEventHeader: ; 0x1a8cce +OlivineCity_MapEventHeader: ; filler db 0, 0 @@ -345,13 +310,13 @@ OlivineCity_MapEventHeader: ; 0x1a8cce ; signposts db 7 - signpost 11, 17, $0, MapOlivineCitySignpost0Script - signpost 24, 20, $0, MapOlivineCitySignpost1Script - signpost 11, 7, $0, MapOlivineCitySignpost2Script - signpost 28, 30, $0, MapOlivineCitySignpost3Script - signpost 23, 3, $0, MapOlivineCitySignpost4Script - signpost 21, 14, $0, MapOlivineCitySignpost5Script - signpost 17, 20, $0, MapOlivineCitySignpost6Script + signpost 11, 17, $0, OlivineCitySign + signpost 24, 20, $0, OlivineCityPortSign + signpost 11, 7, $0, OlivineGymSign + signpost 28, 30, $0, OlivineLighthouseSign + signpost 23, 3, $0, OlivineCityBattleTowerSign + signpost 21, 14, $0, OlivineCityPokeCenterSign + signpost 17, 20, $0, OlivineCityMartSign ; people-events db 4 @@ -359,5 +324,3 @@ OlivineCity_MapEventHeader: ; 0x1a8cce person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, $ffff person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, $ffff person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c3 -; 0x1a8d72 - diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index a5f1555f5..964c61437 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,48 +1,44 @@ -OlivineGoodRodHouse_MapScriptHeader: ; 0x9c719 +OlivineGoodRodHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x9c71b -FishingGuruScript_0x9c71b: ; 0x9c71b +GoodRodGuru: faceplayer loadfont checkevent EVENT_GOT_GOOD_ROD - iftrue UnknownScript_0x9c740 - writetext UnknownText_0x9c749 + iftrue .AlreadyGotItem + writetext OfferGoodRodText yesorno - iffalse UnknownScript_0x9c73a - writetext UnknownText_0x9c7db + iffalse .DontWantIt + writetext GiveGoodRodText keeptextopen verbosegiveitem GOOD_ROD, 1 - writetext UnknownText_0x9c807 + writetext GaveGoodRodText closetext loadmovesprites setevent EVENT_GOT_GOOD_ROD end -; 0x9c73a -UnknownScript_0x9c73a: ; 0x9c73a - writetext UnknownText_0x9c84c +.DontWantIt + writetext DontWantGoodRodText closetext loadmovesprites end -; 0x9c740 -UnknownScript_0x9c740: ; 0x9c740 - writetext UnknownText_0x9c87f +.AlreadyGotItem + writetext HaveGoodRodText closetext loadmovesprites end -; 0x9c746 -UnknownScript_0x9c746: ; 0x9c746 - jumpstd $0002 -; 0x9c749 +GoodRodHouseBookshelf: +; unused + jumpstd picturebookshelf -UnknownText_0x9c749: ; 0x9c749 +OfferGoodRodText: text "OLIVINE is on the" line "sea!" @@ -57,38 +53,33 @@ UnknownText_0x9c749: ; 0x9c749 line "face the sea and" cont "fish?" done -; 0x9c7db -UnknownText_0x9c7db: ; 0x9c7db +GiveGoodRodText: text "Ah, hahah!" line "We have ourselves" cont "a new angler!" done -; 0x9c807 -UnknownText_0x9c807: ; 0x9c807 +GaveGoodRodText: text "Fish aren't found" line "in the sea alone." para "They go wherever" line "there is water." done -; 0x9c84c -UnknownText_0x9c84c: ; 0x9c84c +DontWantGoodRodText: text "Whaaat? You don't" line "like to fish!?" cont "Incomprehensible!" done -; 0x9c87f -UnknownText_0x9c87f: ; 0x9c87f +HaveGoodRodText: text "How are things?" line "Land the big one?" done -; 0x9c8a2 -OlivineGoodRodHouse_MapEventHeader: ; 0x9c8a2 +OlivineGoodRodHouse_MapEventHeader: ; filler db 0, 0 @@ -105,6 +96,4 @@ OlivineGoodRodHouse_MapEventHeader: ; 0x9c8a2 ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x9c71b, $ffff -; 0x9c8bf - + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, $ffff diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 209c558f5..5b1f90b93 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -55,11 +55,11 @@ UnknownScript_0x9c178: ; 0x9c178 ; 0x9c181 UnknownScript_0x9c181: ; 0x9c181 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x9c184 UnknownScript_0x9c184: ; 0x9c184 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x9c187 OlivineGymGuyScript: ; 0x9c187 @@ -91,16 +91,13 @@ OlivineGymGuyScript: ; 0x9c187 end ; 0x9c1a9 -MapOlivineGymSignpost1Script: ; 0x9c1a9 - checkflag $001f - iftrue UnknownScript_0x9c1b2 - jumpstd $002d -; 0x9c1b2 - -UnknownScript_0x9c1b2: ; 0x9c1b2 +OlivineGymStatue: + checkflag ENGINE_MINERALBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext JASMINE, 1, $1 - jumpstd $002e -; 0x9c1b9 + jumpstd gymstatue2 UnknownText_0x9c1b9: ; 0x9c1b9 text "…Thank you for" @@ -229,12 +226,11 @@ OlivineGym_MapEventHeader: ; 0x9c526 ; signposts db 2 - signpost 13, 3, $0, MapOlivineGymSignpost1Script - signpost 13, 6, $0, MapOlivineGymSignpost1Script + signpost 13, 3, $0, OlivineGymStatue + signpost 13, 6, $0, OlivineGymStatue ; people-events db 2 person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, $06d3 person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, $ffff ; 0x9c55a - diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index b62b8f9d0..2f3ec9c0e 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -19,13 +19,11 @@ RhydonScript_0x9c592: ; 0x9c592 end ; 0x9c59c -MapOlivineHouseBetaSignpost0Script: ; 0x9c59c - jumpstd $0002 -; 0x9c59f +OlivineHouseBetaBookshelf1: + jumpstd picturebookshelf -MapOlivineHouseBetaSignpost1Script: ; 0x9c59f - jumpstd $0003 -; 0x9c5a2 +OlivineHouseBetaBookshelf2: + jumpstd magazinebookshelf UnknownText_0x9c5a2: ; 0x9c5a2 text "When my #MON" @@ -56,12 +54,11 @@ OlivineHouseBeta_MapEventHeader: ; 0x9c601 ; signposts db 2 - signpost 1, 0, $0, MapOlivineHouseBetaSignpost0Script - signpost 1, 1, $0, MapOlivineHouseBetaSignpost1Script + signpost 1, 0, $0, OlivineHouseBetaBookshelf1 + signpost 1, 1, $0, OlivineHouseBetaBookshelf2 ; people-events db 2 person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, $ffff person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, $ffff ; 0x9c635 - diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 87bd7752a..4b899ee6b 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -60,4 +60,3 @@ OlivineLighthouse1F_MapEventHeader: ; 0x5af36 person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, $ffff person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, $ffff ; 0x5af6f - diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 1223de492..d8c6b1389 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -93,7 +93,7 @@ UnknownScript_0x5afe2: ; 0x5afe2 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x5b01b UnknownScript_0x5afe8: ; 0x5afe8 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x5b00e UnknownScript_0x5afee: ; 0x5afee checkevent EVENT_CLEARED_RADIO_TOWER @@ -157,48 +157,48 @@ UnknownScript_0x5b03f: ; 0x5b03f ; 0x5b053 UnknownScript_0x5b053: ; 0x5b053 - jumpstd $0019 + jumpstd asknumber1m end ; 0x5b057 UnknownScript_0x5b057: ; 0x5b057 - jumpstd $001a + jumpstd asknumber2m end ; 0x5b05b UnknownScript_0x5b05b: ; 0x5b05b - jumpstd $001b + jumpstd registerednumberm end ; 0x5b05f UnknownScript_0x5b05f: ; 0x5b05f - jumpstd $001c + jumpstd numberacceptedm end ; 0x5b063 UnknownScript_0x5b063: ; 0x5b063 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x5b067 UnknownScript_0x5b067: ; 0x5b067 - jumpstd $001e + jumpstd phonefullm end ; 0x5b06b UnknownScript_0x5b06b: ; 0x5b06b - jumpstd $001f + jumpstd rematchm end ; 0x5b06f UnknownScript_0x5b06f: ; 0x5b06f setevent EVENT_HUEY_PROTEIN - jumpstd $0021 + jumpstd packfullm end ; 0x5b076 UnknownScript_0x5b076: ; 0x5b076 - jumpstd $0022 + jumpstd rematchgiftm end ; 0x5b07a @@ -284,4 +284,3 @@ OlivineLighthouse2F_MapEventHeader: ; 0x5b1fd person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, $ffff person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff ; 0x5b23b - diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index f44991413..fd146ddb7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -200,4 +200,3 @@ OlivineLighthouse3F_MapEventHeader: ; 0x5b481 person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664 ; 0x5b4e8 - diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index da6f2143a..641ed5628 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -148,6 +148,3 @@ OlivineLighthouse4F_MapEventHeader: ; 0x5b6c0 person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, $ffff person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie1, $ffff ; 0x5b712 - - - diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 6c0e0b890..1a9d0f7d5 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -161,4 +161,3 @@ OlivineLighthouse5F_MapEventHeader: ; 0x60b20 person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, $0666 person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, $0667 ; 0x60b8f - diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index e9b18143f..f1bf0c5fd 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -299,4 +299,3 @@ OlivineLighthouse6F_MapEventHeader: ; 0x60f53 person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, $ffff person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, $0668 ; 0x60f8f - diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 30b6fd92c..1320a3330 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -67,4 +67,3 @@ OlivineMart_MapEventHeader: ; 0x9cb9e person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, $ffff person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, $ffff ; 0x9cbd5 - diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 1a83aaef1..45e2a8224 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -7,7 +7,7 @@ OlivinePokeCenter1F_MapScriptHeader: ; 0x9c000 ; 0x9c002 NurseScript_0x9c002: ; 0x9c002 - jumpstd $0000 + jumpstd pokecenternurse ; 0x9c005 FishingGuruScript_0x9c005: ; 0x9c005 @@ -71,4 +71,3 @@ OlivinePokeCenter1F_MapEventHeader: ; 0x9c0e4 person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, $ffff person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, $ffff ; 0x9c12d - diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 437db358a..e24328528 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -450,4 +450,3 @@ OlivinePort_MapEventHeader: ; 0x74d18 person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, $0738 person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, $0738 ; 0x74d90 - diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index d14e948c6..e8f865397 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -41,4 +41,3 @@ OlivinePortPassage_MapEventHeader: ; 0x76fec db 1 person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, $0733 ; 0x77018 - diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 25ca2b111..94b83501f 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,28 +1,23 @@ -OlivinePunishmentSpeechHouse_MapScriptHeader: ; 0x9c635 +OlivinePunishmentSpeechHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x9c637 -PokefanMScript_0x9c637: ; 0x9c637 - jumptextfaceplayer UnknownText_0x9c643 -; 0x9c63a +OlivinePunishmentSpeechHouseDad: + jumptextfaceplayer OlivinePunishmentSpeechHouseDadText -LassScript_0x9c63a: ; 0x9c63a - jumptextfaceplayer UnknownText_0x9c6b1 -; 0x9c63d +OlivinePunishmentSpeechHouseDaughter: + jumptextfaceplayer OlivinePunishmentSpeechHouseDaughterText -MapOlivinePunishmentSpeechHouseSignpost1Script: ; 0x9c63d - jumpstd $0002 -; 0x9c640 +OlivinePunishmentSpeechHouseBookshelf2: + jumpstd picturebookshelf -MapOlivinePunishmentSpeechHouseSignpost0Script: ; 0x9c640 - jumpstd $0003 -; 0x9c643 +OlivinePunishmentSpeechHouseBookshelf1: + jumpstd magazinebookshelf -UnknownText_0x9c643: ; 0x9c643 +OlivinePunishmentSpeechHouseDadText: text "Along the way to" line "CIANWOOD, there" @@ -33,16 +28,14 @@ UnknownText_0x9c643: ; 0x9c643 line "to the islands as" cont "punishment!" done -; 0x9c6b1 -UnknownText_0x9c6b1: ; 0x9c6b1 +OlivinePunishmentSpeechHouseDaughterText: text "Whenever I get in" line "trouble, Daddy" cont "always scares me." done -; 0x9c6e5 -OlivinePunishmentSpeechHouse_MapEventHeader: ; 0x9c6e5 +OlivinePunishmentSpeechHouse_MapEventHeader: ; filler db 0, 0 @@ -56,12 +49,10 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; 0x9c6e5 ; signposts db 2 - signpost 1, 0, $0, MapOlivinePunishmentSpeechHouseSignpost0Script - signpost 1, 1, $0, MapOlivinePunishmentSpeechHouseSignpost1Script + signpost 1, 0, $0, OlivinePunishmentSpeechHouseBookshelf1 + signpost 1, 1, $0, OlivinePunishmentSpeechHouseBookshelf2 ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, PokefanMScript_0x9c637, $ffff - person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, LassScript_0x9c63a, $ffff -; 0x9c719 - + person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, $ffff + person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, $ffff diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 50d4cff50..b59b41076 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -1,25 +1,22 @@ -OlivineVoltorbHouse_MapScriptHeader: ; 0x9c55a +OlivineVoltorbHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x9c55c -FishingGuruScript_0x9c55c: ; 0x9c55c +Tim: faceplayer loadfont trade $2 closetext loadmovesprites end -; 0x9c563 -MapOlivineVoltorbHouseSignpost1Script: ; 0x9c563 - jumpstd $0003 -; 0x9c566 +TimsHouseBookshelf: + jumpstd magazinebookshelf -OlivineVoltorbHouse_MapEventHeader: ; 0x9c566 +OlivineVoltorbHouse_MapEventHeader: ; filler db 0, 0 @@ -33,11 +30,9 @@ OlivineVoltorbHouse_MapEventHeader: ; 0x9c566 ; signposts db 2 - signpost 1, 0, $0, MapOlivineVoltorbHouseSignpost1Script - signpost 1, 1, $0, MapOlivineVoltorbHouseSignpost1Script + signpost 1, 0, $0, TimsHouseBookshelf + signpost 1, 1, $0, TimsHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, FishingGuruScript_0x9c55c, $ffff -; 0x9c58d - + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, $ffff diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 3a0c81413..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,14 +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 eb7650ed0..808936031 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ -PewterCity_MapScriptHeader: ; 0x18c000 +PewterCity_MapScriptHeader: ; trigger count db 0 @@ -6,24 +6,19 @@ PewterCity_MapScriptHeader: ; 0x18c000 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x18c005 -; 0x18c005 - -UnknownScript_0x18c005: ; 0x18c005 - setflag $0037 +.FlyPoint + setflag ENGINE_FLYPOINT_PEWTER return -; 0x18c009 -CooltrainerFScript_0x18c009: ; 0x18c009 +CooltrainerFScript_0x18c009: jumptextfaceplayer UnknownText_0x18c042 -; 0x18c00c -BugCatcherScript_0x18c00c: ; 0x18c00c +BugCatcherScript_0x18c00c: jumptextfaceplayer UnknownText_0x18c080 -; 0x18c00f -GrampsScript_0x18c00f: ; 0x18c00f +GrampsScript_0x18c00f: faceplayer loadfont checkevent EVENT_GOT_SILVER_WING @@ -34,61 +29,49 @@ GrampsScript_0x18c00f: ; 0x18c00f setevent EVENT_GOT_SILVER_WING loadmovesprites end -; 0x18c023 -UnknownScript_0x18c023: ; 0x18c023 +UnknownScript_0x18c023: writetext UnknownText_0x18c1aa closetext loadmovesprites end -; 0x18c029 -MapPewterCitySignpost0Script: ; 0x18c029 - jumptext UnknownText_0x18c1ff -; 0x18c02c +PewterCitySign: + jumptext PewterCitySignText -MapPewterCitySignpost1Script: ; 0x18c02c - jumptext UnknownText_0x18c21e -; 0x18c02f +PewterGymSign: + jumptext PewterGymSignText -MapPewterCitySignpost2Script: ; 0x18c02f - jumptext UnknownText_0x18c25e -; 0x18c032 +PewterMuseumSign: + jumptext PewterMuseumSignText -MapPewterCitySignpost3Script: ; 0x18c032 - jumptext UnknownText_0x18c2a9 -; 0x18c035 +PewterCityMtMoonGiftShopSign: + jumptext PewterCityMtMoonGiftShopSignText -MapPewterCitySignpost4Script: ; 0x18c035 - jumptext UnknownText_0x18c2dc -; 0x18c038 +PewterCityWelcomeSign: + jumptext PewterCityWelcomeSignText -MapPewterCitySignpost5Script: ; 0x18c038 - jumpstd $0010 -; 0x18c03b +PewterCityPokeCenterSign: + jumpstd pokecentersign -MapPewterCitySignpost6Script: ; 0x18c03b - jumpstd $0011 -; 0x18c03e +PewterCityMartSign: + jumpstd martsign -FruitTreeScript_0x18c03e: ; 0x18c03e +FruitTreeScript_0x18c03e: fruittree $1c -; 0x18c040 -FruitTreeScript_0x18c040: ; 0x18c040 +FruitTreeScript_0x18c040: fruittree $1d -; 0x18c042 -UnknownText_0x18c042: ; 0x18c042 +UnknownText_0x18c042: text "Have you visited" line "PEWTER GYM?" para "The LEADER uses" line "rock-type #MON." done -; 0x18c080 -UnknownText_0x18c080: ; 0x18c080 +UnknownText_0x18c080: text "At night, CLEFAIRY" line "come out to play" cont "at MT.MOON." @@ -96,9 +79,8 @@ UnknownText_0x18c080: ; 0x18c080 para "But not every" line "night." done -; 0x18c0c6 -UnknownText_0x18c0c6: ; 0x18c0c6 +UnknownText_0x18c0c6: text "Ah, you came all" line "the way out here" cont "from JOHTO?" @@ -119,9 +101,8 @@ UnknownText_0x18c0c6: ; 0x18c0c6 line "to have this item" cont "I found in JOHTO." done -; 0x18c1aa -UnknownText_0x18c1aa: ; 0x18c1aa +UnknownText_0x18c1aa: text "Going to new, un-" line "known places and" cont "seeing new people…" @@ -129,15 +110,13 @@ UnknownText_0x18c1aa: ; 0x18c1aa para "Those are the joys" line "of travel." done -; 0x18c1ff -UnknownText_0x18c1ff: ; 0x18c1ff +PewterCitySignText: text "PEWTER CITY" line "A Stone Gray City" done -; 0x18c21e -UnknownText_0x18c21e: ; 0x18c21e +PewterGymSignText: text "PEWTER CITY" line "#MON GYM" cont "LEADER: BROCK" @@ -145,9 +124,8 @@ UnknownText_0x18c21e: ; 0x18c21e para "The Rock Solid" line "#MON Trainer" done -; 0x18c25e -UnknownText_0x18c25e: ; 0x18c25e +PewterMuseumSignText: text "There's a notice" line "here…" @@ -155,24 +133,21 @@ UnknownText_0x18c25e: ; 0x18c25e line "SCIENCE is closed" cont "for renovations…" done -; 0x18c2a9 -UnknownText_0x18c2a9: ; 0x18c2a9 +PewterCityMtMoonGiftShopSignText: text "There's a notice" line "here…" para "MT.MOON GIFT SHOP" line "NOW OPEN!" done -; 0x18c2dc -UnknownText_0x18c2dc: ; 0x18c2dc +PewterCityWelcomeSignText: text "WELCOME TO" line "PEWTER CITY!" done -; 0x18c2f5 -PewterCity_MapEventHeader: ; 0x18c2f5 +PewterCity_MapEventHeader: ; filler db 0, 0 @@ -189,13 +164,13 @@ PewterCity_MapEventHeader: ; 0x18c2f5 ; signposts db 7 - signpost 23, 25, $0, MapPewterCitySignpost0Script - signpost 17, 11, $0, MapPewterCitySignpost1Script - signpost 9, 15, $0, MapPewterCitySignpost2Script - signpost 19, 33, $0, MapPewterCitySignpost3Script - signpost 29, 19, $0, MapPewterCitySignpost4Script - signpost 25, 14, $0, MapPewterCitySignpost5Script - signpost 17, 24, $0, MapPewterCitySignpost6Script + signpost 23, 25, $0, PewterCitySign + signpost 17, 11, $0, PewterGymSign + signpost 9, 15, $0, PewterMuseumSign + signpost 19, 33, $0, PewterCityMtMoonGiftShopSign + signpost 29, 19, $0, PewterCityWelcomeSign + signpost 25, 14, $0, PewterCityPokeCenterSign + signpost 17, 24, $0, PewterCityMartSign ; people-events db 5 @@ -204,5 +179,3 @@ PewterCity_MapEventHeader: ; 0x18c2f5 person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, $ffff person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, $ffff person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, $ffff -; 0x18c378 - diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 02036f079..809f0d40a 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -84,16 +84,13 @@ PewterGymGuyScript: ; 0x1a28ac end ; 0x1a28c0 -MapPewterGymSignpost1Script: ; 0x1a28c0 - checkflag $0023 - iftrue UnknownScript_0x1a28c9 - jumpstd $002d -; 0x1a28c9 - -UnknownScript_0x1a28c9: ; 0x1a28c9 +PewterGymStatue: + checkflag ENGINE_BOULDERBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext BROCK, 1, $1 - jumpstd $002e -; 0x1a28d0 + jumpstd gymstatue2 UnknownText_0x1a28d0: ; 0x1a28d0 text "BROCK: Wow, it's" @@ -252,8 +249,8 @@ PewterGym_MapEventHeader: ; 0x1a2d88 ; signposts db 2 - signpost 11, 2, $0, MapPewterGymSignpost1Script - signpost 11, 7, $0, MapPewterGymSignpost1Script + signpost 11, 2, $0, PewterGymStatue + signpost 11, 7, $0, PewterGymStatue ; people-events db 3 @@ -261,4 +258,3 @@ PewterGym_MapEventHeader: ; 0x1a2d88 person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff ; 0x1a2dc9 - diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 4588cf7d1..d41c97cfa 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -67,4 +67,3 @@ PewterMart_MapEventHeader: ; 0x1a2eae person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff ; 0x1a2ee5 - diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 69527d0dc..4fc54289d 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -49,4 +49,3 @@ PewterNidoranSpeechHouse_MapEventHeader: ; 0x1a2838 person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, $ffff person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, $ffff ; 0x1a2862 - diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index e9f58f9df..6cc9a3474 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -23,4 +23,3 @@ PewterPokeCEnter2FBeta_MapEventHeader: ; 0x1a304c ; people-events db 0 ; 0x1a3057 - diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index faf3801f3..f8962f9c8 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -7,7 +7,7 @@ PewterPokeCenter1F_MapScriptHeader: ; 0x1a2ee5 ; 0x1a2ee7 NurseScript_0x1a2ee7: ; 0x1a2ee7 - jumpstd $0000 + jumpstd pokecenternurse ; 0x1a2eea TeacherScript_0x1a2eea: ; 0x1a2eea @@ -93,4 +93,3 @@ PewterPokeCenter1F_MapEventHeader: ; 0x1a2ff4 person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, $ffff person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, $ffff ; 0x1a304a - diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index b9ded5852..e6d3ee25c 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,27 +1,23 @@ -PewterSnoozeSpeechHouse_MapScriptHeader: ; 0x1a3057 +PewterSnoozeSpeechHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1a3059 -GrampsScript_0x1a3059: ; 0x1a3059 +GrampsScript_0x1a3059: jumptextfaceplayer UnknownText_0x1a305f -; 0x1a305c -MapPewterSnoozeSpeechHouseSignpost1Script: ; 0x1a305c - jumpstd $0002 -; 0x1a305f +PewterSnoozeSpeechHouseBookshelf: + jumpstd picturebookshelf -UnknownText_0x1a305f: ; 0x1a305f +UnknownText_0x1a305f: text "I like snoozing" line "with the radio on…" cont "…Zzzz…" done -; 0x1a308a -PewterSnoozeSpeechHouse_MapEventHeader: ; 0x1a308a +PewterSnoozeSpeechHouse_MapEventHeader: ; filler db 0, 0 @@ -35,13 +31,9 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; 0x1a308a ; signposts db 2 - signpost 1, 0, $0, MapPewterSnoozeSpeechHouseSignpost1Script - signpost 1, 1, $0, MapPewterSnoozeSpeechHouseSignpost1Script + signpost 1, 0, $0, PewterSnoozeSpeechHouseBookshelf + signpost 1, 1, $0, PewterSnoozeSpeechHouseBookshelf ; people-events db 1 person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, $ffff -; 0x1a30b1 - - - diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 7b00ed670..8bd060f52 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1178,4 +1178,3 @@ PokeCenter2F_MapEventHeader: ; 0x19337f person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, $ffff person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, $0711 ; 0x1933dc - diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 0d03b21d2..b12439b4b 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -34,4 +34,3 @@ PokeSeersHouse_MapEventHeader: ; 0x9e376 db 1 person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, $ffff ; 0x9e393 - diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index ce86fe900..99c23de62 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -347,4 +347,3 @@ PokemonFanClub_MapEventHeader: ; 0x191e4d person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, $0774 person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, $ffff ; 0x191eb5 - diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 8094b2bd6..236285658 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -141,7 +141,7 @@ UnknownScript_0x188e5f: ; 0x188e5f end ; 0x188e65 -FisherScript_0x188e65: ; 0x188e65 +PowerPlantManager: ; 0x188e65 faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART @@ -209,9 +209,8 @@ GymGuyScript_0x188ecb: ; 0x188ecb end ; 0x188ed2 -MapPowerPlantSignpost1Script: ; 0x188ed2 - jumpstd $0001 -; 0x188ed5 +PowerPlantBookshelf: + jumpstd difficultbookshelf MovementData_0x188ed5: ; 0x188ed5 step_right @@ -437,8 +436,8 @@ PowerPlant_MapEventHeader: ; 0x1894b9 ; signposts db 2 - signpost 1, 0, $0, MapPowerPlantSignpost1Script - signpost 1, 1, $0, MapPowerPlantSignpost1Script + signpost 1, 0, $0, PowerPlantBookshelf + signpost 1, 1, $0, PowerPlantBookshelf ; people-events db 7 @@ -447,7 +446,6 @@ PowerPlant_MapEventHeader: ; 0x1894b9 person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, $ffff person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, $ffff person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, $ffff - person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, FisherScript_0x188e65, $ffff + person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, $ffff person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, $ffff ; 0x189536 - diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 8a5f1aca4..bb5945fd8 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -559,4 +559,3 @@ RadioTower1F_MapEventHeader: ; 0x5d68e person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, $06cf person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, $06cf ; 0x5d6fb - diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index b99bae619..8e643ddb0 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -165,7 +165,7 @@ GruntF2Script: ; 0x5d76d end ; 0x5d775 -BuenaScript_0x5d775: ; 0x5d775 +Buena: faceplayer loadfont checkflag $0013 @@ -420,9 +420,8 @@ MapRadioTower2FSignpost5Script: ; 0x5d91b jumptext UnknownText_0x5e463 ; 0x5d91e -MapRadioTower2FSignpost4Script: ; 0x5d91e - jumpstd $0003 -; 0x5d921 +RadioTower2FBookshelf: + jumpstd magazinebookshelf MovementData_0x5d921: ; 0x5d921 slow_step_down @@ -856,9 +855,9 @@ RadioTower2F_MapEventHeader: ; 0x5e481 db 6 signpost 0, 3, $0, MapRadioTower2FSignpost0Script signpost 0, 5, $0, MapRadioTower2FSignpost1Script - signpost 1, 9, $0, MapRadioTower2FSignpost4Script - signpost 1, 10, $0, MapRadioTower2FSignpost4Script - signpost 1, 11, $0, MapRadioTower2FSignpost4Script + signpost 1, 9, $0, RadioTower2FBookshelf + signpost 1, 10, $0, RadioTower2FBookshelf + signpost 1, 11, $0, RadioTower2FBookshelf signpost 0, 13, $0, MapRadioTower2FSignpost5Script ; people-events @@ -872,7 +871,5 @@ RadioTower2F_MapEventHeader: ; 0x5e481 person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, $06d1 person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, $06d0 person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, $ffff - person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, BuenaScript_0x5d775, $ffff + person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, $ffff person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, $06cf -; 0x5e53e - diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index e30e4961a..6d38adb0d 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -461,4 +461,3 @@ RadioTower3F_MapEventHeader: ; 0x5eb01 person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, $06ce person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, $06ce ; 0x5eb80 - diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 1425cfc09..a305cdb57 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -365,6 +365,3 @@ RadioTower4F_MapEventHeader: ; 0x5f01a person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, $06ce person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, $06ce ; 0x5f099 - - - diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index bafa1a755..50cbbd773 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -51,7 +51,7 @@ UnknownScript_0x60011: ; 0x60011 end ; 0x60046 -GentlemanScript_0x60046: ; 0x60046 +Director: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER @@ -60,7 +60,6 @@ GentlemanScript_0x60046: ; 0x60046 closetext loadmovesprites end -; 0x60054 UnknownScript_0x60054: ; 0x60054 writetext UnknownText_0x60824 @@ -160,9 +159,8 @@ UnknownScript_0x600f1: ; 0x600f1 end ; 0x600fb -RockerScript_0x600fb: ; 0x600fb - jumptextfaceplayer UnknownText_0x608be -; 0x600fe +Ben: + jumptextfaceplayer BenText ItemFragment_0x600fe: ; 0x600fe db ULTRA_BALL, 1 @@ -176,9 +174,8 @@ MapRadioTower5FSignpost2Script: ; 0x60103 jumptext UnknownText_0x608f9 ; 0x60106 -MapRadioTower5FSignpost4Script: ; 0x60106 - jumpstd $0003 -; 0x60109 +RadioTower5FBookshelf: + jumpstd magazinebookshelf MovementData_0x60109: ; 0x60109 step_left @@ -450,11 +447,10 @@ UnknownText_0x60824: ; 0x60824 done ; 0x608be -UnknownText_0x608be: ; 0x608be +BenText: text "BEN: Do you listen" line "to our music?" done -; 0x608e0 UnknownText_0x608e0: ; 0x608e0 text "5F DIRECTOR'S" @@ -486,15 +482,14 @@ RadioTower5F_MapEventHeader: ; 0x60906 signpost 0, 3, $0, MapRadioTower5FSignpost0Script signpost 0, 11, $0, MapRadioTower5FSignpost2Script signpost 0, 15, $0, MapRadioTower5FSignpost2Script - signpost 1, 16, $0, MapRadioTower5FSignpost4Script - signpost 1, 17, $0, MapRadioTower5FSignpost4Script + signpost 1, 16, $0, RadioTower5FBookshelf + signpost 1, 17, $0, RadioTower5FBookshelf ; people-events db 5 - person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, GentlemanScript_0x60046, $ffff + person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, $ffff person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, $06ce person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, $06ce - person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, RockerScript_0x600fb, $06d0 + person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, $06d0 person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd ; 0x60980 - diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 751deae02..1f0178a1b 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,46 +1,39 @@ -RedsHouse1F_MapScriptHeader: ; 0x19ae9c +RedsHouse1F_MapScriptHeader: ; trigger count db 1 ; triggers - dw UnknownScript_0x19aea2, $0000 + dw .Trigger, $0000 ; callback count db 0 -; 0x19aea2 -UnknownScript_0x19aea2: ; 0x19aea2 +.Trigger end -; 0x19aea3 -RedsMomScript_0x19aea3: ; 0x19aea3 +RedsMom: faceplayer loadfont checkevent EVENT_MET_REDS_MOM - iftrue UnknownScript_0x19aeb4 - writetext UnknownText_0x19aec0 + iftrue .MetAlready + writetext RedsMomText1 closetext loadmovesprites setevent EVENT_MET_REDS_MOM end -; 0x19aeb4 - -UnknownScript_0x19aeb4: ; 0x19aeb4 - writetext UnknownText_0x19af81 +.MetAlready + writetext RedsMomText2 closetext loadmovesprites end -; 0x19aeba -MapRedsHouse1FSignpost2Script: ; 0x19aeba - jumptext UnknownText_0x19afe8 -; 0x19aebd +RedsHouse1FTV: + jumptext RedsHouse1FTVText -MapRedsHouse1FSignpost1Script: ; 0x19aebd - jumpstd $0002 -; 0x19aec0 +RedsHouse1FBookshelf: + jumpstd picturebookshelf -UnknownText_0x19aec0: ; 0x19aec0 +RedsMomText1: text "Hi!" para "RED's been away" @@ -60,9 +53,8 @@ UnknownText_0x19aec0: ; 0x19aec0 line "but I do worry" cont "about him." done -; 0x19af81 -UnknownText_0x19af81: ; 0x19af81 +RedsMomText2: text "I worry about RED" line "getting hurt or" @@ -74,16 +66,14 @@ UnknownText_0x19af81: ; 0x19af81 para "do." done -; 0x19afe8 -UnknownText_0x19afe8: ; 0x19afe8 +RedsHouse1FTVText: text "They have programs" line "that aren't shown" cont "in JOHTO…" done -; 0x19b017 -RedsHouse1F_MapEventHeader: ; 0x19b017 +RedsHouse1F_MapEventHeader: ; filler db 0, 0 @@ -98,12 +88,10 @@ RedsHouse1F_MapEventHeader: ; 0x19b017 ; signposts db 3 - signpost 1, 0, $0, MapRedsHouse1FSignpost1Script - signpost 1, 1, $0, MapRedsHouse1FSignpost1Script - signpost 1, 2, $0, MapRedsHouse1FSignpost2Script + signpost 1, 0, $0, RedsHouse1FBookshelf + signpost 1, 1, $0, RedsHouse1FBookshelf + signpost 1, 2, $0, RedsHouse1FTV ; people-events db 1 - person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMomScript_0x19aea3, $ffff -; 0x19b048 - + person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, $ffff diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index b0c1ad0e2..864c9d3a9 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -49,4 +49,3 @@ RedsHouse2F_MapEventHeader: ; 0x19b0b9 ; people-events db 0 ; 0x19b0ce - diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index f13e64145..7e4af31bf 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -52,4 +52,3 @@ RockTunnel1F_MapEventHeader: ; 0x743bf person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f ; 0x74407 - diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 1c0d4e396..d6b3ea8c3 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -48,4 +48,3 @@ RockTunnelB1F_MapEventHeader: ; 0x74412 person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781 person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782 ; 0x74458 - diff --git a/maps/Route1.asm b/maps/Route1.asm index eddd39553..dc102136c 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -141,4 +141,3 @@ Route1_MapEventHeader: ; 0x1ac69a person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, $ffff ; 0x1ac6cc - diff --git a/maps/Route10North.asm b/maps/Route10North.asm index a298e6a37..bf120445a 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,25 +1,21 @@ -Route10North_MapScriptHeader: ; 0x1b207e +Route10North_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1b2080 -MapRoute10NorthSignpost0Script: ; 0x1b2080 - jumptext UnknownText_0x1b2086 -; 0x1b2083 +PowerPlantSign: + jumptext PowerPlantSignText -MapRoute10NorthSignpost1Script: ; 0x1b2083 - jumpstd $0010 -; 0x1b2086 +Route10PokeCenterSign: + jumpstd pokecentersign -UnknownText_0x1b2086: ; 0x1b2086 +PowerPlantSignText: text "KANTO POWER PLANT" done -; 0x1b2099 -Route10North_MapEventHeader: ; 0x1b2099 +Route10North_MapEventHeader: ; filler db 0, 0 @@ -33,11 +29,8 @@ Route10North_MapEventHeader: ; 0x1b2099 ; signposts db 2 - signpost 11, 5, $0, MapRoute10NorthSignpost0Script - signpost 1, 12, $0, MapRoute10NorthSignpost1Script + signpost 11, 5, $0, PowerPlantSign + signpost 1, 12, $0, Route10PokeCenterSign ; people-events db 0 -; 0x1b20b3 - - diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 4f75e87dc..b5da11912 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -7,7 +7,7 @@ Route10PokeCenter1F_MapScriptHeader: ; 0x188bd2 ; 0x188bd4 NurseScript_0x188bd4: ; 0x188bd4 - jumpstd $0000 + jumpstd pokecenternurse ; 0x188bd7 GentlemanScript_0x188bd7: ; 0x188bd7 @@ -107,4 +107,3 @@ Route10PokeCenter1F_MapEventHeader: ; 0x188d63 person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, $ffff person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, $ffff ; 0x188dac - diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index 5e1aebf08..24bad9881 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -23,4 +23,3 @@ Route10PokeCenter2FBeta_MapEventHeader: ; 0x188dae ; people-events db 0 ; 0x188db9 - diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 91ff1d882..363dde504 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -136,4 +136,3 @@ Route10South_MapEventHeader: ; 0x1ae504 person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff ; 0x1ae52e - diff --git a/maps/Route11.asm b/maps/Route11.asm index a6badce14..7f9aca992 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -252,4 +252,3 @@ Route11_MapEventHeader: ; 0x68242 person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff ; 0x68293 - diff --git a/maps/Route12.asm b/maps/Route12.asm index 3429f481b..dfad65689 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -278,6 +278,3 @@ Route12_MapEventHeader: ; 0x1a72cf person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788 person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789 ; 0x1a7337 - - - diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 437b549f8..b16d6508e 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -34,9 +34,9 @@ UnknownScript_0x7f4aa: ; 0x7f4aa end ; 0x7f4ac -UnknownScript_0x7f4ac: ; 0x7f4ac - jumpstd $0002 -; 0x7f4af +SuperRodHouseBookshelf: +; unused + jumpstd picturebookshelf UnknownText_0x7f4af: ; 0x7f4af text "I'm the FISHING" @@ -102,4 +102,3 @@ Route12SuperRodHouse_MapEventHeader: ; 0x7f60b db 1 person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, $ffff ; 0x7f628 - diff --git a/maps/Route13.asm b/maps/Route13.asm index 68a58c25f..d2c9930b7 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -324,4 +324,3 @@ Route13_MapEventHeader: ; 0x1a27aa person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff ; 0x1a2805 - diff --git a/maps/Route14.asm b/maps/Route14.asm index 70eb27728..fab1b9790 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -194,4 +194,3 @@ Route14_MapEventHeader: ; 0x1ad6a1 person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, $ffff ; 0x1ad6db - diff --git a/maps/Route15.asm b/maps/Route15.asm index ec144d7ec..cc1e508ba 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -348,4 +348,3 @@ Route15_MapEventHeader: ; 0x1aa90a person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a ; 0x1aa97a - diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 697503ed5..2442a6d4c 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -40,4 +40,3 @@ Route15FuchsiaGate_MapEventHeader: ; 0x1967e1 db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff ; 0x196808 - diff --git a/maps/Route16.asm b/maps/Route16.asm index 4a77c0d56..408d7f5b2 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -58,4 +58,3 @@ Route16_MapEventHeader: ; 0x1ad35c ; people-events db 0 ; 0x1ad380 - diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index e3981abc4..6660d163a 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,29 +1,25 @@ -Route16FuchsiaSpeechHouse_MapScriptHeader: ; 0x73371 +Route16FuchsiaSpeechHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x73373 -SuperNerdScript_0x73373: ; 0x73373 +SuperNerdScript_0x73373: jumptextfaceplayer UnknownText_0x73379 -; 0x73376 -MapRoute16FuchsiaSpeechHouseSignpost1Script: ; 0x73376 - jumpstd $0002 -; 0x73379 +Route16FuchsiaSpeechHouseBookshelf: + jumpstd picturebookshelf -UnknownText_0x73379: ; 0x73379 +UnknownText_0x73379: text "If you cruise down" line "CYCLING ROAD, you" para "will end up in" line "FUCHSIA CITY." done -; 0x733bc -Route16FuchsiaSpeechHouse_MapEventHeader: ; 0x733bc +Route16FuchsiaSpeechHouse_MapEventHeader: ; filler db 0, 0 @@ -37,11 +33,9 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; 0x733bc ; signposts db 2 - signpost 1, 0, $0, MapRoute16FuchsiaSpeechHouseSignpost1Script - signpost 1, 1, $0, MapRoute16FuchsiaSpeechHouseSignpost1Script + signpost 1, 0, $0, Route16FuchsiaSpeechHouseBookshelf + signpost 1, 1, $0, Route16FuchsiaSpeechHouseBookshelf ; people-events db 1 person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, $ffff -; 0x733e3 - diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 96d0b05d5..d306bda8a 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -90,4 +90,3 @@ Route16Gate_MapEventHeader: ; 0x734df db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff ; 0x73516 - diff --git a/maps/Route17.asm b/maps/Route17.asm index e74c537a2..734de0333 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -245,4 +245,3 @@ Route17_MapEventHeader: ; 0x1ad2c5 person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, $ffff person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, $ffff ; 0x1ad313 - diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 987b0b526..ce932c95d 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -81,6 +81,3 @@ Route1718Gate_MapEventHeader: ; 0x736b6 db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff ; 0x736ed - - - diff --git a/maps/Route18.asm b/maps/Route18.asm index 2f94c2917..7d8c954dc 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -139,4 +139,3 @@ Route18_MapEventHeader: ; 0x1ad077 person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, $ffff person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, $ffff ; 0x1ad0a6 - diff --git a/maps/Route19.asm b/maps/Route19.asm index 08ee826cc..a4e1601b3 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -352,4 +352,3 @@ Route19_MapEventHeader: ; 0x19ee31 person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, $ffff person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, $ffff ; 0x19ee94 - diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 23b9de4de..318c4b7bb 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -68,4 +68,3 @@ Route19FuchsiaGate_MapEventHeader: ; 0x1ab4cd db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff ; 0x1ab4f4 - diff --git a/maps/Route2.asm b/maps/Route2.asm index e6cf1e6e9..e37d96887 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -256,4 +256,3 @@ Route2_MapEventHeader: ; 0x1ac4af person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff ; 0x1ac554 - diff --git a/maps/Route20.asm b/maps/Route20.asm index 2d47a5885..c81882bf9 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -198,4 +198,3 @@ Route20_MapEventHeader: ; 0x1acef8 person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff ; 0x1acf2f - diff --git a/maps/Route21.asm b/maps/Route21.asm index 8db97cffe..2efee7505 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -167,4 +167,3 @@ Route21_MapEventHeader: ; 0x1ac97a person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff ; 0x1ac9a7 - diff --git a/maps/Route22.asm b/maps/Route22.asm index cd6242bd6..b1f4b77f5 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -36,4 +36,3 @@ Route22_MapEventHeader: ; 0x7c028 ; people-events db 0 ; 0x7c038 - diff --git a/maps/Route23.asm b/maps/Route23.asm index 1a709039e..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,9 +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/Route24.asm b/maps/Route24.asm index 70e7d577a..fb59d08f5 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -138,4 +138,3 @@ Route24_MapEventHeader: ; 0x1adf50 db 1 person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c ; 0x1adf63 - diff --git a/maps/Route25.asm b/maps/Route25.asm index a003d362c..922b2750f 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -39,7 +39,7 @@ UnknownScript_0x19eea0: ; 0x19eea0 spriteface $0, $2 applymovement $2, MovementData_0x19f000 disappear $2 - clearevent $076f + clearevent EVENT_TRAINERS_IN_CERULEAN_GYM dotrigger $0 special RestartMapMusic end @@ -66,7 +66,7 @@ UnknownScript_0x19eee0: ; 0x19eee0 spriteface $0, $2 applymovement $2, MovementData_0x19f000 disappear $2 - clearevent $076f + clearevent EVENT_TRAINERS_IN_CERULEAN_GYM dotrigger $0 special RestartMapMusic end @@ -622,6 +622,3 @@ Route25_MapEventHeader: ; 0x19f58f person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, $ffff person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b ; 0x19f643 - - - diff --git a/maps/Route26.asm b/maps/Route26.asm index cd7a08c6c..6dade6303 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -94,7 +94,7 @@ UnknownScript_0x1a4d90: ; 0x1a4d90 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a4db6 UnknownScript_0x1a4d96: ; 0x1a4d96 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a4da9 UnknownScript_0x1a4d9c: ; 0x1a4d9c loadtrainer COOLTRAINERM, GAVEN3 @@ -123,37 +123,37 @@ UnknownScript_0x1a4db6: ; 0x1a4db6 ; 0x1a4dbf UnknownScript_0x1a4dbf: ; 0x1a4dbf - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a4dc3 UnknownScript_0x1a4dc3: ; 0x1a4dc3 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a4dc7 UnknownScript_0x1a4dc7: ; 0x1a4dc7 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a4dcb UnknownScript_0x1a4dcb: ; 0x1a4dcb - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a4dcf UnknownScript_0x1a4dcf: ; 0x1a4dcf - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a4dd3 UnknownScript_0x1a4dd3: ; 0x1a4dd3 - jumpstd $001e + jumpstd phonefullm end ; 0x1a4dd7 UnknownScript_0x1a4dd7: ; 0x1a4dd7 - jumpstd $001f + jumpstd rematchm end ; 0x1a4ddb @@ -245,7 +245,7 @@ UnknownScript_0x1a4e4c: ; 0x1a4e4c checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a4e72 UnknownScript_0x1a4e52: ; 0x1a4e52 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a4e65 UnknownScript_0x1a4e58: ; 0x1a4e58 loadtrainer COOLTRAINERF, BETH1 @@ -274,37 +274,37 @@ UnknownScript_0x1a4e72: ; 0x1a4e72 ; 0x1a4e7b UnknownScript_0x1a4e7b: ; 0x1a4e7b - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a4e7f UnknownScript_0x1a4e7f: ; 0x1a4e7f - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a4e83 UnknownScript_0x1a4e83: ; 0x1a4e83 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a4e87 UnknownScript_0x1a4e87: ; 0x1a4e87 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a4e8b UnknownScript_0x1a4e8b: ; 0x1a4e8b - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a4e8f UnknownScript_0x1a4e8f: ; 0x1a4e8f - jumpstd $0028 + jumpstd phonefullf end ; 0x1a4e93 UnknownScript_0x1a4e93: ; 0x1a4e93 - jumpstd $0029 + jumpstd rematchf end ; 0x1a4e97 @@ -583,4 +583,3 @@ Route26_MapEventHeader: ; 0x1a5389 person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, $ffff person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, $06aa ; 0x1a540b - diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 899292903..5d396fc56 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -91,4 +91,3 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; 0x7b375 db 1 person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, $ffff ; 0x7b392 - diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index e44f898c5..284045fdb 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -27,8 +27,8 @@ TeacherScript_0x7b125: ; 0x7b125 end ; 0x7b14a -MapRoute26HealSpeechHouseSignpost1Script: ; 0x7b14a - jumpstd $0002 +Route26HealHouseBookshelf: ; 0x7b14a + jumpstd picturebookshelf ; 0x7b14d UnknownText_0x7b14d: ; 0x7b14d @@ -64,11 +64,9 @@ Route26HealSpeechHouse_MapEventHeader: ; 0x7b1bb ; signposts db 2 - signpost 1, 0, $0, MapRoute26HealSpeechHouseSignpost1Script - signpost 1, 1, $0, MapRoute26HealSpeechHouseSignpost1Script + signpost 1, 0, $0, Route26HealHouseBookshelf + signpost 1, 1, $0, Route26HealHouseBookshelf ; people-events db 1 person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, $ffff -; 0x7b1e2 - diff --git a/maps/Route27.asm b/maps/Route27.asm index 3261eaf19..260184ee6 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -135,7 +135,7 @@ UnknownScript_0x1a0916: ; 0x1a0916 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a093c UnknownScript_0x1a091c: ; 0x1a091c - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a092f UnknownScript_0x1a0922: ; 0x1a0922 loadtrainer BIRD_KEEPER, JOSE2 @@ -176,47 +176,47 @@ UnknownScript_0x1a0954: ; 0x1a0954 ; 0x1a0957 UnknownScript_0x1a0957: ; 0x1a0957 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a095b UnknownScript_0x1a095b: ; 0x1a095b - jumpstd $001a + jumpstd asknumber2m end ; 0x1a095f UnknownScript_0x1a095f: ; 0x1a095f - jumpstd $001b + jumpstd registerednumberm end ; 0x1a0963 UnknownScript_0x1a0963: ; 0x1a0963 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a0967 UnknownScript_0x1a0967: ; 0x1a0967 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a096b UnknownScript_0x1a096b: ; 0x1a096b - jumpstd $001e + jumpstd phonefullm end ; 0x1a096f UnknownScript_0x1a096f: ; 0x1a096f - jumpstd $001f + jumpstd rematchm end ; 0x1a0973 UnknownScript_0x1a0973: ; 0x1a0973 - jumpstd $0020 + jumpstd giftm end ; 0x1a0977 UnknownScript_0x1a0977: ; 0x1a0977 - jumpstd $0021 + jumpstd packfullm end ; 0x1a097b @@ -337,7 +337,7 @@ UnknownScript_0x1a0a00: ; 0x1a0a00 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a0a26 UnknownScript_0x1a0a06: ; 0x1a0a06 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a0a19 UnknownScript_0x1a0a0c: ; 0x1a0a0c loadtrainer COOLTRAINERF, REENA1 @@ -366,37 +366,37 @@ UnknownScript_0x1a0a26: ; 0x1a0a26 ; 0x1a0a2f UnknownScript_0x1a0a2f: ; 0x1a0a2f - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a0a33 UnknownScript_0x1a0a33: ; 0x1a0a33 - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a0a37 UnknownScript_0x1a0a37: ; 0x1a0a37 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a0a3b UnknownScript_0x1a0a3b: ; 0x1a0a3b - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a0a3f UnknownScript_0x1a0a3f: ; 0x1a0a3f - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a0a43 UnknownScript_0x1a0a43: ; 0x1a0a43 - jumpstd $0028 + jumpstd phonefullf end ; 0x1a0a47 UnknownScript_0x1a0a47: ; 0x1a0a47 - jumpstd $0029 + jumpstd rematchf end ; 0x1a0a4b @@ -655,4 +655,3 @@ Route27_MapEventHeader: ; 0x1a0ead person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, $ffff ; 0x1a0f4c - diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 1b4e969fb..561b645ba 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,49 +1,44 @@ -Route27SandstormHouse_MapScriptHeader: ; 0x7b392 +Route27SandstormHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x7b394 -GrannyScript_0x7b394: ; 0x7b394 +SandstormHouseWoman: faceplayer loadfont checkevent EVENT_GOT_TM37_SANDSTORM - iftrue UnknownScript_0x7b3b7 + iftrue .AlreadyGotItem special Function718d - writetext UnknownText_0x7b3c6 + writetext SandstormHouseWomanText1 keeptextopen - if_greater_than $95, UnknownScript_0x7b3aa - jump UnknownScript_0x7b3bd -; 0x7b3aa + if_greater_than $95, .Loyal + jump .Disloyal -UnknownScript_0x7b3aa: ; 0x7b3aa - writetext UnknownText_0x7b42b +.Loyal + writetext SandstormHouseWomanLoyalText keeptextopen verbosegiveitem TM_37, 1 - iffalse UnknownScript_0x7b3bb + iffalse .Done setevent EVENT_GOT_TM37_SANDSTORM -UnknownScript_0x7b3b7: ; 0x7b3b7 - writetext UnknownText_0x7b48f +.AlreadyGotItem + writetext SandstormHouseSandstormDescription closetext -UnknownScript_0x7b3bb: ; 0x7b3bb +.Done loadmovesprites end -; 0x7b3bd -UnknownScript_0x7b3bd: ; 0x7b3bd - writetext UnknownText_0x7b51f +.Disloyal + writetext SandstormHouseWomanDisloyalText closetext loadmovesprites end -; 0x7b3c3 -MapRoute27SandstormHouseSignpost1Script: ; 0x7b3c3 - jumpstd $0003 -; 0x7b3c6 +SandstormHouseBookshelf: + jumpstd magazinebookshelf -UnknownText_0x7b3c6: ; 0x7b3c6 +SandstormHouseWomanText1: text "Where are you off" line "to with #MON?" @@ -55,9 +50,8 @@ UnknownText_0x7b3c6: ; 0x7b3c6 para "Let me see…" done -; 0x7b42b -UnknownText_0x7b42b: ; 0x7b42b +SandstormHouseWomanLoyalText: text "Ah! Your #MON" line "trusts you very" cont "much." @@ -68,9 +62,8 @@ UnknownText_0x7b42b: ; 0x7b42b para "Here. A gift for" line "your journey." done -; 0x7b48f -UnknownText_0x7b48f: ; 0x7b48f +SandstormHouseSandstormDescription: text "TM37 happens to be" line "SANDSTORM." @@ -84,9 +77,8 @@ UnknownText_0x7b48f: ; 0x7b48f para "Use it if you" line "dare. Good luck!" done -; 0x7b51f -UnknownText_0x7b51f: ; 0x7b51f +SandstormHouseWomanDisloyalText: text "If it doesn't come" line "to trust you some" @@ -97,9 +89,8 @@ UnknownText_0x7b51f: ; 0x7b51f line "that binds #MON" cont "and trainers." done -; 0x7b592 -Route27SandstormHouse_MapEventHeader: ; 0x7b592 +Route27SandstormHouse_MapEventHeader: ; filler db 0, 0 @@ -113,11 +104,9 @@ Route27SandstormHouse_MapEventHeader: ; 0x7b592 ; signposts db 2 - signpost 1, 0, $0, MapRoute27SandstormHouseSignpost1Script - signpost 1, 1, $0, MapRoute27SandstormHouseSignpost1Script + signpost 1, 0, $0, SandstormHouseBookshelf + signpost 1, 1, $0, SandstormHouseBookshelf ; people-events db 1 - person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, GrannyScript_0x7b394, $ffff -; 0x7b5b9 - + person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, $ffff diff --git a/maps/Route28.asm b/maps/Route28.asm index f4666347e..61347bb7a 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -41,4 +41,3 @@ Route28_MapEventHeader: ; 0x1a541d ; people-events db 0 ; 0x1a5437 - diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 8c3f3fac6..62c73400e 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -1,54 +1,47 @@ -Route28FamousSpeechHouse_MapScriptHeader: ; 0x1ae651 +Route28FamousSpeechHouse_MapScriptHeader: ; trigger count db 1 ; triggers - dw UnknownScript_0x1ae657, $0000 + dw .Trigger, $0000 ; callback count db 0 -; 0x1ae657 -UnknownScript_0x1ae657: ; 0x1ae657 +.Trigger end -; 0x1ae658 -CooltrainerFScript_0x1ae658: ; 0x1ae658 +Celebrity: faceplayer loadfont checkevent EVENT_GOT_TM47_STEEL_WING - iftrue UnknownScript_0x1ae66f - writetext UnknownText_0x1ae682 + iftrue .AlreadyGotItem + writetext CelebrityText1 keeptextopen verbosegiveitem TM_47, 1 - iffalse UnknownScript_0x1ae66d + iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING -UnknownScript_0x1ae66d: ; 0x1ae66d +.Done loadmovesprites end -; 0x1ae66f - -UnknownScript_0x1ae66f: ; 0x1ae66f - writetext UnknownText_0x1ae6f0 +.AlreadyGotItem + writetext CelebrityText2 closetext loadmovesprites end -; 0x1ae675 -MoltresScript_0x1ae675: ; 0x1ae675 +CelebritysFearow: loadfont - writetext UnknownText_0x1ae752 + writetext CelebritysFearowText cry FEAROW closetext loadmovesprites end -; 0x1ae67f -MapRoute28FamousSpeechHouseSignpost1Script: ; 0x1ae67f - jumpstd $0003 -; 0x1ae682 +CelebrityHouseBookshelf: + jumpstd magazinebookshelf -UnknownText_0x1ae682: ; 0x1ae682 +CelebrityText1: text "Oh, dear." line "You've found me." @@ -59,9 +52,8 @@ UnknownText_0x1ae682: ; 0x1ae682 line "for keeping my" cont "secret. Please?" done -; 0x1ae6f0 -UnknownText_0x1ae6f0: ; 0x1ae6f0 +CelebrityText2: text "It's tough being a" line "top celebrity." @@ -71,14 +63,12 @@ UnknownText_0x1ae6f0: ; 0x1ae6f0 para "I just want to be" line "left alone…" done -; 0x1ae752 -UnknownText_0x1ae752: ; 0x1ae752 +CelebritysFearowText: text "FEAROW: Feero!" done -; 0x1ae762 -Route28FamousSpeechHouse_MapEventHeader: ; 0x1ae762 +Route28FamousSpeechHouse_MapEventHeader: ; filler db 0, 0 @@ -92,13 +82,10 @@ Route28FamousSpeechHouse_MapEventHeader: ; 0x1ae762 ; signposts db 2 - signpost 1, 0, $0, MapRoute28FamousSpeechHouseSignpost1Script - signpost 1, 1, $0, MapRoute28FamousSpeechHouseSignpost1Script + signpost 1, 0, $0, CelebrityHouseBookshelf + signpost 1, 1, $0, CelebrityHouseBookshelf ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1ae658, $ffff - person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x1ae675, $ffff -; 0x1ae796 - - + person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, $ffff + person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, $ffff diff --git a/maps/Route29.asm b/maps/Route29.asm index 0fbc35aa6..ec769ecc3 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -157,9 +157,9 @@ FisherScript_0x1a102e: ; 0x1a102e CooltrainerMScript_0x1a1031: ; 0x1a1031 faceplayer loadfont - checktime $2 + checkday iftrue UnknownScript_0x1a103d - checktime $4 + checknite iftrue UnknownScript_0x1a1043 UnknownScript_0x1a103d: ; 0x1a103d writetext UnknownText_0x1a134c diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 9774d3204..67fbcc415 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -59,6 +59,3 @@ Route2946Gate_MapEventHeader: ; 0x7b674 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, $ffff person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, $ffff ; 0x7b6a8 - - - diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 4c0800f46..fb4ec0110 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -46,4 +46,3 @@ Route2Gate_MapEventHeader: ; 0x9b9ca db 1 person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff ; 0x9b9f1 - diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index a9c52f8e2..941491b80 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -22,11 +22,10 @@ UnknownScript_0x9b85c: ; 0x9b85c UnknownScript_0x9b860: ; 0x9b860 loadmovesprites end -; 0x9b862 -UnknownScript_0x9b862: ; 0x9b862 - jumpstd $0001 -; 0x9b865 +Route2NuggetSpeechHouseBookshelf: +; unused + jumpstd difficultbookshelf UnknownText_0x9b865: ; 0x9b865 text "Hi! Wow, I'm glad" @@ -72,4 +71,3 @@ Route2NuggetSpeechHouse_MapEventHeader: ; 0x9b933 db 1 person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, $ffff ; 0x9b950 - diff --git a/maps/Route3.asm b/maps/Route3.asm index bbe1c47f0..647f3f313 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -235,4 +235,3 @@ Route3_MapEventHeader: ; 0x1ae18a person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff ; 0x1ae1ce - diff --git a/maps/Route30.asm b/maps/Route30.asm index 2e7e990d6..b3737a7e1 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -85,7 +85,7 @@ UnknownScript_0x1a16e0: ; 0x1a16e0 if_equal $1, UnknownScript_0x1a1711 if_equal $0, UnknownScript_0x1a1717 UnknownScript_0x1a16ff: ; 0x1a16ff - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a174b UnknownScript_0x1a1705: ; 0x1a1705 checkevent EVENT_CLEARED_RADIO_TOWER @@ -164,48 +164,48 @@ UnknownScript_0x1a176f: ; 0x1a176f ; 0x1a1783 UnknownScript_0x1a1783: ; 0x1a1783 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a1787 UnknownScript_0x1a1787: ; 0x1a1787 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a178b UnknownScript_0x1a178b: ; 0x1a178b - jumpstd $001b + jumpstd registerednumberm end ; 0x1a178f UnknownScript_0x1a178f: ; 0x1a178f - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a1793 UnknownScript_0x1a1793: ; 0x1a1793 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a1797 UnknownScript_0x1a1797: ; 0x1a1797 - jumpstd $001e + jumpstd phonefullm end ; 0x1a179b UnknownScript_0x1a179b: ; 0x1a179b - jumpstd $001f + jumpstd rematchm end ; 0x1a179f UnknownScript_0x1a179f: ; 0x1a179f setevent EVENT_JOEY_HP_UP - jumpstd $0021 + jumpstd packfullm end ; 0x1a17a6 UnknownScript_0x1a17a6: ; 0x1a17a6 - jumpstd $0022 + jumpstd rematchgiftm end ; 0x1a17aa @@ -534,4 +534,3 @@ Route30_MapEventHeader: ; 0x1a1c54 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 - diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 384c8fa38..85a63bb90 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -24,9 +24,8 @@ UnknownScript_0x196d7d: ; 0x196d7d end ; 0x196d7f -MapRoute30BerrySpeechHouseSignpost1Script: ; 0x196d7f - jumpstd $0003 -; 0x196d82 +Route30BerrySpeechHouseBookshelf: + jumpstd magazinebookshelf UnknownText_0x196d82: ; 0x196d82 text "You know, #MON" @@ -62,11 +61,9 @@ Route30BerrySpeechHouse_MapEventHeader: ; 0x196e20 ; signposts db 2 - signpost 1, 0, $0, MapRoute30BerrySpeechHouseSignpost1Script - signpost 1, 1, $0, MapRoute30BerrySpeechHouseSignpost1Script + signpost 1, 0, $0, Route30BerrySpeechHouseBookshelf + signpost 1, 1, $0, Route30BerrySpeechHouseBookshelf ; people-events db 1 person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, $ffff -; 0x196e47 - diff --git a/maps/Route31.asm b/maps/Route31.asm index b24345965..2c9f5eafa 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -81,7 +81,7 @@ UnknownScript_0x1a5493: ; 0x1a5493 if_equal $1, UnknownScript_0x1a54c4 if_equal $0, UnknownScript_0x1a54ca UnknownScript_0x1a54b2: ; 0x1a54b2 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a54fe UnknownScript_0x1a54b8: ; 0x1a54b8 checkevent EVENT_CLEARED_RADIO_TOWER @@ -177,47 +177,47 @@ UnknownScript_0x1a5549: ; 0x1a5549 ; 0x1a554c UnknownScript_0x1a554c: ; 0x1a554c - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a5550 UnknownScript_0x1a5550: ; 0x1a5550 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a5554 UnknownScript_0x1a5554: ; 0x1a5554 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a5558 UnknownScript_0x1a5558: ; 0x1a5558 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a555c UnknownScript_0x1a555c: ; 0x1a555c - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a5560 UnknownScript_0x1a5560: ; 0x1a5560 - jumpstd $001e + jumpstd phonefullm end ; 0x1a5564 UnknownScript_0x1a5564: ; 0x1a5564 - jumpstd $001f + jumpstd rematchm end ; 0x1a5568 UnknownScript_0x1a5568: ; 0x1a5568 - jumpstd $0020 + jumpstd giftm end ; 0x1a556c UnknownScript_0x1a556c: ; 0x1a556c - jumpstd $0021 + jumpstd packfullm end ; 0x1a5570 @@ -511,4 +511,3 @@ Route31_MapEventHeader: ; 0x1a5a79 person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, $06ae person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, $06af ; 0x1a5af3 - diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index a9fbfa66f..8fa1b26c6 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -50,6 +50,3 @@ Route31VioletGate_MapEventHeader: ; 0x19768c person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff ; 0x1976c0 - - - diff --git a/maps/Route32.asm b/maps/Route32.asm index ac3124f47..c663ff15c 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ -Route32_MapScriptHeader: ; 0x19044f +Route32_MapScriptHeader: ; trigger count db 3 @@ -14,17 +14,14 @@ Route32_MapScriptHeader: ; 0x19044f dbw 2, FriedaCallback -UnknownScript_0x190460: ; 0x190460 +UnknownScript_0x190460: end -; 0x190461 -UnknownScript_0x190461: ; 0x190461 +UnknownScript_0x190461: end -; 0x190462 -UnknownScript_0x190462: ; 0x190462 +UnknownScript_0x190462: end -; 0x190463 FriedaCallback: checkcode $b @@ -36,9 +33,9 @@ FriedaCallback: appear $e return -CooltrainerMScript_0x19046f: ; 0x19046f +CooltrainerMScript_0x19046f: faceplayer -UnknownScript_0x190470: ; 0x190470 +UnknownScript_0x190470: loadfont checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue UnknownScript_0x1904a5 @@ -50,40 +47,35 @@ UnknownScript_0x190470: ; 0x190470 closetext loadmovesprites end -; 0x190489 -UnknownScript_0x190489: ; 0x190489 +UnknownScript_0x190489: writetext UnknownText_0x190820 closetext loadmovesprites end -; 0x19048f -UnknownScript_0x19048f: ; 0x19048f +UnknownScript_0x19048f: writetext UnknownText_0x190925 keeptextopen verbosegiveitem MIRACLE_SEED, 1 iffalse UnknownScript_0x1904a9 setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 jump UnknownScript_0x1904a5 -; 0x19049f -UnknownScript_0x19049f: ; 0x19049f +UnknownScript_0x19049f: writetext UnknownText_0x1908b0 closetext loadmovesprites end -; 0x1904a5 -UnknownScript_0x1904a5: ; 0x1904a5 +UnknownScript_0x1904a5: writetext UnknownText_0x190a15 closetext -UnknownScript_0x1904a9: ; 0x1904a9 +UnknownScript_0x1904a9: loadmovesprites end -; 0x1904ab -UnknownScript_0x1904ab: ; 0x1904ab +UnknownScript_0x1904ab: spriteface $9, $2 spriteface $0, $3 loadfont @@ -98,9 +90,8 @@ UnknownScript_0x1904ab: ; 0x1904ab applymovement $9, MovementData_0x19078c applymovement $9, MovementData_0x19078e end -; 0x1904ce -FisherScript_0x1904ce: ; 0x1904ce +FisherScript_0x1904ce: faceplayer loadfont checkevent EVENT_GOT_TM05_ROAR @@ -110,23 +101,21 @@ FisherScript_0x1904ce: ; 0x1904ce verbosegiveitem TM_05, 1 iffalse UnknownScript_0x1904e7 setevent EVENT_GOT_TM05_ROAR -UnknownScript_0x1904e3: ; 0x1904e3 +UnknownScript_0x1904e3: writetext UnknownText_0x19118c closetext -UnknownScript_0x1904e7: ; 0x1904e7 +UnknownScript_0x1904e7: loadmovesprites end -; 0x1904e9 -UnknownScript_0x1904e9: ; 0x1904e9 +UnknownScript_0x1904e9: spriteface $b, $0 spriteface $0, $1 jump UnknownScript_0x1904f3 -; 0x1904f2 -FisherScript_0x1904f2: ; 0x1904f2 +FisherScript_0x1904f2: faceplayer -UnknownScript_0x1904f3: ; 0x1904f3 +UnknownScript_0x1904f3: dotrigger $2 loadfont writetext UnknownText_0x190a59 @@ -136,16 +125,14 @@ UnknownScript_0x1904f3: ; 0x1904f3 closetext loadmovesprites end -; 0x190503 -UnknownScript_0x190503: ; 0x190503 +UnknownScript_0x190503: writetext UnknownText_0x190afc closetext loadmovesprites end -; 0x190509 -TrainerCamperRoland: ; 0x190509 +TrainerCamperRoland: ; bit/flag number dw $41a @@ -163,18 +150,16 @@ TrainerCamperRoland: ; 0x190509 ; script when talk again dw CamperRolandScript -; 0x190515 -CamperRolandScript: ; 0x190515 +CamperRolandScript: talkaftercancel loadfont writetext UnknownText_0x190faa closetext loadmovesprites end -; 0x19051d -TrainerFisherJustin: ; 0x19051d +TrainerFisherJustin: ; bit/flag number dw $44e @@ -192,18 +177,16 @@ TrainerFisherJustin: ; 0x19051d ; script when talk again dw FisherJustinScript -; 0x190529 -FisherJustinScript: ; 0x190529 +FisherJustinScript: talkaftercancel loadfont writetext UnknownText_0x190b4e closetext loadmovesprites end -; 0x190531 -TrainerFisherRalph1: ; 0x190531 +TrainerFisherRalph1: ; bit/flag number dw $44f @@ -221,9 +204,8 @@ TrainerFisherRalph1: ; 0x190531 ; script when talk again dw FisherRalph1Script -; 0x19053d -FisherRalph1Script: ; 0x19053d +FisherRalph1Script: writecode $17, $11 talkaftercancel loadfont @@ -240,20 +222,18 @@ FisherRalph1Script: ; 0x19053d setevent $0277 scall UnknownScript_0x1905f7 jump UnknownScript_0x190569 -; 0x190566 -UnknownScript_0x190566: ; 0x190566 +UnknownScript_0x190566: scall UnknownScript_0x1905fb -UnknownScript_0x190569: ; 0x190569 +UnknownScript_0x190569: askforphonenumber $11 if_equal $1, UnknownScript_0x19060b if_equal $2, UnknownScript_0x190607 trainertotext FISHER, RALPH1, $0 scall UnknownScript_0x1905ff jump UnknownScript_0x190603 -; 0x19057d -UnknownScript_0x19057d: ; 0x19057d +UnknownScript_0x19057d: scall UnknownScript_0x19060f winlosstext FisherRalph1BeatenText, $0000 copybytetovar wd9fb @@ -262,105 +242,92 @@ UnknownScript_0x19057d: ; 0x19057d if_equal $2, UnknownScript_0x1905a8 if_equal $1, UnknownScript_0x1905ae if_equal $0, UnknownScript_0x1905b4 -UnknownScript_0x19059c: ; 0x19059c +UnknownScript_0x19059c: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1905e8 -UnknownScript_0x1905a2: ; 0x1905a2 - checkevent $0044 +UnknownScript_0x1905a2: + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1905db -UnknownScript_0x1905a8: ; 0x1905a8 +UnknownScript_0x1905a8: checkflag $004a iftrue UnknownScript_0x1905ce -UnknownScript_0x1905ae: ; 0x1905ae +UnknownScript_0x1905ae: checkflag $0048 iftrue UnknownScript_0x1905c1 -UnknownScript_0x1905b4: ; 0x1905b4 +UnknownScript_0x1905b4: loadtrainer FISHER, RALPH1 startbattle returnafterbattle loadvar wd9fb, $1 clearflag $006d end -; 0x1905c1 -UnknownScript_0x1905c1: ; 0x1905c1 +UnknownScript_0x1905c1: loadtrainer FISHER, RALPH2 startbattle returnafterbattle loadvar wd9fb, $2 clearflag $006d end -; 0x1905ce -UnknownScript_0x1905ce: ; 0x1905ce +UnknownScript_0x1905ce: loadtrainer FISHER, RALPH3 startbattle returnafterbattle loadvar wd9fb, $3 clearflag $006d end -; 0x1905db -UnknownScript_0x1905db: ; 0x1905db +UnknownScript_0x1905db: loadtrainer FISHER, RALPH4 startbattle returnafterbattle loadvar wd9fb, $4 clearflag $006d end -; 0x1905e8 -UnknownScript_0x1905e8: ; 0x1905e8 +UnknownScript_0x1905e8: loadtrainer FISHER, RALPH5 startbattle returnafterbattle clearflag $006d end -; 0x1905f1 -UnknownScript_0x1905f1: ; 0x1905f1 +UnknownScript_0x1905f1: writetext UnknownText_0x190c37 closetext loadmovesprites end -; 0x1905f7 -UnknownScript_0x1905f7: ; 0x1905f7 - jumpstd $0019 +UnknownScript_0x1905f7: + jumpstd asknumber1m end -; 0x1905fb -UnknownScript_0x1905fb: ; 0x1905fb - jumpstd $001a +UnknownScript_0x1905fb: + jumpstd asknumber2m end -; 0x1905ff -UnknownScript_0x1905ff: ; 0x1905ff - jumpstd $001b +UnknownScript_0x1905ff: + jumpstd registerednumberm end -; 0x190603 -UnknownScript_0x190603: ; 0x190603 - jumpstd $001c +UnknownScript_0x190603: + jumpstd numberacceptedm end -; 0x190607 -UnknownScript_0x190607: ; 0x190607 - jumpstd $001d +UnknownScript_0x190607: + jumpstd numberdeclinedm end -; 0x19060b -UnknownScript_0x19060b: ; 0x19060b - jumpstd $001e +UnknownScript_0x19060b: + jumpstd phonefullm end -; 0x19060f -UnknownScript_0x19060f: ; 0x19060f - jumpstd $001f +UnknownScript_0x19060f: + jumpstd rematchm end -; 0x190613 -TrainerFisherHenry: ; 0x190613 +TrainerFisherHenry: ; bit/flag number dw $452 @@ -378,18 +345,16 @@ TrainerFisherHenry: ; 0x190613 ; script when talk again dw FisherHenryScript -; 0x19061f -FisherHenryScript: ; 0x19061f +FisherHenryScript: talkaftercancel loadfont writetext UnknownText_0x190df2 closetext loadmovesprites end -; 0x190627 -TrainerPicnickerLiz1: ; 0x190627 +TrainerPicnickerLiz1: ; bit/flag number dw $47e @@ -407,9 +372,8 @@ TrainerPicnickerLiz1: ; 0x190627 ; script when talk again dw PicnickerLiz1Script -; 0x190633 -PicnickerLiz1Script: ; 0x190633 +PicnickerLiz1Script: writecode $17, $12 talkaftercancel loadfont @@ -424,20 +388,18 @@ PicnickerLiz1Script: ; 0x190633 setevent $0279 scall UnknownScript_0x1906e1 jump UnknownScript_0x190659 -; 0x190656 -UnknownScript_0x190656: ; 0x190656 +UnknownScript_0x190656: scall UnknownScript_0x1906e5 -UnknownScript_0x190659: ; 0x190659 +UnknownScript_0x190659: askforphonenumber $12 if_equal $1, UnknownScript_0x1906f5 if_equal $2, UnknownScript_0x1906f1 trainertotext PICNICKER, LIZ1, $0 scall UnknownScript_0x1906e9 jump UnknownScript_0x1906ed -; 0x19066d -UnknownScript_0x19066d: ; 0x19066d +UnknownScript_0x19066d: scall UnknownScript_0x1906f9 winlosstext PicnickerLiz1BeatenText, $0000 copybytetovar wd9fc @@ -446,98 +408,86 @@ UnknownScript_0x19066d: ; 0x19066d if_equal $2, UnknownScript_0x190698 if_equal $1, UnknownScript_0x19069e if_equal $0, UnknownScript_0x1906a4 -UnknownScript_0x19068c: ; 0x19068c - checkevent $0044 +UnknownScript_0x19068c: + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1906d8 -UnknownScript_0x190692: ; 0x190692 +UnknownScript_0x190692: checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1906cb -UnknownScript_0x190698: ; 0x190698 +UnknownScript_0x190698: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x1906be -UnknownScript_0x19069e: ; 0x19069e +UnknownScript_0x19069e: checkflag $0048 iftrue UnknownScript_0x1906b1 -UnknownScript_0x1906a4: ; 0x1906a4 +UnknownScript_0x1906a4: loadtrainer PICNICKER, LIZ1 startbattle returnafterbattle loadvar wd9fc, $1 clearflag $006e end -; 0x1906b1 -UnknownScript_0x1906b1: ; 0x1906b1 +UnknownScript_0x1906b1: loadtrainer PICNICKER, LIZ2 startbattle returnafterbattle loadvar wd9fc, $2 clearflag $006e end -; 0x1906be -UnknownScript_0x1906be: ; 0x1906be +UnknownScript_0x1906be: loadtrainer PICNICKER, LIZ3 startbattle returnafterbattle loadvar wd9fc, $3 clearflag $006e end -; 0x1906cb -UnknownScript_0x1906cb: ; 0x1906cb +UnknownScript_0x1906cb: loadtrainer PICNICKER, LIZ4 startbattle returnafterbattle loadvar wd9fc, $4 clearflag $006e end -; 0x1906d8 -UnknownScript_0x1906d8: ; 0x1906d8 +UnknownScript_0x1906d8: loadtrainer PICNICKER, LIZ5 startbattle returnafterbattle clearflag $006e end -; 0x1906e1 -UnknownScript_0x1906e1: ; 0x1906e1 - jumpstd $0023 +UnknownScript_0x1906e1: + jumpstd asknumber1f end -; 0x1906e5 -UnknownScript_0x1906e5: ; 0x1906e5 - jumpstd $0024 +UnknownScript_0x1906e5: + jumpstd asknumber2f end -; 0x1906e9 -UnknownScript_0x1906e9: ; 0x1906e9 - jumpstd $0025 +UnknownScript_0x1906e9: + jumpstd registerednumberf end -; 0x1906ed -UnknownScript_0x1906ed: ; 0x1906ed - jumpstd $0026 +UnknownScript_0x1906ed: + jumpstd numberacceptedf end -; 0x1906f1 -UnknownScript_0x1906f1: ; 0x1906f1 - jumpstd $0027 +UnknownScript_0x1906f1: + jumpstd numberdeclinedf end -; 0x1906f5 -UnknownScript_0x1906f5: ; 0x1906f5 - jumpstd $0028 +UnknownScript_0x1906f5: + jumpstd phonefullf end -; 0x1906f9 -UnknownScript_0x1906f9: ; 0x1906f9 - jumpstd $0029 +UnknownScript_0x1906f9: + jumpstd rematchf end -; 0x1906fd -TrainerYoungsterAlbert: ; 0x1906fd +TrainerYoungsterAlbert: ; bit/flag number dw $5ab @@ -555,18 +505,16 @@ TrainerYoungsterAlbert: ; 0x1906fd ; script when talk again dw YoungsterAlbertScript -; 0x190709 -YoungsterAlbertScript: ; 0x190709 +YoungsterAlbertScript: talkaftercancel loadfont writetext UnknownText_0x190e82 closetext loadmovesprites end -; 0x190711 -TrainerYoungsterGordon: ; 0x190711 +TrainerYoungsterGordon: ; bit/flag number dw $5ac @@ -584,18 +532,16 @@ TrainerYoungsterGordon: ; 0x190711 ; script when talk again dw YoungsterGordonScript -; 0x19071d -YoungsterGordonScript: ; 0x19071d +YoungsterGordonScript: talkaftercancel loadfont writetext UnknownText_0x190f49 closetext loadmovesprites end -; 0x190725 -TrainerBird_keeperPeter: ; 0x190725 +TrainerBird_keeperPeter: ; bit/flag number dw $407 @@ -613,16 +559,14 @@ TrainerBird_keeperPeter: ; 0x190725 ; script when talk again dw Bird_keeperPeterScript -; 0x190731 -Bird_keeperPeterScript: ; 0x190731 +Bird_keeperPeterScript: talkaftercancel loadfont writetext UnknownText_0x1910d4 closetext loadmovesprites end -; 0x190739 FriedaScript: faceplayer @@ -660,65 +604,53 @@ FriedaNotFridayScript: loadmovesprites end -ItemFragment_0x190773: ; 0x190773 +ItemFragment_0x190773: db GREAT_BALL, 1 -; 0x190775 -ItemFragment_0x190775: ; 0x190775 +ItemFragment_0x190775: db REPEL, 1 -; 0x190777 -MapRoute32Signpost0Script: ; 0x190777 - jumptext UnknownText_0x19133a -; 0x19077a +Route32Sign: + jumptext Route32SignText -MapRoute32Signpost1Script: ; 0x19077a - jumptext UnknownText_0x19135e -; 0x19077d +Route32RuinsSign: + jumptext Route32RuinsSignText -MapRoute32Signpost2Script: ; 0x19077d - jumptext UnknownText_0x19137b -; 0x190780 +Route32UnionCaveSign: + jumptext Route32UnionCaveSignText -MapRoute32Signpost3Script: ; 0x190780 - jumpstd $0010 -; 0x190783 +Route32PokeCenterSign: + jumpstd pokecentersign -MapRoute32SignpostItem4: ; 0x190783 +MapRoute32SignpostItem4: dw $00a5 db GREAT_BALL -; 0x190786 -MapRoute32SignpostItem5: ; 0x190786 +MapRoute32SignpostItem5: dw $00a6 db SUPER_POTION -; 0x190789 -MovementData_0x190789: ; 0x190789 +MovementData_0x190789: step_up step_up step_end -; 0x19078c -MovementData_0x19078c: ; 0x19078c +MovementData_0x19078c: step_down step_end -; 0x19078e -MovementData_0x19078e: ; 0x19078e +MovementData_0x19078e: step_right step_end -; 0x190790 -UnknownText_0x190790: ; 0x190790 +UnknownText_0x190790: text "Wait up!" line "What's the hurry?" done -; 0x1907ab -UnknownText_0x1907ab: ; 0x1907ab +UnknownText_0x1907ab: text $52, ", right?" line "Some guy wearing" @@ -731,10 +663,9 @@ UnknownText_0x1907ab: ; 0x1907ab para "you at the #MON" line "CENTER." done -; 0x190820 ; might not be referenced anywhere -UnknownText_0x190820: ; 0x190820 +UnknownText_0x190820: text "Have you gone to" line "SPROUT TOWER?" @@ -748,9 +679,8 @@ UnknownText_0x190820: ; 0x190820 line "trainers. Go to" cont "SPROUT TOWER!" done -; 0x1908b0 -UnknownText_0x1908b0: ; 0x1908b0 +UnknownText_0x1908b0: text "Have you gone to" line "the #MON GYM?" @@ -762,9 +692,8 @@ UnknownText_0x1908b0: ; 0x1908b0 line "passage for all" cont "trainers!" done -; 0x190925 -UnknownText_0x190925: ; 0x190925 +UnknownText_0x190925: text "You have some good" line "#MON there." @@ -788,18 +717,16 @@ UnknownText_0x190925: ; 0x190925 line "power of grass-" cont "type moves." done -; 0x190a15 -UnknownText_0x190a15: ; 0x190a15 +UnknownText_0x190a15: text "Your experiences" line "in VIOLET CITY" para "should be useful" line "for your journey." done -; 0x190a59 -UnknownText_0x190a59: ; 0x190a59 +UnknownText_0x190a59: text "How would you like" line "to have this" @@ -811,44 +738,38 @@ UnknownText_0x190a59: ; 0x190a59 para "You'll want this!" done -; 0x190acf -UnknownText_0x190acf: ; 0x190acf +UnknownText_0x190acf: text "Tch! I thought" line "kids these days" cont "were loaded…" done -; 0x190afc -UnknownText_0x190afc: ; 0x190afc +UnknownText_0x190afc: text "You don't want it?" line "Then scram. Shoo!" done -; 0x190b21 -FisherJustinSeenText: ; 0x190b21 +FisherJustinSeenText: text "Whoa!" para "You made me lose" line "that fish!" done -; 0x190b44 -FisherJustinBeatenText: ; 0x190b44 +FisherJustinBeatenText: text "Sploosh!" done -; 0x190b4e -UnknownText_0x190b4e: ; 0x190b4e +UnknownText_0x190b4e: text "Calm, collected…" line "The essence of" para "fishing and #-" line "MON is the same." done -; 0x190b8f -FisherRalph1SeenText: ; 0x190b8f +FisherRalph1SeenText: text "I'm really good at" line "both fishing and" cont "#MON." @@ -856,24 +777,21 @@ FisherRalph1SeenText: ; 0x190b8f para "I'm not about to" line "lose to any kid!" done -; 0x190bda -FisherRalph1BeatenText: ; 0x190bda +FisherRalph1BeatenText: text "Tch! I tried to" line "rush things…" done -; 0x190bf8 -UnknownText_0x190bf8: ; 0x190bf8 +UnknownText_0x190bf8: text "Fishing is a life-" line "long passion." para "#MON are life-" line "long friends!" done -; 0x190c37 -UnknownText_0x190c37: ; 0x190c37 +UnknownText_0x190c37: text "One, two, three…" line "Muahahaha, what a" @@ -883,11 +801,10 @@ UnknownText_0x190c37: ; 0x190c37 para "and catch as many" line "as you can, kid!" done -; 0x190c9c ; --- start a segment of possibly unused texts -UnknownText_0x190c9c: ; 0x190c9c +UnknownText_0x190c9c: text "I keep catching" line "the same #MON…" @@ -895,80 +812,69 @@ UnknownText_0x190c9c: ; 0x190c9c line "will turn things" cont "around for me." done -; 0x190ceb -UnknownText_0x190ceb: ; 0x190ceb +UnknownText_0x190ceb: text "Nothing ever goes" line "right for me now…" done -; 0x190d10 -UnknownText_0x190d10: ; 0x190d10 +UnknownText_0x190d10: text "How come the guy" line "next to me catches" cont "good #MON?" done -; 0x190d40 -UnknownText_0x190d40: ; 0x190d40 +UnknownText_0x190d40: text "Heh, I'm on a roll" line "today. How about a" cont "battle, kid?" done -; 0x190d73 -UnknownText_0x190d73: ; 0x190d73 +UnknownText_0x190d73: text "Oof. I wasn't" line "lucky that time." done -; 0x190d92 -UnknownText_0x190d92: ; 0x190d92 +UnknownText_0x190d92: text "You have to have a" line "good ROD if you" para "want to catch good" line "#MON." done -; 0x190dcf ; --- end a segment of possibly unused texts -FisherHenrySeenText: ; 0x190dcf +FisherHenrySeenText: text "My #MON?" line "Freshly caught!" done -; 0x190de9 -FisherHenryBeatenText: ; 0x190de9 +FisherHenryBeatenText: text "SPLASH?" done -; 0x190df2 -UnknownText_0x190df2: ; 0x190df2 +UnknownText_0x190df2: text "Freshly caught" line "#MON are no" para "match for properly" line "raised ones." done -; 0x190e2e -YoungsterAlbertSeenText: ; 0x190e2e +YoungsterAlbertSeenText: text "I haven't seen you" line "around before." para "So you think you" line "are pretty tough?" done -; 0x190e73 -YoungsterAlbertBeatenText: ; 0x190e73 +YoungsterAlbertBeatenText: text "You're strong!" done -; 0x190e82 -UnknownText_0x190e82: ; 0x190e82 +UnknownText_0x190e82: text "I'm going to try" line "to be the best" cont "with my favorites." @@ -977,9 +883,8 @@ UnknownText_0x190e82: ; 0x190e82 line "same tough #MON" cont "as everyone else." done -; 0x190ee8 -YoungsterGordonSeenText: ; 0x190ee8 +YoungsterGordonSeenText: text "I found some good" line "#MON in the" cont "grass!" @@ -987,40 +892,34 @@ YoungsterGordonSeenText: ; 0x190ee8 para "I think they'll do" line "it for me!" done -; 0x190f2b -YoungsterGordonBeatenText: ; 0x190f2b +YoungsterGordonBeatenText: text "Darn. I thought I" line "could win." done -; 0x190f49 -UnknownText_0x190f49: ; 0x190f49 +UnknownText_0x190f49: text "The grass is full" line "of clingy things." done -; 0x190f6e -CamperRolandSeenText: ; 0x190f6e +CamperRolandSeenText: text "That glance…" line "It's intriguing." done -; 0x190f8c -CamperRolandBeatenText: ; 0x190f8c +CamperRolandBeatenText: text "Hmmm. This is" line "disappointing." done -; 0x190faa -UnknownText_0x190faa: ; 0x190faa +UnknownText_0x190faa: text "If you don't want" line "to battle, just" cont "avoid eye contact." done -; 0x190fdf -PicnickerLiz1SeenText: ; 0x190fdf +PicnickerLiz1SeenText: text "Uh-huh. Yeah, and" line "you know…" @@ -1030,50 +929,43 @@ PicnickerLiz1SeenText: ; 0x190fdf para "Oh, all right. But" line "make it fast." done -; 0x19103e -PicnickerLiz1BeatenText: ; 0x19103e +PicnickerLiz1BeatenText: text "Oh! I've got to" line "relieve my anger!" done -; 0x191060 -UnknownText_0x191060: ; 0x191060 +UnknownText_0x191060: text "I was having a" line "nice chat too." done -; 0x19107f -Bird_keeperPeterSeenText: ; 0x19107f +Bird_keeperPeterSeenText: text "That BADGE! It's" line "from VIOLET CITY!" para "You beat FALKNER?" done -; 0x1910b4 -Bird_keeperPeterBeatenText: ; 0x1910b4 +Bird_keeperPeterBeatenText: text "I know what my" line "weaknesses are." done -; 0x1910d4 -UnknownText_0x1910d4: ; 0x1910d4 +UnknownText_0x1910d4: text "I should train" line "again at the GYM" cont "in VIOLET CITY." done -; 0x191105 ; possibly unused -UnknownText_0x191105: ; 0x191105 +UnknownText_0x191105: text "The fishermen" line "yelled at me for" cont "bugging them…" done -; 0x191133 -UnknownText_0x191133: ; 0x191133 +UnknownText_0x191133: text "WROOOOAR!" line "PEOPLE RUN WHEN I" @@ -1083,16 +975,14 @@ UnknownText_0x191133: ; 0x191133 para "THAT PLEASES ME!" line "NOW TAKE THIS!" done -; 0x19118c -UnknownText_0x19118c: ; 0x19118c +UnknownText_0x19118c: text "WROOOAR!" line "IT'S ROAR!" para "EVEN #MON RUN" line "FROM A GOOD ROAR!" done -; 0x1911c1 MeetFriedaText: text "FRIEDA: Yahoo!" @@ -1142,27 +1032,24 @@ FriedaNotFridayText: line "when it's not!" done -UnknownText_0x19133a: ; 0x19133a +Route32SignText: text "ROUTE 32" para "VIOLET CITY -" line "AZALEA TOWN" done -; 0x19135e -UnknownText_0x19135e: ; 0x19135e +Route32RuinsSignText: text "RUINS OF ALPH" line "EAST ENTRANCE" done -; 0x19137b -UnknownText_0x19137b: ; 0x19137b +Route32UnionCaveSignText: text "UNION CAVE" line "AHEAD" done -; 0x19138d -Route32_MapEventHeader: ; 0x19138d +Route32_MapEventHeader: ; filler db 0, 0 @@ -1180,10 +1067,10 @@ Route32_MapEventHeader: ; 0x19138d ; signposts db 6 - signpost 5, 13, $0, MapRoute32Signpost0Script - signpost 1, 9, $0, MapRoute32Signpost1Script - signpost 84, 10, $0, MapRoute32Signpost2Script - signpost 73, 12, $0, MapRoute32Signpost3Script + signpost 5, 13, $0, Route32Sign + signpost 1, 9, $0, Route32RuinsSign + signpost 84, 10, $0, Route32UnionCaveSign + signpost 73, 12, $0, Route32PokeCenterSign signpost 67, 12, $7, MapRoute32SignpostItem4 signpost 40, 11, $7, MapRoute32SignpostItem5 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index db23b7105..602c502fc 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -7,7 +7,7 @@ Route32PokeCenter1F_MapScriptHeader: ; 0x69b50 ; 0x69b52 NurseScript_0x69b52: ; 0x69b52 - jumpstd $0000 + jumpstd pokecenternurse ; 0x69b55 FishingGuruScript_0x69b55: ; 0x69b55 @@ -123,4 +123,3 @@ Route32PokeCenter1F_MapEventHeader: ; 0x69cf9 person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, $ffff person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, $ffff ; 0x69d35 - diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index a588bde83..fde87863b 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -71,4 +71,3 @@ Route32RuinsofAlphGate_MapEventHeader: ; 0x69b0f person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, $ffff person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, $ffff ; 0x69b50 - diff --git a/maps/Route33.asm b/maps/Route33.asm index f8ece08cc..48c6a856a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -73,7 +73,7 @@ UnknownScript_0x1ac070: ; 0x1ac070 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1ac0bc UnknownScript_0x1ac076: ; 0x1ac076 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1ac0af UnknownScript_0x1ac07c: ; 0x1ac07c checkevent EVENT_CLEARED_RADIO_TOWER @@ -133,37 +133,37 @@ UnknownScript_0x1ac0c5: ; 0x1ac0c5 ; 0x1ac0cb UnknownScript_0x1ac0cb: ; 0x1ac0cb - jumpstd $0019 + jumpstd asknumber1m end ; 0x1ac0cf UnknownScript_0x1ac0cf: ; 0x1ac0cf - jumpstd $001a + jumpstd asknumber2m end ; 0x1ac0d3 UnknownScript_0x1ac0d3: ; 0x1ac0d3 - jumpstd $001b + jumpstd registerednumberm end ; 0x1ac0d7 UnknownScript_0x1ac0d7: ; 0x1ac0d7 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1ac0db UnknownScript_0x1ac0db: ; 0x1ac0db - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1ac0df UnknownScript_0x1ac0df: ; 0x1ac0df - jumpstd $001e + jumpstd phonefullm end ; 0x1ac0e3 UnknownScript_0x1ac0e3: ; 0x1ac0e3 - jumpstd $001f + jumpstd rematchm end ; 0x1ac0e7 @@ -252,4 +252,3 @@ Route33_MapEventHeader: ; 0x1ac283 person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, $ffff person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, $ffff ; 0x1ac2ba - diff --git a/maps/Route34.asm b/maps/Route34.asm index 846b84059..6a2c2c20b 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -149,7 +149,7 @@ UnknownScript_0x780dc: ; 0x780dc checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x78128 UnknownScript_0x780e2: ; 0x780e2 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x7811b UnknownScript_0x780e8: ; 0x780e8 checkflag $004b @@ -209,37 +209,37 @@ UnknownScript_0x78131: ; 0x78131 ; 0x78137 UnknownScript_0x78137: ; 0x78137 - jumpstd $0019 + jumpstd asknumber1m end ; 0x7813b UnknownScript_0x7813b: ; 0x7813b - jumpstd $001a + jumpstd asknumber2m end ; 0x7813f UnknownScript_0x7813f: ; 0x7813f - jumpstd $001b + jumpstd registerednumberm end ; 0x78143 UnknownScript_0x78143: ; 0x78143 - jumpstd $001c + jumpstd numberacceptedm end ; 0x78147 UnknownScript_0x78147: ; 0x78147 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x7814b UnknownScript_0x7814b: ; 0x7814b - jumpstd $001e + jumpstd phonefullm end ; 0x7814f UnknownScript_0x7814f: ; 0x7814f - jumpstd $001f + jumpstd rematchm end ; 0x78153 @@ -306,7 +306,7 @@ UnknownScript_0x781be: ; 0x781be checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x7820a UnknownScript_0x781c4: ; 0x781c4 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x781fd UnknownScript_0x781ca: ; 0x781ca checkevent EVENT_CLEARED_RADIO_TOWER @@ -372,54 +372,54 @@ UnknownScript_0x78225: ; 0x78225 ; 0x78228 UnknownScript_0x78228: ; 0x78228 - jumpstd $0023 + jumpstd asknumber1f end ; 0x7822c UnknownScript_0x7822c: ; 0x7822c - jumpstd $0024 + jumpstd asknumber2f end ; 0x78230 UnknownScript_0x78230: ; 0x78230 - jumpstd $0025 + jumpstd registerednumberf end ; 0x78234 UnknownScript_0x78234: ; 0x78234 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x78238 UnknownScript_0x78238: ; 0x78238 - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x7823c UnknownScript_0x7823c: ; 0x7823c - jumpstd $0028 + jumpstd phonefullf end ; 0x78240 UnknownScript_0x78240: ; 0x78240 - jumpstd $0029 + jumpstd rematchf end ; 0x78244 UnknownScript_0x78244: ; 0x78244 - jumpstd $002a + jumpstd giftf end ; 0x78248 UnknownScript_0x78248: ; 0x78248 - jumpstd $002b + jumpstd packfullf end ; 0x7824c OfficerScript_0x7824c: ; 0x7824c faceplayer loadfont - checktime $4 + checknite iffalse UnknownScript_0x78276 checkevent $0546 iftrue UnknownScript_0x78270 @@ -1028,4 +1028,3 @@ Route34_MapEventHeader: ; 0x78a7c person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, $ffff person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, $07bc ; 0x78b5d - diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index e4225f78f..5197082e5 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -172,4 +172,3 @@ Route34IlexForestGate_MapEventHeader: ; 0x62f20 person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, $06eb person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ec ; 0x62f76 - diff --git a/maps/Route35.asm b/maps/Route35.asm index 568fe88ea..9c8c88612 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -82,37 +82,37 @@ UnknownScript_0x19c8ef: ; 0x19c8ef ; 0x19c903 UnknownScript_0x19c903: ; 0x19c903 - jumpstd $0019 + jumpstd asknumber1m end ; 0x19c907 UnknownScript_0x19c907: ; 0x19c907 - jumpstd $001a + jumpstd asknumber2m end ; 0x19c90b UnknownScript_0x19c90b: ; 0x19c90b - jumpstd $001b + jumpstd registerednumberm end ; 0x19c90f UnknownScript_0x19c90f: ; 0x19c90f - jumpstd $001c + jumpstd numberacceptedm end ; 0x19c913 UnknownScript_0x19c913: ; 0x19c913 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19c917 UnknownScript_0x19c917: ; 0x19c917 - jumpstd $001e + jumpstd phonefullm end ; 0x19c91b UnknownScript_0x19c91b: ; 0x19c91b - jumpstd $001f + jumpstd rematchm end ; 0x19c91f @@ -295,7 +295,7 @@ UnknownScript_0x19c9da: ; 0x19c9da checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19ca26 UnknownScript_0x19c9e0: ; 0x19c9e0 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19ca19 UnknownScript_0x19c9e6: ; 0x19c9e6 checkflag $004b @@ -386,7 +386,7 @@ FirebreatherWaltScript: ; 0x19ca41 OfficerScript_0x19ca49: ; 0x19ca49 faceplayer loadfont - checktime $4 + checknite iffalse UnknownScript_0x19ca73 checkevent $0547 iftrue UnknownScript_0x19ca6d @@ -677,4 +677,3 @@ Route35_MapEventHeader: ; 0x19cf9e person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, $ffff person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, $06b2 ; 0x19d04c - diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 271b09614..6f80f9d2e 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -231,4 +231,3 @@ Route35Goldenrodgate_MapEventHeader: ; 0x6a148 person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, $ffff person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, $ffff ; 0x6a189 - diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index da0cc9de6..b45ecddc4 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -75,7 +75,7 @@ UnknownScript_0x6a1d1: ; 0x6a1d1 writetext UnknownText_0x6a7db closetext loadmovesprites - jumpstd $0016 + jumpstd bugcontestresultswarp ; 0x6a1ee UnknownScript_0x6a1ee: ; 0x6a1ee @@ -231,7 +231,7 @@ MapRoute36NationalParkgateSignpost0Script: ; 0x6a2db ; 0x6a2de UnknownScript_0x6a2de: ; 0x6a2de - jumpstd $0015 + jumpstd daytotext end ; 0x6a2e2 @@ -509,4 +509,3 @@ Route35NationalParkgate_MapEventHeader: ; 0x6a9d2 person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, $0734 person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, $0746 ; 0x6aa18 - diff --git a/maps/Route36.asm b/maps/Route36.asm index 38db65fca..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 @@ -239,7 +239,7 @@ UnknownScript_0x19415f: ; 0x19415f checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1941ab UnknownScript_0x194165: ; 0x194165 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19419e UnknownScript_0x19416b: ; 0x19416b checkflag $004b @@ -305,47 +305,47 @@ UnknownScript_0x1941c6: ; 0x1941c6 ; 0x1941c9 UnknownScript_0x1941c9: ; 0x1941c9 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1941cd UnknownScript_0x1941cd: ; 0x1941cd - jumpstd $001a + jumpstd asknumber2m end ; 0x1941d1 UnknownScript_0x1941d1: ; 0x1941d1 - jumpstd $001b + jumpstd registerednumberm end ; 0x1941d5 UnknownScript_0x1941d5: ; 0x1941d5 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1941d9 UnknownScript_0x1941d9: ; 0x1941d9 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1941dd UnknownScript_0x1941dd: ; 0x1941dd - jumpstd $001e + jumpstd phonefullm end ; 0x1941e1 UnknownScript_0x1941e1: ; 0x1941e1 - jumpstd $001f + jumpstd rematchm end ; 0x1941e5 UnknownScript_0x1941e5: ; 0x1941e5 - jumpstd $0020 + jumpstd giftm end ; 0x1941e9 UnknownScript_0x1941e9: ; 0x1941e9 - jumpstd $0021 + jumpstd packfullm end ; 0x1941ed @@ -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/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 5414e9b46..42293f109 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -83,7 +83,7 @@ UnknownScript_0x6ab47: ; 0x6ab47 applymovement $0, MovementData_0x6add1 pause 15 special Function8c0ab - jumpstd $0017 + jumpstd bugcontestresults ; 0x6ab76 UnknownScript_0x6ab76: ; 0x6ab76 @@ -320,7 +320,7 @@ OfficerScript_0x6acf4: ; 0x6acf4 ; 0x6ad02 UnknownScript_0x6ad02: ; 0x6ad02 - jumpstd $0015 + jumpstd daytotext end ; 0x6ad06 @@ -964,6 +964,3 @@ Route36NationalParkgate_MapEventHeader: ; 0x6b9ac person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, $0729 person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, $0748 ; 0x6ba67 - - - diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 5a92e2cdf..359f1f269 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -57,4 +57,3 @@ Route36RuinsofAlphgate_MapEventHeader: ; 0x6aac9 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff ; 0x6aafd - diff --git a/maps/Route38.asm b/maps/Route38.asm index 85c08531d..4afbdbff1 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -127,7 +127,7 @@ UnknownScript_0x1a1da1: ; 0x1a1da1 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a1ded UnknownScript_0x1a1da7: ; 0x1a1da7 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a1de0 UnknownScript_0x1a1dad: ; 0x1a1dad checkevent EVENT_CLEARED_RADIO_TOWER @@ -193,47 +193,47 @@ UnknownScript_0x1a1e08: ; 0x1a1e08 ; 0x1a1e0b UnknownScript_0x1a1e0b: ; 0x1a1e0b - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a1e0f UnknownScript_0x1a1e0f: ; 0x1a1e0f - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a1e13 UnknownScript_0x1a1e13: ; 0x1a1e13 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a1e17 UnknownScript_0x1a1e17: ; 0x1a1e17 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a1e1b UnknownScript_0x1a1e1b: ; 0x1a1e1b - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a1e1f UnknownScript_0x1a1e1f: ; 0x1a1e1f - jumpstd $0028 + jumpstd phonefullf end ; 0x1a1e23 UnknownScript_0x1a1e23: ; 0x1a1e23 - jumpstd $0029 + jumpstd rematchf end ; 0x1a1e27 UnknownScript_0x1a1e27: ; 0x1a1e27 - jumpstd $002a + jumpstd giftf end ; 0x1a1e2b UnknownScript_0x1a1e2b: ; 0x1a1e2b - jumpstd $002b + jumpstd packfullf end ; 0x1a1e2f @@ -298,7 +298,7 @@ UnknownScript_0x1a1e94: ; 0x1a1e94 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a1ee0 UnknownScript_0x1a1e9a: ; 0x1a1e9a - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a1ed3 UnknownScript_0x1a1ea0: ; 0x1a1ea0 checkevent EVENT_CLEARED_RADIO_TOWER @@ -351,37 +351,37 @@ UnknownScript_0x1a1ee0: ; 0x1a1ee0 ; 0x1a1ee9 UnknownScript_0x1a1ee9: ; 0x1a1ee9 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a1eed UnknownScript_0x1a1eed: ; 0x1a1eed - jumpstd $001a + jumpstd asknumber2m end ; 0x1a1ef1 UnknownScript_0x1a1ef1: ; 0x1a1ef1 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a1ef5 UnknownScript_0x1a1ef5: ; 0x1a1ef5 - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a1ef9 UnknownScript_0x1a1ef9: ; 0x1a1ef9 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a1efd UnknownScript_0x1a1efd: ; 0x1a1efd - jumpstd $001e + jumpstd phonefullm end ; 0x1a1f01 UnknownScript_0x1a1f01: ; 0x1a1f01 - jumpstd $001f + jumpstd rematchm end ; 0x1a1f05 @@ -652,4 +652,3 @@ Route38_MapEventHeader: ; 0x1a23bb person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, $ffff person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff ; 0x1a2430 - diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 408ebd634..356727576 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -45,4 +45,3 @@ Route38EcruteakGate_MapEventHeader: ; 0x9cc4d db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, $ffff ; 0x9cc74 - diff --git a/maps/Route39.asm b/maps/Route39.asm index e8eba3deb..12f9f13c5 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -85,42 +85,42 @@ UnknownScript_0x1a5b5c: ; 0x1a5b5c ; 0x1a5b62 UnknownScript_0x1a5b62: ; 0x1a5b62 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a5b66 UnknownScript_0x1a5b66: ; 0x1a5b66 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a5b6a UnknownScript_0x1a5b6a: ; 0x1a5b6a - jumpstd $001b + jumpstd registerednumberm end ; 0x1a5b6e UnknownScript_0x1a5b6e: ; 0x1a5b6e - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a5b72 UnknownScript_0x1a5b72: ; 0x1a5b72 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a5b76 UnknownScript_0x1a5b76: ; 0x1a5b76 - jumpstd $001e + jumpstd phonefullm end ; 0x1a5b7a UnknownScript_0x1a5b7a: ; 0x1a5b7a - jumpstd $0020 + jumpstd giftm end ; 0x1a5b7e UnknownScript_0x1a5b7e: ; 0x1a5b7e - jumpstd $0021 + jumpstd packfullm end ; 0x1a5b82 @@ -214,7 +214,7 @@ PsychicNormanScript: ; 0x1a5bb6 PokefanFScript_0x1a5bbe: ; 0x1a5bbe faceplayer loadfont - checktime $4 + checknite iffalse UnknownScript_0x1a5be5 checkevent $05c2 iftrue UnknownScript_0x1a5bdf @@ -480,4 +480,3 @@ Route39_MapEventHeader: ; 0x1a60ba person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, $ffff person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, $ffff ; 0x1a6160 - diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 161e563b8..19fe0ca23 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -229,4 +229,3 @@ Route39Barn_MapEventHeader: ; 0x9ce7b person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, $ffff person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, $ffff ; 0x9ceb2 - diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index b1224e7f6..2c5ead1ea 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -95,8 +95,8 @@ UnknownScript_0x9cf33: ; 0x9cf33 end ; 0x9cf35 -MapRoute39FarmhouseSignpost1Script: ; 0x9cf35 - jumpstd $0002 +FarmhouseBookshelf: + jumpstd picturebookshelf ; 0x9cf38 UnknownText_0x9cf38: ; 0x9cf38 @@ -223,12 +223,11 @@ Route39Farmhouse_MapEventHeader: ; 0x9d242 ; signposts db 2 - signpost 1, 0, $0, MapRoute39FarmhouseSignpost1Script - signpost 1, 1, $0, MapRoute39FarmhouseSignpost1Script + signpost 1, 0, $0, FarmhouseBookshelf + signpost 1, 1, $0, FarmhouseBookshelf ; people-events db 2 person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, $ffff person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, $ffff ; 0x9d276 - diff --git a/maps/Route4.asm b/maps/Route4.asm index 8c69d6d58..f33f7e563 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -207,4 +207,3 @@ Route4_MapEventHeader: ; 0x1ae3ab person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787 ; 0x1ae3f4 - diff --git a/maps/Route40.asm b/maps/Route40.asm index 6b8dab552..ea889d272 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -198,8 +198,8 @@ MapRoute40Signpost0Script: ; 0x1a6213 jumptext UnknownText_0x1a6767 ; 0x1a6216 -RockScript_0x1a6216: ; 0x1a6216 - jumpstd $000f +Route40Rock: ; 0x1a6216 + jumpstd smashrock ; 0x1a6219 MapRoute40SignpostItem1: ; 0x1a6219 @@ -450,9 +450,9 @@ Route40_MapEventHeader: ; 0x1a678e person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, $ffff person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, $ffff person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, $ffff - person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff - person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff - person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff + person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff + person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff + person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, $ffff person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, $ffff person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, $075e person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, $ffff diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index e0ac6bbb7..9a9ef164f 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -100,4 +100,3 @@ Route40BattleTowerGate_MapEventHeader: ; 0x9f81e person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff ; 0x9f852 - diff --git a/maps/Route41.asm b/maps/Route41.asm index 56d2e9c1f..9898b22f3 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -296,9 +296,9 @@ SwimmermMathewScript: ; 0x1a6901 end ; 0x1a6909 -UnknownScript_0x1a6909: ; 0x1a6909 - jumpstd $000f -; 0x1a690c +Route41Rock: +; unused + jumpstd smashrock MapRoute41SignpostItem0: ; 0x1a690c dw $00ac @@ -573,4 +573,3 @@ Route41_MapEventHeader: ; 0x1a6f12 person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff ; 0x1a6fb3 - diff --git a/maps/Route42.asm b/maps/Route42.asm index df3d730df..d2360c4a4 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -93,7 +93,7 @@ UnknownScript_0x1a929a: ; 0x1a929a checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a92d3 UnknownScript_0x1a92a0: ; 0x1a92a0 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a92c6 UnknownScript_0x1a92a6: ; 0x1a92a6 checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -147,47 +147,47 @@ UnknownScript_0x1a92ee: ; 0x1a92ee ; 0x1a92f1 UnknownScript_0x1a92f1: ; 0x1a92f1 - jumpstd $0019 + jumpstd asknumber1m end ; 0x1a92f5 UnknownScript_0x1a92f5: ; 0x1a92f5 - jumpstd $001a + jumpstd asknumber2m end ; 0x1a92f9 UnknownScript_0x1a92f9: ; 0x1a92f9 - jumpstd $001b + jumpstd registerednumberm end ; 0x1a92fd UnknownScript_0x1a92fd: ; 0x1a92fd - jumpstd $001c + jumpstd numberacceptedm end ; 0x1a9301 UnknownScript_0x1a9301: ; 0x1a9301 - jumpstd $001d + jumpstd numberdeclinedm end ; 0x1a9305 UnknownScript_0x1a9305: ; 0x1a9305 - jumpstd $001e + jumpstd phonefullm end ; 0x1a9309 UnknownScript_0x1a9309: ; 0x1a9309 - jumpstd $001f + jumpstd rematchm end ; 0x1a930d UnknownScript_0x1a930d: ; 0x1a930d - jumpstd $0020 + jumpstd giftm end ; 0x1a9311 UnknownScript_0x1a9311: ; 0x1a9311 - jumpstd $0021 + jumpstd packfullm end ; 0x1a9315 @@ -445,4 +445,3 @@ Route42_MapEventHeader: ; 0x1a95c9 person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, $06b4 person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, $07af ; 0x1a967e - diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index cc65e67f1..4ac15e86b 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -40,4 +40,3 @@ Route42EcruteakGate_MapEventHeader: ; 0x19a4fe db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, $ffff ; 0x19a525 - diff --git a/maps/Route43.asm b/maps/Route43.asm index c29d4c1c2..1c3bf0459 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -140,7 +140,7 @@ UnknownScript_0x19d0ea: ; 0x19d0ea checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d123 UnknownScript_0x19d0f0: ; 0x19d0f0 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19d116 UnknownScript_0x19d0f6: ; 0x19d0f6 checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -181,37 +181,37 @@ UnknownScript_0x19d123: ; 0x19d123 ; 0x19d12c UnknownScript_0x19d12c: ; 0x19d12c - jumpstd $0019 + jumpstd asknumber1m end ; 0x19d130 UnknownScript_0x19d130: ; 0x19d130 - jumpstd $001a + jumpstd asknumber2m end ; 0x19d134 UnknownScript_0x19d134: ; 0x19d134 - jumpstd $001b + jumpstd registerednumberm end ; 0x19d138 UnknownScript_0x19d138: ; 0x19d138 - jumpstd $001c + jumpstd numberacceptedm end ; 0x19d13c UnknownScript_0x19d13c: ; 0x19d13c - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19d140 UnknownScript_0x19d140: ; 0x19d140 - jumpstd $001e + jumpstd phonefullm end ; 0x19d144 UnknownScript_0x19d144: ; 0x19d144 - jumpstd $001f + jumpstd rematchm end ; 0x19d148 @@ -337,7 +337,7 @@ UnknownScript_0x19d1dc: ; 0x19d1dc checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d215 UnknownScript_0x19d1e2: ; 0x19d1e2 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19d208 UnknownScript_0x19d1e8: ; 0x19d1e8 checkevent EVENT_CLEARED_RADIO_TOWER @@ -398,47 +398,47 @@ UnknownScript_0x19d233: ; 0x19d233 ; 0x19d239 UnknownScript_0x19d239: ; 0x19d239 - jumpstd $0023 + jumpstd asknumber1f end ; 0x19d23d UnknownScript_0x19d23d: ; 0x19d23d - jumpstd $0024 + jumpstd asknumber2f end ; 0x19d241 UnknownScript_0x19d241: ; 0x19d241 - jumpstd $0025 + jumpstd registerednumberf end ; 0x19d245 UnknownScript_0x19d245: ; 0x19d245 - jumpstd $0026 + jumpstd numberacceptedf end ; 0x19d249 UnknownScript_0x19d249: ; 0x19d249 - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x19d24d UnknownScript_0x19d24d: ; 0x19d24d - jumpstd $0028 + jumpstd phonefullf end ; 0x19d251 UnknownScript_0x19d251: ; 0x19d251 - jumpstd $0029 + jumpstd rematchf end ; 0x19d255 UnknownScript_0x19d255: ; 0x19d255 - jumpstd $002a + jumpstd giftf end ; 0x19d259 UnknownScript_0x19d259: ; 0x19d259 - jumpstd $002b + jumpstd packfullf end ; 0x19d25d @@ -692,4 +692,3 @@ Route43_MapEventHeader: ; 0x19d78c person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, $ffff person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, $06b5 ; 0x19d822 - diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index dc0b45ca6..9e6a606a0 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -301,4 +301,3 @@ Route43Gate_MapEventHeader: ; 0x19ae5b person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc ; 0x19ae9c - diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index e03efe453..f8808672f 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -61,4 +61,3 @@ Route43MahoganyGate_MapEventHeader: ; 0x19ab91 db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, $ffff ; 0x19abb8 - diff --git a/maps/Route44.asm b/maps/Route44.asm index d4d88ff60..0eed20948 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -65,7 +65,7 @@ UnknownScript_0x19d881: ; 0x19d881 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d8a7 UnknownScript_0x19d887: ; 0x19d887 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19d89a UnknownScript_0x19d88d: ; 0x19d88d loadtrainer BIRD_KEEPER, VANCE1 @@ -117,58 +117,58 @@ UnknownScript_0x19d8cb: ; 0x19d8cb ; 0x19d8df UnknownScript_0x19d8df: ; 0x19d8df - jumpstd $0019 + jumpstd asknumber1m end ; 0x19d8e3 UnknownScript_0x19d8e3: ; 0x19d8e3 - jumpstd $001a + jumpstd asknumber2m end ; 0x19d8e7 UnknownScript_0x19d8e7: ; 0x19d8e7 - jumpstd $001b + jumpstd registerednumberm end ; 0x19d8eb UnknownScript_0x19d8eb: ; 0x19d8eb - jumpstd $001c + jumpstd numberacceptedm end ; 0x19d8ef UnknownScript_0x19d8ef: ; 0x19d8ef - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19d8f3 UnknownScript_0x19d8f3: ; 0x19d8f3 - jumpstd $001e + jumpstd phonefullm end ; 0x19d8f7 UnknownScript_0x19d8f7: ; 0x19d8f7 - jumpstd $001f + jumpstd rematchm end ; 0x19d8fb UnknownScript_0x19d8fb: ; 0x19d8fb - jumpstd $0020 + jumpstd giftm end ; 0x19d8ff UnknownScript_0x19d8ff: ; 0x19d8ff - jumpstd $0021 + jumpstd packfullm end ; 0x19d903 UnknownScript_0x19d903: ; 0x19d903 setevent EVENT_VANCE_CARBOS - jumpstd $0021 + jumpstd packfullm end ; 0x19d90a UnknownScript_0x19d90a: ; 0x19d90a - jumpstd $0022 + jumpstd rematchgiftm end ; 0x19d90e @@ -262,7 +262,7 @@ UnknownScript_0x19d985: ; 0x19d985 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19d9ab UnknownScript_0x19d98b: ; 0x19d98b - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19d99e UnknownScript_0x19d991: ; 0x19d991 loadtrainer FISHER, WILTON1 @@ -709,4 +709,3 @@ Route44_MapEventHeader: ; 0x19dff6 person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd ; 0x19e09f - diff --git a/maps/Route45.asm b/maps/Route45.asm index 4a762660f..79e9a1530 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -56,9 +56,9 @@ UnknownScript_0x19e0d0: ; 0x19e0d0 UnknownScript_0x19e0e4: ; 0x19e0e4 checkcode $1a if_not_equal $1, UnknownScript_0x19e127 - checktime $1 + checkmorn iftrue UnknownScript_0x19e10c - checktime $4 + checknite iftrue UnknownScript_0x19e112 checkevent $026a iffalse UnknownScript_0x19e127 @@ -89,58 +89,58 @@ UnknownScript_0x19e118: ; 0x19e118 ; 0x19e11b UnknownScript_0x19e11b: ; 0x19e11b - jumpstd $0019 + jumpstd asknumber1m end ; 0x19e11f UnknownScript_0x19e11f: ; 0x19e11f - jumpstd $001a + jumpstd asknumber2m end ; 0x19e123 UnknownScript_0x19e123: ; 0x19e123 - jumpstd $001b + jumpstd registerednumberm end ; 0x19e127 UnknownScript_0x19e127: ; 0x19e127 - jumpstd $001c + jumpstd numberacceptedm end ; 0x19e12b UnknownScript_0x19e12b: ; 0x19e12b - jumpstd $001d + jumpstd numberdeclinedm end ; 0x19e12f UnknownScript_0x19e12f: ; 0x19e12f - jumpstd $001e + jumpstd phonefullm end ; 0x19e133 UnknownScript_0x19e133: ; 0x19e133 - jumpstd $001f + jumpstd rematchm end ; 0x19e137 UnknownScript_0x19e137: ; 0x19e137 - jumpstd $0020 + jumpstd giftm end ; 0x19e13b UnknownScript_0x19e13b: ; 0x19e13b - jumpstd $0021 + jumpstd packfullm end ; 0x19e13f UnknownScript_0x19e13f: ; 0x19e13f setevent EVENT_PARRY_IRON - jumpstd $0021 + jumpstd packfullm end ; 0x19e146 UnknownScript_0x19e146: ; 0x19e146 - jumpstd $0022 + jumpstd rematchgiftm end ; 0x19e14a @@ -261,7 +261,7 @@ UnknownScript_0x19e1cf: ; 0x19e1c checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x19e1f5 UnknownScript_0x19e1d5: ; 0x19e1d5 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x19e1e8 UnknownScript_0x19e1db: ; 0x19e1db loadtrainer HIKER, PARRY3 @@ -738,4 +738,3 @@ Route45_MapEventHeader: ; 0x19e91b person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, $06bb person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, $ffff ; 0x19e9d9 - diff --git a/maps/Route46.asm b/maps/Route46.asm index 8042da3bd..2853cdd9a 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -94,7 +94,7 @@ UnknownScript_0x1a96f1: ; 0x1a96f1 checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue UnknownScript_0x1a9717 UnknownScript_0x1a96f7: ; 0x1a96f7 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0x1a970a UnknownScript_0x1a96fd: ; 0x1a96fd loadtrainer PICNICKER, ERIN1 @@ -146,48 +146,48 @@ UnknownScript_0x1a973b: ; 0x1a973b ; 0x1a974f UnknownScript_0x1a974f: ; 0x1a974f - jumpstd $0023 + jumpstd asknumber1f end ; 0x1a9753 UnknownScript_0x1a9753: ; 0x1a9753 - jumpstd $0024 + jumpstd asknumber2f end ; 0x1a9757 UnknownScript_0x1a9757: ; 0x1a9757 - jumpstd $0025 + jumpstd registerednumberf end ; 0x1a975b UnknownScript_0x1a975b: ; 0x1a975b - jumpstd $0026 + jumpstd numberacceptedf end ; 0x1a975f UnknownScript_0x1a975f: ; 0x1a975f - jumpstd $0027 + jumpstd numberdeclinedf end ; 0x1a9763 UnknownScript_0x1a9763: ; 0x1a9763 - jumpstd $0028 + jumpstd phonefullf end ; 0x1a9767 UnknownScript_0x1a9767: ; 0x1a9767 - jumpstd $0029 + jumpstd rematchf end ; 0x1a976b UnknownScript_0x1a976b: ; 0x1a976b setevent EVENT_ERIN_CALCIUM - jumpstd $002b + jumpstd packfullf end ; 0x1a9772 UnknownScript_0x1a9772: ; 0x1a9772 - jumpstd $002c + jumpstd rematchgiftf end ; 0x1a9776 @@ -353,4 +353,3 @@ Route46_MapEventHeader: ; 0x1a99db person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc ; 0x1a9a43 - diff --git a/maps/Route5.asm b/maps/Route5.asm index e23f40523..34d706685 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -66,4 +66,3 @@ Route5_MapEventHeader: ; 0x1adbc7 db 1 person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, $0771 ; 0x1adbf8 - diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 806a6554f..6296ec292 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -28,9 +28,8 @@ TeacherScript_0x18b64f: ; 0x18b64f jumptextfaceplayer UnknownText_0x18b6de ; 0x18b652 -MapRoute5CleanseTagSpeechHouseSignpost1Script: ; 0x18b652 - jumpstd $0001 -; 0x18b655 +HouseForSaleBookshelf: + jumpstd difficultbookshelf UnknownText_0x18b655: ; 0x18b655 text "Eeyaaaah!" @@ -77,14 +76,10 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; 0x18b744 ; signposts db 2 - signpost 1, 0, $0, MapRoute5CleanseTagSpeechHouseSignpost1Script - signpost 1, 1, $0, MapRoute5CleanseTagSpeechHouseSignpost1Script + signpost 1, 0, $0, HouseForSaleBookshelf + signpost 1, 1, $0, HouseForSaleBookshelf ; people-events db 2 person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, $ffff person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, $ffff -; 0x18b778 - - - diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 7449e512f..ec49620f2 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -41,4 +41,3 @@ Route5SaffronCityGate_MapEventHeader: ; 0x18b60b db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, $ffff ; 0x18b632 - diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index b718e661c..fbea3ee17 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -39,4 +39,3 @@ Route5UndergroundEntrance_MapEventHeader: ; 0x18b595 db 1 person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, $ffff ; 0x18b5b7 - diff --git a/maps/Route6.asm b/maps/Route6.asm index 5cb412a06..92a7c48b8 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -155,4 +155,3 @@ Route6_MapEventHeader: ; 0x1adadb person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff ; 0x1adb17 - diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 29eea10b6..7d4bc40c0 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -83,4 +83,3 @@ Route6SaffronGate_MapEventHeader: ; 0x192807 db 1 person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff ; 0x19282e - diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index ff205bc63..3035e5095 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -25,4 +25,3 @@ Route6UndergroundEntrance_MapEventHeader: ; 0x192830 ; people-events db 0 ; 0x192845 - diff --git a/maps/Route7.asm b/maps/Route7.asm index 2f83a7edd..b74ae5166 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -59,4 +59,3 @@ Route7_MapEventHeader: ; 0x1ad463 ; people-events db 0 ; 0x1ad47d - diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index cba403de4..d23d9774a 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -68,4 +68,3 @@ Route7SaffronGate_MapEventHeader: ; 0x735e0 db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff ; 0x73607 - diff --git a/maps/Route8.asm b/maps/Route8.asm index b7aad9cd7..70762bb81 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -301,4 +301,3 @@ Route8_MapEventHeader: ; 0x6c2e1 person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, $ffff ; 0x6c349 - diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index ab1013700..382dec3ad 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -40,4 +40,3 @@ Route8SaffronGate_MapEventHeader: ; 0x7f45b db 1 person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff ; 0x7f482 - diff --git a/maps/Route9.asm b/maps/Route9.asm index b5746b97d..a97bc0986 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -354,4 +354,3 @@ Route9_MapEventHeader: ; 0x1ab2c7 person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, $ffff person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, $ffff ; 0x1ab32a - diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 6018c1f7d..767c567db 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -196,4 +196,3 @@ RuinsofAlphAerodactylChamber_MapEventHeader: ; 0x58f22 ; people-events db 0 ; 0x58f5f - diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 2c7f7ee35..ecfd6b1bc 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; 0x59ae6 person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, $07a2 person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, $07a3 ; 0x59b3e - diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index 661933b65..202757766 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphAerodactylWordRoom_MapEventHeader: ; 0x59b85 ; people-events db 0 ; 0x59b9a - diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 6159cf19d..33eb7db97 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -197,4 +197,3 @@ RuinsofAlphHoOhChamber_MapEventHeader: ; 0x586e1 ; people-events db 0 ; 0x5871e - diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 07d3e20d4..aba83e902 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; 0x59948 person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, $0796 person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, $0797 ; 0x599a0 - diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index e51dfc7ea..e0b700866 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphHoOhWordRoom_MapEventHeader: ; 0x59b40 ; people-events db 0 ; 0x59b55 - diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 9e1ed41a6..ba62be9e3 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -143,4 +143,3 @@ RuinsofAlphInnerChamber_MapEventHeader: ; 0x59097 person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, $0705 person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, $0705 ; 0x59173 - diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 57528ffa8..897c7be5c 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -318,4 +318,3 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; 0x58b85 person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, $074e person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, $ffff ; 0x58bdc - diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 02833117a..bf96e08a1 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; 0x599d2 person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, $079a person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, $079b ; 0x59a2a - diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 3e13e8fcb..b8b020fbd 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphKabutoWordRoom_MapEventHeader: ; 0x59b57 ; people-events db 0 ; 0x59b6c - diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 0518c383f..075129a80 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -197,4 +197,3 @@ RuinsofAlphOmanyteChamber_MapEventHeader: ; 0x58d63 ; people-events db 0 ; 0x58da0 - diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 7dcf050fd..e0a84974f 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -59,4 +59,3 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; 0x59a5c person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, $079e person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, $079f ; 0x59ab4 - diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 705aa634e..4059e3651 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -25,4 +25,3 @@ RuinsofAlphOmanyteWordRoom_MapEventHeader: ; 0x59b6e ; people-events db 0 ; 0x59b83 - diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 492e9d448..5282fed21 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -385,4 +385,3 @@ RuinsofAlphOutside_MapEventHeader: ; 0x584c3 person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, $078f person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, $078f ; 0x58560 - diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index f925044d0..0a0b22a97 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -459,4 +459,3 @@ RuinsofAlphResearchCenter_MapEventHeader: ; 0x598d0 person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, $ffff person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, $0704 ; 0x59916 - diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 1491def30..715963542 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -24,4 +24,3 @@ SafariZoneBeta_MapEventHeader: ; 0x74476 ; people-events db 0 ; 0x74486 - diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index bab3a3bdb..9a4c41742 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -26,4 +26,3 @@ SafariZoneFuchsiaGateBeta_MapEventHeader: ; 0x7445a ; people-events db 0 ; 0x74474 - diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index c22fcd828..24a47c105 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -24,4 +24,3 @@ SafariZoneMainOffice_MapEventHeader: ; 0x195da7 ; people-events db 0 ; 0x195db7 - diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 03e579b7f..2e3cb0c69 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,43 +1,36 @@ -SafariZoneWardensHome_MapScriptHeader: ; 0x1965c4 +SafariZoneWardensHome_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1965c6 -LassScript_0x1965c6: ; 0x1965c6 +WardensGranddaughter: faceplayer loadfont checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER - iftrue UnknownScript_0x1965d7 - writetext UnknownText_0x1965e6 + iftrue .AlreadyMet + writetext WardensGranddaughterText1 closetext loadmovesprites setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER end -; 0x1965d7 - -UnknownScript_0x1965d7: ; 0x1965d7 - writetext UnknownText_0x196691 +.AlreadyMet + writetext WardensGranddaughterText2 closetext loadmovesprites end -; 0x1965dd -MapSafariZoneWardensHomeSignpost2Script: ; 0x1965dd - jumptext UnknownText_0x1966ea -; 0x1965e0 +WardenPhoto: + jumptext WardenPhotoText -MapSafariZoneWardensHomeSignpost3Script: ; 0x1965e0 - jumptext UnknownText_0x196726 -; 0x1965e3 +SafariZonePhoto: + jumptext SafariZonePhotoText -MapSafariZoneWardensHomeSignpost1Script: ; 0x1965e3 - jumpstd $0002 -; 0x1965e6 +WardensHomeBookshelf: + jumpstd picturebookshelf -UnknownText_0x1965e6: ; 0x1965e6 +WardensGranddaughterText1: text "My grandpa is the" line "SAFARI ZONE WAR-" cont "DEN." @@ -54,9 +47,8 @@ UnknownText_0x1965e6: ; 0x1965e6 line "SAFARI ZONE just" cont "like that." done -; 0x196691 -UnknownText_0x196691: ; 0x196691 +WardensGranddaughterText2: text "Many people were" line "disappointed that" @@ -64,27 +56,24 @@ UnknownText_0x196691: ; 0x196691 line "down, but Grandpa" cont "is so stubborn…" done -; 0x1966ea -UnknownText_0x1966ea: ; 0x1966ea +WardenPhotoText: text "It's a photo of a" line "grinning old man" para "who's surrounded" line "by #MON." done -; 0x196726 -UnknownText_0x196726: ; 0x196726 +SafariZonePhotoText: text "It's a photo of a" line "huge grassy plain" para "with rare #MON" line "frolicking in it." done -; 0x19676b -SafariZoneWardensHome_MapEventHeader: ; 0x19676b +SafariZoneWardensHome_MapEventHeader: ; filler db 0, 0 @@ -98,13 +87,11 @@ SafariZoneWardensHome_MapEventHeader: ; 0x19676b ; signposts db 4 - signpost 1, 0, $0, MapSafariZoneWardensHomeSignpost1Script - signpost 1, 1, $0, MapSafariZoneWardensHomeSignpost1Script - signpost 0, 7, $0, MapSafariZoneWardensHomeSignpost2Script - signpost 0, 9, $0, MapSafariZoneWardensHomeSignpost3Script + signpost 1, 0, $0, WardensHomeBookshelf + signpost 1, 1, $0, WardensHomeBookshelf + signpost 0, 7, $0, WardenPhoto + signpost 0, 9, $0, SafariZonePhoto ; people-events db 1 - person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, LassScript_0x1965c6, $ffff -; 0x19679c - + person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, $ffff diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 081f569e6..6179555a4 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ -SaffronCity_MapScriptHeader: ; 0x199321 +SaffronCity_MapScriptHeader: ; trigger count db 0 @@ -6,16 +6,13 @@ SaffronCity_MapScriptHeader: ; 0x199321 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x199326 -; 0x199326 - -UnknownScript_0x199326: ; 0x199326 - setflag $003c +.FlyPoint + setflag ENGINE_FLYPOINT_SAFFRON return -; 0x19932a -LassScript_0x19932a: ; 0x19932a +LassScript_0x19932a: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART @@ -24,16 +21,14 @@ LassScript_0x19932a: ; 0x19932a closetext loadmovesprites end -; 0x199338 -UnknownScript_0x199338: ; 0x199338 +UnknownScript_0x199338: writetext UnknownText_0x19940d closetext loadmovesprites end -; 0x19933e -PokefanMScript_0x19933e: ; 0x19933e +PokefanMScript_0x19933e: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART @@ -42,24 +37,20 @@ PokefanMScript_0x19933e: ; 0x19933e closetext loadmovesprites end -; 0x19934c -UnknownScript_0x19934c: ; 0x19934c +UnknownScript_0x19934c: writetext UnknownText_0x1994ae closetext loadmovesprites end -; 0x199352 -CooltrainerMScript_0x199352: ; 0x199352 +CooltrainerMScript_0x199352: jumptextfaceplayer UnknownText_0x1994fe -; 0x199355 -CooltrainerFScript_0x199355: ; 0x199355 +CooltrainerFScript_0x199355: jumptextfaceplayer UnknownText_0x19958e -; 0x199358 -FisherScript_0x199358: ; 0x199358 +FisherScript_0x199358: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART @@ -68,60 +59,47 @@ FisherScript_0x199358: ; 0x199358 closetext loadmovesprites end -; 0x199366 -UnknownScript_0x199366: ; 0x199366 +UnknownScript_0x199366: writetext UnknownText_0x19964b closetext loadmovesprites end -; 0x19936c -YoungsterScript_0x19936c: ; 0x19936c +YoungsterScript_0x19936c: jumptextfaceplayer UnknownText_0x1996a5 -; 0x19936f -YoungsterScript_0x19936f: ; 0x19936f +YoungsterScript_0x19936f: jumptextfaceplayer UnknownText_0x1996e5 -; 0x199372 -LassScript_0x199372: ; 0x199372 +LassScript_0x199372: jumptextfaceplayer UnknownText_0x199745 -; 0x199375 -MapSaffronCitySignpost0Script: ; 0x199375 - jumptext UnknownText_0x1997b7 -; 0x199378 +SaffronCitySign: + jumptext SaffronCitySignText -MapSaffronCitySignpost1Script: ; 0x199378 - jumptext UnknownText_0x1997e6 -; 0x19937b +SaffronGymSign: + jumptext SaffronGymSignText -MapSaffronCitySignpost2Script: ; 0x19937b - jumptext UnknownText_0x199829 -; 0x19937e +FightingDojoSign: + jumptext FightingDojoSignText -MapSaffronCitySignpost3Script: ; 0x19937e - jumptext UnknownText_0x19984a -; 0x199381 +SilphCoSign: + jumptext SilphCoSignText -MapSaffronCitySignpost4Script: ; 0x199381 - jumptext UnknownText_0x199865 -; 0x199384 +MrPsychicsHouseSign: + jumptext MrPsychicsHouseSignText -MapSaffronCitySignpost5Script: ; 0x199384 - jumptext UnknownText_0x199879 -; 0x199387 +SaffronCityMagnetTrainStationSign: + jumptext SaffronCityMagnetTrainStationSignText -MapSaffronCitySignpost6Script: ; 0x199387 - jumpstd $0010 -; 0x19938a +SaffronCityPokeCenterSign: + jumpstd pokecentersign -MapSaffronCitySignpost7Script: ; 0x19938a - jumpstd $0011 -; 0x19938d +SaffronCityMartSign: + jumpstd martsign -UnknownText_0x19938d: ; 0x19938d +UnknownText_0x19938d: text "A little girl who" line "is an expert at" @@ -134,9 +112,8 @@ UnknownText_0x19938d: ; 0x19938d para "conversing with." line "It's confusing." done -; 0x19940d -UnknownText_0x19940d: ; 0x19940d +UnknownText_0x19940d: text "The COPYCAT girl" line "looked unhappy." @@ -144,9 +121,8 @@ UnknownText_0x19940d: ; 0x19940d line "her favorite #" cont "DOLL--CLEFAIRY." done -; 0x199460 -UnknownText_0x199460: ; 0x199460 +UnknownText_0x199460: text "You came out from" line "JOHTO?" @@ -154,9 +130,8 @@ UnknownText_0x199460: ; 0x199460 line "home if the MAGNET" cont "TRAIN's running." done -; 0x1994ae -UnknownText_0x1994ae: ; 0x1994ae +UnknownText_0x1994ae: text "You came out from" line "JOHTO?" @@ -164,9 +139,8 @@ UnknownText_0x1994ae: ; 0x1994ae line "home by hopping on" cont "the MAGNET TRAIN." done -; 0x1994fe -UnknownText_0x1994fe: ; 0x1994fe +UnknownText_0x1994fe: text "I went to the GYM," line "raring for battles" cont "against trainers…" @@ -180,9 +154,8 @@ UnknownText_0x1994fe: ; 0x1994fe para "Boy, I was pretty" line "embarrassed." done -; 0x19958e -UnknownText_0x19958e: ; 0x19958e +UnknownText_0x19958e: text "This is SILPH CO.," line "famous for #MON" cont "merchandise." @@ -193,9 +166,8 @@ UnknownText_0x19958e: ; 0x19958e para "company because of" line "that." done -; 0x1995fc -UnknownText_0x1995fc: ; 0x1995fc +UnknownText_0x1995fc: text "Chew… Chew…" para "I hear there's big" @@ -204,9 +176,8 @@ UnknownText_0x1995fc: ; 0x1995fc para "Chew… Chew…" done -; 0x19964b -UnknownText_0x19964b: ; 0x19964b +UnknownText_0x19964b: text "Chew… Chew…" para "I hear there was" @@ -216,18 +187,16 @@ UnknownText_0x19964b: ; 0x19964b para "Chew… Chew…" line "Haaah, I'm full!" done -; 0x1996a5 -UnknownText_0x1996a5: ; 0x1996a5 +UnknownText_0x1996a5: text "Going into an" line "alley for the" para "first time makes" line "me sorta anxious." done -; 0x1996e5 -UnknownText_0x1996e5: ; 0x1996e5 +UnknownText_0x1996e5: text "There's a place" line "called TRAINER" @@ -237,9 +206,8 @@ UnknownText_0x1996e5: ; 0x1996e5 para "gather from all" line "over the place." done -; 0x199745 -UnknownText_0x199745: ; 0x199745 +UnknownText_0x199745: text "Our city was" line "featured on a" cont "radio program." @@ -251,17 +219,15 @@ UnknownText_0x199745: ; 0x199745 line "bit embarrassing" cont "too." done -; 0x1997b7 -UnknownText_0x1997b7: ; 0x1997b7 +SaffronCitySignText: text "SAFFRON CITY" para "Shining, Golden" line "Land of Commerce" done -; 0x1997e6 -UnknownText_0x1997e6: ; 0x1997e6 +SaffronGymSignText: text "SAFFRON CITY" line "#MON GYM" cont "LEADER: SABRINA" @@ -269,34 +235,29 @@ UnknownText_0x1997e6: ; 0x1997e6 para "The Master of" line "Psychic #MON!" done -; 0x199829 -UnknownText_0x199829: ; 0x199829 +FightingDojoSignText: text "Everyone Welcome!" line "FIGHTING DOJO" done -; 0x19984a -UnknownText_0x19984a: ; 0x19984a +SilphCoSignText: text "SILPH CO." line "OFFICE BUILDING" done -; 0x199865 -UnknownText_0x199865: ; 0x199865 +MrPsychicsHouseSignText: text "MR.PSYCHIC'S" line "HOUSE" done -; 0x199879 -UnknownText_0x199879: ; 0x199879 +SaffronCityMagnetTrainStationSignText: text "SAFFRON CITY" line "MAGNET TRAIN" cont "STATION" done -; 0x19989c -SaffronCity_MapEventHeader: ; 0x19989c +SaffronCity_MapEventHeader: ; filler db 0, 0 @@ -323,14 +284,14 @@ SaffronCity_MapEventHeader: ; 0x19989c ; signposts db 8 - signpost 5, 21, $0, MapSaffronCitySignpost0Script - signpost 5, 33, $0, MapSaffronCitySignpost1Script - signpost 5, 25, $0, MapSaffronCitySignpost2Script - signpost 21, 15, $0, MapSaffronCitySignpost3Script - signpost 29, 25, $0, MapSaffronCitySignpost4Script - signpost 5, 11, $0, MapSaffronCitySignpost5Script - signpost 29, 10, $0, MapSaffronCitySignpost6Script - signpost 11, 26, $0, MapSaffronCitySignpost7Script + signpost 5, 21, $0, SaffronCitySign + signpost 5, 33, $0, SaffronGymSign + signpost 5, 25, $0, FightingDojoSign + signpost 21, 15, $0, SilphCoSign + signpost 29, 25, $0, MrPsychicsHouseSign + signpost 5, 11, $0, SaffronCityMagnetTrainStationSign + signpost 29, 10, $0, SaffronCityPokeCenterSign + signpost 11, 26, $0, SaffronCityMartSign ; people-events db 8 @@ -342,5 +303,3 @@ SaffronCity_MapEventHeader: ; 0x19989c person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, $ffff person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, $ffff person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, $ffff -; 0x19997d - diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 15b95d155..43066d00a 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -174,16 +174,13 @@ SaffronGymGuyScript: ; 0x189cbb end ; 0x189ccf -MapSaffronGymSignpost0Script: ; 0x189ccf - checkflag $0028 - iftrue UnknownScript_0x189cd8 - jumpstd $002d -; 0x189cd8 - -UnknownScript_0x189cd8: ; 0x189cd8 +SaffronGymStatue: + checkflag ENGINE_MARSHBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext SABRINA, 1, $1 - jumpstd $002e -; 0x189cdf + jumpstd gymstatue2 UnknownText_0x189cdf: ; 0x189cdf text "SABRINA: I knew" @@ -424,7 +421,7 @@ SaffronGym_MapEventHeader: ; 0x18a2c4 ; signposts db 1 - signpost 15, 8, $0, MapSaffronGymSignpost0Script + signpost 15, 8, $0, SaffronGymStatue ; people-events db 6 @@ -435,4 +432,3 @@ SaffronGym_MapEventHeader: ; 0x18a2c4 person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff ; 0x18a3bd - diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 61c272546..fe798909b 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -59,4 +59,3 @@ SaffronMart_MapEventHeader: ; 0x18a444 person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff ; 0x18a47b - diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index c05f93dd9..03d560202 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -7,7 +7,7 @@ SaffronPokeCenter1F_MapScriptHeader: ; 0x18a47b ; 0x18a47d NurseScript_0x18a47d: ; 0x18a47d - jumpstd $0000 + jumpstd pokecenternurse ; 0x18a480 TeacherScript_0x18a480: ; 0x18a480 @@ -140,4 +140,3 @@ SaffronPokeCenter1F_MapEventHeader: ; 0x18a722 person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, $ffff person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, $ffff ; 0x18a76b - diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index e9bd0d8ce..32997c250 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ SaffronPokeCenter2FBeta_MapEventHeader: ; 0x18a76d ; people-events db 0 ; 0x18a778 - diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 453d23f9b..0b67083ac 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -262,4 +262,3 @@ SaffronTrainStation_MapEventHeader: ; 0x18ab8d person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, $0772 person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, $0772 ; 0x18abe3 - diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index bd109f3f7..3c39974d9 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -186,6 +186,3 @@ SeafoamGym_MapEventHeader: ; 0x1ab865 person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, $ffff person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, $0777 ; 0x1ab88a - - - diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index e977aad49..7446d8d04 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -77,4 +77,3 @@ SilphCo1F_MapEventHeader: ; 0x18ace7 person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, $ffff person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, $ffff ; 0x18ad11 - diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 3e28f7e8c..c9574b701 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -34,4 +34,3 @@ SilverCaveItemRooms_MapEventHeader: ; 0x18c662 person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, $069c person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, $069d ; 0x18c68c - diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 8d6d9cc24..290c17977 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,4 +1,4 @@ -SilverCaveOutside_MapScriptHeader: ; 0x1b2042 +SilverCaveOutside_MapScriptHeader: ; trigger count db 0 @@ -6,35 +6,27 @@ SilverCaveOutside_MapScriptHeader: ; 0x1b2042 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1b2047 -; 0x1b2047 - -UnknownScript_0x1b2047: ; 0x1b2047 - setflag $004c +.FlyPoint + setflag ENGINE_FLYPOINT_SILVER_CAVE return -; 0x1b204b -MapSilverCaveOutsideSignpost0Script: ; 0x1b204b - jumpstd $0010 -; 0x1b204e +MtSilverPokeCenterSign: + jumpstd pokecentersign -MapSilverCaveOutsideSignpost1Script: ; 0x1b204e - jumptext UnknownText_0x1b2054 -; 0x1b2051 +MtSilverSign: + jumptext MtSilverSignText -MapSilverCaveOutsideSignpostItem2: ; 0x1b2051 +MapSilverCaveOutsideSignpostItem2: dw $00b8 db FULL_RESTORE - -; 0x1b2054 -UnknownText_0x1b2054: ; 0x1b2054 +MtSilverSignText: text "MT.SILVER" done -; 0x1b205f -SilverCaveOutside_MapEventHeader: ; 0x1b205f +SilverCaveOutside_MapEventHeader: ; filler db 0, 0 @@ -48,11 +40,9 @@ SilverCaveOutside_MapEventHeader: ; 0x1b205f ; signposts db 3 - signpost 19, 24, $0, MapSilverCaveOutsideSignpost0Script - signpost 13, 17, $0, MapSilverCaveOutsideSignpost1Script + signpost 19, 24, $0, MtSilverPokeCenterSign + signpost 13, 17, $0, MtSilverSign signpost 25, 9, $7, MapSilverCaveOutsideSignpostItem2 ; people-events db 0 -; 0x1b207e - diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index d2527f612..5de3ad7e3 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -7,7 +7,7 @@ SilverCavePokeCenter1F_MapScriptHeader: ; 0x1ae598 ; 0x1ae59a NurseScript_0x1ae59a: ; 0x1ae59a - jumpstd $0000 + jumpstd pokecenternurse ; 0x1ae59d GrannyScript_0x1ae59d: ; 0x1ae59d @@ -50,4 +50,3 @@ SilverCavePokeCenter1F_MapEventHeader: ; 0x1ae622 person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, $ffff person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, $ffff ; 0x1ae651 - diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 9a0b419b1..f30486c60 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -58,4 +58,3 @@ SilverCaveRoom1_MapEventHeader: ; 0x18c562 person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, $069b person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, $07c1 ; 0x18c5b0 - diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 637a750d6..f67098ed1 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -48,4 +48,3 @@ SilverCaveRoom2_MapEventHeader: ; 0x18c5bb person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3 person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4 ; 0x18c601 - diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index b855d0516..5cd1358ac 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -66,6 +66,5 @@ SilverCaveRoom3_MapEventHeader: ; 0x18c644 ; people-events db 1 - person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, $0762 + person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER ; 0x18c65c - diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index c06792b43..2884889bf 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -186,9 +186,8 @@ SlowpokeScript_0x5a695: ; 0x5a695 end ; 0x5a6a0 -BoulderScript_0x5a6a0: ; 0x5a6a0 - jumpstd $000e -; 0x5a6a3 +SlowpokeWellB1FBoulder: + jumpstd strengthboulder ItemFragment_0x5a6a3: ; 0x5a6a3 db SUPER_POTION, 1 @@ -430,7 +429,6 @@ SlowpokeWellB1F_MapEventHeader: ; 0x5ac84 person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, $06fb person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, $06fb person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, $0740 - person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a6a0, $ffff + person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, $ffff person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662 ; 0x5ad09 - diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 02bb779af..babf85873 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -82,4 +82,3 @@ SlowpokeWellB2F_MapEventHeader: ; 0x5ae40 person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, $ffff person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, $0663 ; 0x5ae65 - diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 27fd5fdca..b3d537caa 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -97,4 +97,3 @@ SoulHouse_MapEventHeader: ; 0x7ee1d person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, $ffff person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, $ffff ; 0x7ee61 - diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 50d4651df..fd2d2a823 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -156,4 +156,3 @@ SproutTower1F_MapEventHeader: ; 0x184703 person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, $ffff person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, $0647 ; 0x18477a - diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index c99b2f05e..18e9800f5 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -149,4 +149,3 @@ SproutTower2F_MapEventHeader: ; 0x1848f5 person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, $ffff person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, $0648 ; 0x18493b - diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 4c2fb6805..5d07da973 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -437,6 +437,5 @@ SproutTower3F_MapEventHeader: ; 0x184f8e person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, $ffff person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, $0649 person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, $064a - person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c4 + person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER ; 0x18501a - diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index dece0d88d..5a5e7990b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -556,7 +556,7 @@ MapTeamRocketBaseB1FSignpost5Script: ; 0x6ca96 ; 0x6ca99 MapTeamRocketBaseB1FSignpost7Script: ; 0x6ca99 - jumpstd $0004 + jumpstd teamrocketoath ; 0x6ca9c MapTeamRocketBaseB1FSignpost0Script: ; 0x6ca9c @@ -876,4 +876,3 @@ TeamRocketBaseB1F_MapEventHeader: ; 0x6cdeb person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b ; 0x6cf70 - diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index dbfd357ac..1cbaae9c6 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1100,4 +1100,3 @@ TeamRocketBaseB2F_MapEventHeader: ; 0x6de44 person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, $06da person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, $066c ; 0x6dfd4 - diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index c22068a46..4ba63faf1 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -282,7 +282,7 @@ UnknownScript_0x6e10b: ; 0x6e10b ; 0x6e11d MapTeamRocketBaseB3FSignpost9Script: ; 0x6e11d - jumpstd $0004 + jumpstd teamrocketoath ; 0x6e120 ItemFragment_0x6e120: ; 0x6e120 @@ -729,4 +729,3 @@ TeamRocketBaseB3F_MapEventHeader: ; 0x6e9e4 person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, $0670 person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, $0654 ; 0x6eafe - diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 8e5b4e343..4b9df263f 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -85,4 +85,3 @@ TimeCapsule_MapEventHeader: ; 0x193538 person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0000 person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0001 ; 0x19356c - diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 43ae52b69..a5e118384 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -28,7 +28,7 @@ UnknownScript_0x18502e: ; 0x18502e UnknownScript_0x18502f: ; 0x18502f checkevent EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x185047 - checkevent $0044 + checkevent EVENT_BEAT_ELITE_FOUR iffalse UnknownScript_0x185050 special SpecialBeastsCheck iffalse UnknownScript_0x185050 @@ -589,4 +589,3 @@ TinTower1F_MapEventHeader: ; 0x18598c person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, $07c5 person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, $07c5 ; 0x185a23 - diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 00fe07420..6730fd214 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -24,4 +24,3 @@ TinTower2F_MapEventHeader: ; 0x185a25 ; people-events db 0 ; 0x185a35 - diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 2eb79a55e..b607e28e9 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -29,4 +29,3 @@ TinTower3F_MapEventHeader: ; 0x185a39 db 1 person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b ; 0x185a56 - diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 0db1463b5..5221cfc45 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -48,4 +48,3 @@ TinTower4F_MapEventHeader: ; 0x185a61 person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, $064d person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, $064e ; 0x185aa7 - diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 4fccbdf04..95549a257 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -45,4 +45,3 @@ TinTower5F_MapEventHeader: ; 0x185ab1 db 1 person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f ; 0x185ae2 - diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 6db5548c2..6e01af477 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -29,4 +29,3 @@ TinTower6F_MapEventHeader: ; 0x185ae6 db 1 person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6 ; 0x185b03 - diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index ae20c4b01..6ecc68ebe 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -32,4 +32,3 @@ TinTower7F_MapEventHeader: ; 0x185b07 db 1 person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650 ; 0x185b33 - diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 11a11b045..35835c059 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -43,4 +43,3 @@ TinTower8F_MapEventHeader: ; 0x185b3b person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, $0652 person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, $0653 ; 0x185b86 - diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 0849d733e..bd50904f8 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -44,4 +44,3 @@ TinTower9F_MapEventHeader: ; 0x185bab db 1 person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7 ; 0x185be1 - diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index e74ceb907..1f3d035b8 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -68,6 +68,3 @@ TinTowerRoof_MapEventHeader: ; 0x7726a db 1 person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, $073c ; 0x77282 - - - diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 3aff0fdf6..1bd94db19 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -29,4 +29,3 @@ TohjoFalls_MapEventHeader: ; 0x18db04 db 1 person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9 ; 0x18db21 - diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index a87b10d9c..54b3780d2 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -85,4 +85,3 @@ TradeCenter_MapEventHeader: ; 0x193429 person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x19345d - diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d17526f2d..96c86ead4 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -174,4 +174,3 @@ TrainerHouse1F_MapEventHeader: ; 0x9b31f person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, $ffff person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, $ffff ; 0x9b384 - diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 9c65f4e9f..4accd0088 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -204,4 +204,3 @@ TrainerHouseB1F_MapEventHeader: ; 0x9b5b8 person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff ; 0x9b5e5 - diff --git a/maps/Underground.asm b/maps/Underground.asm index 6eb0a5068..1872b0477 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -38,4 +38,3 @@ Underground_MapEventHeader: ; 0x74399 ; people-events db 0 ; 0x743b3 - diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 264db76b7..1bf2974f8 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1134,4 +1134,3 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; 0x7d689 person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, $0674 person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c1 ; 0x7d779 - diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index e39e9ab85..640d24a60 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -302,4 +302,3 @@ UndergroundWarehouse_MapEventHeader: ; 0x7dd84 person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655 ; 0x7ddf4 - diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 3c764f12f..ed9b8aa36 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -329,4 +329,3 @@ UnionCave1F_MapEventHeader: ; 0x59f35 person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, $065c person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, $065d ; 0x59fc4 - diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 482b23cdd..076916215 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -130,9 +130,8 @@ ItemFragment_0x5a018: ; 0x5a018 db X_DEFEND, 1 ; 0x5a01a -BoulderScript_0x5a01a: ; 0x5a01a - jumpstd $000e -; 0x5a01d +UnionCaveB1FBoulder: + jumpstd strengthboulder HikerPhillipSeenText: ; 0x5a01d text "It's been a while" @@ -256,7 +255,6 @@ UnionCaveB1F_MapEventHeader: ; 0x5a28e person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, $ffff person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, $ffff person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, $065e - person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a01a, $ffff + person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, $ffff person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f ; 0x5a308 - diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index d63d55810..f57519427 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -228,4 +228,3 @@ UnionCaveB2F_MapEventHeader: ; 0x5a57a person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661 person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, $0760 ; 0x5a5d3 - diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index f1dd6f2a7..007fe2aa1 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCity_MapScriptHeader: ; 0x1aa97a +VermilionCity_MapScriptHeader: ; trigger count db 0 @@ -6,24 +6,19 @@ VermilionCity_MapScriptHeader: ; 0x1aa97a db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1aa97f -; 0x1aa97f - -UnknownScript_0x1aa97f: ; 0x1aa97f - setflag $003a +.FlyPoint + setflag ENGINE_FLYPOINT_VERMILION return -; 0x1aa983 -TeacherScript_0x1aa983: ; 0x1aa983 +TeacherScript_0x1aa983: jumptextfaceplayer UnknownText_0x1aaa15 -; 0x1aa986 -GrampsScript_0x1aa986: ; 0x1aa986 +GrampsScript_0x1aa986: jumptextfaceplayer UnknownText_0x1aaa6f -; 0x1aa989 -MachopScript_0x1aa989: ; 0x1aa989 +VermilionMachop: loadfont writetext UnknownText_0x1aaaca cry MACHOP @@ -35,13 +30,11 @@ MachopScript_0x1aa989: ; 0x1aa989 closetext loadmovesprites end -; 0x1aa99b -SuperNerdScript_0x1aa99b: ; 0x1aa99b +SuperNerdScript_0x1aa99b: jumptextfaceplayer UnknownText_0x1aab1a -; 0x1aa99e -BigSnorlaxScript_0x1aa99e: ; 0x1aa99e +VermilionSnorlax: loadfont special SpecialSnorlaxAwake iftrue UnknownScript_0x1aa9ab @@ -49,9 +42,8 @@ BigSnorlaxScript_0x1aa99e: ; 0x1aa99e closetext loadmovesprites end -; 0x1aa9ab -UnknownScript_0x1aa9ab: ; 0x1aa9ab +UnknownScript_0x1aa9ab: writetext UnknownText_0x1aab84 pause 15 cry SNORLAX @@ -63,86 +55,72 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab setevent EVENT_FOUGHT_SNORLAX returnafterbattle end -; 0x1aa9c2 -PokefanMScript_0x1aa9c2: ; 0x1aa9c2 +VermilionGymBadgeGuy: faceplayer loadfont - checkevent $00e2 - iftrue UnknownScript_0x1aa9f7 + checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY + iftrue .AlreadyGotItem checkcode $7 - if_equal $10, UnknownScript_0x1aa9ea - if_greater_than $d, UnknownScript_0x1aa9e4 - if_greater_than $9, UnknownScript_0x1aa9de + if_equal 16, .AllBadges + if_greater_than 13, .MostBadges + if_greater_than 9, .SomeBadges writetext UnknownText_0x1aabc8 closetext loadmovesprites end -; 0x1aa9de -UnknownScript_0x1aa9de: ; 0x1aa9de +.SomeBadges writetext UnknownText_0x1aac2b closetext loadmovesprites end -; 0x1aa9e4 -UnknownScript_0x1aa9e4: ; 0x1aa9e4 +.MostBadges writetext UnknownText_0x1aac88 closetext loadmovesprites end -; 0x1aa9ea -UnknownScript_0x1aa9ea: ; 0x1aa9ea +.AllBadges writetext UnknownText_0x1aacf3 keeptextopen verbosegiveitem HP_UP, 1 - iffalse UnknownScript_0x1aa9fb - setevent $00e2 -UnknownScript_0x1aa9f7: ; 0x1aa9f7 + iffalse .Done + setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY +.AlreadyGotItem writetext UnknownText_0x1aad4a closetext -UnknownScript_0x1aa9fb: ; 0x1aa9fb +.Done loadmovesprites end -; 0x1aa9fd -MapVermilionCitySignpost0Script: ; 0x1aa9fd - jumptext UnknownText_0x1aadb9 -; 0x1aaa00 +VermilionCitySign: + jumptext VermilionCitySignText -MapVermilionCitySignpost1Script: ; 0x1aaa00 - jumptext UnknownText_0x1aade7 -; 0x1aaa03 +VermilionGymSign: + jumptext VermilionGymSignText -MapVermilionCitySignpost2Script: ; 0x1aaa03 - jumptext UnknownText_0x1aae28 -; 0x1aaa06 +PokemonFanClubSign: + jumptext PokemonFanClubSignText -MapVermilionCitySignpost3Script: ; 0x1aaa06 - jumptext UnknownText_0x1aae4e -; 0x1aaa09 +VermilionCityDiglettsCaveSign: + jumptext VermilionCityDiglettsCaveSignText -MapVermilionCitySignpost4Script: ; 0x1aaa09 - jumptext UnknownText_0x1aae5e -; 0x1aaa0c +VermilionCityPortSign: + jumptext VermilionCityPortSignText -MapVermilionCitySignpost5Script: ; 0x1aaa0c - jumpstd $0010 -; 0x1aaa0f +VermilionCityPokeCenterSign: + jumpstd pokecentersign -MapVermilionCitySignpost6Script: ; 0x1aaa0f - jumpstd $0011 -; 0x1aaa12 +VermilionCityMartSign: + jumpstd martsign -MapVermilionCitySignpostItem7: ; 0x1aaa12 +MapVermilionCitySignpostItem7: dw $00fc db FULL_HEAL - -; 0x1aaa15 -UnknownText_0x1aaa15: ; 0x1aaa15 +UnknownText_0x1aaa15: text "VERMILION PORT is" line "KANTO's seaside" cont "gateway." @@ -151,9 +129,8 @@ UnknownText_0x1aaa15: ; 0x1aaa15 line "around the world" cont "dock here." done -; 0x1aaa6f -UnknownText_0x1aaa6f: ; 0x1aaa6f +UnknownText_0x1aaa6f: text "My #MON is" line "preparing the land" cont "for construction." @@ -162,22 +139,19 @@ UnknownText_0x1aaa6f: ; 0x1aaa6f line "money to start the" cont "project…" done -; 0x1aaaca -UnknownText_0x1aaaca: ; 0x1aaaca +UnknownText_0x1aaaca: text "MACHOP: Guooh" line "gogogoh!" done -; 0x1aaae2 -UnknownText_0x1aaae2: ; 0x1aaae2 +UnknownText_0x1aaae2: text "A MACHOP is growl-" line "ing while stomping" cont "the ground flat." done -; 0x1aab1a -UnknownText_0x1aab1a: ; 0x1aab1a +UnknownText_0x1aab1a: text "There are eight" line "GYMS in KANTO." @@ -185,15 +159,13 @@ UnknownText_0x1aab1a: ; 0x1aab1a line "is VERMILION's" cont "#MON GYM." done -; 0x1aab64 -UnknownText_0x1aab64: ; 0x1aab64 +UnknownText_0x1aab64: text "SNORLAX is snoring" line "peacefully…" done -; 0x1aab84 -UnknownText_0x1aab84: ; 0x1aab84 +UnknownText_0x1aab84: text "The #GEAR was" line "placed near the" cont "sleeping SNORLAX…" @@ -202,9 +174,8 @@ UnknownText_0x1aab84: ; 0x1aab84 para "SNORLAX woke up!" done -; 0x1aabc8 -UnknownText_0x1aabc8: ; 0x1aabc8 +UnknownText_0x1aabc8: text "Skilled trainers" line "gather in KANTO." @@ -214,9 +185,8 @@ UnknownText_0x1aabc8: ; 0x1aabc8 para "They won't be easy" line "to defeat." done -; 0x1aac2b -UnknownText_0x1aac2b: ; 0x1aac2b +UnknownText_0x1aac2b: text "You've started to" line "collect KANTO GYM" cont "BADGES?" @@ -225,9 +195,8 @@ UnknownText_0x1aac2b: ; 0x1aac2b line "that the trainers" cont "here are tough?" done -; 0x1aac88 -UnknownText_0x1aac88: ; 0x1aac88 +UnknownText_0x1aac88: text "I guess you'll be" line "finished with your" @@ -238,9 +207,8 @@ UnknownText_0x1aac88: ; 0x1aac88 line "you get all eight" cont "BADGES." done -; 0x1aacf3 -UnknownText_0x1aacf3: ; 0x1aacf3 +UnknownText_0x1aacf3: text "Congratulations!" para "You got all the" @@ -249,9 +217,8 @@ UnknownText_0x1aacf3: ; 0x1aacf3 para "I've got a reward" line "for your efforts." done -; 0x1aad4a -UnknownText_0x1aad4a: ; 0x1aad4a +UnknownText_0x1aad4a: text "Having a variety" line "of #MON types" @@ -262,17 +229,15 @@ UnknownText_0x1aad4a: ; 0x1aad4a line "GYM BADGES will" cont "help you." done -; 0x1aadb9 -UnknownText_0x1aadb9: ; 0x1aadb9 +VermilionCitySignText: text "VERMILION CITY" para "The Port of" line "Exquisite Sunsets" done -; 0x1aade7 -UnknownText_0x1aade7: ; 0x1aade7 +VermilionGymSignText: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -280,28 +245,24 @@ UnknownText_0x1aade7: ; 0x1aade7 para "The Lightning" line "American" done -; 0x1aae28 -UnknownText_0x1aae28: ; 0x1aae28 +PokemonFanClubSignText: text "#MON FAN CLUB" para "All #MON Fans" line "Welcome!" done -; 0x1aae4e -UnknownText_0x1aae4e: ; 0x1aae4e +VermilionCityDiglettsCaveSignText: text "DIGLETT'S CAVE" done -; 0x1aae5e -UnknownText_0x1aae5e: ; 0x1aae5e +VermilionCityPortSignText: text "VERMILION PORT" line "ENTRANCE" done -; 0x1aae77 -VermilionCity_MapEventHeader: ; 0x1aae77 +VermilionCity_MapEventHeader: ; filler db 0, 0 @@ -323,22 +284,20 @@ VermilionCity_MapEventHeader: ; 0x1aae77 ; signposts db 8 - signpost 3, 25, $0, MapVermilionCitySignpost0Script - signpost 19, 5, $0, MapVermilionCitySignpost1Script - signpost 13, 5, $0, MapVermilionCitySignpost2Script - signpost 9, 33, $0, MapVermilionCitySignpost3Script - signpost 15, 27, $0, MapVermilionCitySignpost4Script - signpost 5, 10, $0, MapVermilionCitySignpost5Script - signpost 13, 22, $0, MapVermilionCitySignpost6Script + signpost 3, 25, $0, VermilionCitySign + signpost 19, 5, $0, VermilionGymSign + signpost 13, 5, $0, PokemonFanClubSign + signpost 9, 33, $0, VermilionCityDiglettsCaveSign + signpost 15, 27, $0, VermilionCityPortSign + signpost 5, 10, $0, VermilionCityPokeCenterSign + signpost 13, 22, $0, VermilionCityMartSign signpost 19, 12, $7, MapVermilionCitySignpostItem7 ; people-events db 6 person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, $ffff person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, $ffff - person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, MachopScript_0x1aa989, $ffff + person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, $ffff person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, $ffff - person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, BigSnorlaxScript_0x1aa99e, $0770 - person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1aa9c2, $ffff -; 0x1aaf25 - + person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, $0770 + person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, $ffff diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 18fc4c76c..56cc5a81d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -148,16 +148,13 @@ MapVermilionGymSignpost14Script: ; 0x19212f jumptext UnknownText_0x19261e ; 0x192132 -MapVermilionGymSignpost16Script: ; 0x192132 - checkflag $0025 - iftrue UnknownScript_0x19213b - jumpstd $002d -; 0x19213b - -UnknownScript_0x19213b: ; 0x19213b +VermilionGymStatue: + checkflag ENGINE_THUNDERBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext LT_SURGE, 1, $1 - jumpstd $002e -; 0x192142 + jumpstd gymstatue2 UnknownText_0x192142: ; 0x192142 text "SURGE: Hey, you" @@ -361,8 +358,8 @@ VermilionGym_MapEventHeader: ; 0x19263d signpost 11, 5, $0, MapVermilionGymSignpost14Script signpost 11, 7, $0, MapVermilionGymSignpost14Script signpost 11, 9, $0, MapVermilionGymSignpost14Script - signpost 15, 3, $0, MapVermilionGymSignpost16Script - signpost 15, 6, $0, MapVermilionGymSignpost16Script + signpost 15, 3, $0, VermilionGymStatue + signpost 15, 6, $0, VermilionGymStatue ; people-events db 5 @@ -372,4 +369,3 @@ VermilionGym_MapEventHeader: ; 0x19263d person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, $ffff person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, $ffff ; 0x1926e3 - diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index a93741002..85a10eb64 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -39,4 +39,3 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; 0x192086 db 1 person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, $ffff ; 0x1920a3 - diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 422d257ba..11b2a7f67 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,24 +1,21 @@ -VermilionHouseFishingSpeechHouse_MapScriptHeader: ; 0x19148b +VermilionHouseFishingSpeechHouse_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x19148d -FishingGuruScript_0x19148d: ; 0x19148d - jumptextfaceplayer UnknownText_0x191496 -; 0x191490 +FishingDude: + jumptextfaceplayer FishingDudeText -MapVermilionHouseFishingSpeechHouseSignpost0Script: ; 0x191490 - jumptext UnknownText_0x1915a3 -; 0x191493 +FishingDudesHousePhoto: + jumptext FishingDudesHousePhotoText -UnknownScript_0x191493: ; 0x191493 - jumpstd $0002 -; 0x191496 +FishingDudesHouseBookshelf: +; unused + jumpstd picturebookshelf -UnknownText_0x191496: ; 0x191496 +FishingDudeText: text "I am the FISHING" line "DUDE, the elder of" cont "the FISHING BROS." @@ -41,18 +38,16 @@ UnknownText_0x191496: ; 0x191496 line "catch the MAGIKARP" cont "of his dreams." done -; 0x1915a3 -UnknownText_0x1915a3: ; 0x1915a3 +FishingDudesHousePhotoText: text "It's a photo of" line "people fishing…" para "They're having a" line "great time…" done -; 0x1915df -VermilionHouseFishingSpeechHouse_MapEventHeader: ; 0x1915df +VermilionHouseFishingSpeechHouse_MapEventHeader: ; filler db 0, 0 @@ -66,10 +61,8 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; 0x1915df ; signposts db 1 - signpost 0, 3, $0, MapVermilionHouseFishingSpeechHouseSignpost0Script + signpost 0, 3, $0, FishingDudesHousePhoto ; people-events db 1 - person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x19148d, $ffff -; 0x191601 - + person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, $ffff diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 6722010da..d41c66c1f 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -14,9 +14,8 @@ YoungsterScript_0x191eba: ; 0x191eba jumptextfaceplayer UnknownText_0x191f16 ; 0x191ebd -MapVermilionMagnetTrainSpeechHouseSignpost1Script: ; 0x191ebd - jumpstd $0002 -; 0x191ec0 +VermilionMagnetTrainSpeechHouseBookshelf: + jumpstd picturebookshelf UnknownText_0x191ec0: ; 0x191ec0 text "Do you know about" @@ -49,12 +48,11 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; 0x191f48 ; signposts db 2 - signpost 1, 0, $0, MapVermilionMagnetTrainSpeechHouseSignpost1Script - signpost 1, 1, $0, MapVermilionMagnetTrainSpeechHouseSignpost1Script + signpost 1, 0, $0, VermilionMagnetTrainSpeechHouseBookshelf + signpost 1, 1, $0, VermilionMagnetTrainSpeechHouseBookshelf ; people-events db 2 person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, $ffff person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, $ffff ; 0x191f7c - diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 799a31024..71d301919 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -58,4 +58,3 @@ VermilionMart_MapEventHeader: ; 0x191ff8 person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, $ffff person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, $ffff ; 0x19202f - diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 4b5bbf0d7..c611b2b32 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -7,7 +7,7 @@ VermilionPokeCenter1F_MapScriptHeader: ; 0x191601 ; 0x191603 NurseScript_0x191603: ; 0x191603 - jumpstd $0000 + jumpstd pokecenternurse ; 0x191606 FishingGuruScript_0x191606: ; 0x191606 @@ -103,4 +103,3 @@ VermilionPokeCenter1F_MapEventHeader: ; 0x191791 person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, $ffff person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, $ffff ; 0x1917da - diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index d42badcc8..35c14337f 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ VermilionPokeCenter2FBeta_MapEventHeader: ; 0x1917dc ; people-events db 0 ; 0x1917e7 - diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 914511b18..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,5 +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/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 570ff837c..05355e027 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -40,4 +40,3 @@ VermilionPortPassage_MapEventHeader: ; 0x7705a db 1 person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, $ffff ; 0x77086 - diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 003249b6c..d94a94be6 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -296,4 +296,3 @@ VictoryRoad_MapEventHeader: ; 0x74802 person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 ; 0x748a2 - diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 80dd5f677..04fa8a1bc 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -30,7 +30,7 @@ UnknownScript_0x9ba04: ; 0x9ba04 writetext UnknownText_0x9ba29 keeptextopen checkcode $7 - if_greater_than $7, UnknownScript_0x9ba19 + if_greater_than 7, UnknownScript_0x9ba19 writetext UnknownText_0x9ba5f closetext loadmovesprites @@ -133,9 +133,6 @@ VictoryRoadGate_MapEventHeader: ; 0x9bb9b ; people-events db 3 person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, $ffff - person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, $074f + person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, $0750 ; 0x9bbf8 - - - diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 316818371..f3769cc7c 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ -VioletCity_MapScriptHeader: ; 0x1a83b2 +VioletCity_MapScriptHeader: ; trigger count db 0 @@ -6,16 +6,13 @@ VioletCity_MapScriptHeader: ; 0x1a83b2 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a83b7 -; 0x1a83b7 - -UnknownScript_0x1a83b7: ; 0x1a83b7 - setflag $0043 +.FlyPoint + setflag ENGINE_FLYPOINT_VIOLET return -; 0x1a83bb -FisherScript_0x1a83bb: ; 0x1a83bb +FisherScript_0x1a83bb: applymovement $2, MovementData_0x1a8465 faceplayer loadfont @@ -23,16 +20,14 @@ FisherScript_0x1a83bb: ; 0x1a83bb yesorno iffalse UnknownScript_0x1a83d1 jump UnknownScript_0x1a83cb -; 0x1a83cb -UnknownScript_0x1a83cb: ; 0x1a83cb +UnknownScript_0x1a83cb: writetext UnknownText_0x1a84ac closetext loadmovesprites end -; 0x1a83d1 -UnknownScript_0x1a83d1: ; 0x1a83d1 +UnknownScript_0x1a83d1: writetext UnknownText_0x1a84cb closetext loadmovesprites @@ -54,67 +49,51 @@ UnknownScript_0x1a83d1: ; 0x1a83d1 clearevent $06cb waitbutton end -; 0x1a8403 -LassScript_0x1a8403: ; 0x1a8403 +LassScript_0x1a8403: jumptextfaceplayer UnknownText_0x1a8529 -; 0x1a8406 -SuperNerdScript_0x1a8406: ; 0x1a8406 +SuperNerdScript_0x1a8406: jumptextfaceplayer UnknownText_0x1a8593 -; 0x1a8409 -GrampsScript_0x1a8409: ; 0x1a8409 +GrampsScript_0x1a8409: jumptextfaceplayer UnknownText_0x1a85ef -; 0x1a840c -YoungsterScript_0x1a840c: ; 0x1a840c +YoungsterScript_0x1a840c: jumptextfaceplayer UnknownText_0x1a8665 -; 0x1a840f -MapVioletCitySignpost0Script: ; 0x1a840f - jumptext UnknownText_0x1a86b2 -; 0x1a8412 +VioletCitySign: + jumptext VioletCitySignText -MapVioletCitySignpost1Script: ; 0x1a8412 - jumptext UnknownText_0x1a86dc -; 0x1a8415 +VioletGymSign: + jumptext VioletGymSignText -MapVioletCitySignpost2Script: ; 0x1a8415 - jumptext UnknownText_0x1a8724 -; 0x1a8418 +SproutTowerSign: + jumptext SproutTowerSignText -MapVioletCitySignpost3Script: ; 0x1a8418 - jumptext UnknownText_0x1a874d -; 0x1a841b +EarlsPokemonAcademySign: + jumptext EarlsPokemonAcademySignText -MapVioletCitySignpost4Script: ; 0x1a841b - jumpstd $0010 -; 0x1a841e +VioletCityPokeCenterSign: + jumpstd pokecentersign -MapVioletCitySignpost5Script: ; 0x1a841e - jumpstd $0011 -; 0x1a8421 +VioletCityMartSign: + jumpstd martsign -ItemFragment_0x1a8421: ; 0x1a8421 +ItemFragment_0x1a8421: db PP_UP, 1 -; 0x1a8423 -ItemFragment_0x1a8423: ; 0x1a8423 +ItemFragment_0x1a8423: db RARE_CANDY, 1 -; 0x1a8425 -FruitTreeScript_0x1a8425: ; 0x1a8425 +FruitTreeScript_0x1a8425: fruittree $9 -; 0x1a8427 -MapVioletCitySignpostItem6: ; 0x1a8427 +MapVioletCitySignpostItem6: dw $00b0 db HYPER_POTION - -; 0x1a842a -MovementData_0x1a842a: ; 0x1a842a +MovementData_0x1a842a: big_step_down big_step_down turn_head_down @@ -172,14 +151,12 @@ MovementData_0x1a842a: ; 0x1a842a big_step_up turn_head_down step_end -; 0x1a8463 -MovementData_0x1a8463: ; 0x1a8463 +MovementData_0x1a8463: step_up step_end -; 0x1a8465 -MovementData_0x1a8465: ; 0x1a8465 +MovementData_0x1a8465: turn_head_down turn_head_left turn_head_up @@ -194,38 +171,33 @@ MovementData_0x1a8465: ; 0x1a8465 turn_head_right turn_head_down step_end -; 0x1a8473 -UnknownText_0x1a8473: ; 0x1a8473 +UnknownText_0x1a8473: text "Hello!" line "You are trainer?" para "Battle GYM LEADER," line "win you did?" done -; 0x1a84ac -UnknownText_0x1a84ac: ; 0x1a84ac +UnknownText_0x1a84ac: text "Ooh, la la!" line "Very indeed nice!" done -; 0x1a84cb -UnknownText_0x1a84cb: ; 0x1a84cb +UnknownText_0x1a84cb: text "Is that so? Then" line "study shall you!" cont "Follow me!" done -; 0x1a84f9 -UnknownText_0x1a84f9: ; 0x1a84f9 +UnknownText_0x1a84f9: text "Here, teacher I" line "am. Good it is" cont "you study here!" done -; 0x1a8529 -UnknownText_0x1a8529: ; 0x1a8529 +UnknownText_0x1a8529: text "Ghosts are rumored" line "to appear in" cont "SPROUT TOWER." @@ -236,9 +208,8 @@ UnknownText_0x1a8529: ; 0x1a8529 para "had no effect on" line "ghosts." done -; 0x1a8593 -UnknownText_0x1a8593: ; 0x1a8593 +UnknownText_0x1a8593: text "Hey, you're a" line "#MON trainer?" @@ -248,9 +219,8 @@ UnknownText_0x1a8593: ; 0x1a8593 para "you'll be ready" line "for prime time!" done -; 0x1a85ef -UnknownText_0x1a85ef: ; 0x1a85ef +UnknownText_0x1a85ef: text "FALKNER, from the" line "VIOLET #MON" @@ -263,9 +233,8 @@ UnknownText_0x1a85ef: ; 0x1a85ef para "has done a great" line "job with it." done -; 0x1a8665 -UnknownText_0x1a8665: ; 0x1a8665 +UnknownText_0x1a8665: text "I saw a wiggly" line "tree up ahead!" @@ -273,17 +242,15 @@ UnknownText_0x1a8665: ; 0x1a8665 line "it squirms and" cont "dances! Cool!" done -; 0x1a86b2 -UnknownText_0x1a86b2: ; 0x1a86b2 +VioletCitySignText: text "VIOLET CITY" para "The City of" line "Nostalgic Scents" done -; 0x1a86dc -UnknownText_0x1a86dc: ; 0x1a86dc +VioletGymSignText: text "VIOLET CITY" line "#MON GYM" cont "LEADER: FALKNER" @@ -291,23 +258,20 @@ UnknownText_0x1a86dc: ; 0x1a86dc para "The Elegant Master" line "of Flying #MON" done -; 0x1a8724 -UnknownText_0x1a8724: ; 0x1a8724 +SproutTowerSignText: text "SPROUT TOWER" para "Experience the" line "Way of #MON" done -; 0x1a874d -UnknownText_0x1a874d: ; 0x1a874d +EarlsPokemonAcademySignText: text "EARL'S #MON" line "ACADEMY" done -; 0x1a8762 -VioletCity_MapEventHeader: ; 0x1a8762 +VioletCity_MapEventHeader: ; filler db 0, 0 @@ -328,12 +292,12 @@ VioletCity_MapEventHeader: ; 0x1a8762 ; signposts db 7 - signpost 20, 24, $0, MapVioletCitySignpost0Script - signpost 17, 15, $0, MapVioletCitySignpost1Script - signpost 8, 24, $0, MapVioletCitySignpost2Script - signpost 17, 27, $0, MapVioletCitySignpost3Script - signpost 25, 32, $0, MapVioletCitySignpost4Script - signpost 17, 10, $0, MapVioletCitySignpost5Script + signpost 20, 24, $0, VioletCitySign + signpost 17, 15, $0, VioletGymSign + signpost 8, 24, $0, SproutTowerSign + signpost 17, 27, $0, EarlsPokemonAcademySign + signpost 25, 32, $0, VioletCityPokeCenterSign + signpost 17, 10, $0, VioletCityMartSign signpost 14, 37, $7, MapVioletCitySignpostItem6 ; people-events @@ -346,5 +310,3 @@ VioletCity_MapEventHeader: ; 0x1a8762 person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, $ffff person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, $0643 person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, $0644 -; 0x1a8820 - diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 743c5c471..4fe31d0b4 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -59,11 +59,11 @@ UnknownScript_0x68418: ; 0x68418 ; 0x68421 UnknownScript_0x68421: ; 0x68421 - jumpstd $0012 + jumpstd goldenrodrockets ; 0x68424 UnknownScript_0x68424: ; 0x68424 - jumpstd $0013 + jumpstd radiotowerrockets ; 0x68427 TrainerBird_keeperRod: ; 0x68427 @@ -141,16 +141,13 @@ VioletGymGuyScript: ; 0x6844f end ; 0x68463 -MapVioletGymSignpost1Script: ; 0x68463 - checkflag $001b - iftrue UnknownScript_0x6846c - jumpstd $002d -; 0x6846c - -UnknownScript_0x6846c: ; 0x6846c +VioletGymStatue: + checkflag ENGINE_ZEPHYRBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext FALKNER, 1, $1 - jumpstd $002e -; 0x68473 + jumpstd gymstatue2 UnknownText_0x68473: ; 0x68473 text "I'm FALKNER, the" @@ -349,8 +346,8 @@ VioletGym_MapEventHeader: ; 0x68a0c ; signposts db 2 - signpost 13, 3, $0, MapVioletGymSignpost1Script - signpost 13, 6, $0, MapVioletGymSignpost1Script + signpost 13, 3, $0, VioletGymStatue + signpost 13, 6, $0, VioletGymStatue ; people-events db 4 @@ -359,4 +356,3 @@ VioletGym_MapEventHeader: ; 0x68a0c person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, $ffff person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, $ffff ; 0x68a5a - diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 54f90ddf9..ce19a3f88 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -70,4 +70,3 @@ VioletMart_MapEventHeader: ; 0x68389 person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff ; 0x683c0 - diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index ab7cdabef..3401a724d 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -67,4 +67,3 @@ VioletNicknameSpeechHouse_MapEventHeader: ; 0x69490 person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, $ffff person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, $ffff ; 0x694c7 - diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 91b3a635d..c9a0b7213 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -52,4 +52,3 @@ VioletOnixTradeHouse_MapEventHeader: ; 0x69a01 person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, $ffff person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, $ffff ; 0x69a2b - diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index ca1ae8f8c..5b80e7d01 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -7,7 +7,7 @@ VioletPokeCenter1F_MapScriptHeader: ; 0x694c7 ; 0x694c9 NurseScript_0x694c9: ; 0x694c9 - jumpstd $0000 + jumpstd pokecenternurse ; 0x694cc ScientistScript_0x694cc: ; 0x694cc @@ -256,4 +256,3 @@ VioletPokeCenter1F_MapEventHeader: ; 0x69935 person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, $ffff person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, $0700 ; 0x6998b - diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 60fdba4d0..418418a42 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,4 +1,4 @@ -ViridianCity_MapScriptHeader: ; 0x1a9a43 +ViridianCity_MapScriptHeader: ; trigger count db 0 @@ -6,16 +6,13 @@ ViridianCity_MapScriptHeader: ; 0x1a9a43 db 1 ; callbacks + dbw 5, .FlyPoint - dbw 5, UnknownScript_0x1a9a48 -; 0x1a9a48 - -UnknownScript_0x1a9a48: ; 0x1a9a48 - setflag $0036 +.FlyPoint + setflag ENGINE_FLYPOINT_VIRIDIAN return -; 0x1a9a4c -GrampsScript_0x1a9a4c: ; 0x1a9a4c +GrampsScript_0x1a9a4c: faceplayer loadfont writetext UnknownText_0x1a9aa5 @@ -25,16 +22,14 @@ GrampsScript_0x1a9a4c: ; 0x1a9a4c closetext loadmovesprites end -; 0x1a9a5b -UnknownScript_0x1a9a5b: ; 0x1a9a5b +UnknownScript_0x1a9a5b: writetext UnknownText_0x1a9bb7 closetext loadmovesprites end -; 0x1a9a61 -GrampsScript_0x1a9a61: ; 0x1a9a61 +GrampsScript_0x1a9a61: faceplayer loadfont checkevent $0775 @@ -43,16 +38,14 @@ GrampsScript_0x1a9a61: ; 0x1a9a61 closetext loadmovesprites end -; 0x1a9a6f -UnknownScript_0x1a9a6f: ; 0x1a9a6f +UnknownScript_0x1a9a6f: writetext UnknownText_0x1a9c7e closetext loadmovesprites end -; 0x1a9a75 -FisherScript_0x1a9a75: ; 0x1a9a75 +FisherScript_0x1a9a75: faceplayer loadfont checkevent EVENT_GOT_TM42_DREAM_EATER @@ -62,43 +55,35 @@ FisherScript_0x1a9a75: ; 0x1a9a75 verbosegiveitem TM_42, 1 iffalse UnknownScript_0x1a9a8e setevent EVENT_GOT_TM42_DREAM_EATER -UnknownScript_0x1a9a8a: ; 0x1a9a8a +UnknownScript_0x1a9a8a: writetext UnknownText_0x1a9d86 closetext -UnknownScript_0x1a9a8e: ; 0x1a9a8e +UnknownScript_0x1a9a8e: loadmovesprites end -; 0x1a9a90 -YoungsterScript_0x1a9a90: ; 0x1a9a90 +YoungsterScript_0x1a9a90: jumptextfaceplayer UnknownText_0x1a9daa -; 0x1a9a93 -MapViridianCitySignpost0Script: ; 0x1a9a93 - jumptext UnknownText_0x1a9def -; 0x1a9a96 +ViridianCitySign: + jumptext ViridianCitySignText -MapViridianCitySignpost1Script: ; 0x1a9a96 - jumptext UnknownText_0x1a9e1b -; 0x1a9a99 +ViridianGymSign: + jumptext ViridianGymSignText -MapViridianCitySignpost2Script: ; 0x1a9a99 - jumptext UnknownText_0x1a9e60 -; 0x1a9a9c +ViridianCityWelcomeSign: + jumptext ViridianCityWelcomeSignText -MapViridianCitySignpost3Script: ; 0x1a9a9c - jumptext UnknownText_0x1a9e99 -; 0x1a9a9f +TrainerHouseSign: + jumptext TrainerHouseSignText -MapViridianCitySignpost4Script: ; 0x1a9a9f - jumpstd $0010 -; 0x1a9aa2 +ViridianCityPokeCenterSign: + jumpstd pokecentersign -MapViridianCitySignpost5Script: ; 0x1a9aa2 - jumpstd $0011 -; 0x1a9aa5 +ViridianCityMartSign: + jumpstd martsign -UnknownText_0x1a9aa5: ; 0x1a9aa5 +UnknownText_0x1a9aa5: text "Hey, kid! I just" line "had a double shot" @@ -117,18 +102,16 @@ UnknownText_0x1a9aa5: ; 0x1a9aa5 para "Do you believe me?" done -; 0x1a9b6f -UnknownText_0x1a9b6f: ; 0x1a9b6f +UnknownText_0x1a9b6f: text "Good, good. Yes, I" line "was something out" para "of the ordinary," line "let me tell you!" done -; 0x1a9bb7 -UnknownText_0x1a9bb7: ; 0x1a9bb7 +UnknownText_0x1a9bb7: text "What? You little" line "whelp!" @@ -138,9 +121,8 @@ UnknownText_0x1a9bb7: ; 0x1a9bb7 para "show you a thing" line "or two. Humph!" done -; 0x1a9c11 -UnknownText_0x1a9c11: ; 0x1a9c11 +UnknownText_0x1a9c11: text "This GYM didn't" line "have a LEADER" cont "until recently." @@ -151,18 +133,16 @@ UnknownText_0x1a9c11: ; 0x1a9c11 para "LEADER, but he's" line "often away." done -; 0x1a9c7e -UnknownText_0x1a9c7e: ; 0x1a9c7e +UnknownText_0x1a9c7e: text "Are you going to" line "battle the LEADER?" para "Good luck to you." line "You'll need it." done -; 0x1a9cc4 -UnknownText_0x1a9cc4: ; 0x1a9cc4 +UnknownText_0x1a9cc4: text "Yawn!" para "I must have dozed" @@ -184,34 +164,30 @@ UnknownText_0x1a9cc4: ; 0x1a9cc4 line "Here, you can have" cont "this TM." done -; 0x1a9d86 -UnknownText_0x1a9d86: ; 0x1a9d86 +UnknownText_0x1a9d86: text "TM42 contains" line "DREAM EATER…" para "…Zzzzz…" done -; 0x1a9daa -UnknownText_0x1a9daa: ; 0x1a9daa +UnknownText_0x1a9daa: text "I heard that there" line "are many items on" para "the ground in" line "VIRIDIAN FOREST." done -; 0x1a9def -UnknownText_0x1a9def: ; 0x1a9def +ViridianCitySignText: text "VIRIDIAN CITY" para "The Eternally" line "Green Paradise" done -; 0x1a9e1b -UnknownText_0x1a9e1b: ; 0x1a9e1b +ViridianGymSignText: text "VIRIDIAN CITY" line "#MON GYM" cont "LEADER: …" @@ -219,26 +195,23 @@ UnknownText_0x1a9e1b: ; 0x1a9e1b para "The rest of the" line "text is illegible…" done -; 0x1a9e60 -UnknownText_0x1a9e60: ; 0x1a9e60 +ViridianCityWelcomeSignText: text "WELCOME TO" line "VIRIDIAN CITY," para "THE GATEWAY TO" line "INDIGO PLATEAU" done -; 0x1a9e99 -UnknownText_0x1a9e99: ; 0x1a9e99 +TrainerHouseSignText: text "TRAINER HOUSE" para "The Club for Top" line "Trainer Battles" done -; 0x1a9ec9 -ViridianCity_MapEventHeader: ; 0x1a9ec9 +ViridianCity_MapEventHeader: ; filler db 0, 0 @@ -255,12 +228,12 @@ ViridianCity_MapEventHeader: ; 0x1a9ec9 ; signposts db 6 - signpost 17, 17, $0, MapViridianCitySignpost0Script - signpost 7, 27, $0, MapViridianCitySignpost1Script - signpost 1, 19, $0, MapViridianCitySignpost2Script - signpost 15, 21, $0, MapViridianCitySignpost3Script - signpost 25, 24, $0, MapViridianCitySignpost4Script - signpost 19, 30, $0, MapViridianCitySignpost5Script + signpost 17, 17, $0, ViridianCitySign + signpost 7, 27, $0, ViridianGymSign + signpost 1, 19, $0, ViridianCityWelcomeSign + signpost 15, 21, $0, TrainerHouseSign + signpost 25, 24, $0, ViridianCityPokeCenterSign + signpost 19, 30, $0, ViridianCityMartSign ; people-events db 4 @@ -268,5 +241,3 @@ ViridianCity_MapEventHeader: ; 0x1a9ec9 person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, $ffff person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, $ffff person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, $ffff -; 0x1a9f3a - diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index a183a6f44..a4ab70017 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -54,16 +54,13 @@ ViridianGymGuyScript: ; 0x9aa57 end ; 0x9aa6b -MapViridianGymSignpost1Script: ; 0x9aa6b - checkflag $002a - iftrue UnknownScript_0x9aa74 - jumpstd $002d -; 0x9aa74 - -UnknownScript_0x9aa74: ; 0x9aa74 +ViridianGymStatue: + checkflag ENGINE_EARTHBADGE + iftrue .Beaten + jumpstd gymstatue1 +.Beaten trainertotext BLUE, 1, $1 - jumpstd $002e -; 0x9aa7b + jumpstd gymstatue2 UnknownText_0x9aa7b: ; 0x9aa7b text "BLUE: Yo! Finally" @@ -192,12 +189,11 @@ ViridianGym_MapEventHeader: ; 0x9ae04 ; signposts db 2 - signpost 13, 3, $0, MapViridianGymSignpost1Script - signpost 13, 6, $0, MapViridianGymSignpost1Script + signpost 13, 3, $0, ViridianGymStatue + signpost 13, 6, $0, ViridianGymStatue ; people-events db 2 person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, $0776 person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, $0776 ; 0x9ae38 - diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index e96608ec9..3354ca59c 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -58,4 +58,3 @@ ViridianMart_MapEventHeader: ; 0x9b657 person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, $ffff person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, $ffff ; 0x9b68e - diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index aed513c1b..b86ab2d46 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -86,4 +86,3 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; 0x9af21 person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, $ffff person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, $ffff ; 0x9af65 - diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index a5f322aec..39bba37f7 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -7,7 +7,7 @@ ViridianPokeCenter1F_MapScriptHeader: ; 0x9b68e ; 0x9b690 NurseScript_0x9b690: ; 0x9b690 - jumpstd $0000 + jumpstd pokecenternurse ; 0x9b693 CooltrainerMScript_0x9b693: ; 0x9b693 @@ -98,4 +98,3 @@ ViridianPokeCenter1F_MapEventHeader: ; 0x9b7ef person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, $ffff person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, $ffff ; 0x9b838 - diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index 3f1f5f0a7..95b81f77c 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -23,4 +23,3 @@ ViridianPokeCenter2FBeta_MapEventHeader: ; 0x9b83a ; people-events db 0 ; 0x9b845 - diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index b80f29cee..64b8e99cd 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -63,7 +63,7 @@ UnknownScript_0x7c082: ; 0x7c082 UnknownScript_0x7c0a5: ; 0x7c0a5 disappear $7 - checktime $1 + checkmorn iffalse UnknownScript_0x7c0ae appear $7 UnknownScript_0x7c0ae: ; 0x7c0ae @@ -253,7 +253,7 @@ GrampsScript_0x7c146: ; 0x7c146 ; 0x7c156 UnknownScript_0x7c156: ; 0x7c156 - checktime $1 + checkmorn iffalse UnknownScript_0x7c300 pokemart $2, $0000 loadmovesprites @@ -831,4 +831,3 @@ WarehouseEntrance_MapEventHeader: ; 0x7c936 person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, $0755 person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, $0752 ; 0x7c9e8 - diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 362871fcc..c1345d8d4 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -26,9 +26,8 @@ ItemFragment_0x18c418: ; 0x18c418 db ESCAPE_ROPE, 1 ; 0x18c41a -BoulderScript_0x18c41a: ; 0x18c41a - jumpstd $000e -; 0x18c41d +WhirlIslandB1FBoulder: + jumpstd strengthboulder MapWhirlIslandB1FSignpostItem0: ; 0x18c41d dw $0097 @@ -80,6 +79,5 @@ WhirlIslandB1F_MapEventHeader: ; 0x18c426 person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, $0693 person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, $0694 person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, $0695 - person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, BoulderScript_0x18c41a, $ffff + person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, $ffff ; 0x18c4b6 - diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index ae3960bcd..dcd88e768 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -41,4 +41,3 @@ WhirlIslandB2F_MapEventHeader: ; 0x18c4be person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697 person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698 ; 0x18c4ff - diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index b595021e8..39239faf1 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -24,4 +24,3 @@ WhirlIslandCave_MapEventHeader: ; 0x18c3ec ; people-events db 0 ; 0x18c3fc - diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 76965fa9e..6ec8c969f 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -67,4 +67,3 @@ WhirlIslandLugiaChamber_MapEventHeader: ; 0x18c53a db 1 person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, $073d ; 0x18c552 - diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 8d51b6595..7065638dd 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -30,4 +30,3 @@ WhirlIslandNE_MapEventHeader: ; 0x18c398 db 1 person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f ; 0x18c3ba - diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 4b0a454b5..43a31ad2d 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -26,4 +26,3 @@ WhirlIslandNW_MapEventHeader: ; 0x18c37a ; people-events db 0 ; 0x18c394 - diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 735e77f04..235453ca2 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -24,4 +24,3 @@ WhirlIslandSE_MapEventHeader: ; 0x18c3fe ; people-events db 0 ; 0x18c40e - diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 6f877d8c7..3ec1fac03 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -32,4 +32,3 @@ WhirlIslandSW_MapEventHeader: ; 0x18c3be db 1 person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690 ; 0x18c3ea - diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 84f7f7403..9c61d5e84 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -161,4 +161,3 @@ WillsRoom_MapEventHeader: ; 0x1806f9 db 1 person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff ; 0x18071b - diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index c5ee42902..204dca627 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -450,4 +450,3 @@ WiseTriosRoom_MapEventHeader: ; 0x98dea person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, $07ac person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, $07ac ; 0x98e55 - diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm index d9d6fc432..83bb76b96 100644 --- a/maps/blockdata_1.asm +++ b/maps/blockdata_1.asm @@ -384,4 +384,3 @@ Route9_BlockData: ; 0xabde9 Route22_BlockData: ; 0xabef7 INCBIN "maps/Route22.blk" ; 0xabfab - diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm index 09fafd7d0..a60303c5d 100644 --- a/maps/blockdata_2.asm +++ b/maps/blockdata_2.asm @@ -598,4 +598,3 @@ OlivineLighthouse5F_BlockData: ; 0xafea6 OlivineLighthouse6F_BlockData: ; 0xaff00 INCBIN "maps/OlivineLighthouse6F.blk" ; 0xaff5a - diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm index 28cc9fb7c..3db7f1152 100644 --- a/maps/blockdata_3.asm +++ b/maps/blockdata_3.asm @@ -351,4 +351,3 @@ BetaBlank_BlockData: ; 0xb1afa GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22 INCBIN "maps/GoldenrodDeptStoreRoof.blk" ; 0xb1b42 - diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 36768a54d..e346c50c7 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -493,4 +493,3 @@ MapGroup26: map_header Route30BerrySpeechHouse, $5, 3, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 1, 1 map_header MrPokemonsHouse, $b, 3, ROUTE_30, MUSIC_CHERRYGROVE_CITY, 1, 1 map_header Route31VioletGate, $8, 6, ROUTE_31, MUSIC_ROUTE_30, 1, 1 - diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 0651dd9d1..82e97ede5 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -597,4 +597,3 @@ map_header_2 Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $0, NONE ; 0x9668c map_header_2 MrPokemonsHouse, MR_POKEMONS_HOUSE, $0, NONE ; 0x96698 map_header_2 Route31VioletGate, ROUTE_31_VIOLET_GATE, $0, NONE ; 0x966a4 - |