diff --git a/constants/map_constants.asm b/constants/map_constants.asm index bedcf29ddeb..9be0a775a11 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -10,7 +10,7 @@ MAP_NONE EQU 0 mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1 mapgroup OLIVINE_GYM, 8, 5 ; 2 - mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4 ; 3 + mapgroup OLIVINE_TIMS_HOUSE, 4, 4 ; 3 mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4 mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 @@ -144,7 +144,7 @@ MAP_NONE EQU 0 mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1 mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2 mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 - mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4 ; 4 + mapgroup BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 mapgroup BLACKTHORN_MART, 4, 6 ; 5 mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6 mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7 @@ -233,7 +233,7 @@ MAP_NONE EQU 0 mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4 ; 10 + mapgroup GOLDENROD_NAME_RATER, 4, 4 ; 10 mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 diff --git a/maps.asm b/maps.asm index 70ad1eb5c69..282d4fb1763 100644 --- a/maps.asm +++ b/maps.asm @@ -33,7 +33,7 @@ INCLUDE "maps/GoldenrodBillsHouse.asm" INCLUDE "maps/GoldenrodMagnetTrainStation.asm" INCLUDE "maps/GoldenrodFlowerShop.asm" INCLUDE "maps/GoldenrodPPSpeechHouse.asm" -INCLUDE "maps/GoldenrodNameRatersHouse.asm" +INCLUDE "maps/GoldenrodNameRater.asm" INCLUDE "maps/GoldenrodDeptStore1F.asm" INCLUDE "maps/GoldenrodDeptStore2F.asm" INCLUDE "maps/GoldenrodDeptStore3F.asm" @@ -241,7 +241,7 @@ SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12] INCLUDE "maps/OlivinePokeCenter1F.asm" INCLUDE "maps/OlivineGym.asm" -INCLUDE "maps/OlivineVoltorbHouse.asm" +INCLUDE "maps/OlivineTimsHouse.asm" INCLUDE "maps/OlivineHouseBeta.asm" INCLUDE "maps/OlivinePunishmentSpeechHouse.asm" INCLUDE "maps/OlivineGoodRodHouse.asm" @@ -380,7 +380,7 @@ INCLUDE "maps/FuchsiaCity.asm" INCLUDE "maps/BlackthornGym1F.asm" INCLUDE "maps/BlackthornGym2F.asm" INCLUDE "maps/BlackthornDragonSpeechHouse.asm" -INCLUDE "maps/BlackthornDodrioTradeHouse.asm" +INCLUDE "maps/BlackthornEmysHouse.asm" INCLUDE "maps/BlackthornMart.asm" INCLUDE "maps/BlackthornPokeCenter1F.asm" INCLUDE "maps/MoveDeletersHouse.asm" diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index adf5a0b3c53..8a6b134b42e 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -322,7 +322,7 @@ BlackthornCity_MapEventHeader: db 8 warp_def $b, $12, 1, BLACKTHORN_GYM_1F warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_def $17, $1d, 1, BLACKTHORN_DODRIO_TRADE_HOUSE + warp_def $17, $1d, 1, BLACKTHORN_EMYS_HOUSE warp_def $1d, $f, 2, BLACKTHORN_MART warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 1cd07b3cca7..333f05129f0 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -12,18 +12,18 @@ BlackthornDragonSpeechHouse_MapScriptHeader: GrannyScript_0x195949: jumptextfaceplayer UnknownText_0x19595c -EkansScript_0x19594c: +Dratini: opentext - writetext UnknownText_0x1959ee + writetext DratiniText cry DRATINI waitbutton closetext end -UnknownScript_0x195956: +; unused jumpstd picturebookshelf -UnknownScript_0x195959: +; unused jumpstd magazinebookshelf UnknownText_0x19595c: @@ -41,7 +41,7 @@ UnknownText_0x19595c: line "this town." done -UnknownText_0x1959ee: +DratiniText: text "DRATINI: Draa!" done @@ -63,4 +63,4 @@ BlackthornDragonSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, EkansScript_0x19594c, -1 + person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornEmysHouse.asm similarity index 82% rename from maps/BlackthornDodrioTradeHouse.asm rename to maps/BlackthornEmysHouse.asm index c70fcde2ad4..9bd9522d4a7 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const BLACKTHORNDODRIOTRADEHOUSE_LASS + const BLACKTHORNEMYSHOUSE_EMY -BlackthornDodrioTradeHouse_MapScriptHeader: +BlackthornEmysHouse_MapScriptHeader: .MapTriggers: db 0 @@ -19,7 +19,7 @@ Emy: EmysHouseBookshelf: jumpstd magazinebookshelf -BlackthornDodrioTradeHouse_MapEventHeader: +BlackthornEmysHouse_MapEventHeader: ; filler db 0, 0 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index e892bb68c08..67e79099bcf 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,6 +1,6 @@ const_value set 2 const BURNEDTOWER1F_ROCK - const BURNEDTOWER1F_SUPER_NERD + const BURNEDTOWER1F_EUSINE const BURNEDTOWER1F_SILVER const BURNEDTOWER1F_MORTY const BURNEDTOWER1F_POKE_BALL @@ -43,14 +43,14 @@ BurnedTower1F_MapScriptHeader: return .EusineTrigger: - spriteface BURNEDTOWER1F_SUPER_NERD, DOWN - showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15 - applymovement BURNEDTOWER1F_SUPER_NERD, BurnedTower1FEusineMovement + spriteface BURNEDTOWER1F_EUSINE, DOWN + showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 + applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement opentext writetext BurnedTower1FEusineIntroText waitbutton closetext - moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e + moveperson BURNEDTOWER1F_EUSINE, $9, $e dotrigger $1 end diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 3ab89533c71..0991a2ecba7 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -7,7 +7,7 @@ const_value set 2 const BURNEDTOWERB1F_ENTEI2 const BURNEDTOWERB1F_SUICUNE2 const BURNEDTOWERB1F_POKE_BALL - const BURNEDTOWERB1F_SUPER_NERD + const BURNEDTOWERB1F_EUSINE BurnedTowerB1F_MapScriptHeader: .MapTriggers: @@ -22,7 +22,7 @@ BurnedTowerB1F_MapScriptHeader: ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x186160 + dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback UnknownScript_0x18615e: end @@ -30,14 +30,14 @@ UnknownScript_0x18615e: UnknownScript_0x18615f: end -UnknownScript_0x186160: +BurnedTowerB1FLadderCallback: checkevent EVENT_RELEASED_THE_BEASTS - iftrue UnknownScript_0x18616a + iftrue .NoChange changeblock $6, $e, $2 -UnknownScript_0x18616a: +.NoChange return -UnknownScript_0x18616b: +ReleaseTheBeasts: playmusic MUSIC_NONE pause 30 appear BURNEDTOWERB1F_RAIKOU1 @@ -61,27 +61,27 @@ UnknownScript_0x18616b: pause 15 playsound SFX_WARP_FROM spriteface PLAYER, LEFT - applymovement BURNEDTOWERB1F_RAIKOU1, MovementData_0x186236 + applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement disappear BURNEDTOWERB1F_RAIKOU1 waitsfx playsound SFX_WARP_FROM spriteface PLAYER, RIGHT - applymovement BURNEDTOWERB1F_ENTEI1, MovementData_0x18623b + applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement disappear BURNEDTOWERB1F_ENTEI1 waitsfx pause 15 playsound SFX_WARP_FROM spriteface PLAYER, UP - applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186241 + applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1 playsound SFX_WARP_FROM spriteface PLAYER, DOWN - applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186248 + applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2 spriteface PLAYER, UP pause 20 cry SUICUNE pause 30 playsound SFX_WARP_FROM - applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186253 + applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3 spriteface PLAYER, DOWN disappear BURNEDTOWERB1F_SUICUNE1 waitsfx @@ -96,7 +96,7 @@ UnknownScript_0x18616b: clearevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_BURNED_TOWER_MORTY setevent EVENT_BURNED_TOWER_1F_EUSINE - appear BURNEDTOWERB1F_SUPER_NERD + appear BURNEDTOWERB1F_EUSINE refreshscreen $0 changeblock $6, $e, $1b reloadmappart @@ -104,21 +104,21 @@ UnknownScript_0x18616b: dotrigger $1 end -SuperNerdScript_0x186212: +BurnedTowerB1FEusine: faceplayer opentext - writetext UnknownText_0x18626a + writetext BurnedTowerB1FEusineText waitbutton closetext checkcode VAR_FACING - if_equal $1, UnknownScript_0x186226 - applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x186263 + if_equal $1, .Movement + applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 jump UnknownScript_0x18622a -UnknownScript_0x186226: - applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x18625c +.Movement + applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2 UnknownScript_0x18622a: - disappear BURNEDTOWERB1F_SUPER_NERD + disappear BURNEDTOWERB1F_EUSINE playsound SFX_EXIT_BUILDING waitsfx end @@ -129,14 +129,14 @@ BurnedTowerB1FTMEndure: BurnedTowerB1FBoulder: jumpstd strengthboulder -MovementData_0x186236: +BurnedTowerRaikouMovement: db $39 ; movement fast_jump_step_down fast_jump_step_left db $38 ; movement step_end -MovementData_0x18623b: +BurnedTowerEnteiMovement: db $39 ; movement fast_jump_step_right fast_jump_step_down @@ -144,7 +144,7 @@ MovementData_0x18623b: db $38 ; movement step_end -MovementData_0x186241: +BurnedTowerSuicuneMovement1: db $39 ; movement fast_jump_step_right fast_jump_step_down @@ -153,7 +153,7 @@ MovementData_0x186241: db $38 ; movement step_end -MovementData_0x186248: +BurnedTowerSuicuneMovement2: db $39 ; movement fast_jump_step_left fast_jump_step_up @@ -168,7 +168,7 @@ MovementData_0x18624f: db $38 ; movement step_end -MovementData_0x186253: +BurnedTowerSuicuneMovement3: db $39 ; movement big_step_up fast_jump_step_right @@ -179,7 +179,7 @@ MovementData_0x186253: db $38 ; movement step_end -MovementData_0x18625c: +BurnedTowerB1FEusineMovement2: step_left step_left step_down @@ -188,7 +188,7 @@ MovementData_0x18625c: step_down step_end -MovementData_0x186263: +BurnedTowerB1FEusineMovement1: step_down step_left step_left @@ -197,7 +197,7 @@ MovementData_0x186263: step_down step_end -UnknownText_0x18626a: +BurnedTowerB1FEusineText: text "EUSINE: I dug a" line "hole here, too…" @@ -255,7 +255,7 @@ BurnedTowerB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $6, $a, $0, UnknownScript_0x18616b, $0, $0 + xy_trigger 0, $6, $a, $0, ReleaseTheBeasts, $0, $0 .Signposts: db 0 @@ -270,4 +270,4 @@ BurnedTowerB1F_MapEventHeader: person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE - person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER + person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index cb9b99c46d0..8deb8dc6777 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST const CELADONPOKECENTER1F_COOLTRAINER_F - const CELADONPOKECENTER1F_SUPER_NERD + const CELADONPOKECENTER1F_EUSINE CeladonPokeCenter1F_MapScriptHeader: .MapTriggers: @@ -24,40 +24,40 @@ CooltrainerFScript_0x71e28: PharmacistScript_0x71e2b: jumptextfaceplayer UnknownText_0x71ec1 -SuperNerdScript_0x71e2e: +CeladonEusine: faceplayer opentext - writetext UnknownText_0x71f22 + writetext CeladonEusineText1 buttonsound writebyte SUICUNE special SpecialMonCheck - iffalse UnknownScript_0x71e46 + iffalse .NoSuicune special SpecialBeastsCheck - iftrue UnknownScript_0x71e48 - writetext UnknownText_0x7201a + iftrue .HoOh + writetext NoBeastsText waitbutton -UnknownScript_0x71e46: +.NoSuicune closetext end -UnknownScript_0x71e48: - writetext UnknownText_0x71f65 +.HoOh + writetext EusineLeavesCeladonText waitbutton closetext checkcode VAR_FACING - if_equal $1, UnknownScript_0x71e5a - applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e6b - jump UnknownScript_0x71e5e - -UnknownScript_0x71e5a: - applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e65 -UnknownScript_0x71e5e: - disappear CELADONPOKECENTER1F_SUPER_NERD + if_equal $1, .Location1 + applymovement CELADONPOKECENTER1F_EUSINE, .Movement1 + jump .Continue + +.Location1 + applymovement CELADONPOKECENTER1F_EUSINE, .Movement2 +.Continue + disappear CELADONPOKECENTER1F_EUSINE playsound SFX_EXIT_BUILDING waitsfx end -MovementData_0x71e65: +.Movement2 step_left step_down step_down @@ -65,7 +65,7 @@ MovementData_0x71e65: step_down step_end -MovementData_0x71e6b: +.Movement1 step_down step_down step_down @@ -92,7 +92,7 @@ UnknownText_0x71ec1: line "three years ago." done -UnknownText_0x71f22: +CeladonEusineText1: text "EUSINE: Hi!" para "I'm back visiting" @@ -102,7 +102,7 @@ UnknownText_0x71f22: line "while." done -UnknownText_0x71f65: +EusineLeavesCeladonText: text ", have you" line "heard?" @@ -123,7 +123,7 @@ UnknownText_0x71f65: line "you, !" done -UnknownText_0x7201a: +NoBeastsText: text "Oh, by the way," line "." @@ -167,4 +167,4 @@ CeladonPokeCenter1F_MapEventHeader: person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1 person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1 - person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH + person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 3f4c9d8f73b..2787899b714 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -16,9 +16,9 @@ FishingGuruScript_0x18804a: PokefanFScript_0x18804d: jumptextfaceplayer UnknownText_0x1880c3 -DiglettScript_0x188050: +CeruleanDiglett: opentext - writetext UnknownText_0x1880e7 + writetext CeruleanDiglettText cry DIGLETT waitbutton closetext @@ -39,7 +39,7 @@ UnknownText_0x1880c3: line "robbers before." done -UnknownText_0x1880e7: +CeruleanDiglettText: text "DIGLETT: Dug dug." done @@ -62,4 +62,4 @@ CeruleanPoliceStation_MapEventHeader: db 3 person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18804a, -1 person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18804d, -1 - person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, DiglettScript_0x188050, -1 + person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index aabfc0eb3a1..549861d7b17 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,9 +1,9 @@ const_value set 2 const COPYCATSHOUSE2F_COPYCAT1 - const COPYCATSHOUSE2F_MOLTRES - const COPYCATSHOUSE2F_FAIRY - const COPYCATSHOUSE2F_MONSTER - const COPYCATSHOUSE2F_BIRD + const COPYCATSHOUSE2F_DODRIO + const COPYCATSHOUSE2F_FAIRYDOLL + const COPYCATSHOUSE2F_MONSTERDOLL + const COPYCATSHOUSE2F_BIRDDOLL const COPYCATSHOUSE2F_COPYCAT2 CopycatsHouse2F_MapScriptHeader: diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 865e34c1c24..77faf9005a9 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,5 +1,5 @@ const_value set 2 - const EARLSPOKEMONACADEMY_FISHER + const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 const EARLSPOKEMONACADEMY_GAMEBOY_KID2 @@ -14,7 +14,7 @@ EarlsPokemonAcademy_MapScriptHeader: db 0 AcademyEarl: - applymovement EARLSPOKEMONACADEMY_FISHER, MovementData_0x68b2d + applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d faceplayer opentext writetext UnknownText_0x68b3b diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 950d7a6f3c0..2c5403b4226 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,6 +1,6 @@ const_value set 2 - const ELMSHOUSE_TEACHER - const ELMSHOUSE_BUG_CATCHER + const ELMSHOUSE_ELMS_WIFE + const ELMSHOUSE_ELMS_SON ElmsHouse_MapScriptHeader: .MapTriggers: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 4dbffe754d2..2747f6a247f 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,6 +1,6 @@ const_value set 2 const ELMSLAB_ELM - const ELMSLAB_SCIENTIST + const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 const ELMSLAB_POKE_BALL2 const ELMSLAB_POKE_BALL3 @@ -463,17 +463,17 @@ ElmJumpRightScript: end AideScript_WalkPotions1: - applymovement ELMSLAB_SCIENTIST, AideWalksRight1 + applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1 spriteface PLAYER, DOWN scall AideScript_GivePotions - applymovement ELMSLAB_SCIENTIST, AideWalksLeft1 + applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1 end AideScript_WalkPotions2: - applymovement ELMSLAB_SCIENTIST, AideWalksRight2 + applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2 spriteface PLAYER, DOWN scall AideScript_GivePotions - applymovement ELMSLAB_SCIENTIST, AideWalksLeft2 + applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2 end AideScript_GivePotions: @@ -488,17 +488,17 @@ AideScript_GivePotions: end AideScript_WalkBalls1: - applymovement ELMSLAB_SCIENTIST, AideWalksRight1 + applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1 spriteface PLAYER, DOWN scall AideScript_GiveYouBalls - applymovement ELMSLAB_SCIENTIST, AideWalksLeft1 + applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1 end AideScript_WalkBalls2: - applymovement ELMSLAB_SCIENTIST, AideWalksRight2 + applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2 spriteface PLAYER, DOWN scall AideScript_GiveYouBalls - applymovement ELMSLAB_SCIENTIST, AideWalksLeft2 + applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2 end AideScript_GiveYouBalls: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 598e7405f9d..cf01ef68c07 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -569,7 +569,7 @@ GoldenrodCity_MapEventHeader: warp_def $d, $9, 2, GOLDENROD_MAGNET_TRAIN_STATION warp_def $5, $1d, 1, GOLDENROD_FLOWER_SHOP warp_def $9, $21, 1, GOLDENROD_PP_SPEECH_HOUSE - warp_def $7, $f, 1, GOLDENROD_NAME_RATERS_HOUSE + warp_def $7, $f, 1, GOLDENROD_NAME_RATER warp_def $1b, $18, 1, GOLDENROD_DEPT_STORE_1F warp_def $15, $e, 1, GOLDENROD_GAME_CORNER warp_def $f, $5, 1, RADIO_TOWER_1F diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 32a6691fe2b..f146a5e52f0 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,9 +1,9 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS - const GOLDENRODDEPTSTORE5F_COOLTRAINER_M + const GOLDENRODDEPTSTORE5F_MIKE const GOLDENRODDEPTSTORE5F_POKEFAN_M - const GOLDENRODDEPTSTORE5F_TWIN + const GOLDENRODDEPTSTORE5F_CARRIE const GOLDENRODDEPTSTORE5F_RECEPTIONIST GoldenrodDeptStore5F_MapScriptHeader: @@ -106,7 +106,7 @@ ReceptionistScript_0x560ce: closetext end -TwinScript_0x56118: +Carrie: faceplayer opentext special SpecialGameboyCheck @@ -126,7 +126,7 @@ TwinScript_0x56118: LassScript_0x56130: jumptextfaceplayer UnknownText_0x562ad -CooltrainerMScript_0x56133: +Mike: faceplayer opentext trade $0 @@ -242,7 +242,7 @@ GoldenrodDeptStore5F_MapEventHeader: db 6 person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x56130, -1 - person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x56133, -1 + person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Mike, -1 person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5613a, -1 - person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56118, -1 + person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 34829c3fa30..d3cb7af7630 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -86,17 +86,17 @@ TeacherScript_0x5676d: BugCatcherScript_0x56770: jumptextfaceplayer UnknownText_0x56942 -MapGoldenrodDeptStoreRoofSignpost0Script: - jumptext UnknownText_0x569c3 +Binoculars1: + jumptext Binoculars1Text -MapGoldenrodDeptStoreRoofSignpost1Script: - jumptext UnknownText_0x56a2b +Binoculars2: + jumptext Binoculars2Text -MapGoldenrodDeptStoreRoofSignpost2Script: - jumptext UnknownText_0x56aa6 +Binoculars3: + jumptext Binoculars3Text -MapGoldenrodDeptStoreRoofSignpost3Script: - jumptext UnknownText_0x56b11 +PokeDollVendingMachine: + jumptext PokeDollVendingMachineText UnknownText_0x5677f: text "Whew, I'm tired." @@ -169,7 +169,7 @@ UnknownText_0x56942: line "there's any left?" done -UnknownText_0x569c3: +Binoculars1Text: text "These binoculars" line "let me see far" @@ -180,7 +180,7 @@ UnknownText_0x569c3: line "the green roof?" done -UnknownText_0x56a2b: +Binoculars2Text: text "Hey! Some trainers" line "are battling on" cont "the road!" @@ -193,7 +193,7 @@ UnknownText_0x56a2b: cont "right now!" done -UnknownText_0x56aa6: +Binoculars3Text: text "A FISHER caught a" line "lot of MAGIKARP…" @@ -204,7 +204,7 @@ UnknownText_0x56aa6: line "going everywhere!" done -UnknownText_0x56b11: +PokeDollVendingMachineText: text "A vending machine" line "for #MON dolls?" @@ -228,10 +228,10 @@ GoldenrodDeptStoreRoof_MapEventHeader: .Signposts: db 4 - signpost 3, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost0Script - signpost 5, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost1Script - signpost 6, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost2Script - signpost 0, 3, SIGNPOST_UP, MapGoldenrodDeptStoreRoofSignpost3Script + signpost 3, 15, SIGNPOST_RIGHT, Binoculars1 + signpost 5, 15, SIGNPOST_RIGHT, Binoculars2 + signpost 6, 15, SIGNPOST_RIGHT, Binoculars3 + signpost 0, 3, SIGNPOST_UP, PokeDollVendingMachine .PersonEvents: db 8 diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm new file mode 100644 index 00000000000..216fba7c1d5 --- /dev/null +++ b/maps/GoldenrodNameRater.asm @@ -0,0 +1,47 @@ +const_value set 2 + const GOLDENRODNAMERATER_NAME_RATER + +GoldenrodNameRater_MapScriptHeader: +.MapTriggers: + db 0 + +.MapCallbacks: + db 0 + +GoldenrodNameRater: + faceplayer + opentext + special SpecialNameRater + waitbutton + closetext + end + +GoldenrodNameRaterBookshelf: + jumpstd difficultbookshelf + +GoldenrodNameRaterRadio: + jumpstd radio2 + +INCLUDE "text/sweethoney.asm" + +GoldenrodNameRater_MapEventHeader: + ; filler + db 0, 0 + +.Warps: + db 2 + warp_def $7, $2, 8, GOLDENROD_CITY + warp_def $7, $3, 8, GOLDENROD_CITY + +.XYTriggers: + db 0 + +.Signposts: + db 3 + signpost 1, 0, SIGNPOST_READ, GoldenrodNameRaterBookshelf + signpost 1, 1, SIGNPOST_READ, GoldenrodNameRaterBookshelf + signpost 1, 7, SIGNPOST_READ, GoldenrodNameRaterRadio + +.PersonEvents: + db 1 + person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm deleted file mode 100644 index 3b2c5cc3fae..00000000000 --- a/maps/GoldenrodNameRatersHouse.asm +++ /dev/null @@ -1,47 +0,0 @@ -const_value set 2 - const GOLDENRODNAMERATERSHOUSE_GENTLEMAN - -GoldenrodNameRatersHouse_MapScriptHeader: -.MapTriggers: - db 0 - -.MapCallbacks: - db 0 - -GentlemanScript_0x5577c: - faceplayer - opentext - special SpecialNameRater - waitbutton - closetext - end - -GoldenrodNameRatersHouseBookshelf: - jumpstd difficultbookshelf - -GoldenrodNameRatersHouseRadio: - jumpstd radio2 - -INCLUDE "text/sweethoney.asm" - -GoldenrodNameRatersHouse_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def $7, $2, 8, GOLDENROD_CITY - warp_def $7, $3, 8, GOLDENROD_CITY - -.XYTriggers: - db 0 - -.Signposts: - db 3 - signpost 1, 0, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf - signpost 1, 1, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf - signpost 1, 7, SIGNPOST_READ, GoldenrodNameRatersHouseRadio - -.PersonEvents: - db 1 - person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5577c, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index c3dba4ac79f..ef8043ec1b1 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,5 +1,5 @@ const_value set 2 - const ILEXFOREST_BIRD + const ILEXFOREST_FARFETCHD const ILEXFOREST_YOUNGSTER1 const ILEXFOREST_BLACK_BELT const ILEXFOREST_ROCKER @@ -40,53 +40,53 @@ IlexForest_MapScriptHeader: return .PositionOne: - moveperson ILEXFOREST_BIRD, $e, $1f - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $e, $1f + appear ILEXFOREST_FARFETCHD return .PositionTwo: - moveperson ILEXFOREST_BIRD, $f, $19 - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $f, $19 + appear ILEXFOREST_FARFETCHD return .PositionThree: - moveperson ILEXFOREST_BIRD, $14, $18 - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $14, $18 + appear ILEXFOREST_FARFETCHD return .PositionFour: - moveperson ILEXFOREST_BIRD, $1d, $16 - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $1d, $16 + appear ILEXFOREST_FARFETCHD return .PositionFive: - moveperson ILEXFOREST_BIRD, $1c, $1f - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $1c, $1f + appear ILEXFOREST_FARFETCHD return .PositionSix: - moveperson ILEXFOREST_BIRD, $18, $23 - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $18, $23 + appear ILEXFOREST_FARFETCHD return .PositionSeven: - moveperson ILEXFOREST_BIRD, $16, $1f - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $16, $1f + appear ILEXFOREST_FARFETCHD return .PositionEight: - moveperson ILEXFOREST_BIRD, $f, $1d - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $f, $1d + appear ILEXFOREST_FARFETCHD return .PositionNine: - moveperson ILEXFOREST_BIRD, $a, $23 - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $a, $23 + appear ILEXFOREST_FARFETCHD return .PositionTen: - moveperson ILEXFOREST_BIRD, $6, $1c - appear ILEXFOREST_BIRD + moveperson ILEXFOREST_FARFETCHD, $6, $1c + appear ILEXFOREST_FARFETCHD return IlexForestCharcoalApprenticeScript: @@ -127,64 +127,64 @@ IlexForestFarfetchdScript: cry FARFETCH_D waitbutton closetext - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos1_Pos2 - moveperson ILEXFOREST_BIRD, $f, $19 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos1_Pos2 + moveperson ILEXFOREST_FARFETCHD, $f, $19 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 end .Position2: scall .CryAndCheckFacing if_equal DOWN, .Position2_Down - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos2_Pos3 - moveperson ILEXFOREST_BIRD, $14, $18 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3 + moveperson ILEXFOREST_FARFETCHD, $14, $18 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 end .Position2_Down: - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos2_Pos8 - moveperson ILEXFOREST_BIRD, $f, $1d - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos8 + moveperson ILEXFOREST_FARFETCHD, $f, $1d + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 end .Position3: scall .CryAndCheckFacing if_equal LEFT, .Position3_Left - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos3_Pos4 - moveperson ILEXFOREST_BIRD, $1d, $16 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4 + moveperson ILEXFOREST_FARFETCHD, $1d, $16 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 end .Position3_Left: - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos3_Pos2 - moveperson ILEXFOREST_BIRD, $f, $19 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos2 + moveperson ILEXFOREST_FARFETCHD, $f, $19 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 end .Position4: scall .CryAndCheckFacing if_equal UP, .Position4_Up - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos4_Pos5 - moveperson ILEXFOREST_BIRD, $1c, $1f - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5 + moveperson ILEXFOREST_FARFETCHD, $1c, $1f + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 end .Position4_Up: - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos4_Pos3 - moveperson ILEXFOREST_BIRD, $14, $18 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos3 + moveperson ILEXFOREST_FARFETCHD, $14, $18 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 3 end @@ -193,52 +193,52 @@ IlexForestFarfetchdScript: if_equal UP, .Position5_Up if_equal LEFT, .Position5_Left if_equal RIGHT, .Position5_Right - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos5_Pos6 - moveperson ILEXFOREST_BIRD, $18, $23 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6 + moveperson ILEXFOREST_FARFETCHD, $18, $23 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 end .Position5_Left: - applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos5_Pos7 - moveperson ILEXFOREST_BIRD, $16, $1f - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos7 + moveperson ILEXFOREST_FARFETCHD, $16, $1f + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 end .Position5_Up: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos5_Pos4_Up - moveperson ILEXFOREST_BIRD, $1d, $16 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Up + moveperson ILEXFOREST_FARFETCHD, $1d, $16 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 end .Position5_Right: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos5_Pos4_Right - moveperson ILEXFOREST_BIRD, $1d, $16 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos5_Pos4_Right + moveperson ILEXFOREST_FARFETCHD, $1d, $16 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 4 end .Position6: scall .CryAndCheckFacing if_equal RIGHT, .Position6_Right - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos6_Pos7 - moveperson ILEXFOREST_BIRD, $16, $1f - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7 + moveperson ILEXFOREST_FARFETCHD, $16, $1f + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 end .Position6_Right: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos6_Pos5 - moveperson ILEXFOREST_BIRD, $1c, $1f - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos5 + moveperson ILEXFOREST_FARFETCHD, $1c, $1f + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 end @@ -246,26 +246,26 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal DOWN, .Position7_Down if_equal LEFT, .Position7_Left - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos8 - moveperson ILEXFOREST_BIRD, $f, $1d - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8 + moveperson ILEXFOREST_FARFETCHD, $f, $1d + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 end .Position7_Left: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos6 - moveperson ILEXFOREST_BIRD, $18, $23 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos6 + moveperson ILEXFOREST_FARFETCHD, $18, $23 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 6 end .Position7_Down: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos5 - moveperson ILEXFOREST_BIRD, $1c, $1f - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos5 + moveperson ILEXFOREST_FARFETCHD, $1c, $1f + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 5 end @@ -274,27 +274,27 @@ IlexForestFarfetchdScript: if_equal UP, .Position8_Up if_equal LEFT, .Position8_Left if_equal RIGHT, .Position8_Right - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos9 - moveperson ILEXFOREST_BIRD, $a, $23 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9 + moveperson ILEXFOREST_FARFETCHD, $a, $23 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 9 end .Position8_Right: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos7 - moveperson ILEXFOREST_BIRD, $16, $1f - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos7 + moveperson ILEXFOREST_FARFETCHD, $16, $1f + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 7 end .Position8_Up: .Position8_Left: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos2 - moveperson ILEXFOREST_BIRD, $f, $19 - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos2 + moveperson ILEXFOREST_FARFETCHD, $f, $19 + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 2 end @@ -302,10 +302,10 @@ IlexForestFarfetchdScript: scall .CryAndCheckFacing if_equal DOWN, .Position9_Down if_equal RIGHT, .Position9_Right - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos10 - moveperson ILEXFOREST_BIRD, $6, $1c - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10 + moveperson ILEXFOREST_FARFETCHD, $6, $1c + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 10 appear ILEXFOREST_BLACK_BELT setevent EVENT_CHARCOAL_KILN_BOSS @@ -313,18 +313,18 @@ IlexForestFarfetchdScript: end .Position9_Right: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos8_Right - moveperson ILEXFOREST_BIRD, $f, $1d - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Right + moveperson ILEXFOREST_FARFETCHD, $f, $1d + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 end .Position9_Down: - applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos8_Down - moveperson ILEXFOREST_BIRD, $f, $1d - disappear ILEXFOREST_BIRD - appear ILEXFOREST_BIRD + applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos8_Down + moveperson ILEXFOREST_FARFETCHD, $f, $1d + disappear ILEXFOREST_FARFETCHD + appear ILEXFOREST_FARFETCHD loadvar FarfetchdPosition, 8 end diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 49678a955b0..ce217afde25 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M const INDIGOPLATEAUPOKECENTER1F_SILVER const INDIGOPLATEAUPOKECENTER1F_GRAMPS - const INDIGOPLATEAUPOKECENTER1F_JYNX + const INDIGOPLATEAUPOKECENTER1F_ABRA IndigoPlateauPokeCenter1F_MapScriptHeader: .MapTriggers: @@ -48,96 +48,97 @@ UnknownScript_0x18000a: setevent EVENT_LANCES_ROOM_OAK_AND_MARY return -UnknownScript_0x180053: +PlateauRivalBattle1: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iffalse UnknownScript_0x18012b + iffalse PlateauRivalScriptDone checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT - iftrue UnknownScript_0x18012b + iftrue PlateauRivalScriptDone checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x18012b - if_equal TUESDAY, UnknownScript_0x18012b - if_equal THURSDAY, UnknownScript_0x18012b - if_equal FRIDAY, UnknownScript_0x18012b - if_equal SATURDAY, UnknownScript_0x18012b + if_equal SUNDAY, PlateauRivalScriptDone + if_equal TUESDAY, PlateauRivalScriptDone + if_equal THURSDAY, PlateauRivalScriptDone + if_equal FRIDAY, PlateauRivalScriptDone + if_equal SATURDAY, PlateauRivalScriptDone moveperson INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 - applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180164 + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1 playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, RIGHT - jump UnknownScript_0x1800ce + jump PlateauRivalBattleCommon -UnknownScript_0x180094: +PlateauRivalBattle2: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iffalse UnknownScript_0x18012b + iffalse PlateauRivalScriptDone checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT - iftrue UnknownScript_0x18012b + iftrue PlateauRivalScriptDone checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x18012b - if_equal TUESDAY, UnknownScript_0x18012b - if_equal THURSDAY, UnknownScript_0x18012b - if_equal FRIDAY, UnknownScript_0x18012b - if_equal SATURDAY, UnknownScript_0x18012b + if_equal SUNDAY, PlateauRivalScriptDone + if_equal TUESDAY, PlateauRivalScriptDone + if_equal THURSDAY, PlateauRivalScriptDone + if_equal FRIDAY, PlateauRivalScriptDone + if_equal SATURDAY, PlateauRivalScriptDone appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 - applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x18016b + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2 playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, LEFT -UnknownScript_0x1800ce: +PlateauRivalBattleCommon: opentext - writetext UnknownText_0x1801f5 + writetext PlateauRivalText1 waitbutton closetext setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x1800f3 + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x180103 - winlosstext UnknownText_0x180295, UnknownText_0x1802fd + iftrue .Chikorita + ; Cyndaquil + winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 6 startbattle dontrestartmapmusic reloadmapafterbattle - jump UnknownScript_0x180113 + jump PlateauRivalPostBattle -UnknownScript_0x1800f3: - winlosstext UnknownText_0x180295, UnknownText_0x1802fd +.Totodile + winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 4 startbattle dontrestartmapmusic reloadmapafterbattle - jump UnknownScript_0x180113 + jump PlateauRivalPostBattle -UnknownScript_0x180103: - winlosstext UnknownText_0x180295, UnknownText_0x1802fd +.Chikorita + winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 5 startbattle dontrestartmapmusic reloadmapafterbattle - jump UnknownScript_0x180113 + jump PlateauRivalPostBattle -UnknownScript_0x180113: +PlateauRivalPostBattle: playmusic MUSIC_RIVAL_AFTER opentext - writetext UnknownText_0x1802a4 + writetext PlateauRivalText2 waitbutton closetext spriteface PLAYER, DOWN - applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180172 + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement disappear INDIGOPLATEAUPOKECENTER1F_SILVER dotrigger $0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT -UnknownScript_0x18012b: +PlateauRivalScriptDone: end NurseScript_0x18012c: @@ -181,7 +182,7 @@ AbraScript: closetext end -MovementData_0x180164: +PlateauRivalMovement1: step_up step_up step_up @@ -190,7 +191,7 @@ MovementData_0x180164: turn_head_left step_end -MovementData_0x18016b: +PlateauRivalMovement2: step_up step_up step_up @@ -199,7 +200,7 @@ MovementData_0x18016b: turn_head_right step_end -MovementData_0x180172: +PlateauRivalLeavesMovement: step_down step_down step_down @@ -221,7 +222,7 @@ UnknownText_0x180178: line "start all over!" done -UnknownText_0x1801f5: +PlateauRivalText1: text "Hold it." para "You're going to" @@ -243,13 +244,13 @@ UnknownText_0x1801f5: line "I challenge you!" done -UnknownText_0x180295: +PlateauRivalWinText: text "…" para "OK--I lost…" done -UnknownText_0x1802a4: +PlateauRivalText2: text "…Darn… I still" line "can't win…" @@ -261,7 +262,7 @@ UnknownText_0x1802a4: line "lose!" done -UnknownText_0x1802fd: +PlateauRivalLoseText: text "…" para "Whew…" @@ -319,8 +320,8 @@ IndigoPlateauPokeCenter1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $10, $0, UnknownScript_0x180053, $0, $0 - xy_trigger 0, $4, $11, $0, UnknownScript_0x180094, $0, $0 + xy_trigger 0, $4, $10, $0, PlateauRivalBattle1, $0, $0 + xy_trigger 0, $4, $11, $0, PlateauRivalBattle2, $0, $0 .Signposts: db 0 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 3258685b45f..6ac3cfb266e 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,5 +1,5 @@ const_value set 2 - const LAVENDERNAMERATER_GENTLEMAN + const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScriptHeader: .MapTriggers: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 243678c9e8c..89ebc156826 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,9 +1,9 @@ const_value set 2 const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS - const MRFUJISHOUSE_RHYDON - const MRFUJISHOUSE_GROWLITHE - const MRFUJISHOUSE_MOLTRES + const MRFUJISHOUSE_PSYDUCK + const MRFUJISHOUSE_NIDORINO + const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScriptHeader: .MapTriggers: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 81d7b02097e..b2d132bdee5 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -5,7 +5,7 @@ const_value set 2 const NATIONALPARK_YOUNGSTER1 const NATIONALPARK_YOUNGSTER2 const NATIONALPARK_TEACHER2 - const NATIONALPARK_GROWLITHE + const NATIONALPARK_PERSIAN const NATIONALPARK_YOUNGSTER3 const NATIONALPARK_POKEFAN_F2 const NATIONALPARK_POKEFAN_M @@ -53,10 +53,10 @@ YoungsterScript_0x5c026: TeacherScript_0x5c029: jumptextfaceplayer UnknownText_0x5c3bc -GrowlitheScript_0x5c02c: +NationalParkPersian: faceplayer opentext - writetext UnknownText_0x5c416 + writetext NationalParkPersianText cry PERSIAN waitbutton closetext @@ -377,7 +377,7 @@ UnknownText_0x5c3bc: line "want to battle…" done -UnknownText_0x5c416: +NationalParkPersianText: text "PERSIAN: Fufushaa!" done @@ -543,7 +543,7 @@ NationalPark_MapEventHeader: person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c023, -1 person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c026, -1 person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c029, -1 - person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrowlitheScript_0x5c02c, -1 + person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPersian, -1 person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 03ca03fbe29..1546f647e6a 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -299,7 +299,7 @@ OlivineCity_MapEventHeader: db 11 warp_def $15, $d, 1, OLIVINE_POKECENTER_1F warp_def $b, $a, 1, OLIVINE_GYM - warp_def $b, $19, 1, OLIVINE_VOLTORB_HOUSE + warp_def $b, $19, 1, OLIVINE_TIMS_HOUSE warp_def $0, $0, 1, OLIVINE_HOUSE_BETA warp_def $b, $1d, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE warp_def $f, $d, 1, OLIVINE_GOOD_ROD_HOUSE diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineTimsHouse.asm similarity index 83% rename from maps/OlivineVoltorbHouse.asm rename to maps/OlivineTimsHouse.asm index acd87e47e5f..311f0543a94 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,7 +1,7 @@ const_value set 2 - const OLIVINEVOLTORBHOUSE_FISHING_GURU + const OLIVINETIMSHOUSE_TIM -OlivineVoltorbHouse_MapScriptHeader: +OlivineTimsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -19,7 +19,7 @@ Tim: TimsHouseBookshelf: jumpstd magazinebookshelf -OlivineVoltorbHouse_MapEventHeader: +OlivineTimsHouse_MapEventHeader: ; filler db 0, 0 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 47d8a148186..4bc958979e9 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -12,9 +12,9 @@ PewterNidoranSpeechHouse_MapScriptHeader: SuperNerdScript_0x1a2807: jumptextfaceplayer UnknownText_0x1a2814 -GrowlitheScript_0x1a280a: +PewterNidoran: opentext - writetext UnknownText_0x1a2825 + writetext PewterNidoranText cry NIDORAN_M waitbutton closetext @@ -24,7 +24,7 @@ UnknownText_0x1a2814: text "NIDORAN, shake!" done -UnknownText_0x1a2825: +PewterNidoranText: text "NIDORAN: Gau gau!" done @@ -46,4 +46,4 @@ PewterNidoranSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2807, -1 - person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrowlitheScript_0x1a280a, -1 + person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 1ab6012a8a7..90aac7428fb 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF const PEWTERPOKECENTER1F_BUG_CATCHER - const PEWTERPOKECENTER1F_POKEFAN_M + const PEWTERPOKECENTER1F_CHRIS PewterPokeCenter1F_MapScriptHeader: .MapTriggers: @@ -18,9 +18,9 @@ NurseScript_0x1a2ee7: TeacherScript_0x1a2eea: jumptextfaceplayer UnknownText_0x1a2f01 -JigglypuffScript_0x1a2eed: +PewterJigglypuff: opentext - writetext UnknownText_0x1a2f5d + writetext PewterJigglypuffText cry JIGGLYPUFF waitbutton closetext @@ -29,7 +29,7 @@ JigglypuffScript_0x1a2eed: BugCatcherScript_0x1a2ef7: jumptextfaceplayer UnknownText_0x1a2f75 -PokefanMScript_0x1a2efa: +Chris: faceplayer opentext trade $4 @@ -48,7 +48,7 @@ UnknownText_0x1a2f01: line "phone. Go away!" done -UnknownText_0x1a2f5d: +PewterJigglypuffText: text "JIGGLYPUFF: Puu" line "pupuu." done @@ -87,6 +87,6 @@ PewterPokeCenter1F_MapEventHeader: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a2eea, -1 - person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, JigglypuffScript_0x1a2eed, -1 + person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterJigglypuff, -1 person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x1a2ef7, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a2efa, -1 + person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 9331b66815c..7424f9b73af 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -103,12 +103,12 @@ UnknownScript_0x191865: TeacherScript_0x19186b: jumptextfaceplayer UnknownText_0x191d73 -FairyScript_0x19186e: - jumptext UnknownText_0x191db1 +ClefairyDoll: + jumptext ClefairyDollText -OddishScript_0x191871: +FanClubBayleef: opentext - writetext UnknownText_0x191de9 + writetext FanClubBayleefText cry BAYLEEF waitbutton closetext @@ -272,7 +272,7 @@ UnknownText_0x191d73: line "head is so cute!" done -UnknownText_0x191db1: +ClefairyDollText: text "It's a CLEFAIRY!" line "Huh?" @@ -281,7 +281,7 @@ UnknownText_0x191db1: cont "DOLL." done -UnknownText_0x191de9: +FanClubBayleefText: text "BAYLEEF: Li liif!" done @@ -319,5 +319,5 @@ PokemonFanClub_MapEventHeader: person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x191821, -1 person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x191824, -1 person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19186b, -1 - person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL - person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OddishScript_0x191871, -1 + person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL + person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 41cd2e816be..04e860de2cb 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -5,7 +5,7 @@ const_value set 2 const POWERPLANT_OFFICER2 const POWERPLANT_GYM_GUY3 const POWERPLANT_FISHER - const POWERPLANT_GYM_GUY4 + const POWERPLANT_FOREST PowerPlant_MapScriptHeader: .MapTriggers: @@ -24,7 +24,7 @@ UnknownScript_0x188dc3: UnknownScript_0x188dc4: end -UnknownScript_0x188dc5: +PowerPlantGuardPhoneScript: playsound SFX_CALL showemote EMOTE_SHOCK, POWERPLANT_OFFICER1, 15 waitsfx @@ -190,7 +190,7 @@ UnknownScript_0x188ec5: closetext end -GymGuyScript_0x188ecb: +Forest: faceplayer opentext trade $6 @@ -401,7 +401,7 @@ PowerPlant_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $c, $5, $0, UnknownScript_0x188dc5, $0, $0 + xy_trigger 1, $c, $5, $0, PowerPlantGuardPhoneScript, $0, $0 .Signposts: db 2 @@ -416,4 +416,4 @@ PowerPlant_MapEventHeader: person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 person_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PowerPlantManager, -1 - person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188ecb, -1 + person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 13835e96bc3..8145530a81d 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -28,21 +28,21 @@ TeacherScript_0x5d701: faceplayer opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER - iftrue UnknownScript_0x5d70f + iftrue .Rockets writetext UnknownText_0x5d956 waitbutton closetext end -UnknownScript_0x5d70f: +.Rockets writetext UnknownText_0x5d983 waitbutton closetext end -JigglypuffScript_0x5d715: +RadioTowerJigglypuff: opentext - writetext UnknownText_0x5d9b6 + writetext RadioTowerJigglypuffText cry JIGGLYPUFF waitbutton closetext @@ -361,7 +361,7 @@ UnknownText_0x5d983: cont "the RADIO TOWER?" done -UnknownText_0x5d9b6: +RadioTowerJigglypuffText: text "JIGGLYPUFF:" line "Jiggly…" done @@ -741,6 +741,6 @@ RadioTower2F_MapEventHeader: person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, JigglypuffScript_0x5d715, -1 + person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 13c953d8d9a..928f44cd40f 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -16,14 +16,14 @@ RadioTower3F_MapScriptHeader: ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x5e543 + dbw MAPCALLBACK_TILES, CardKeyShutterCallback -UnknownScript_0x5e543: +CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER - iftrue UnknownScript_0x5e54a + iftrue .Change return -UnknownScript_0x5e54a: +.Change changeblock $e, $2, $2a changeblock $e, $4, $1 return diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 398a9d33732..4fdcf7d2dcb 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -47,9 +47,9 @@ UnknownScript_0x5ebb0: closetext end -GrowlitheScript_0x5ebb2: +RadioTowerMeowth: opentext - writetext UnknownText_0x5ed66 + writetext RadioTowerMeowthText cry MEOWTH waitbutton closetext @@ -146,7 +146,7 @@ UnknownText_0x5ed2c: line "show." done -UnknownText_0x5ed66: +RadioTowerMeowthText: text "MEOWTH: Meowth…" done @@ -268,7 +268,7 @@ RadioTower4F_MapEventHeader: db 7 person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 - person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GrowlitheScript_0x5ebb2, -1 + person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/Route14.asm b/maps/Route14.asm index bef460b423e..fabb3af5c86 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 - const ROUTE14_TEACHER + const ROUTE14_KIM Route14_MapScriptHeader: .MapTriggers: @@ -11,7 +11,7 @@ Route14_MapScriptHeader: .MapCallbacks: db 0 -TeacherScript_0x1ad47f: +Kim: faceplayer opentext trade $5 @@ -133,4 +133,4 @@ Route14_MapEventHeader: person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 - person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 4, TeacherScript_0x1ad47f, -1 + person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 3f30815fd3a..624fcbfccc6 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -1,6 +1,6 @@ const_value set 2 - const ROUTE28FAMOUSSPEECHHOUSE_COOLTRAINER_F - const ROUTE28FAMOUSSPEECHHOUSE_MOLTRES + const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY + const ROUTE28FAMOUSSPEECHHOUSE_FEAROW Route28FamousSpeechHouse_MapScriptHeader: .MapTriggers: diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 4f66cb6edfa..fd5847f8030 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -70,7 +70,7 @@ UnknownScript_0x62d84: closetext end -ButterfreeScript_0x62d8a: +IlexGateButterfree: opentext writetext UnknownText_0x62e83 cry BUTTERFREE @@ -159,6 +159,6 @@ Route34IlexForestGate_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ButterfreeScript_0x62d8a, -1 + person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route39.asm b/maps/Route39.asm index c34553dfbad..3145f9bba50 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -2,11 +2,11 @@ const_value set 2 const ROUTE39_SAILOR const ROUTE39_POKEFAN_M const ROUTE39_POKEFAN_F1 - const ROUTE39_TAUROS1 - const ROUTE39_TAUROS2 - const ROUTE39_TAUROS3 - const ROUTE39_TAUROS4 - const ROUTE39_STANDING_YOUNGSTER + const ROUTE39_MILTANK1 + const ROUTE39_MILTANK2 + const ROUTE39_MILTANK3 + const ROUTE39_MILTANK4 + const ROUTE39_PSYCHIC_NORMAN const ROUTE39_FRUIT_TREE const ROUTE39_POKEFAN_F2 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 45cc8f92a5c..a057f2b5f42 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,7 +1,7 @@ const_value set 2 const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 - const ROUTE39BARN_TAUROS + const ROUTE39BARN_MOOMOO Route39Barn_MapScriptHeader: .MapTriggers: @@ -46,7 +46,7 @@ TwinScript_0x9cc90: spriteface ROUTE39BARN_TWIN2, LEFT end -TaurosScript_0x9ccaa: +MooMoo: opentext checkevent EVENT_HEALED_MOOMOO iftrue .HappyCow @@ -207,4 +207,4 @@ Route39Barn_MapEventHeader: db 3 person_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 person_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 - person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TaurosScript_0x9ccaa, -1 + person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index be1d1977af3..dd3ea9dab68 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -9,8 +9,8 @@ SilphCo1F_MapScriptHeader: .MapCallbacks: db 0 -ReceptionistScript_0x18abe5: - jumptextfaceplayer UnknownText_0x18ac03 +SilphCoReceptionist: + jumptextfaceplayer SilphCoReceptionistText OfficerScript_0x18abe8: faceplayer @@ -29,7 +29,7 @@ UnknownScript_0x18ac01: closetext end -UnknownText_0x18ac03: +SilphCoReceptionistText: text "Welcome. This is" line "SILPH CO.'s HEAD" cont "OFFICE BUILDING." @@ -72,5 +72,5 @@ SilphCo1F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x18abe5, -1 + person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SilphCoReceptionist, -1 person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 0a8933b6798..82575a93a9a 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -8,21 +8,21 @@ SilverCaveRoom3_MapScriptHeader: .MapCallbacks: db 0 -RedScript_0x18c603: +Red: special Special_FadeOutMusic faceplayer opentext - writetext UnknownText_0x18c637 + writetext .Text1 waitbutton closetext - winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c + winlosstext .Text2, .Text2 loadtrainer RED, 1 startbattle dontrestartmapmusic reloadmapafterbattle special Special_FadeOutMusic opentext - writetext UnknownText_0x18c63f + writetext .Text3 waitbutton closetext special Special_FadeBlackQuickly @@ -36,16 +36,16 @@ RedScript_0x18c603: credits end -UnknownText_0x18c637: +.Text1: text $56 line $56 done -UnknownText_0x18c63c: +.Text2: text "…" done -UnknownText_0x18c63f: +.Text3: text $56 line $56 done @@ -66,4 +66,4 @@ SilverCaveRoom3_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER + person_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index db00dda585f..37041c88dc7 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,5 +1,5 @@ const_value set 2 - const SOULHOUSE_GRAMPS + const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS const SOULHOUSE_GRANNY @@ -11,8 +11,8 @@ SoulHouse_MapScriptHeader: .MapCallbacks: db 0 -GrampsScript_0x7ec47: - jumptextfaceplayer UnknownText_0x7ec53 +MrFuji: + jumptextfaceplayer MrFujiText TeacherScript_0x7ec4a: jumptextfaceplayer UnknownText_0x7ed4d @@ -23,7 +23,7 @@ LassScript_0x7ec4d: GrannyScript_0x7ec50: jumptextfaceplayer UnknownText_0x7eddb -UnknownText_0x7ec53: +MrFujiText: text "MR.FUJI: Welcome." para "Hmm… You appear to" @@ -89,7 +89,7 @@ SoulHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7ec47, -1 + person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ec4a, -1 person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x7ec4d, -1 person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7ec50, -1 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 4df43d739cf..1a06d6a7031 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -3,12 +3,12 @@ const_value set 2 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE const TEAMROCKETBASEB2F_DRAGON - const TEAMROCKETBASEB2F_VOLTORB1 - const TEAMROCKETBASEB2F_VOLTORB2 - const TEAMROCKETBASEB2F_VOLTORB3 - const TEAMROCKETBASEB2F_VOLTORB4 - const TEAMROCKETBASEB2F_VOLTORB5 - const TEAMROCKETBASEB2F_VOLTORB6 + const TEAMROCKETBASEB2F_ELECTRODE1 + const TEAMROCKETBASEB2F_ELECTRODE2 + const TEAMROCKETBASEB2F_ELECTRODE3 + const TEAMROCKETBASEB2F_ELECTRODE4 + const TEAMROCKETBASEB2F_ELECTRODE5 + const TEAMROCKETBASEB2F_ELECTRODE6 const TEAMROCKETBASEB2F_ROCKET2 const TEAMROCKETBASEB2F_ROCKET3 const TEAMROCKETBASEB2F_ROCKET4 @@ -29,7 +29,7 @@ TeamRocketBaseB2F_MapScriptHeader: ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x6cf89 + dbw MAPCALLBACK_TILES, TransmitterDoorCallback UnknownScript_0x6cf85: end @@ -43,12 +43,12 @@ UnknownScript_0x6cf87: UnknownScript_0x6cf88: end -UnknownScript_0x6cf89: +TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - iftrue UnknownScript_0x6cf90 + iftrue .Change return -UnknownScript_0x6cf90: +.Change changeblock $e, $c, $7 return @@ -159,16 +159,16 @@ UnknownScript_0x6d07a: applymovement PLAYER, MovementData_0x6d278 end -UnknownScript_0x6d085: +LanceHealsScript1: spriteface PLAYER, UP - jump UnknownScript_0x6d091 + jump LanceHealsCommon -UnknownScript_0x6d08b: +LanceHealsScript2: spriteface PLAYER, RIGHT spriteface TEAMROCKETBASEB2F_LANCE, LEFT -UnknownScript_0x6d091: +LanceHealsCommon: opentext - writetext UnknownText_0x6da97 + writetext LanceHealsText1 waitbutton closetext special FadeOutPalettes @@ -177,7 +177,7 @@ UnknownScript_0x6d091: special HealParty special FadeInPalettes opentext - writetext UnknownText_0x6daf7 + writetext LanceHealsText2 waitbutton closetext dotrigger $1 @@ -226,13 +226,13 @@ GruntM19Script: closetext end -VoltorbScript_0x6d101: +RocketElectrode1: cry ELECTRODE loadwildmon ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear TEAMROCKETBASEB2F_VOLTORB1 - disappear TEAMROCKETBASEB2F_VOLTORB4 + disappear TEAMROCKETBASEB2F_ELECTRODE1 + disappear TEAMROCKETBASEB2F_ELECTRODE4 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 @@ -244,13 +244,13 @@ VoltorbScript_0x6d101: applymovement PLAYER, MovementData_0x6d28c jump UnknownScript_0x6d184 -VoltorbScript_0x6d12c: +RocketElectrode2: cry ELECTRODE loadwildmon ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear TEAMROCKETBASEB2F_VOLTORB2 - disappear TEAMROCKETBASEB2F_VOLTORB5 + disappear TEAMROCKETBASEB2F_ELECTRODE2 + disappear TEAMROCKETBASEB2F_ELECTRODE5 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 @@ -262,13 +262,13 @@ VoltorbScript_0x6d12c: applymovement PLAYER, MovementData_0x6d299 jump UnknownScript_0x6d184 -VoltorbScript_0x6d157: +RocketElectrode3: cry ELECTRODE loadwildmon ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear TEAMROCKETBASEB2F_VOLTORB3 - disappear TEAMROCKETBASEB2F_VOLTORB6 + disappear TEAMROCKETBASEB2F_ELECTRODE3 + disappear TEAMROCKETBASEB2F_ELECTRODE6 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 @@ -793,7 +793,7 @@ UnknownText_0x6d994: line "seeing you again!" done -UnknownText_0x6da97: +LanceHealsText1: text "LANCE: Are you all" line "right?" @@ -805,7 +805,7 @@ UnknownText_0x6da97: cont "cine." done -UnknownText_0x6daf7: +LanceHealsText2: text "LANCE: ," line "let's give it our" cont "best for #MON." @@ -930,8 +930,8 @@ TeamRocketBaseB2F_MapEventHeader: .XYTriggers: db 9 - xy_trigger 0, $e, $5, $0, UnknownScript_0x6d085, $0, $0 - xy_trigger 0, $d, $4, $0, UnknownScript_0x6d08b, $0, $0 + xy_trigger 0, $e, $5, $0, LanceHealsScript1, $0, $0 + xy_trigger 0, $d, $4, $0, LanceHealsScript2, $0, $0 xy_trigger 1, $b, $e, $0, UnknownScript_0x6cf95, $0, $0 xy_trigger 1, $b, $f, $0, UnknownScript_0x6cf9c, $0, $0 xy_trigger 2, $c, $e, $0, UnknownScript_0x6d075, $0, $0 @@ -972,9 +972,9 @@ TeamRocketBaseB2F_MapEventHeader: person_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE person_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE person_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - person_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - person_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 9, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 person_event SPRITE_VOLTORB, 5, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 person_event SPRITE_VOLTORB, 7, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 person_event SPRITE_VOLTORB, 9, 22, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index e49a2b39a97..dba82208f69 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -32,7 +32,7 @@ TeamRocketBaseB3F_MapScriptHeader: dbw MAPCALLBACK_TILES, .CheckGiovanniDoor .Trigger0: - priorityjump LanceScript_0x6dffc + priorityjump LanceGetPasswordScript end .Trigger1: @@ -53,14 +53,14 @@ TeamRocketBaseB3F_MapScriptHeader: changeblock $a, $8, $7 return -LanceScript_0x6dffc: +LanceGetPasswordScript: spriteface PLAYER, LEFT pause 5 spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a opentext - writetext UnknownText_0x6e179 + writetext LanceGetPasswordText waitbutton closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c @@ -68,21 +68,21 @@ LanceScript_0x6dffc: dotrigger $1 end -UnknownScript_0x6e019: +RocketBaseRival: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic appear TEAMROCKETBASEB3F_SILVER - applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e164 + applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement spriteface PLAYER, LEFT playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x6e267 + writetext RocketBaseRivalText waitbutton closetext playsound SFX_TACKLE - applymovement PLAYER, MovementData_0x6e175 - applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e16d + applymovement PLAYER, RocketBaseRivalShovesPlayerMovement + applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER dotrigger $2 special RestartMapMusic @@ -124,15 +124,15 @@ UnknownScript_0x6e056: dotrigger $3 end -MoltresScript_0x6e091: +RocketBaseMurkrow: opentext - writetext UnknownText_0x6e585 + writetext RocketBaseMurkrowText waitbutton closetext setevent EVENT_LEARNED_HAIL_GIOVANNI end -TrainerGruntF5: +SlowpokeTailGrunt: trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: @@ -144,7 +144,7 @@ GruntF5Script: setevent EVENT_LEARNED_SLOWPOKETAIL end -TrainerGruntM28: +RaticateTailGrunt: trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: @@ -297,7 +297,7 @@ MovementData_0x6e147: big_step_left step_end -MovementData_0x6e164: +RocketBaseRivalEnterMovement: step_down step_down step_down @@ -308,7 +308,7 @@ MovementData_0x6e164: step_right step_end -MovementData_0x6e16d: +RocketBaseRivalLeaveMovement: step_left step_left step_up @@ -318,13 +318,13 @@ MovementData_0x6e16d: step_up step_end -MovementData_0x6e175: +RocketBaseRivalShovesPlayerMovement: fix_facing big_step_right remove_fixed_facing step_end -UnknownText_0x6e179: +LanceGetPasswordText: text "LANCE: It takes" line "two passwords to" @@ -349,7 +349,7 @@ UnknownText_0x6e235: cont "incredibly tough…" done -UnknownText_0x6e267: +RocketBaseRivalText: text "…" para "Didn't I tell you" @@ -434,7 +434,7 @@ UnknownText_0x6e548: line "the others…" done -UnknownText_0x6e585: +RocketBaseMurkrowText: text "MURKROW: The" line "password is…" @@ -586,7 +586,7 @@ TeamRocketBaseB3F_MapEventHeader: db 3 xy_trigger 2, $8, $a, $0, UnknownScript_0x6e04b, $0, $0 xy_trigger 2, $8, $b, $0, UnknownScript_0x6e052, $0, $0 - xy_trigger 1, $a, $8, $0, UnknownScript_0x6e019, $0, $0 + xy_trigger 1, $a, $8, $0, RocketBaseRival, $0, $0 .Signposts: db 10 @@ -603,11 +603,11 @@ TeamRocketBaseB3F_MapEventHeader: .PersonEvents: db 14 - person_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + person_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS person_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE - person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MoltresScript_0x6e091, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerGruntF5, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 4d23f2ce1b4..81fb366e661 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -2,7 +2,7 @@ const_value set 2 const TINTOWER1F_SUICUNE const TINTOWER1F_RAIKOU const TINTOWER1F_ENTEI - const TINTOWER1F_SUPER_NERD + const TINTOWER1F_EUSINE const TINTOWER1F_SAGE1 const TINTOWER1F_SAGE2 const TINTOWER1F_SAGE3 @@ -25,10 +25,10 @@ TinTower1F_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f - dbw MAPCALLBACK_TILES, UnknownScript_0x185084 + dbw MAPCALLBACK_TILES, TinTowerStairsCallback UnknownScript_0x18502a: - priorityjump UnknownScript_0x18508f + priorityjump SuicuneBattle end UnknownScript_0x18502e: @@ -45,9 +45,9 @@ UnknownScript_0x18502f: setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH - iffalse UnknownScript_0x18504f - appear TINTOWER1F_SUPER_NERD -UnknownScript_0x18504f: + iffalse .Done + appear TINTOWER1F_EUSINE +.Done return UnknownScript_0x185050: @@ -82,46 +82,46 @@ UnknownScript_0x185077: setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return -UnknownScript_0x185084: +TinTowerStairsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x18508e + iftrue .NoChange changeblock $a, $2, $9 -UnknownScript_0x18508e: +.NoChange return -UnknownScript_0x18508f: - applymovement PLAYER, MovementData_0x1851cb +SuicuneBattle: + applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU special SpecialMonCheck - iftrue UnknownScript_0x1850b6 - applymovement TINTOWER1F_RAIKOU, MovementData_0x1851d0 + iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower + applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 spriteface PLAYER, LEFT cry RAIKOU pause 10 playsound SFX_WARP_FROM - applymovement TINTOWER1F_RAIKOU, MovementData_0x1851d4 + applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement2 disappear TINTOWER1F_RAIKOU playsound SFX_EXIT_BUILDING waitsfx -UnknownScript_0x1850b6: +.Next1 writebyte ENTEI special SpecialMonCheck - iftrue UnknownScript_0x1850d7 - applymovement TINTOWER1F_ENTEI, MovementData_0x1851da + iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower + applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 spriteface PLAYER, RIGHT cry ENTEI pause 10 playsound SFX_WARP_FROM - applymovement TINTOWER1F_ENTEI, MovementData_0x1851de + applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement2 disappear TINTOWER1F_ENTEI playsound SFX_EXIT_BUILDING waitsfx -UnknownScript_0x1850d7: +.Next2 spriteface PLAYER, UP pause 10 - applymovement PLAYER, MovementData_0x1851e8 - applymovement TINTOWER1F_SUICUNE, MovementData_0x1851e4 + applymovement PLAYER, TinTowerPlayerMovement2 + applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement cry SUICUNE pause 20 loadwildmon SUICUNE, 40 @@ -143,9 +143,9 @@ UnknownScript_0x1850d7: spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR - moveperson TINTOWER1F_SUPER_NERD, $a, $f - appear TINTOWER1F_SUPER_NERD - applymovement TINTOWER1F_SUPER_NERD, MovementData_0x1851ec + moveperson TINTOWER1F_EUSINE, $a, $f + appear TINTOWER1F_EUSINE + applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec playsound SFX_ENTER_DOOR moveperson TINTOWER1F_SAGE1, $9, $f appear TINTOWER1F_SAGE1 @@ -163,12 +163,12 @@ UnknownScript_0x1850d7: moveperson TINTOWER1F_SAGE3, $b, $d spriteface PLAYER, RIGHT opentext - writetext UnknownText_0x185203 + writetext TinTowerEusineSuicuneText waitbutton closetext - applymovement TINTOWER1F_SUPER_NERD, MovementData_0x1851f1 + applymovement TINTOWER1F_EUSINE, MovementData_0x1851f1 playsound SFX_EXIT_BUILDING - disappear TINTOWER1F_SUPER_NERD + disappear TINTOWER1F_EUSINE waitsfx special Special_FadeOutMusic pause 20 @@ -232,23 +232,23 @@ SageScript_0x1851bc: UnknownScript_0x1851c5: jumptextfaceplayer UnknownText_0x1858d0 -SuperNerdScript_0x1851c8: - jumptextfaceplayer UnknownText_0x1856a3 +TinTowerEusine: + jumptextfaceplayer TinTowerEusineHoOhText -MovementData_0x1851cb: +TinTowerPlayerMovement1: slow_step_up slow_step_up slow_step_up slow_step_up step_end -MovementData_0x1851d0: +TinTowerRaikouMovement1: db $39 ; movement fast_jump_step_down db $38 ; movement step_end -MovementData_0x1851d4: +TinTowerRaikouMovement2: db $39 ; movement fast_jump_step_down fast_jump_step_right @@ -256,13 +256,13 @@ MovementData_0x1851d4: db $38 ; movement step_end -MovementData_0x1851da: +TinTowerEnteiMovement1: db $39 ; movement fast_jump_step_down db $38 ; movement step_end -MovementData_0x1851de: +TinTowerEnteiMovement2: db $39 ; movement fast_jump_step_down fast_jump_step_left @@ -270,13 +270,13 @@ MovementData_0x1851de: db $38 ; movement step_end -MovementData_0x1851e4: +TinTowerSuicuneMovement: db $39 ; movement fast_jump_step_down db $38 ; movement step_end -MovementData_0x1851e8: +TinTowerPlayerMovement2: fix_facing big_step_down remove_fixed_facing @@ -315,7 +315,7 @@ MovementData_0x1851fe: step_up step_end -UnknownText_0x185203: +TinTowerEusineSuicuneText: text "EUSINE: Awesome!" line "Too awesome, even!" @@ -448,7 +448,7 @@ UnknownText_0x185654: cont "and advance." done -UnknownText_0x1856a3: +TinTowerEusineHoOhText: text "I knew it." para "I knew you'd get" @@ -549,7 +549,7 @@ TinTower1F_MapEventHeader: person_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1851c8, EVENT_TIN_TOWER_1F_EUSINE + person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index bdfc8bb335f..ca5e50bcf76 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -10,27 +10,27 @@ TinTowerRoof_MapScriptHeader: ; callbacks - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x77230 + dbw MAPCALLBACK_OBJECTS, .HoOh -UnknownScript_0x77230: +.HoOh checkevent EVENT_FOUGHT_HO_OH - iftrue UnknownScript_0x77241 + iftrue .NoAppear checkitem RAINBOW_WING - iftrue UnknownScript_0x7723e - jump UnknownScript_0x77241 + iftrue .Appear + jump .NoAppear -UnknownScript_0x7723e: +.Appear appear TINTOWERROOF_HO_OH return -UnknownScript_0x77241: +.NoAppear disappear TINTOWERROOF_HO_OH return -HoOhScript_0x77244: +TinTowerHoOh: faceplayer opentext - writetext UnknownText_0x77260 + writetext HoOhText cry HO_OH pause 15 closetext @@ -43,7 +43,7 @@ HoOhScript_0x77244: setevent EVENT_SET_WHEN_FOUGHT_HO_OH end -UnknownText_0x77260: +HoOhText: text "Shaoooh!" done @@ -63,4 +63,4 @@ TinTowerRoof_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH + person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 354771bb90b..d31bd970285 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -4,7 +4,7 @@ const_value set 2 const UNIONCAVEB2F_COOLTRAINER_F2 const UNIONCAVEB2F_POKE_BALL1 const UNIONCAVEB2F_POKE_BALL2 - const UNIONCAVEB2F_SURF + const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScriptHeader: .MapTriggers: @@ -15,27 +15,27 @@ UnionCaveB2F_MapScriptHeader: ; callbacks - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5a30d + dbw MAPCALLBACK_OBJECTS, .Lapras -UnknownScript_0x5a30d: +.Lapras checkflag ENGINE_UNION_CAVE_LAPRAS - iftrue UnknownScript_0x5a319 + iftrue .NoAppear checkcode VAR_WEEKDAY - if_equal FRIDAY, UnknownScript_0x5a31c -UnknownScript_0x5a319: - disappear UNIONCAVEB2F_SURF + if_equal FRIDAY, .Appear +.NoAppear + disappear UNIONCAVEB2F_LAPRAS return -UnknownScript_0x5a31c: - appear UNIONCAVEB2F_SURF +.Appear + appear UNIONCAVEB2F_LAPRAS return -SurfScript_0x5a31f: +UnionCaveLapras: faceplayer cry LAPRAS loadwildmon LAPRAS, 20 startbattle - disappear UNIONCAVEB2F_SURF + disappear UNIONCAVEB2F_LAPRAS setflag ENGINE_UNION_CAVE_LAPRAS reloadmapafterbattle end @@ -165,4 +165,4 @@ UnionCaveB2F_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS + person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index fb5e4e2e559..c84321e78b5 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -23,18 +23,18 @@ VermilionCity_MapScriptHeader: TeacherScript_0x1aa983: jumptextfaceplayer UnknownText_0x1aaa15 -GrampsScript_0x1aa986: - jumptextfaceplayer UnknownText_0x1aaa6f +VermilionMachopOwner: + jumptextfaceplayer VermilionMachopOwnerText VermilionMachop: opentext - writetext UnknownText_0x1aaaca + writetext VermilionMachopText1 cry MACHOP waitbutton closetext earthquake 30 opentext - writetext UnknownText_0x1aaae2 + writetext VermilionMachopText2 waitbutton closetext end @@ -137,7 +137,7 @@ UnknownText_0x1aaa15: cont "dock here." done -UnknownText_0x1aaa6f: +VermilionMachopOwnerText: text "My #MON is" line "preparing the land" cont "for construction." @@ -147,12 +147,12 @@ UnknownText_0x1aaa6f: cont "project…" done -UnknownText_0x1aaaca: +VermilionMachopText1: text "MACHOP: Guooh" line "gogogoh!" done -UnknownText_0x1aaae2: +VermilionMachopText2: text "A MACHOP is growl-" line "ing while stomping" cont "the ground flat." @@ -303,7 +303,7 @@ VermilionCity_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1aa983, -1 - person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1aa986, -1 + person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMachopOwner, -1 person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1aa99b, -1 person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index eabab4e7def..5824d6f4b5e 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -1,6 +1,6 @@ const_value set 2 const VIOLETONIXTRADEHOUSE_POKEFAN_M - const VIOLETONIXTRADEHOUSE_YOUNGSTER + const VIOLETONIXTRADEHOUSE_KYLE VioletOnixTradeHouse_MapScriptHeader: .MapTriggers: @@ -12,7 +12,7 @@ VioletOnixTradeHouse_MapScriptHeader: PokefanMScript_0x6998d: jumptextfaceplayer UnknownText_0x69997 -YoungsterScript_0x69990: +Kyle: faceplayer opentext trade $1 @@ -50,4 +50,4 @@ VioletOnixTradeHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69990, -1 + person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 42447d2fa50..8166fb3a1f1 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,8 +1,8 @@ const_value set 2 const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS - const VIRIDIANNICKNAMESPEECHHOUSE_MOLTRES - const VIRIDIANNICKNAMESPEECHHOUSE_GROWLITHE + const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY + const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScriptHeader: .MapTriggers: @@ -17,17 +17,17 @@ PokefanMScript_0x9ae3a: LassScript_0x9ae3d: jumptextfaceplayer UnknownText_0x9aecb -MoltresScript_0x9ae40: +Speary: opentext - writetext UnknownText_0x9aefe + writetext SpearyText cry SPEAROW waitbutton closetext end -GrowlitheScript_0x9ae4a: +Rattey: opentext - writetext UnknownText_0x9af10 + writetext RatteyText cry RATTATA waitbutton closetext @@ -53,11 +53,11 @@ UnknownText_0x9aecb: cont "RATTEY--a RATTATA." done -UnknownText_0x9aefe: +SpearyText: text "SPEARY: Ch-chun!" done -UnknownText_0x9af10: +RatteyText: text "RATTEY: Kikiii!" done @@ -80,5 +80,5 @@ ViridianNicknameSpeechHouse_MapEventHeader: db 4 person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ae3a, -1 person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9ae3d, -1 - person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MoltresScript_0x9ae40, -1 - person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrowlitheScript_0x9ae4a, -1 + person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 + person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index eb42831fd79..f014d8ea8af 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -10,27 +10,27 @@ WhirlIslandLugiaChamber_MapScriptHeader: ; callbacks - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18c504 + dbw MAPCALLBACK_OBJECTS, .Lugia -UnknownScript_0x18c504: +.Lugia checkevent EVENT_FOUGHT_LUGIA - iftrue UnknownScript_0x18c515 + iftrue .NoAppear checkitem SILVER_WING - iftrue UnknownScript_0x18c512 - jump UnknownScript_0x18c515 + iftrue .Appear + jump .NoAppear -UnknownScript_0x18c512: +.Appear appear WHIRLISLANDLUGIACHAMBER_LUGIA return -UnknownScript_0x18c515: +.NoAppear disappear WHIRLISLANDLUGIACHAMBER_LUGIA return -LugiaScript_0x18c518: +Lugia: faceplayer opentext - writetext UnknownText_0x18c531 + writetext LugiaText cry LUGIA pause 15 closetext @@ -42,7 +42,7 @@ LugiaScript_0x18c518: reloadmapafterbattle end -UnknownText_0x18c531: +LugiaText: text "Gyaaas!" done @@ -62,4 +62,4 @@ WhirlIslandLugiaChamber_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm index 02930aec07c..0a8fa0a8bbd 100644 --- a/maps/blockdata_1.asm +++ b/maps/blockdata_1.asm @@ -146,14 +146,14 @@ Route38_BlockData: BetaCianwoodCity_BlockData: INCBIN "maps/BetaCianwoodCity.blk" -OlivineVoltorbHouse_BlockData: +OlivineTimsHouse_BlockData: OlivineHouseBeta_BlockData: OlivinePunishmentSpeechHouse_BlockData: OlivineGoodRodHouse_BlockData: Route39Farmhouse_BlockData: MahoganyRedGyaradosSpeechHouse_BlockData: BlackthornDragonSpeechHouse_BlockData: -BlackthornDodrioTradeHouse_BlockData: +BlackthornEmysHouse_BlockData: MoveDeletersHouse_BlockData: CeruleanGymBadgeSpeechHouse_BlockData: CeruleanPoliceStation_BlockData: @@ -165,7 +165,7 @@ LakeofRageMagikarpHouse_BlockData: GoldenrodHappinessRater_BlockData: GoldenrodBillsHouse_BlockData: GoldenrodPPSpeechHouse_BlockData: -GoldenrodNameRatersHouse_BlockData: +GoldenrodNameRater_BlockData: VermilionHouseFishingSpeechHouse_BlockData: VermilionMagnetTrainSpeechHouse_BlockData: VermilionHouseDiglettsCaveSpeechHouse_BlockData: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 8fb625078d9..32be86ac04b 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -31,7 +31,7 @@ MapGroupPointers:: MapGroup1: map_header OlivinePokeCenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header OlivineVoltorbHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivinePunishmentSpeechHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGoodRodHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -165,7 +165,7 @@ MapGroup5: map_header BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornDodrioTradeHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornPokeCenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -254,7 +254,7 @@ MapGroup11: map_header GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodFlowerShop, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodPPSpeechHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodNameRatersHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header GoldenrodNameRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index c2e07bde934..895f99dae2e 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -362,7 +362,7 @@ map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0 map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, 0 map_header_2 OlivineGym, OLIVINE_GYM, $0, 0 - map_header_2 OlivineVoltorbHouse, OLIVINE_VOLTORB_HOUSE, $0, 0 + map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0 map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0 map_header_2 OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $0, 0 map_header_2 OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $0, 0 @@ -394,7 +394,7 @@ map_header_2 BlackthornGym1F, BLACKTHORN_GYM_1F, $0, 0 map_header_2 BlackthornGym2F, BLACKTHORN_GYM_2F, $0, 0 map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0 - map_header_2 BlackthornDodrioTradeHouse, BLACKTHORN_DODRIO_TRADE_HOUSE, $0, 0 + map_header_2 BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $0, 0 map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0 map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0 @@ -441,7 +441,7 @@ map_header_2 GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $0, 0 map_header_2 GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $0, 0 map_header_2 GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $0, 0 - map_header_2 GoldenrodNameRatersHouse, GOLDENROD_NAME_RATERS_HOUSE, $0, 0 + map_header_2 GoldenrodNameRater, GOLDENROD_NAME_RATER, $0, 0 map_header_2 GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $0, 0 map_header_2 GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $0, 0 map_header_2 GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $0, 0