diff options
Diffstat (limited to 'maps')
28 files changed, 75 insertions, 75 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 0dcaa5ae2..2bb4b2bdc 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -91,7 +91,7 @@ UnknownScript_0x9f4a3: UnknownScript_0x9f4c2: pause 60 - special Function8c092 + special Special_BattleTowerFade warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 writebyte $4 special Function170687 @@ -103,7 +103,7 @@ UnknownScript_0x9f4c2: UnknownScript_0x9f4d9: pause 60 - special Function8c092 + special Special_BattleTowerFade warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 BattleTowerBattleRoomScript_0x9f4e4: loadfont diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index b61412ea9..339da1118 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -104,20 +104,20 @@ MapCeladonGameCornerSignpost35Script: if_equal $0, MapCeladonGameCornerSignpost16Script refreshscreen $0 writebyte $0 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapCeladonGameCornerSignpost16Script: refreshscreen $0 writebyte $1 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapCeladonGameCornerSignpost11Script: refreshscreen $0 - special Functionc380 + special Special_CardFlip loadmovesprites end @@ -128,7 +128,7 @@ MapCeladonGameCornerSignpost9Script: loadfont writetext UnknownText_0x72567 closetext - special Functionc380 + special Special_CardFlip loadmovesprites end diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index ec3c078a7..d8899dd7f 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -146,7 +146,7 @@ UnknownScript_0x727ed: writetext UnknownText_0x729ad closetext writebyte PIKACHU - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke PIKACHU, 25, 0, 0 takecoins 2222 jump UnknownScript_0x727d3 @@ -164,7 +164,7 @@ UnknownScript_0x7281b: writetext UnknownText_0x729ad closetext writebyte PORYGON - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke PORYGON, 15, 0, 0 takecoins 5555 jump UnknownScript_0x727d3 @@ -182,7 +182,7 @@ UnknownScript_0x72849: writetext UnknownText_0x729ad closetext writebyte LARVITAR - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke LARVITAR, 40, 0, 0 takecoins 8888 jump UnknownScript_0x727d3 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index e2f09ecce..252740764 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -50,7 +50,7 @@ UnknownScript_0x62fb6: end UnknownScript_0x62fbd: - special Function166d6 + special Special_DayCareMan closetext loadmovesprites end @@ -60,7 +60,7 @@ GrannyScript_0x62fc3: loadfont checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62fd1 - special Function1672a + special Special_DayCareLady closetext loadmovesprites end diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index ae8aa1132..112c6224d 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -35,15 +35,15 @@ TwinScript_0x75ebb: writetext UnknownText_0x7621f closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $5 applymovement $0, MovementData_0x76004 moveperson $4, $3, $13 appear $4 spriteface $0, UP spriteface $4, UP - special Function8c0ab + special Special_FadeInQuickly spriteface $3, DOWN showemote EMOTE_SHOCK, $3, 15 applymovement $4, MovementData_0x7600c diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 31d796648..1f4fafcf4 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -63,14 +63,14 @@ FastShipBed: writetext FastShipBedText1 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes special Mobile_HealParty special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Function8c0ab + special Special_FadeInQuickly loadfont writetext FastShipBedText2 closetext diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index b8ab87fb9..09596d0a6 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -175,7 +175,7 @@ UnknownScript_0x56d26: writetext UnknownText_0x56ebd closetext writebyte ABRA - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke ABRA, 5, 0, 0 takecoins 100 jump UnknownScript_0x56d0c @@ -193,7 +193,7 @@ UnknownScript_0x56d54: writetext UnknownText_0x56ebd closetext writebyte CUBONE - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke CUBONE, 15, 0, 0 takecoins 800 jump UnknownScript_0x56d0c @@ -211,7 +211,7 @@ UnknownScript_0x56d82: writetext UnknownText_0x56ebd closetext writebyte WOBBUFFET - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15, 0, 0 takecoins 1500 jump UnknownScript_0x56d0c @@ -292,20 +292,20 @@ MapGoldenrodGameCornerSignpost17Script: if_equal $0, MapGoldenrodGameCornerSignpost7Script refreshscreen $0 writebyte $0 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapGoldenrodGameCornerSignpost7Script: refreshscreen $0 writebyte $1 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapGoldenrodGameCornerSignpost29Script: refreshscreen $0 - special Functionc380 + special Special_CardFlip loadmovesprites end diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index f809106aa..04796814e 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -33,7 +33,7 @@ UnknownScript_0x550fa: applymovement $2, MovementData_0x55146 applymovement $0, MovementData_0x5514f writebyte $0 - special Function8cc04 + special Special_MagnetTrain warpcheck newloadmap $f9 applymovement $0, MovementData_0x55122 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index d387fa154..3ca74f2e7 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -43,7 +43,7 @@ UnknownScript_0x7a4f6: clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd keeptextopen - special Function90913 + special Special_SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 yesorno @@ -142,7 +142,7 @@ UnknownScript_0x7a5b5: setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - special Function16218 + special Special_BankOfMom closetext loadmovesprites end diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 84b17ffda..bffe5f16a 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -84,7 +84,7 @@ KrissHouseBookshelf: KrissHousePC: loadfont - special Functionc2e7 + special Special_KrissHousePC iftrue .Warp loadmovesprites end diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 3d5572f52..fdc14ebcd 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -132,7 +132,7 @@ MapLakeofRageSignpost1Script: UnknownScript_0x700b8: keeptextopen - special Functionfbcd2 + special Special_MagikarpHouseSign loadmovesprites end diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 88989329c..e808c2d49 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -108,13 +108,13 @@ UnknownScript_0x196ec9: writetext UnknownText_0x1970ed closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes playmusic MUSIC_HEAL special Mobile_HealParty special HealParty pause 60 - special Function8c0ab + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x197134 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 60c322f95..531420604 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -435,7 +435,7 @@ PokeCenter2F_CheckGender: special Functionc225 applymovement $0, MovementData_0x192d1c setflag ENGINE_KRIS_IN_CABLE_CLUB - special Functione4a + special Special_ReplaceKrisSprite loadfont writetext Text_LikeTheLook closetext @@ -461,7 +461,7 @@ Script_CleanUpFemaleFlagAfterTrade: writebyte $90 special Functionc225 applymovement $0, MovementData_0x192d1c - special Functione4a + special Special_ReplaceKrisSprite applymovement $0, MovementData_0x192d2a applymovement $2, MovementData_0x192cfe end @@ -483,7 +483,7 @@ Script_CleanUpFemaleFlagAfterBattle: writebyte $90 special Functionc225 applymovement $0, MovementData_0x192d1c - special Functione4a + special Special_ReplaceKrisSprite applymovement $0, MovementData_0x192d2a applymovement $3, MovementData_0x192cfe end @@ -544,7 +544,7 @@ TimeCapsuleScript_CheckPlayerGender: applymovement $0, MovementData_0x192d22 faceperson $0, $4 setflag ENGINE_KRIS_IN_CABLE_CLUB - special Functione4a + special Special_ReplaceKrisSprite loadfont writetext Text_LikeTheLook closetext @@ -571,7 +571,7 @@ Script_LeftTimeCapsule: writebyte $90 special Functionc225 applymovement $0, MovementData_0x192d1c - special Functione4a + special Special_ReplaceKrisSprite applymovement $0, MovementData_0x192cfc applymovement $4, MovementData_0x192d01 .Done: diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 9509ed504..bc245c964 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -90,12 +90,12 @@ UnknownScript_0x6006e: writetext UnknownText_0x6050e closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $3 disappear $4 pause 15 - special Function8c0ab + special Special_FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/maps/Route24.asm b/maps/Route24.asm index 7469934a3..06ba45bf9 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -25,11 +25,11 @@ RocketScript_0x1adbfa: writetext UnknownText_0x1adee1 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 pause 25 - special Function8c0ab + special Special_FadeInQuickly playmapmusic end diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index a8547cd3a..366c67125 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -11,13 +11,13 @@ TeacherScript_0x7b125: writetext UnknownText_0x7b14d closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes special Mobile_HealParty playmusic MUSIC_HEAL special HealParty pause 60 - special Function8c0ab + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x7b18b diff --git a/maps/Route34.asm b/maps/Route34.asm index a74aaa244..04c8ee921 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -44,7 +44,7 @@ UnknownScript_0x78039: GrampsScript_0x7803d: faceplayer loadfont - special Function16936 + special Special_DayCareManOutside closetext loadmovesprites if_equal $1, UnknownScript_0x7805a diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 23cacb61c..df4bc16d0 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -67,14 +67,14 @@ UnknownScript_0x6ab47: writetext UnknownText_0x6b2c5 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes scall UnknownScript_0x6ab8c disappear $2 appear $d applymovement $0, MovementData_0x6add1 pause 15 - special Function8c0ab + special Special_FadeInQuickly jumpstd bugcontestresults UnknownScript_0x6ab76: diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index e5d9597d7..0e6245923 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -55,7 +55,7 @@ UnknownScript_0x58dd3: MapRuinsofAlphAerodactylChamberSignpost2Script: refreshscreen $0 writebyte $2 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x58df7 end @@ -89,7 +89,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: loadfont writetext UnknownText_0x58e4f writebyte $1 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -99,7 +99,7 @@ MapRuinsofAlphAerodactylChamberSignpost5Script: loadfont writetext UnknownText_0x58e81 writebyte $1 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 40d5fe4cd..77652fa80 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -56,7 +56,7 @@ UnknownScript_0x58596: MapRuinsofAlphHoOhChamberSignpost2Script: refreshscreen $0 writebyte $3 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x585ba end @@ -90,7 +90,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: loadfont writetext UnknownText_0x58612 writebyte $3 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -100,7 +100,7 @@ MapRuinsofAlphHoOhChamberSignpost5Script: loadfont writetext UnknownText_0x58644 writebyte $3 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 9fff028f7..ae6f10e7c 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -60,7 +60,7 @@ ReceptionistScript_0x58769: MapRuinsofAlphKabutoChamberSignpost2Script: refreshscreen $0 writebyte $0 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x58778 end @@ -125,7 +125,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: loadfont writetext UnknownText_0x58aa7 writebyte $0 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -135,7 +135,7 @@ MapRuinsofAlphKabutoChamberSignpost5Script: loadfont writetext UnknownText_0x58ad9 writebyte $0 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 669774e35..0bd926a57 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -56,7 +56,7 @@ UnknownScript_0x58c12: MapRuinsofAlphOmanyteChamberSignpost2Script: refreshscreen $0 writebyte $1 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x58c36 end @@ -90,7 +90,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: loadfont writetext UnknownText_0x58c8e writebyte $2 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -100,7 +100,7 @@ MapRuinsofAlphOmanyteChamberSignpost5Script: loadfont writetext UnknownText_0x58cc0 writebyte $2 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 1c66fd74a..3f89c89d7 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -165,7 +165,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d closetext - special Functionc2cd + special Special_UnownPrinter loadmovesprites end diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 1962be284..c4653f8c4 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -33,7 +33,7 @@ UnknownScript_0x18a82c: applymovement $2, MovementData_0x18a88f applymovement $0, MovementData_0x18a898 writebyte $1 - special Function8cc04 + special Special_MagnetTrain warpcheck newloadmap $f9 applymovement $0, MovementData_0x18a854 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 0ae7b780b..1631d032a 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -22,11 +22,11 @@ RedScript_0x18c603: writetext UnknownText_0x18c63f closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 pause 15 - special Function8c0ab + special Special_FadeInQuickly pause 30 special HealParty refreshscreen $0 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index a15734af9..bbffda06e 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -27,14 +27,14 @@ GruntM1Script: writetext TrainerGruntM1WhenTalkText closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 disappear $3 disappear $4 disappear $5 pause 15 - special Function8c0ab + special Special_FadeInQuickly disappear $8 moveperson $8, $b, $6 appear $8 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index db0a2cd85..36b424b41 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -47,11 +47,11 @@ UnknownScript_0x184947: pause 15 loadmovesprites playsound SFX_WARP_TO - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $8 waitbutton - special Function8c0ab + special Special_FadeInQuickly dotrigger $1 special RestartMapMusic end diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 78df0926d..966f74788 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -98,15 +98,15 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d4c6 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 disappear $3 disappear $c disappear $d disappear $e pause 15 - special Function8c0ab + special Special_FadeInQuickly dotrigger $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface $4, DOWN |