diff options
Diffstat (limited to 'maps')
41 files changed, 2 insertions, 42 deletions
diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 9ce00fb6d..77133b30f 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,4 +1,3 @@ -const_value set 2 CeladonDeptStoreElevator_MapScriptHeader: .MapTriggers: diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 487295c34..1b9528b5f 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,4 +1,3 @@ -const_value set 2 CeladonMansion2F_MapScriptHeader: .MapTriggers: diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index 9081ce119..2f211dc8d 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 CeladonPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index 8aa260b47..20c577fb7 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 CeruleanPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index 7ce32df68..b73f9c43d 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 CinnabarPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 093b48acf..dd68d73f2 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,4 +1,3 @@ -const_value set 2 DragonsDen1F_MapScriptHeader: .MapTriggers: diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 0c41ae299..496bc7c06 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 FuchsiaPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 84db2f980..c6b99287e 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,4 +1,3 @@ -const_value set 2 GoldenrodDeptStoreElevator_MapScriptHeader: .MapTriggers: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index d92233639..d1fa4bc43 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -146,10 +146,10 @@ GoldenrodGameCornerTMVendorMenuData: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0x56cd1 + dw .MenuData2 db 1 ; default option -MenuData2_0x56cd1: +.MenuData2 db $80 ; flags db 4 ; items db "TM25 5500@" diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index cbaff9bae..19a431331 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 LavenderPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index b781e44b8..05e4c4b1d 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,4 +1,3 @@ -const_value set 2 MobileBattleRoom_MapScriptHeader: .MapTriggers: diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 422945de9..e0eb4df2f 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,4 +1,3 @@ -const_value set 2 MobileTradeRoomMobile_MapScriptHeader: .MapTriggers: diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index 9acc590fe..9a78c7c59 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 PewterPokeCEnter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 7ea443097..76380d2e5 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,4 +1,3 @@ -const_value set 2 RedsHouse2F_MapScriptHeader: .MapTriggers: diff --git a/maps/Route10North.asm b/maps/Route10North.asm index b8ac1d641..21dc630ab 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,4 +1,3 @@ -const_value set 2 Route10North_MapScriptHeader: .MapTriggers: diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index 9b630c78f..308b7c752 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 Route10PokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/Route16.asm b/maps/Route16.asm index 8a787d3ba..d5c1454d0 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,4 +1,3 @@ -const_value set 2 Route16_MapScriptHeader: .MapTriggers: diff --git a/maps/Route22.asm b/maps/Route22.asm index 55ccb16ff..e5466fe15 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,4 +1,3 @@ -const_value set 2 Route22_MapScriptHeader: .MapTriggers: diff --git a/maps/Route23.asm b/maps/Route23.asm index 7194d7819..8f4fc6a56 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,4 +1,3 @@ -const_value set 2 Route23_MapScriptHeader: .MapTriggers: diff --git a/maps/Route28.asm b/maps/Route28.asm index fc815b05b..ea65d5e1e 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,4 +1,3 @@ -const_value set 2 Route28_MapScriptHeader: .MapTriggers: diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index f2d23ef50..a294bce23 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -1,4 +1,3 @@ -const_value set 2 Route6UndergroundEntrance_MapScriptHeader: .MapTriggers: diff --git a/maps/Route7.asm b/maps/Route7.asm index e98fc20b9..59b260dd2 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,4 +1,3 @@ -const_value set 2 Route7_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 50fcee10c..31a5a373f 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphAerodactylChamber_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index 5b7917c6e..0ff2f6028 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphAerodactylWordRoom_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index a039c0b7d..e27439fdc 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphHoOhChamber_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index b547912e7..eed98968a 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphHoOhWordRoom_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 1db1e5c6a..64aa21491 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphKabutoWordRoom_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 10609fbb1..701eca02d 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphOmanyteChamber_MapScriptHeader: .MapTriggers: diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 87848a2a7..3f98b7fe4 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -1,4 +1,3 @@ -const_value set 2 RuinsofAlphOmanyteWordRoom_MapScriptHeader: .MapTriggers: diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index c29dce0df..e3f5922f9 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 SafariZoneBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 0f5cddc98..4c046f012 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 SafariZoneFuchsiaGateBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index e557e7a61..94b030858 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,4 +1,3 @@ -const_value set 2 SafariZoneMainOffice_MapScriptHeader: .MapTriggers: diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index d45e81076..5fb7ed1eb 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 SaffronPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 29e02e287..9e050cf72 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,4 +1,3 @@ -const_value set 2 SilverCaveOutside_MapScriptHeader: .MapTriggers: diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index e1689843e..c73a1eb4e 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,4 +1,3 @@ -const_value set 2 TinTower2F_MapScriptHeader: .MapTriggers: diff --git a/maps/Underground.asm b/maps/Underground.asm index 3c235f8b1..905ab6fcd 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -1,4 +1,3 @@ -const_value set 2 Underground_MapScriptHeader: .MapTriggers: diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index 3d97cfd04..23d9a4408 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 VermilionPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index e7f0e36d1..be9def165 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -1,4 +1,3 @@ -const_value set 2 ViridianPokeCenter2FBeta_MapScriptHeader: .MapTriggers: diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 5b496eca4..8b0aaea9a 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,4 +1,3 @@ -const_value set 2 WhirlIslandCave_MapScriptHeader: .MapTriggers: diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 14cddfb45..e7d8525fc 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,4 +1,3 @@ -const_value set 2 WhirlIslandNW_MapScriptHeader: .MapTriggers: diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index ba5a186d7..921b57312 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,4 +1,3 @@ -const_value set 2 WhirlIslandSE_MapScriptHeader: .MapTriggers: |