diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/CeruleanPokeCenter1F.asm | 6 | ||||
| -rw-r--r-- | maps/EcruteakPokeCenter1F.asm | 6 | ||||
| -rw-r--r-- | maps/FastShip1F.asm | 14 | ||||
| -rw-r--r-- | maps/FastShipCabins_SW_SSW_NW.asm | 6 | ||||
| -rw-r--r-- | maps/PokeCenter2F.asm | 8 | ||||
| -rw-r--r-- | maps/Route40.asm | 6 | ||||
| -rw-r--r-- | maps/SaffronPokeCenter1F.asm | 10 |
7 files changed, 28 insertions, 28 deletions
diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 15ab1911e..8a04b43cb 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -9,11 +9,11 @@ NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Function10630f - iftrue UnknownScript_0x18821b + special Mobile_DummyReturnFalse + iftrue .mobile jumptextfaceplayer UnknownText_0x188221 -UnknownScript_0x18821b: +.mobile: jumptextfaceplayer UnknownText_0x18828c GymGuyScript_0x18821e: diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 12858558d..be51b7764 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -56,11 +56,11 @@ NurseScript_0x98eb0: jumpstd pokecenternurse PokefanMScript_0x98eb3: - special Function10630f - iftrue UnknownScript_0x98ebc + special Mobile_DummyReturnFalse + iftrue .mobile jumptextfaceplayer UnknownText_0x99155 -UnknownScript_0x98ebc: +.mobile: jumptextfaceplayer UnknownText_0x991aa CooltrainerFScript_0x98ebf: diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 209813653..be1675a1b 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -30,11 +30,11 @@ FastShip1F_MapScriptHeader: blackoutmod FAST_SHIP_CABINS_SW_SSW_NW clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME - iftrue .Vermilion + iftrue .SkipGrandpa dotrigger $2 end -.Vermilion: +.SkipGrandpa: dotrigger $0 end @@ -115,10 +115,10 @@ SailorScript_0x751d0: SailorScript_0x751e4: jumptextfaceplayer UnknownText_0x753c0 -UnknownScript_0x751e7: +WorriedGrandpaTriggerRight: moveperson $5, $14, $6 -UnknownScript_0x751eb: +WorriedGrandpaTriggerLeft: appear $5 applymovement $5, MovementData_0x7521b playsound SFX_TACKLE @@ -287,7 +287,7 @@ FastShip1F_MapEventHeader: .Warps: db 12 - warp_def $1, $19, 255, FAST_SHIP_1F + warp_def $1, $19, -1, FAST_SHIP_1F warp_def $8, $1b, 1, FAST_SHIP_CABINS_NNW_NNE_NE warp_def $8, $17, 2, FAST_SHIP_CABINS_NNW_NNE_NE warp_def $8, $13, 3, FAST_SHIP_CABINS_NNW_NNE_NE @@ -302,8 +302,8 @@ FastShip1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 2, $6, $18, $0, UnknownScript_0x751eb, $0, $0 - xy_trigger 2, $6, $19, $0, UnknownScript_0x751e7, $0, $0 + xy_trigger 2, $6, $18, $0, WorriedGrandpaTriggerLeft, $0, $0 + xy_trigger 2, $6, $19, $0, WorriedGrandpaTriggerRight, $0, $0 .Signposts: db 0 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 6161d4287..493ee070e 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -43,15 +43,15 @@ TrainerGuitaristClyde: GuitaristClydeScript: talkaftercancel - special Function10630f - iftrue UnknownScript_0x75aa5 + special Mobile_DummyReturnFalse + iftrue .mobile loadfont writetext UnknownText_0x75d65 closetext loadmovesprites end -UnknownScript_0x75aa5: +.mobile: loadfont writetext UnknownText_0x75cfe closetext diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index ede7b5305..40f9173c1 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -72,10 +72,10 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Function10630f + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special Function103612 + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: @@ -174,10 +174,10 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Function10630f + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special Function103612 + special AskMobileOrCable iffalse .Cancel if_equal $1, .Mobile .NoMobile: diff --git a/maps/Route40.asm b/maps/Route40.asm index a9947beb6..d753be910 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -68,11 +68,11 @@ LassScript_0x1a61c4: jumptextfaceplayer UnknownText_0x1a6429 PokefanMScript_0x1a61c7: - special Function10630f - iftrue UnknownScript_0x1a61d0 + special Mobile_DummyReturnFalse + iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a -UnknownScript_0x1a61d0: +.mobile: jumptextfaceplayer UnknownText_0x1a649b LassScript_0x1a61d3: diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 0a3202d0e..21d6aa136 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -9,24 +9,24 @@ NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Function10630f - iftrue UnknownScript_0x18a489 + special Mobile_DummyReturnFalse + iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 -UnknownScript_0x18a489: +.mobile: jumptextfaceplayer UnknownText_0x18a532 FisherScript_0x18a48c: faceplayer loadfont checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x18a49a + iftrue .SolvedKantoPowerCrisis writetext UnknownText_0x18a5d3 closetext loadmovesprites end -UnknownScript_0x18a49a: +.SolvedKantoPowerCrisis: writetext UnknownText_0x18a62e closetext loadmovesprites |