diff options
Diffstat (limited to 'maps')
-rw-r--r-- | maps/AzaleaTown.asm | 22 | ||||
-rw-r--r-- | maps/BurnedTower1F.asm | 6 | ||||
-rw-r--r-- | maps/CherrygroveCity.asm | 6 | ||||
-rw-r--r-- | maps/CianwoodCity.asm | 14 | ||||
-rw-r--r-- | maps/IndigoPlateauPokeCenter1F.asm | 6 | ||||
-rw-r--r-- | maps/LancesRoom.asm | 22 | ||||
-rw-r--r-- | maps/MountMoon.asm | 60 | ||||
-rw-r--r-- | maps/RadioTower5F.asm | 112 | ||||
-rw-r--r-- | maps/TeamRocketBaseB1F.asm | 18 | ||||
-rw-r--r-- | maps/TeamRocketBaseB2F.asm | 2 | ||||
-rw-r--r-- | maps/TeamRocketBaseB3F.asm | 2 | ||||
-rw-r--r-- | maps/TrainerHouseB1F.asm | 84 | ||||
-rw-r--r-- | maps/UndergroundPathSwitchRoomEntrances.asm | 611 | ||||
-rw-r--r-- | maps/VictoryRoad.asm | 6 |
14 files changed, 499 insertions, 472 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 655f6cb87..78ebf4479 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -8,7 +8,7 @@ const_value set 2 const AZALEATOWN_SLOWPOKE3 const AZALEATOWN_SLOWPOKE4 const AZALEATOWN_FRUIT_TREE - const AZALEATOWN_AZALEA_ROCKET2 + const AZALEATOWN_SILVER const AZALEATOWN_AZALEA_ROCKET3 const AZALEATOWN_KURT_OUTSIDE @@ -41,13 +41,13 @@ AzaleaTown_MapScriptHeader: return UnknownScript_0x198018: - moveperson AZALEATOWN_AZALEA_ROCKET2, $b, $b + moveperson AZALEATOWN_SILVER, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 - appear AZALEATOWN_AZALEA_ROCKET2 - applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198134 + appear AZALEATOWN_SILVER + applymovement AZALEATOWN_SILVER, MovementData_0x198134 spriteface PLAYER, DOWN jump UnknownScript_0x198049 @@ -56,8 +56,8 @@ UnknownScript_0x198034: showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 - appear AZALEATOWN_AZALEA_ROCKET2 - applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x19813c + appear AZALEATOWN_SILVER + applymovement AZALEATOWN_SILVER, MovementData_0x19813c spriteface PLAYER, UP UnknownScript_0x198049: playmusic MUSIC_RIVAL_ENCOUNTER @@ -71,7 +71,7 @@ UnknownScript_0x198049: checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x198081 winlosstext UnknownText_0x1981e6, UnknownText_0x19835b - setlasttalked $b + setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_6 startbattle reloadmapmusic @@ -80,7 +80,7 @@ UnknownScript_0x198049: UnknownScript_0x198071: winlosstext UnknownText_0x1981e6, UnknownText_0x19835b - setlasttalked $b + setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_4 startbattle reloadmapmusic @@ -89,7 +89,7 @@ UnknownScript_0x198071: UnknownScript_0x198081: winlosstext UnknownText_0x1981e6, UnknownText_0x19835b - setlasttalked $b + setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_5 startbattle reloadmapmusic @@ -103,9 +103,9 @@ UnknownScript_0x198091: waitbutton closetext spriteface PLAYER, LEFT - applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198144 + applymovement AZALEATOWN_SILVER, MovementData_0x198144 playsound SFX_EXIT_BUILDING - disappear AZALEATOWN_AZALEA_ROCKET2 + disappear AZALEATOWN_SILVER dotrigger $0 waitsfx playmapmusic diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 3047ceb78..dd3e7b070 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -72,7 +72,7 @@ UnknownScript_0x185c25: checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x185c70 winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c - setlasttalked $4 + setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_9 startbattle reloadmapmusic @@ -81,7 +81,7 @@ UnknownScript_0x185c25: UnknownScript_0x185c60: winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c - setlasttalked $4 + setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_7 startbattle reloadmapmusic @@ -90,7 +90,7 @@ UnknownScript_0x185c60: UnknownScript_0x185c70: winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c - setlasttalked $4 + setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_8 startbattle reloadmapmusic diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d6ce724e9..8c286be2a 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -125,7 +125,7 @@ UnknownScript_0x19c0ae: checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x19c104 winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 - setlasttalked $3 + setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_3 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle @@ -136,7 +136,7 @@ UnknownScript_0x19c0ae: UnknownScript_0x19c0ee: winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 - setlasttalked $3 + setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_1 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle @@ -147,7 +147,7 @@ UnknownScript_0x19c0ee: UnknownScript_0x19c104: winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 - setlasttalked $3 + setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_2 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 871e86d28..54f87d40c 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -9,7 +9,7 @@ const_value set 2 const CIANWOODCITY_ROCK5 const CIANWOODCITY_ROCK6 const CIANWOODCITY_POKEFAN_F - const CIANWOODCITY_SUPER_NERD + const CIANWOODCITY_EUSINE const CIANWOODCITY_SUICUNE CianwoodCity_MapScriptHeader: @@ -37,7 +37,7 @@ CianwoodCity_MapScriptHeader: setevent EVENT_EUSINE_IN_BURNED_TOWER checkevent EVENT_FOUGHT_EUSINE iffalse UnknownScript_0x1a001d - disappear CIANWOODCITY_SUPER_NERD + disappear CIANWOODCITY_EUSINE UnknownScript_0x1a001d: return @@ -60,14 +60,14 @@ UnknownScript_0x1a001e: iftrue .Done setevent EVENT_FOUGHT_EUSINE playmusic MUSIC_MYSTICALMAN_ENCOUNTER - appear CIANWOODCITY_SUPER_NERD - applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00e7 + appear CIANWOODCITY_EUSINE + applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7 loadfont writetext UnknownText_0x1a0433 waitbutton closetext winlosstext UnknownText_0x1a05a1, 0 - setlasttalked $c + setlasttalked CIANWOODCITY_EUSINE loadtrainer MYSTICALMAN, EUSINE startbattle reloadmapmusic @@ -77,8 +77,8 @@ UnknownScript_0x1a001e: writetext UnknownText_0x1a05c3 waitbutton closetext - applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00ec - disappear CIANWOODCITY_SUPER_NERD + applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec + disappear CIANWOODCITY_EUSINE pause 20 special Special_FadeOutMusic playmapmusic diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index f8101a278..115e61085 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -100,7 +100,7 @@ UnknownScript_0x1800ce: checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x180103 winlosstext UnknownText_0x180295, UnknownText_0x1802fd - setlasttalked $5 + setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 6 startbattle reloadmapmusic @@ -109,7 +109,7 @@ UnknownScript_0x1800ce: UnknownScript_0x1800f3: winlosstext UnknownText_0x180295, UnknownText_0x1802fd - setlasttalked $5 + setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 4 startbattle reloadmapmusic @@ -118,7 +118,7 @@ UnknownScript_0x1800f3: UnknownScript_0x180103: winlosstext UnknownText_0x180295, UnknownText_0x1802fd - setlasttalked $5 + setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 5 startbattle reloadmapmusic diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index f307ffd4a..099b98166 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,6 +1,6 @@ const_value set 2 const LANCESROOM_LANCE - const LANCESROOM_TEACHER + const LANCESROOM_MARY const LANCESROOM_OAK LancesRoom_MapScriptHeader: @@ -63,7 +63,7 @@ LanceScript_0x180e7b: waitbutton closetext winlosstext UnknownText_0x1810a4, 0 - setlasttalked $2 + setlasttalked LANCESROOM_LANCE loadtrainer CHAMPION, LANCE startbattle reloadmapmusic @@ -84,16 +84,16 @@ LanceScript_0x180e7b: spriteface LANCESROOM_LANCE, DOWN pause 10 spriteface PLAYER, DOWN - appear LANCESROOM_TEACHER - applymovement LANCESROOM_TEACHER, MovementData_0x180f41 + appear LANCESROOM_MARY + applymovement LANCESROOM_MARY, MovementData_0x180f41 loadfont writetext UnknownText_0x1811dd waitbutton closetext appear LANCESROOM_OAK applymovement LANCESROOM_OAK, MovementData_0x180f46 - follow LANCESROOM_TEACHER, LANCESROOM_OAK - applymovement LANCESROOM_TEACHER, MovementData_0x180f49 + follow LANCESROOM_MARY, LANCESROOM_OAK + applymovement LANCESROOM_MARY, MovementData_0x180f49 stopfollow spriteface LANCESROOM_OAK, UP spriteface LANCESROOM_LANCE, LEFT @@ -101,7 +101,7 @@ LanceScript_0x180e7b: writetext UnknownText_0x18121b waitbutton closetext - applymovement LANCESROOM_TEACHER, MovementData_0x180f4c + applymovement LANCESROOM_MARY, MovementData_0x180f4c spriteface PLAYER, LEFT loadfont writetext UnknownText_0x18134b @@ -114,7 +114,7 @@ LanceScript_0x180e7b: waitbutton closetext follow LANCESROOM_LANCE, PLAYER - spriteface LANCESROOM_TEACHER, UP + spriteface LANCESROOM_MARY, UP spriteface LANCESROOM_OAK, UP applymovement LANCESROOM_LANCE, MovementData_0x180f53 stopfollow @@ -123,13 +123,13 @@ LanceScript_0x180e7b: applymovement PLAYER, MovementData_0x180f55 playsound SFX_EXIT_BUILDING disappear PLAYER - applymovement LANCESROOM_TEACHER, MovementData_0x180f57 - showemote EMOTE_SHOCK, LANCESROOM_TEACHER, 15 + applymovement LANCESROOM_MARY, MovementData_0x180f57 + showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 loadfont writetext UnknownText_0x1813c5 pause 30 closetext - applymovement LANCESROOM_TEACHER, MovementData_0x180f5b + applymovement LANCESROOM_MARY, MovementData_0x180f5b special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 4ab5be0d1..c7965dc56 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -6,80 +6,80 @@ MountMoon_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x74089, 0 - dw UnknownScript_0x7408d, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 0 -UnknownScript_0x74089: - priorityjump UnknownScript_0x7408e +.Trigger0: + priorityjump .RivalBattle end -UnknownScript_0x7408d: +.Trigger1: end -UnknownScript_0x7408e: +.RivalBattle: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 - applymovement MOUNTMOON_SILVER, MovementData_0x740f9 + applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER loadfont - writetext UnknownText_0x74105 + writetext MountMoonSilverTextBefore waitbutton closetext checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x740c3 + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x740d3 - winlosstext UnknownText_0x7419d, UnknownText_0x742e0 - setlasttalked $2 + iftrue .Chikorita + winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss + setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 3 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x740e3 + jump .FinishBattle -UnknownScript_0x740c3: - winlosstext UnknownText_0x7419d, UnknownText_0x742e0 - setlasttalked $2 +.Totodile: + winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss + setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 1 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x740e3 + jump .FinishBattle -UnknownScript_0x740d3: - winlosstext UnknownText_0x7419d, UnknownText_0x742e0 - setlasttalked $2 +.Chikorita: + winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss + setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 2 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x740e3 + jump .FinishBattle -UnknownScript_0x740e3: +.FinishBattle: playmusic MUSIC_RIVAL_AFTER loadfont - writetext UnknownText_0x741fa + writetext MountMoonSilverTextAfter waitbutton closetext - applymovement MOUNTMOON_SILVER, MovementData_0x740fd + applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER dotrigger $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end -MovementData_0x740f9: +MountMoonSilverMovementBefore: step_left step_left step_left step_end -MovementData_0x740fd: +MountMoonSilverMovementAfter: step_right step_right step_down @@ -89,7 +89,7 @@ MovementData_0x740fd: step_down step_end -UnknownText_0x74105: +MountMoonSilverTextBefore: text "<......> <......> <......>" para "It's been a while," @@ -109,7 +109,7 @@ UnknownText_0x74105: line "show you!" done -UnknownText_0x7419d: +MountMoonSilverTextWin: text "<......> <......> <......>" para "I thought I raised" @@ -122,7 +122,7 @@ UnknownText_0x7419d: line "wasn't enough…" done -UnknownText_0x741fa: +MountMoonSilverTextAfter: text "<......> <......> <......>" para "…You won, fair" @@ -148,7 +148,7 @@ UnknownText_0x741fa: line "beating you." done -UnknownText_0x742e0: +MountMoonSilverTextLoss: text "<......> <......> <......>" para "I've repaid my" diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index e0c50d4c1..295897ecf 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,5 +1,5 @@ const_value set 2 - const RADIOTOWER5F_GENTLEMAN + const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL const RADIOTOWER5F_ROCKER @@ -10,42 +10,42 @@ RadioTower5F_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x6000e, 0 - dw UnknownScript_0x6000f, 0 - dw UnknownScript_0x60010, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 0 -UnknownScript_0x6000e: +.Trigger0: end -UnknownScript_0x6000f: +.Trigger1: end -UnknownScript_0x60010: +.Trigger2: end -UnknownScript_0x60011: - spriteface RADIOTOWER5F_GENTLEMAN, UP - showemote EMOTE_SHOCK, RADIOTOWER5F_GENTLEMAN, 15 +FakeDirectorScript: + spriteface RADIOTOWER5F_DIRECTOR, UP + showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15 loadfont - writetext UnknownText_0x60128 + writetext FakeDirectorTextBefore1 waitbutton closetext - applymovement RADIOTOWER5F_GENTLEMAN, MovementData_0x60109 + applymovement RADIOTOWER5F_DIRECTOR, FakeDirectorMovement playmusic MUSIC_ROCKET_ENCOUNTER loadfont - writetext UnknownText_0x60147 + writetext FakeDirectorTextBefore2 waitbutton closetext - winlosstext UnknownText_0x60223, 0 - setlasttalked $2 + winlosstext FakeDirectorWinText, 0 + setlasttalked RADIOTOWER5F_DIRECTOR loadtrainer EXECUTIVEM, 3 startbattle returnafterbattle loadfont - writetext UnknownText_0x60246 + writetext FakeDirectorTextAfter buttonsound verbosegiveitem BASEMENT_KEY closetext @@ -57,14 +57,14 @@ Director: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x60054 - writetext UnknownText_0x60246 + iftrue .TrueDirector + writetext FakeDirectorTextAfter waitbutton closetext end -UnknownScript_0x60054: - writetext UnknownText_0x60824 +.TrueDirector: + writetext RadioTower5FDirectorText waitbutton closetext end @@ -75,26 +75,26 @@ TrainerExecutivef1: Executivef1Script: end_if_just_battled loadfont - writetext UnknownText_0x60358 + writetext Executivef1AfterText waitbutton closetext end -UnknownScript_0x6006e: +RadioTower5FRocketBossTrigger: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER spriteface RADIOTOWER5F_ROCKET, RIGHT loadfont - writetext UnknownText_0x603d1 + writetext RadioTower5FRocketBossBeforeText waitbutton closetext - winlosstext UnknownText_0x604f3, 0 - setlasttalked $3 + winlosstext RadioTower5FRocketBossWinText, 0 + setlasttalked RADIOTOWER5F_ROCKET loadtrainer EXECUTIVEM, 1 startbattle returnafterbattle loadfont - writetext UnknownText_0x6050e + writetext RadioTower5FRocketBossAfterText waitbutton closetext special Special_FadeBlackQuickly @@ -116,28 +116,28 @@ UnknownScript_0x6006e: setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic - disappear RADIOTOWER5F_GENTLEMAN - moveperson RADIOTOWER5F_GENTLEMAN, $c, $0 - appear RADIOTOWER5F_GENTLEMAN - applymovement RADIOTOWER5F_GENTLEMAN, MovementData_0x6010f + disappear RADIOTOWER5F_DIRECTOR + moveperson RADIOTOWER5F_DIRECTOR, $c, $0 + appear RADIOTOWER5F_DIRECTOR + applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT loadfont - writetext UnknownText_0x605b2 + writetext RadioTower5FDirectorThankYouText buttonsound verbosegiveitem CLEAR_BELL - writetext UnknownText_0x6062c + writetext RadioTower5FDirectorDescribeClearBellText waitbutton closetext dotrigger $2 domaptrigger ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED - jump UnknownScript_0x600f1 + jump .UselessJump -UnknownScript_0x600f1: - applymovement RADIOTOWER5F_GENTLEMAN, MovementData_0x6011a +.UselessJump: + applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksOut playsound SFX_EXIT_BUILDING - disappear RADIOTOWER5F_GENTLEMAN + disappear RADIOTOWER5F_DIRECTOR end Ben: @@ -147,15 +147,15 @@ ItemFragment_0x600fe: db ULTRA_BALL, 1 MapRadioTower5FSignpost0Script: - jumptext UnknownText_0x608e0 + jumptext SignpostRadioTower5FOffice MapRadioTower5FSignpost2Script: - jumptext UnknownText_0x608f9 + jumptext SignpostRadioTower5FStudio RadioTower5FBookshelf: jumpstd magazinebookshelf -MovementData_0x60109: +FakeDirectorMovement: step_left step_left step_left @@ -163,7 +163,7 @@ MovementData_0x60109: step_up step_end -MovementData_0x6010f: +RadioTower5FDirectorWalksIn: step_down step_down step_right @@ -176,7 +176,7 @@ MovementData_0x6010f: step_left step_end -MovementData_0x6011a: +RadioTower5FDirectorWalksOut: step_right step_up step_up @@ -194,12 +194,12 @@ MovementData_0x60125: step_left step_end -UnknownText_0x60128: +FakeDirectorTextBefore1: text "Y-you! You came to" line "rescue me?" done -UnknownText_0x60147: +FakeDirectorTextBefore2: text "Is that what you" line "were expecting?" @@ -221,12 +221,12 @@ UnknownText_0x60147: cont "you can beat me!" done -UnknownText_0x60223: +FakeDirectorWinText: text "OK, OK. I'll tell" line "you where he is." done -UnknownText_0x60246: +FakeDirectorTextAfter: text "We stashed the" line "real DIRECTOR in" @@ -258,7 +258,7 @@ Executivef1BeatenText: line "I still lost…" done -UnknownText_0x60358: +Executivef1AfterText: text "<PLAYER>, isn't it?" para "A brat like you" @@ -272,7 +272,7 @@ UnknownText_0x60358: cont "your power." done -UnknownText_0x603d1: +RadioTower5FRocketBossBeforeText: text "Oh? You managed to" line "get this far?" @@ -301,12 +301,12 @@ UnknownText_0x603d1: cont "our plans." done -UnknownText_0x604f3: +RadioTower5FRocketBossWinText: text "No! Forgive me," line "GIOVANNI!" done -UnknownText_0x6050e: +RadioTower5FRocketBossAfterText: text "How could this be?" para "Our dreams have" @@ -324,7 +324,7 @@ UnknownText_0x6050e: para "Farewell." done -UnknownText_0x605b2: +RadioTower5FDirectorThankYouText: text "DIRECTOR: <PLAY_G>," line "thank you!" @@ -339,7 +339,7 @@ UnknownText_0x605b2: cont "take this." done -UnknownText_0x6062c: +RadioTower5FDirectorDescribeClearBellText: text "There used to be a" line "tower right here" cont "in GOLDENROD CITY." @@ -390,7 +390,7 @@ UnknownText_0x6062c: line "my OFFICE." done -UnknownText_0x60824: +RadioTower5FDirectorText: text "DIRECTOR: Hello," line "<PLAY_G>!" @@ -413,12 +413,12 @@ BenText: line "to our music?" done -UnknownText_0x608e0: +SignpostRadioTower5FOffice: text "5F DIRECTOR'S" line " OFFICE" done -UnknownText_0x608f9: +SignpostRadioTower5FStudio: text "5F STUDIO 1" done @@ -433,8 +433,8 @@ RadioTower5F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $3, $0, $0, UnknownScript_0x60011, $0, $0 - xy_trigger 1, $5, $10, $0, UnknownScript_0x6006e, $0, $0 + xy_trigger 0, $3, $0, $0, FakeDirectorScript, $0, $0 + xy_trigger 1, $5, $10, $0, RadioTower5FRocketBossTrigger, $0, $0 .Signposts: db 5 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 8e5a30e5a..48f2b9647 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -11,19 +11,19 @@ TeamRocketBaseB1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x6c65a, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x6c65b + dbw 2, .Callback1 -UnknownScript_0x6c65a: +.Trigger1: end -UnknownScript_0x6c65b: +.Callback1: disappear TEAMROCKETBASEB1F_ROCKET1 return @@ -242,7 +242,7 @@ TrainerCameraGrunt1: waitbutton closetext winlosstext CameraGrunt1BeatenText, 0 - setlasttalked $2 + setlasttalked TEAMROCKETBASEB1F_ROCKET1 loadtrainer GRUNTM, 20 startbattle disappear TEAMROCKETBASEB1F_ROCKET1 @@ -255,7 +255,7 @@ TrainerCameraGrunt2: waitbutton closetext winlosstext CameraGrunt2BeatenText, 0 - setlasttalked $2 + setlasttalked TEAMROCKETBASEB1F_ROCKET1 loadtrainer GRUNTM, 21 startbattle disappear TEAMROCKETBASEB1F_ROCKET1 @@ -456,7 +456,7 @@ VoltorbExplodingTrap: special FadeOutPalettes cry VOLTORB special FadeInPalettes - setlasttalked $ff + setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 startbattle @@ -466,7 +466,7 @@ GeodudeExplodingTrap: special FadeOutPalettes cry GEODUDE special FadeInPalettes - setlasttalked $ff + setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 startbattle @@ -476,7 +476,7 @@ KoffingExplodingTrap: special FadeOutPalettes cry KOFFING special FadeInPalettes - setlasttalked $ff + setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 startbattle diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0861cbde7..793dcac37 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -101,7 +101,7 @@ UnknownScript_0x6cfac: applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 winlosstext UnknownText_0x6d45c, 0 - setlasttalked $3 + setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, 2 startbattle disappear TEAMROCKETBASEB2F_DRAGON diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index ad98b0fb6..ea4fbf13e 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -108,7 +108,7 @@ UnknownScript_0x6e056: closetext applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 winlosstext UnknownText_0x6e511, 0 - setlasttalked $3 + setlasttalked TEAMROCKETBASEB3F_ROCKET1 loadtrainer EXECUTIVEM, 4 startbattle returnafterbattle diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 7a8c98784..7fae3553d 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -7,76 +7,76 @@ TrainerHouseB1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x9b38a, 0 + dw Trigger0, 0 .MapCallbacks: db 0 -UnknownScript_0x9b38a: +Trigger0: end -UnknownScript_0x9b38b: +TrainerHouseReceptionistScript: spriteface PLAYER, UP loadfont checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY - iftrue UnknownScript_0x9b3f7 - writetext UnknownText_0x9b420 + iftrue .FoughtTooManyTimes + writetext TrainerHouseB1FIntroText buttonsound special SpecialTrainerHouse - iffalse UnknownScript_0x9b3a6 + iffalse .GetCal3Name trainertotext CAL, CAL2, $0 - jump UnknownScript_0x9b3aa + jump .GotName -UnknownScript_0x9b3a6: +.GetCal3Name: trainertotext CAL, CAL3, $0 -UnknownScript_0x9b3aa: - writetext UnknownText_0x9b46a +.GotName: + writetext TrainerHouseB1FYourOpponentIsText buttonsound - writetext UnknownText_0x9b487 + writetext TrainerHouseB1FAskWantToBattleText yesorno - iffalse UnknownScript_0x9b3ed + iffalse .Declined setflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY - writetext UnknownText_0x9b4a2 + writetext TrainerHouseB1FGoRightInText waitbutton closetext - applymovement PLAYER, MovementData_0x9b401 + applymovement PLAYER, Movement_EnterTrainerHouseBattleRoom loadfont - writetext UnknownText_0x9b587 + writetext TrainerHouseB1FCalBeforeText waitbutton closetext special SpecialTrainerHouse - iffalse UnknownScript_0x9b3dc - winlosstext UnknownText_0x9b578, 0 - setlasttalked $3 + iffalse .NoSpecialBattle + winlosstext TrainerHouseB1FCalBeatenText, 0 + setlasttalked TRAINERHOUSEB1F_CHRIS loadtrainer CAL, CAL2 startbattle returnafterbattle - iffalse UnknownScript_0x9b3e8 -UnknownScript_0x9b3dc: - winlosstext UnknownText_0x9b578, 0 - setlasttalked $3 + iffalse .End +.NoSpecialBattle: + winlosstext TrainerHouseB1FCalBeatenText, 0 + setlasttalked TRAINERHOUSEB1F_CHRIS loadtrainer CAL, CAL3 startbattle returnafterbattle -UnknownScript_0x9b3e8: - applymovement PLAYER, MovementData_0x9b40f +.End: + applymovement PLAYER, Movement_ExitTrainerHouseBattleRoom end -UnknownScript_0x9b3ed: - writetext UnknownText_0x9b4d6 +.Declined: + writetext TrainerHouseB1FPleaseComeAgainText waitbutton closetext - applymovement PLAYER, MovementData_0x9b41d + applymovement PLAYER, Movement_TrainerHouseTurnBack end -UnknownScript_0x9b3f7: - writetext UnknownText_0x9b51d +.FoughtTooManyTimes: + writetext TrainerHouseB1FSecondChallengeDeniedText waitbutton closetext - applymovement PLAYER, MovementData_0x9b41d + applymovement PLAYER, Movement_TrainerHouseTurnBack end -MovementData_0x9b401: +Movement_EnterTrainerHouseBattleRoom: step_left step_left step_left @@ -92,7 +92,7 @@ MovementData_0x9b401: turn_head_right step_end -MovementData_0x9b40f: +Movement_ExitTrainerHouseBattleRoom: step_up step_up step_up @@ -108,12 +108,12 @@ MovementData_0x9b40f: step_right step_end -MovementData_0x9b41d: +Movement_TrainerHouseTurnBack: step_right turn_head_left step_end -UnknownText_0x9b420: +TrainerHouseB1FIntroText: text "Hi. Welcome to our" line "TRAINING HALL." @@ -122,18 +122,18 @@ UnknownText_0x9b420: cont "day." done -UnknownText_0x9b46a: +TrainerHouseB1FYourOpponentIsText: text_from_ram StringBuffer3 text " is your" line "opponent today." done -UnknownText_0x9b487: +TrainerHouseB1FAskWantToBattleText: text "Would you like to" line "battle?" done -UnknownText_0x9b4a2: +TrainerHouseB1FGoRightInText: text "Please go right" line "through." @@ -141,7 +141,7 @@ UnknownText_0x9b4a2: line "right away." done -UnknownText_0x9b4d6: +TrainerHouseB1FPleaseComeAgainText: text "Sorry. Only those" line "trainers who will" @@ -149,7 +149,7 @@ UnknownText_0x9b4d6: line "allowed to go in." done -UnknownText_0x9b51d: +TrainerHouseB1FSecondChallengeDeniedText: text "I'm sorry." line "This would be your" @@ -160,12 +160,12 @@ UnknownText_0x9b51d: line "a day." done -UnknownText_0x9b578: +TrainerHouseB1FCalBeatenText: text "I lost…" line "Darn…" done -UnknownText_0x9b587: +TrainerHouseB1FCalBeforeText: text "I traveled out" line "here just so I" cont "could battle you." @@ -181,7 +181,7 @@ TrainerHouseB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $3, $7, $0, UnknownScript_0x9b38b, $0, $0 + xy_trigger 0, $3, $7, $0, TrainerHouseReceptionistScript, $0, $0 .Signposts: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 01181cd7c..6966c6c9a 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1,3 +1,30 @@ +UNDERGROUND_DOOR_CLOSED1 EQU $2a +UNDERGROUND_DOOR_CLOSED2 EQU $3e +UNDERGROUND_DOOR_CLOSED3 EQU $3f +UNDERGROUND_DOOR_OPEN1 EQU $2d +UNDERGROUND_DOOR_OPEN2 EQU $3d + +UGDOOR_1 EQU $1006 +UGDOOR_2 EQU $0a06 +UGDOOR_3 EQU $0206 +UGDOOR_4 EQU $020a +UGDOOR_5 EQU $0a0a +UGDOOR_6 EQU $100a +UGDOOR_7 EQU $0c06 +UGDOOR_8 EQU $0c08 +UGDOOR_9 EQU $0606 +UGDOOR_10 EQU $0608 +UGDOOR_11 EQU $0c0a +UGDOOR_12 EQU $0c0c +UGDOOR_13 EQU $060a +UGDOOR_14 EQU $060c +UGDOOR_15 EQU $120a +UGDOOR_16 EQU $120c + +doorstate: macro + changeblock UGDOOR_\1 / $100, UGDOOR_\1 % $100, UNDERGROUND_DOOR_\2 +endm + const_value set 2 const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST1 const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST2 @@ -16,81 +43,81 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x7c9f5, 0 - dw UnknownScript_0x7c9f6, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw 1, UnknownScript_0x7c9f7 + dbw 1, .UpdateDoorPositions -UnknownScript_0x7c9f5: +.Trigger0: end -UnknownScript_0x7c9f6: +.Trigger1: end -UnknownScript_0x7c9f7: +.UpdateDoorPositions: checkevent EVENT_SWITCH_4 - iffalse UnknownScript_0x7ca01 - changeblock $10, $6, $2d -UnknownScript_0x7ca01: + iffalse .false4 + doorstate 1, OPEN1 +.false4: checkevent EVENT_SWITCH_5 - iffalse UnknownScript_0x7ca0b - changeblock $a, $6, $2d -UnknownScript_0x7ca0b: + iffalse .false5 + doorstate 2, OPEN1 +.false5: checkevent EVENT_SWITCH_6 - iffalse UnknownScript_0x7ca15 - changeblock $2, $6, $2d -UnknownScript_0x7ca15: + iffalse .false6 + doorstate 3, OPEN1 +.false6: checkevent EVENT_SWITCH_7 - iffalse UnknownScript_0x7ca1f - changeblock $2, $a, $2d -UnknownScript_0x7ca1f: + iffalse .false7 + doorstate 4, OPEN1 +.false7: checkevent EVENT_SWITCH_8 - iffalse UnknownScript_0x7ca29 - changeblock $a, $a, $2d -UnknownScript_0x7ca29: + iffalse .false8 + doorstate 5, OPEN1 +.false8: checkevent EVENT_SWITCH_9 - iffalse UnknownScript_0x7ca33 - changeblock $10, $a, $2d -UnknownScript_0x7ca33: + iffalse .false9 + doorstate 6, OPEN1 +.false9: checkevent EVENT_SWITCH_10 - iffalse UnknownScript_0x7ca41 - changeblock $c, $6, $2a - changeblock $c, $8, $2d -UnknownScript_0x7ca41: + iffalse .false10 + doorstate 7, CLOSED1 + doorstate 8, OPEN1 +.false10: checkevent EVENT_SWITCH_11 - iffalse UnknownScript_0x7ca4f - changeblock $6, $6, $2a - changeblock $6, $8, $2d -UnknownScript_0x7ca4f: + iffalse .false11 + doorstate 9, CLOSED1 + doorstate 10, OPEN1 +.false11: checkevent EVENT_SWITCH_12 - iffalse UnknownScript_0x7ca5d - changeblock $c, $a, $2a - changeblock $c, $c, $2d -UnknownScript_0x7ca5d: + iffalse .false12 + doorstate 11, CLOSED1 + doorstate 12, OPEN1 +.false12: checkevent EVENT_SWITCH_13 - iffalse UnknownScript_0x7ca6b - changeblock $6, $a, $2a - changeblock $6, $c, $2d -UnknownScript_0x7ca6b: + iffalse .false13 + doorstate 13, CLOSED1 + doorstate 14, OPEN1 +.false13: checkevent EVENT_SWITCH_14 - iffalse UnknownScript_0x7ca79 - changeblock $12, $a, $2a - changeblock $12, $c, $2d -UnknownScript_0x7ca79: + iffalse .false14 + doorstate 15, CLOSED1 + doorstate 16, OPEN1 +.false14: return SuperNerdScript_0x7ca7a: - jumptextfaceplayer UnknownText_0x7d176 + jumptextfaceplayer UndergroundPathSwitchRoomEntrances_SuperNerdText TeacherScript_0x7ca7d: - jumptextfaceplayer UnknownText_0x7d1d0 + jumptextfaceplayer UndergroundPathSwitchRoomEntrances_TeacherText -UnknownScript_0x7ca80: +UndergroundSilverTrigger1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -98,18 +125,18 @@ UnknownScript_0x7ca80: playsound SFX_EXIT_BUILDING appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER waitsfx - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce87 + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1 spriteface PLAYER, RIGHT - scall UnknownScript_0x7cad4 - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce92 + scall UndergroundSilverBattleScript + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 playsound SFX_EXIT_BUILDING disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - dotrigger $1 + dotrigger 1 waitsfx playmapmusic end -UnknownScript_0x7caaa: +UndergroundSilverTrigger2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -117,63 +144,63 @@ UnknownScript_0x7caaa: playsound SFX_EXIT_BUILDING appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER waitsfx - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce8c + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2 spriteface PLAYER, RIGHT - scall UnknownScript_0x7cad4 - applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce97 + scall UndergroundSilverBattleScript + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 playsound SFX_EXIT_BUILDING disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER - dotrigger $1 + dotrigger 1 waitsfx playmapmusic end -UnknownScript_0x7cad4: +UndergroundSilverBattleScript: checkevent EVENT_RIVAL_BURNED_TOWER - iftrue UnknownScript_0x7cae1 + iftrue .Continue setevent EVENT_RIVAL_BURNED_TOWER - domaptrigger BURNED_TOWER_1F, $1 -UnknownScript_0x7cae1: + domaptrigger BURNED_TOWER_1F, 1 +.Continue: playmusic MUSIC_RIVAL_ENCOUNTER loadfont - writetext UnknownText_0x7ce9d + writetext UndergroundSilverBeforeText waitbutton closetext setevent EVENT_RIVAL_UNDERGROUND_PATH checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x7cb09 + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x7cb19 - winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 - setlasttalked $c + iftrue .Chikorita + winlosstext UndergroundSilverWinText, UndergroundSilverLossText + setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_12 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x7cb29 + jump .FinishRivalBattle -UnknownScript_0x7cb09: - winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 - setlasttalked $c +.Totodile: + winlosstext UndergroundSilverWinText, UndergroundSilverLossText + setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_10 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x7cb29 + jump .FinishRivalBattle -UnknownScript_0x7cb19: - winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 - setlasttalked $c +.Chikorita: + winlosstext UndergroundSilverWinText, UndergroundSilverLossText + setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_11 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x7cb29 + jump .FinishRivalBattle -UnknownScript_0x7cb29: +.FinishRivalBattle: playmusic MUSIC_RIVAL_AFTER loadfont - writetext UnknownText_0x7cfc2 + writetext UndergroundSilverAfterText waitbutton closetext end @@ -184,7 +211,7 @@ TrainerGruntM11: GruntM11Script: end_if_just_battled loadfont - writetext UnknownText_0x7d290 + writetext GruntM11AfterText waitbutton closetext end @@ -195,7 +222,7 @@ TrainerGruntM25: GruntM25Script: end_if_just_battled loadfont - writetext UnknownText_0x7d347 + writetext GruntM25AfterText waitbutton closetext end @@ -206,7 +233,7 @@ TrainerBurglarDuncan: BurglarDuncanScript: end_if_just_battled loadfont - writetext UnknownText_0x7d3cf + writetext BurglarDuncanAfterText waitbutton closetext end @@ -217,7 +244,7 @@ TrainerBurglarEddie: BurglarEddieScript: end_if_just_battled loadfont - writetext UnknownText_0x7d45b + writetext BurglarEddieAfterText waitbutton closetext end @@ -228,7 +255,7 @@ TrainerGruntM13: GruntM13Script: end_if_just_battled loadfont - writetext UnknownText_0x7d51f + writetext GruntM13AfterText waitbutton closetext end @@ -239,360 +266,360 @@ TrainerGruntF3: GruntF3Script: end_if_just_battled loadfont - writetext UnknownText_0x7d5e6 + writetext GruntF3AfterText waitbutton closetext end -MapUndergroundPathSwitchRoomEntrancesSignpost0Script: +Switch1Script: loadfont - writetext UnknownText_0x7d554 + writetext SwitchRoomText_Switch1 buttonsound checkevent EVENT_SWITCH_1 - iftrue UnknownScript_0x7cbcb - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions - addvar $1 + addvar 1 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_1 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cbcb: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -1 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_1 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -MapUndergroundPathSwitchRoomEntrancesSignpost1Script: +Switch2Script: loadfont - writetext UnknownText_0x7d643 + writetext SwitchRoomText_Switch2 buttonsound checkevent EVENT_SWITCH_2 - iftrue UnknownScript_0x7cc00 - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions - addvar $2 + addvar 2 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_2 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc00: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -2 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_2 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -MapUndergroundPathSwitchRoomEntrancesSignpost2Script: +Switch3Script: loadfont - writetext UnknownText_0x7d65a + writetext SwitchRoomText_Switch3 buttonsound checkevent EVENT_SWITCH_3 - iftrue UnknownScript_0x7cc35 - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions - addvar $3 + addvar 3 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc35: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -3 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -MapUndergroundPathSwitchRoomEntrancesSignpost3Script: +EmergencySwitchScript: loadfont - writetext UnknownText_0x7d671 + writetext SwitchRoomText_Emergency buttonsound checkevent EVENT_EMERGENCY_SWITCH - iftrue UnknownScript_0x7cc70 - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b - writebyte $7 + iffalse UndergroundPathSwitchRoomEntrances_DontToggle + writebyte 7 copyvartobyte UndergroundSwitchPositions setevent EVENT_EMERGENCY_SWITCH setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc70: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b - writebyte $0 + iffalse UndergroundPathSwitchRoomEntrances_DontToggle + writebyte 0 copyvartobyte UndergroundSwitchPositions clearevent EVENT_EMERGENCY_SWITCH clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc8b: +UndergroundPathSwitchRoomEntrances_DontToggle: closetext end -UnknownScript_0x7cc8d: +UndergroundPathSwitchRoomEntrances_UpdateDoors: copybytetovar UndergroundSwitchPositions - if_equal $0, UnknownScript_0x7ccb0 - if_equal $1, UnknownScript_0x7ccd7 - if_equal $2, UnknownScript_0x7ccf2 - if_equal $3, UnknownScript_0x7cd0d - if_equal $4, UnknownScript_0x7cd28 - if_equal $5, UnknownScript_0x7cd43 - if_equal $6, UnknownScript_0x7cd5e - if_equal $7, UnknownScript_0x7cd79 -UnknownScript_0x7ccb0: + if_equal 0, .Position0 + if_equal 1, .Position1 + if_equal 2, .Position2 + if_equal 3, .Position3 + if_equal 4, .Position4 + if_equal 5, .Position5 + if_equal 6, .Position6 + if_equal 7, .EmergencyPosition +.Position0: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7ce11 - scall UnknownScript_0x7ce19 - scall UnknownScript_0x7ce21 - scall UnknownScript_0x7ce29 - scall UnknownScript_0x7ce31 - scall UnknownScript_0x7ce39 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce71 + scall .Clear4 + scall .Clear5 + scall .Clear6 + scall .Clear7 + scall .Clear8 + scall .Clear9 + scall .Clear10 + scall .Clear11 + scall .Clear12 + scall .Clear13 + scall .Clear14 reloadmappart closetext end -UnknownScript_0x7ccd7: +.Position1: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cda5 - scall UnknownScript_0x7cdd5 - scall UnknownScript_0x7cdf9 - scall UnknownScript_0x7ce39 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce71 + scall .Set4 + scall .Set10 + scall .Set13 + scall .Clear9 + scall .Clear11 + scall .Clear12 + scall .Clear14 reloadmappart closetext end -UnknownScript_0x7ccf2: +.Position2: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdad - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce31 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce71 + scall .Set5 + scall .Set11 + scall .Set12 + scall .Clear8 + scall .Clear10 + scall .Clear13 + scall .Clear14 reloadmappart closetext end -UnknownScript_0x7cd0d: +.Position3: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdb5 - scall UnknownScript_0x7cdd5 - scall UnknownScript_0x7cdf9 - scall UnknownScript_0x7ce29 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce71 + scall .Set6 + scall .Set10 + scall .Set13 + scall .Clear7 + scall .Clear11 + scall .Clear12 + scall .Clear14 reloadmappart closetext end -UnknownScript_0x7cd28: +.Position4: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdbd - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce21 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce71 + scall .Set7 + scall .Set11 + scall .Set12 + scall .Clear6 + scall .Clear10 + scall .Clear13 + scall .Clear14 reloadmappart closetext end -UnknownScript_0x7cd43: +.Position5: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdc5 - scall UnknownScript_0x7cdd5 - scall UnknownScript_0x7cdf9 - scall UnknownScript_0x7ce19 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce71 + scall .Set8 + scall .Set10 + scall .Set13 + scall .Clear5 + scall .Clear11 + scall .Clear12 + scall .Clear14 reloadmappart closetext end -UnknownScript_0x7cd5e: +.Position6: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdcd - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce05 - scall UnknownScript_0x7ce11 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce65 + scall .Set9 + scall .Set11 + scall .Set12 + scall .Set14 + scall .Clear4 + scall .Clear10 + scall .Clear13 reloadmappart closetext end -UnknownScript_0x7cd79: +.EmergencyPosition: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7ce11 - scall UnknownScript_0x7ce19 - scall UnknownScript_0x7cdb5 - scall UnknownScript_0x7ce29 - scall UnknownScript_0x7cdc5 - scall UnknownScript_0x7cdcd - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce05 + scall .Clear4 + scall .Clear5 + scall .Set6 + scall .Clear7 + scall .Set8 + scall .Set9 + scall .Clear10 + scall .Set11 + scall .Set12 + scall .Clear13 + scall .Set14 reloadmappart closetext - writebyte $6 + writebyte 6 copyvartobyte UndergroundSwitchPositions end -UnknownScript_0x7cda5: - changeblock $10, $6, $2d +.Set4: + doorstate 1, OPEN1 setevent EVENT_SWITCH_4 end -UnknownScript_0x7cdad: - changeblock $a, $6, $2d +.Set5: + doorstate 2, OPEN1 setevent EVENT_SWITCH_5 end -UnknownScript_0x7cdb5: - changeblock $2, $6, $2d +.Set6: + doorstate 3, OPEN1 setevent EVENT_SWITCH_6 end -UnknownScript_0x7cdbd: - changeblock $2, $a, $2d +.Set7: + doorstate 4, OPEN1 setevent EVENT_SWITCH_7 end -UnknownScript_0x7cdc5: - changeblock $a, $a, $2d +.Set8: + doorstate 5, OPEN1 setevent EVENT_SWITCH_8 end -UnknownScript_0x7cdcd: - changeblock $10, $a, $2d +.Set9: + doorstate 6, OPEN1 setevent EVENT_SWITCH_9 end -UnknownScript_0x7cdd5: - changeblock $c, $6, $2a - changeblock $c, $8, $2d +.Set10: + doorstate 7, CLOSED1 + doorstate 8, OPEN1 setevent EVENT_SWITCH_10 end -UnknownScript_0x7cde1: - changeblock $6, $6, $2a - changeblock $6, $8, $2d +.Set11: + doorstate 9, CLOSED1 + doorstate 10, OPEN1 setevent EVENT_SWITCH_11 end -UnknownScript_0x7cded: - changeblock $c, $a, $2a - changeblock $c, $c, $2d +.Set12: + doorstate 11, CLOSED1 + doorstate 12, OPEN1 setevent EVENT_SWITCH_12 end -UnknownScript_0x7cdf9: - changeblock $6, $a, $2a - changeblock $6, $c, $2d +.Set13: + doorstate 13, CLOSED1 + doorstate 14, OPEN1 setevent EVENT_SWITCH_13 end -UnknownScript_0x7ce05: - changeblock $12, $a, $2a - changeblock $12, $c, $2d +.Set14: + doorstate 15, CLOSED1 + doorstate 16, OPEN1 setevent EVENT_SWITCH_14 end -UnknownScript_0x7ce11: - changeblock $10, $6, $3e +.Clear4: + doorstate 1, CLOSED2 clearevent EVENT_SWITCH_4 end -UnknownScript_0x7ce19: - changeblock $a, $6, $3e +.Clear5: + doorstate 2, CLOSED2 clearevent EVENT_SWITCH_5 end -UnknownScript_0x7ce21: - changeblock $2, $6, $3e +.Clear6: + doorstate 3, CLOSED2 clearevent EVENT_SWITCH_6 end -UnknownScript_0x7ce29: - changeblock $2, $a, $3e +.Clear7: + doorstate 4, CLOSED2 clearevent EVENT_SWITCH_7 end -UnknownScript_0x7ce31: - changeblock $a, $a, $3e +.Clear8: + doorstate 5, CLOSED2 clearevent EVENT_SWITCH_8 end -UnknownScript_0x7ce39: - changeblock $10, $a, $3e +.Clear9: + doorstate 6, CLOSED2 clearevent EVENT_SWITCH_9 end -UnknownScript_0x7ce41: - changeblock $c, $6, $3f - changeblock $c, $8, $3d +.Clear10: + doorstate 7, CLOSED3 + doorstate 8, OPEN2 clearevent EVENT_SWITCH_10 end -UnknownScript_0x7ce4d: - changeblock $6, $6, $3f - changeblock $6, $8, $3d +.Clear11: + doorstate 9, CLOSED3 + doorstate 10, OPEN2 clearevent EVENT_SWITCH_11 end -UnknownScript_0x7ce59: - changeblock $c, $a, $3f - changeblock $c, $c, $3d +.Clear12: + doorstate 11, CLOSED3 + doorstate 12, OPEN2 clearevent EVENT_SWITCH_12 end -UnknownScript_0x7ce65: - changeblock $6, $a, $3f - changeblock $6, $c, $3d +.Clear13: + doorstate 13, CLOSED3 + doorstate 14, OPEN2 clearevent EVENT_SWITCH_13 end -UnknownScript_0x7ce71: - changeblock $12, $a, $3f - changeblock $12, $c, $3d +.Clear14: + doorstate 15, CLOSED3 + doorstate 16, OPEN2 clearevent EVENT_SWITCH_14 end @@ -610,14 +637,14 @@ MapUndergroundPathSwitchRoomEntrancesSignpostItem5: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE -MovementData_0x7ce87: +UndergroundSilverApproachMovement1: step_down step_left step_left step_left step_end -MovementData_0x7ce8c: +UndergroundSilverApproachMovement2: step_down step_down step_left @@ -625,14 +652,14 @@ MovementData_0x7ce8c: step_left step_end -MovementData_0x7ce92: +UndergroundSilverRetreatMovement1: step_right step_right step_right step_up step_end -MovementData_0x7ce97: +UndergroundSilverRetreatMovement2: step_right step_right step_right @@ -640,7 +667,7 @@ MovementData_0x7ce97: step_up step_end -UnknownText_0x7ce9d: +UndergroundSilverBeforeText: text "Hold it!" para "I saw you, so I" @@ -663,7 +690,7 @@ UnknownText_0x7ce9d: line "debts!" done -UnknownText_0x7cf5d: +UndergroundSilverWinText: text "…Why…" line "Why do I lose?" @@ -676,7 +703,7 @@ UnknownText_0x7cf5d: para "So why do I lose?" done -UnknownText_0x7cfc2: +UndergroundSilverAfterText: text "…I don't under-" line "stand…" @@ -712,7 +739,7 @@ UnknownText_0x7cfc2: line "#MON trainer!" done -UnknownText_0x7d102: +UndergroundSilverLossText: text "Humph. This is my" line "real power, wimp." @@ -724,7 +751,7 @@ UnknownText_0x7d102: cont "under my heels." done -UnknownText_0x7d176: +UndergroundPathSwitchRoomEntrances_SuperNerdText: text "I was challenged" line "to a battle down-" cont "stairs." @@ -734,7 +761,7 @@ UnknownText_0x7d176: cont "better be careful." done -UnknownText_0x7d1d0: +UndergroundPathSwitchRoomEntrances_TeacherText: text "There are some" line "shops downstairs…" @@ -758,7 +785,7 @@ GruntM11BeatenText: line "by indecision!" done -UnknownText_0x7d290: +GruntM11AfterText: text "I'm confused too…" line "The switch on the" @@ -782,7 +809,7 @@ GruntM25BeatenText: line "I blew it." done -UnknownText_0x7d347: +GruntM25AfterText: text "All right. A hint!" para "Change the order" @@ -802,7 +829,7 @@ BurglarDuncanBeatenText: text "Mercy!" done -UnknownText_0x7d3cf: +BurglarDuncanAfterText: text "Steal and sell!" line "That's basic in" cont "crime, kid!" @@ -821,7 +848,7 @@ BurglarEddieBeatenText: text "Over the top!" done -UnknownText_0x7d45b: +BurglarEddieAfterText: text "UNDERGROUND WARE-" line "HOUSE?" @@ -846,13 +873,13 @@ GruntM13BeatenText: line "you're cool, huh?" done -UnknownText_0x7d51f: +GruntM13AfterText: text "You must have ice" line "in your veins to" cont "dis TEAM ROCKET." done -UnknownText_0x7d554: +SwitchRoomText_Switch1: text "It's labeled" line "SWITCH 1." done @@ -873,33 +900,33 @@ GruntF3BeatenText: text "How could you?" done -UnknownText_0x7d5e6: +GruntF3AfterText: text "Go wherever you'd" line "like! Get lost!" cont "See if I care!" done -UnknownText_0x7d617: +SwitchRoomText_OffTurnOn: text "It's OFF." line "Turn it ON?" done -UnknownText_0x7d62d: +SwitchRoomText_OnTurnOff: text "It's ON." line "Turn it OFF?" done -UnknownText_0x7d643: +SwitchRoomText_Switch2: text "It's labeled" line "SWITCH 2." done -UnknownText_0x7d65a: +SwitchRoomText_Switch3: text "It's labeled" line "SWITCH 3." done -UnknownText_0x7d671: +SwitchRoomText_Emergency: text "It's labeled" line "EMERGENCY." done @@ -922,15 +949,15 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $13, $0, UnknownScript_0x7ca80, $0, $0 - xy_trigger 0, $5, $13, $0, UnknownScript_0x7caaa, $0, $0 + xy_trigger 0, $4, $13, $0, UndergroundSilverTrigger1, $0, 0 + xy_trigger 0, $5, $13, $0, UndergroundSilverTrigger2, $0, 0 .Signposts: db 6 - signpost 1, 16, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost0Script - signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script - signpost 1, 2, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost2Script - signpost 11, 20, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost3Script + signpost 1, 16, SIGNPOST_READ, Switch1Script + signpost 1, 10, SIGNPOST_READ, Switch2Script + signpost 1, 2, SIGNPOST_READ, Switch3Script + signpost 11, 20, SIGNPOST_READ, EmergencySwitchScript signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index ae4094513..c857fa346 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -65,7 +65,7 @@ UnknownScript_0x744d4: checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa - setlasttalked $2 + setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_15 startbattle reloadmapmusic @@ -74,7 +74,7 @@ UnknownScript_0x744d4: UnknownScript_0x744ff: winlosstext UnknownText_0x7463d, UnknownText_0x747aa - setlasttalked $2 + setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_13 startbattle reloadmapmusic @@ -83,7 +83,7 @@ UnknownScript_0x744ff: UnknownScript_0x7450f: winlosstext UnknownText_0x7463d, UnknownText_0x747aa - setlasttalked $2 + setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_14 startbattle reloadmapmusic |