diff options
| author | dannye <33dannye@gmail.com> | 2023-10-11 20:12:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 20:12:25 -0500 |
| commit | b302e93674f376f2881cbd931a698345ad27bec3 (patch) | |
| tree | 7091cec7b54cbea58969cfb1759a6a3b297e9df2 /data/maps/objects | |
| parent | Use PSN constant in PoisonEffect routine (#426) (diff) | |
| download | pokeyellow-b302e93674f376f2881cbd931a698345ad27bec3.tar.gz pokeyellow-b302e93674f376f2881cbd931a698345ad27bec3.tar.xz pokeyellow-b302e93674f376f2881cbd931a698345ad27bec3.zip | |
Use map object consts in data/maps/hide_show_data.asm (#432)
Diffstat (limited to 'data/maps/objects')
208 files changed, 922 insertions, 921 deletions
diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm index 6cd6f21d..59a0f9d3 100644 --- a/data/maps/objects/AgathasRoom.asm +++ b/data/maps/objects/AgathasRoom.asm @@ -1,5 +1,5 @@ object_const_def - const AGATHASROOM_AGATHA + const_export AGATHASROOM_AGATHA AgathasRoom_Object: db $0 ; border block diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index 450d7a3a..a635d009 100644 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -1,7 +1,7 @@ object_const_def - const BIKESHOP_CLERK - const BIKESHOP_MIDDLE_AGED_WOMAN - const BIKESHOP_YOUNGSTER + const_export BIKESHOP_CLERK + const_export BIKESHOP_MIDDLE_AGED_WOMAN + const_export BIKESHOP_YOUNGSTER BikeShop_Object: db $e ; border block diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index 198e6d9e..6cbbb5b6 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -1,7 +1,7 @@ object_const_def - const BILLSHOUSE_BILL_POKEMON - const BILLSHOUSE_BILL1 - const BILLSHOUSE_BILL2 + const_export BILLSHOUSE_BILL_POKEMON + const_export BILLSHOUSE_BILL1 + const_export BILLSHOUSE_BILL2 BillsHouse_Object: db $d ; border block diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 9633c1d0..d356506d 100644 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -1,7 +1,7 @@ object_const_def - const BLUESHOUSE_DAISY1 - const BLUESHOUSE_DAISY2 - const BLUESHOUSE_TOWN_MAP + const_export BLUESHOUSE_DAISY1 + const_export BLUESHOUSE_DAISY2 + const_export BLUESHOUSE_TOWN_MAP BluesHouse_Object: db $a ; border block diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm index e4cd5692..0ec7a5a2 100644 --- a/data/maps/objects/BrunosRoom.asm +++ b/data/maps/objects/BrunosRoom.asm @@ -1,5 +1,5 @@ object_const_def - const BRUNOSROOM_BRUNO + const_export BRUNOSROOM_BRUNO BrunosRoom_Object: db $3 ; border block diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index 8fe27f68..0f457589 100644 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -1,7 +1,7 @@ object_const_def - const CELADONCHIEFHOUSE_CHIEF - const CELADONCHIEFHOUSE_ROCKET - const CELADONCHIEFHOUSE_SAILOR + const_export CELADONCHIEFHOUSE_CHIEF + const_export CELADONCHIEFHOUSE_ROCKET + const_export CELADONCHIEFHOUSE_SAILOR CeladonChiefHouse_Object: db $f ; border block diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 6975bf6b..bab78ab7 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -1,13 +1,13 @@ object_const_def - const CELADONCITY_LITTLE_GIRL - const CELADONCITY_GRAMPS1 - const CELADONCITY_GIRL - const CELADONCITY_GRAMPS2 - const CELADONCITY_GRAMPS3 - const CELADONCITY_FISHER - const CELADONCITY_POLIWRATH - const CELADONCITY_ROCKET1 - const CELADONCITY_ROCKET2 + const_export CELADONCITY_LITTLE_GIRL + const_export CELADONCITY_GRAMPS1 + const_export CELADONCITY_GIRL + const_export CELADONCITY_GRAMPS2 + const_export CELADONCITY_GRAMPS3 + const_export CELADONCITY_FISHER + const_export CELADONCITY_POLIWRATH + const_export CELADONCITY_ROCKET1 + const_export CELADONCITY_ROCKET2 CeladonCity_Object: db $f ; border block diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index 98363688..d3c1a019 100644 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -1,9 +1,9 @@ object_const_def - const CELADONDINER_COOK - const CELADONDINER_MIDDLE_AGED_WOMAN - const CELADONDINER_MIDDLE_AGED_MAN - const CELADONDINER_FISHER - const CELADONDINER_GYM_GUIDE + const_export CELADONDINER_COOK + const_export CELADONDINER_MIDDLE_AGED_WOMAN + const_export CELADONDINER_MIDDLE_AGED_MAN + const_export CELADONDINER_FISHER + const_export CELADONDINER_GYM_GUIDE CeladonDiner_Object: db $f ; border block diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index bb4ad61c..06fc882e 100644 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -1,12 +1,12 @@ object_const_def - const CELADONGYM_ERIKA - const CELADONGYM_COOLTRAINER_F1 - const CELADONGYM_BEAUTY1 - const CELADONGYM_COOLTRAINER_F2 - const CELADONGYM_BEAUTY2 - const CELADONGYM_COOLTRAINER_F3 - const CELADONGYM_BEAUTY3 - const CELADONGYM_COOLTRAINER_F4 + const_export CELADONGYM_ERIKA + const_export CELADONGYM_COOLTRAINER_F1 + const_export CELADONGYM_BEAUTY1 + const_export CELADONGYM_COOLTRAINER_F2 + const_export CELADONGYM_BEAUTY2 + const_export CELADONGYM_COOLTRAINER_F3 + const_export CELADONGYM_BEAUTY3 + const_export CELADONGYM_COOLTRAINER_F4 CeladonGym_Object: db $3 ; border block diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index 700361ce..54a64d51 100644 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -1,7 +1,7 @@ object_const_def - const CELADONHOTEL_GRANNY - const CELADONHOTEL_BEAUTY - const CELADONHOTEL_SUPER_NERD + const_export CELADONHOTEL_GRANNY + const_export CELADONHOTEL_BEAUTY + const_export CELADONHOTEL_SUPER_NERD CeladonHotel_Object: db $0 ; border block diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 6161cf0a..e36b7b49 100644 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMANSION1F_MEOWTH - const CELADONMANSION1F_GRANNY - const CELADONMANSION1F_CLEFAIRY - const CELADONMANSION1F_NIDORANF + const_export CELADONMANSION1F_MEOWTH + const_export CELADONMANSION1F_GRANNY + const_export CELADONMANSION1F_CLEFAIRY + const_export CELADONMANSION1F_NIDORANF CeladonMansion1F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 5d2c1e99..7e744af3 100644 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMANSION3F_PROGRAMMER - const CELADONMANSION3F_GRAPHIC_ARTIST - const CELADONMANSION3F_WRITER - const CELADONMANSION3F_GAME_DESIGNER + const_export CELADONMANSION3F_PROGRAMMER + const_export CELADONMANSION3F_GRAPHIC_ARTIST + const_export CELADONMANSION3F_WRITER + const_export CELADONMANSION3F_GAME_DESIGNER CeladonMansion3F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index 4ee9494b..4a37bf4e 100644 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -1,6 +1,6 @@ object_const_def - const CELADONMANSION_ROOF_HOUSE_HIKER - const CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL + const_export CELADONMANSION_ROOF_HOUSE_HIKER + const_export CELADONMANSION_ROOF_HOUSE_EEVEE_POKEBALL CeladonMansionRoofHouse_Object: db $a ; border block diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 6ec1e35d..d1dd2683 100644 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,5 +1,5 @@ object_const_def - const CELADONMART1F_RECEPTIONIST + const_export CELADONMART1F_RECEPTIONIST CeladonMart1F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 52052383..039afecd 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMART2F_CLERK1 - const CELADONMART2F_CLERK2 - const CELADONMART2F_MIDDLE_AGED_MAN - const CELADONMART2F_GIRL + const_export CELADONMART2F_CLERK1 + const_export CELADONMART2F_CLERK2 + const_export CELADONMART2F_MIDDLE_AGED_MAN + const_export CELADONMART2F_GIRL CeladonMart2F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index e0e3f7be..99d98078 100644 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -1,9 +1,9 @@ object_const_def - const CELADONMART3F_CLERK - const CELADONMART3F_GAMEBOY_KID1 - const CELADONMART3F_GAMEBOY_KID2 - const CELADONMART3F_GAMEBOY_KID3 - const CELADONMART3F_LITTLE_BOY + const_export CELADONMART3F_CLERK + const_export CELADONMART3F_GAMEBOY_KID1 + const_export CELADONMART3F_GAMEBOY_KID2 + const_export CELADONMART3F_GAMEBOY_KID3 + const_export CELADONMART3F_LITTLE_BOY CeladonMart3F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 6ee17f19..21846abe 100644 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -1,7 +1,7 @@ object_const_def - const CELADONMART4F_CLERK - const CELADONMART4F_SUPER_NERD - const CELADONMART4F_YOUNGSTER + const_export CELADONMART4F_CLERK + const_export CELADONMART4F_SUPER_NERD + const_export CELADONMART4F_YOUNGSTER CeladonMart4F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index 916d2756..637fd662 100644 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONMART5F_GENTLEMAN - const CELADONMART5F_SAILOR - const CELADONMART5F_CLERK1 - const CELADONMART5F_CLERK2 + const_export CELADONMART5F_GENTLEMAN + const_export CELADONMART5F_SAILOR + const_export CELADONMART5F_CLERK1 + const_export CELADONMART5F_CLERK2 CeladonMart5F_Object: db $f ; border block diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index e686567c..51350b5d 100644 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -1,6 +1,6 @@ object_const_def - const CELADONMARTROOF_SUPER_NERD - const CELADONMARTROOF_LITTLE_GIRL + const_export CELADONMARTROOF_SUPER_NERD + const_export CELADONMARTROOF_LITTLE_GIRL CeladonMartRoof_Object: db $42 ; border block diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index 4709203b..4d9c5f26 100644 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const CELADONPOKECENTER_NURSE - const CELADONPOKECENTER_GENTLEMAN - const CELADONPOKECENTER_BEAUTY - const CELADONPOKECENTER_LINK_RECEPTIONIST + const_export CELADONPOKECENTER_NURSE + const_export CELADONPOKECENTER_GENTLEMAN + const_export CELADONPOKECENTER_BEAUTY + const_export CELADONPOKECENTER_LINK_RECEPTIONIST CeladonPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index 1fec6ac8..d534cbe7 100644 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -1,5 +1,5 @@ object_const_def - const CERULEANBADGEHOUSE_MIDDLE_AGED_MAN + const_export CERULEANBADGEHOUSE_MIDDLE_AGED_MAN CeruleanBadgeHouse_Object: db $c ; border block diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 777805d4..89a64726 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANCAVE1F_FULL_RESTORE - const CERULEANCAVE1F_MAX_ELIXER - const CERULEANCAVE1F_NUGGET + const_export CERULEANCAVE1F_FULL_RESTORE + const_export CERULEANCAVE1F_MAX_ELIXER + const_export CERULEANCAVE1F_NUGGET CeruleanCave1F_Object: db $7d ; border block diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 6eea42a0..3fb226a3 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANCAVE2F_PP_UP - const CERULEANCAVE2F_ULTRA_BALL - const CERULEANCAVE2F_FULL_RESTORE + const_export CERULEANCAVE2F_PP_UP + const_export CERULEANCAVE2F_ULTRA_BALL + const_export CERULEANCAVE2F_FULL_RESTORE CeruleanCave2F_Object: db $7d ; border block diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 81e2b880..a82d1712 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANCAVE_B1F_MEWTWO - const CERULEANCAVE_B1F_ULTRA_BALL - const CERULEANCAVE_B1F_MAX_REVIVE + const_export CERULEANCAVE_B1F_MEWTWO + const_export CERULEANCAVE_B1F_ULTRA_BALL + const_export CERULEANCAVE_B1F_MAX_REVIVE CeruleanCaveB1F_Object: db $7d ; border block diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index 605aa417..12de9dd3 100644 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -1,15 +1,15 @@ object_const_def - const CERULEANCITY_RIVAL - const CERULEANCITY_ROCKET - const CERULEANCITY_COOLTRAINER_M - const CERULEANCITY_SUPER_NERD1 - const CERULEANCITY_SUPER_NERD2 - const CERULEANCITY_GUARD1 - const CERULEANCITY_COOLTRAINER_F1 - const CERULEANCITY_SLOWBRO - const CERULEANCITY_COOLTRAINER_F2 - const CERULEANCITY_SUPER_NERD3 - const CERULEANCITY_GUARD2 + const_export CERULEANCITY_RIVAL + const_export CERULEANCITY_ROCKET + const_export CERULEANCITY_COOLTRAINER_M + const_export CERULEANCITY_SUPER_NERD1 + const_export CERULEANCITY_SUPER_NERD2 + const_export CERULEANCITY_GUARD1 + const_export CERULEANCITY_COOLTRAINER_F1 + const_export CERULEANCITY_SLOWBRO + const_export CERULEANCITY_COOLTRAINER_F2 + const_export CERULEANCITY_SUPER_NERD3 + const_export CERULEANCITY_GUARD2 CeruleanCity_Object: db $f ; border block diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index 19a06870..cfee7bfa 100644 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -1,8 +1,8 @@ object_const_def - const CERULEANGYM_MISTY - const CERULEANGYM_COOLTRAINER_F - const CERULEANGYM_SWIMMER - const CERULEANGYM_GYM_GUIDE + const_export CERULEANGYM_MISTY + const_export CERULEANGYM_COOLTRAINER_F + const_export CERULEANGYM_SWIMMER + const_export CERULEANGYM_GYM_GUIDE CeruleanGym_Object: db $3 ; border block diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index a1ab6717..fa13abd5 100644 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -1,7 +1,7 @@ object_const_def - const CERULEANMART_CLERK - const CERULEANMART_COOLTRAINER_M - const CERULEANMART_COOLTRAINER_F + const_export CERULEANMART_CLERK + const_export CERULEANMART_COOLTRAINER_M + const_export CERULEANMART_COOLTRAINER_F CeruleanMart_Object: db $0 ; border block diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index 5e1a4015..9eb61178 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const CERULEANPOKECENTER_NURSE - const CERULEANPOKECENTER_SUPER_NERD - const CERULEANPOKECENTER_GENTLEMAN - const CERULEANPOKECENTER_LINK_RECEPTIONIST + const_export CERULEANPOKECENTER_NURSE + const_export CERULEANPOKECENTER_SUPER_NERD + const_export CERULEANPOKECENTER_GENTLEMAN + const_export CERULEANPOKECENTER_LINK_RECEPTIONIST CeruleanPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index c55ed6ef..d4014f3a 100644 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -1,6 +1,6 @@ object_const_def - const CERULEANTRADEHOUSE_GRANNY - const CERULEANTRADEHOUSE_GAMBLER + const_export CERULEANTRADEHOUSE_GRANNY + const_export CERULEANTRADEHOUSE_GAMBLER CeruleanTradeHouse_Object: db $a ; border block diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 993e66c2..f8dfa87e 100644 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -1,6 +1,6 @@ object_const_def - const CERULEANTRASHEDHOUSE_FISHING_GURU - const CERULEANTRASHEDHOUSE_GIRL + const_export CERULEANTRASHEDHOUSE_FISHING_GURU + const_export CERULEANTRASHEDHOUSE_GIRL CeruleanTrashedHouse_Object: db $a ; border block diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm index 50bdee60..79fd15dc 100644 --- a/data/maps/objects/ChampionsRoom.asm +++ b/data/maps/objects/ChampionsRoom.asm @@ -1,6 +1,6 @@ object_const_def - const CHAMPIONSROOM_RIVAL - const CHAMPIONSROOM_OAK + const_export CHAMPIONSROOM_RIVAL + const_export CHAMPIONSROOM_OAK ChampionsRoom_Object: db $3 ; border block diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index 9453d0b7..f571b435 100644 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -1,13 +1,13 @@ object_const_def - const CINNABARGYM_BLAINE - const CINNABARGYM_SUPER_NERD1 - const CINNABARGYM_SUPER_NERD2 - const CINNABARGYM_SUPER_NERD3 - const CINNABARGYM_SUPER_NERD4 - const CINNABARGYM_SUPER_NERD5 - const CINNABARGYM_SUPER_NERD6 - const CINNABARGYM_SUPER_NERD7 - const CINNABARGYM_GYM_GUIDE + const_export CINNABARGYM_BLAINE + const_export CINNABARGYM_SUPER_NERD1 + const_export CINNABARGYM_SUPER_NERD2 + const_export CINNABARGYM_SUPER_NERD3 + const_export CINNABARGYM_SUPER_NERD4 + const_export CINNABARGYM_SUPER_NERD5 + const_export CINNABARGYM_SUPER_NERD6 + const_export CINNABARGYM_SUPER_NERD7 + const_export CINNABARGYM_GYM_GUIDE CinnabarGym_Object: db $2e ; border block diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index dd3593b3..739d5d75 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -1,6 +1,6 @@ object_const_def - const CINNABARISLAND_GIRL - const CINNABARISLAND_GAMBLER + const_export CINNABARISLAND_GIRL + const_export CINNABARISLAND_GAMBLER CinnabarIsland_Object: db $43 ; border block diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index bced7c56..a921cb26 100644 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -1,5 +1,5 @@ object_const_def - const CINNABARLAB_FISHING_GURU + const_export CINNABARLAB_FISHING_GURU CinnabarLab_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 6ffe4912..42a80134 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,6 +1,6 @@ object_const_def - const CINNABARLABFOSSILROOM_SCIENTIST1 - const CINNABARLABFOSSILROOM_SCIENTIST2 + const_export CINNABARLABFOSSILROOM_SCIENTIST1 + const_export CINNABARLABFOSSILROOM_SCIENTIST2 CinnabarLabFossilRoom_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index 926e9024..abcae5a7 100644 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -1,6 +1,6 @@ object_const_def - const CINNABARLABMETRONOMEROOM_SCIENTIST1 - const CINNABARLABMETRONOMEROOM_SCIENTIST2 + const_export CINNABARLABMETRONOMEROOM_SCIENTIST1 + const_export CINNABARLABMETRONOMEROOM_SCIENTIST2 CinnabarLabMetronomeRoom_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 69a94483..294646a7 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -1,7 +1,7 @@ object_const_def - const CINNABARLABTRADEROOM_SUPER_NERD - const CINNABARLABTRADEROOM_GRAMPS - const CINNABARLABTRADEROOM_BEAUTY + const_export CINNABARLABTRADEROOM_SUPER_NERD + const_export CINNABARLABTRADEROOM_GRAMPS + const_export CINNABARLABTRADEROOM_BEAUTY CinnabarLabTradeRoom_Object: db $17 ; border block diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index d6651e97..e77ba5cf 100644 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -1,7 +1,7 @@ object_const_def - const CINNABARMART_CLERK - const CINNABARMART_SILPH_WORKER_F - const CINNABARMART_SCIENTIST + const_export CINNABARMART_CLERK + const_export CINNABARMART_SILPH_WORKER_F + const_export CINNABARMART_SCIENTIST CinnabarMart_Object: db $0 ; border block diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 1d3b39f0..1c50b298 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const CINNABARPOKECENTER_NURSE - const CINNABARPOKECENTER_COOLTRAINER_F - const CINNABARPOKECENTER_GENTLEMAN - const CINNABARPOKECENTER_LINK_RECEPTIONIST + const_export CINNABARPOKECENTER_NURSE + const_export CINNABARPOKECENTER_COOLTRAINER_F + const_export CINNABARPOKECENTER_GENTLEMAN + const_export CINNABARPOKECENTER_LINK_RECEPTIONIST CinnabarPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm index 9d6b0441..6fc8e902 100644 --- a/data/maps/objects/Colosseum.asm +++ b/data/maps/objects/Colosseum.asm @@ -1,5 +1,5 @@ object_const_def - const COLOSSEUM_OPPONENT + const_export COLOSSEUM_OPPONENT Colosseum_Object: db $e ; border block diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index e82bd780..cf55877b 100644 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -1,7 +1,7 @@ object_const_def - const COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN - const COPYCATSHOUSE1F_MIDDLE_AGED_MAN - const COPYCATSHOUSE1F_CHANSEY + const_export COPYCATSHOUSE1F_MIDDLE_AGED_WOMAN + const_export COPYCATSHOUSE1F_MIDDLE_AGED_MAN + const_export COPYCATSHOUSE1F_CHANSEY CopycatsHouse1F_Object: db $a ; border block diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index dbc9918d..ac1890ed 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -1,9 +1,9 @@ object_const_def - const COPYCATSHOUSE2F_COPYCAT - const COPYCATSHOUSE2F_DODUO - const COPYCATSHOUSE2F_MONSTER - const COPYCATSHOUSE2F_BIRD - const COPYCATSHOUSE2F_FAIRY + const_export COPYCATSHOUSE2F_COPYCAT + const_export COPYCATSHOUSE2F_DODUO + const_export COPYCATSHOUSE2F_MONSTER + const_export COPYCATSHOUSE2F_BIRD + const_export COPYCATSHOUSE2F_FAIRY CopycatsHouse2F_Object: db $a ; border block diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm index 78060a94..f19f9937 100644 --- a/data/maps/objects/Daycare.asm +++ b/data/maps/objects/Daycare.asm @@ -1,5 +1,5 @@ object_const_def - const DAYCARE_GENTLEMAN + const_export DAYCARE_GENTLEMAN Daycare_Object: db $a ; border block diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm index 50956693..a10df285 100644 --- a/data/maps/objects/DiglettsCaveRoute11.asm +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -1,5 +1,5 @@ object_const_def - const DIGLETTSCAVEROUTE11_GAMBLER + const_export DIGLETTSCAVEROUTE11_GAMBLER DiglettsCaveRoute11_Object: db $7d ; border block diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 97b975c0..9da4f0cd 100644 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -1,5 +1,5 @@ object_const_def - const DIGLETTSCAVEROUTE2_FISHING_GURU + const_export DIGLETTSCAVEROUTE2_FISHING_GURU DiglettsCaveRoute2_Object: db $7d ; border block diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 15ce598f..9d364a46 100644 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -1,11 +1,11 @@ object_const_def - const FIGHTINGDOJO_KARATE_MASTER - const FIGHTINGDOJO_BLACKBELT1 - const FIGHTINGDOJO_BLACKBELT2 - const FIGHTINGDOJO_BLACKBELT3 - const FIGHTINGDOJO_BLACKBELT4 - const FIGHTINGDOJO_HITMONLEE_POKE_BALL - const FIGHTINGDOJO_HITMONCHAN_POKE_BALL + const_export FIGHTINGDOJO_KARATE_MASTER + const_export FIGHTINGDOJO_BLACKBELT1 + const_export FIGHTINGDOJO_BLACKBELT2 + const_export FIGHTINGDOJO_BLACKBELT3 + const_export FIGHTINGDOJO_BLACKBELT4 + const_export FIGHTINGDOJO_HITMONLEE_POKE_BALL + const_export FIGHTINGDOJO_HITMONCHAN_POKE_BALL FightingDojo_Object: db $3 ; border block diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 3d9bc143..72a1c382 100644 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -1,7 +1,7 @@ object_const_def - const FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN - const FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA - const FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER + const_export FUCHSIABILLSGRANDPASHOUSE_MIDDLE_AGED_WOMAN + const_export FUCHSIABILLSGRANDPASHOUSE_BILLS_GRANDPA + const_export FUCHSIABILLSGRANDPASHOUSE_YOUNGSTER FuchsiaBillsGrandpasHouse_Object: db $a ; border block diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 7e4201ff..23015884 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -1,14 +1,14 @@ object_const_def - const FUCHSIACITY_YOUNGSTER1 - const FUCHSIACITY_GAMBLER - const FUCHSIACITY_ERIK - const FUCHSIACITY_YOUNGSTER2 - const FUCHSIACITY_CHANSEY - const FUCHSIACITY_VOLTORB - const FUCHSIACITY_KANGASKHAN - const FUCHSIACITY_SLOWPOKE - const FUCHSIACITY_LAPRAS - const FUCHSIACITY_FOSSIL + const_export FUCHSIACITY_YOUNGSTER1 + const_export FUCHSIACITY_GAMBLER + const_export FUCHSIACITY_ERIK + const_export FUCHSIACITY_YOUNGSTER2 + const_export FUCHSIACITY_CHANSEY + const_export FUCHSIACITY_VOLTORB + const_export FUCHSIACITY_KANGASKHAN + const_export FUCHSIACITY_SLOWPOKE + const_export FUCHSIACITY_LAPRAS + const_export FUCHSIACITY_FOSSIL FuchsiaCity_Object: db $f ; border block diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index eea49399..3282a904 100644 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -1,5 +1,5 @@ object_const_def - const FUCHSIAGOODRODHOUSE_FISHING_GURU + const_export FUCHSIAGOODRODHOUSE_FISHING_GURU FuchsiaGoodRodHouse_Object: db $c ; border block diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index e3d0680a..71be2232 100644 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -1,12 +1,12 @@ object_const_def - const FUCHSIAGYM_KOGA - const FUCHSIAGYM_ROCKER1 - const FUCHSIAGYM_ROCKER2 - const FUCHSIAGYM_ROCKER3 - const FUCHSIAGYM_ROCKER4 - const FUCHSIAGYM_ROCKER5 - const FUCHSIAGYM_ROCKER6 - const FUCHSIAGYM_GYM_GUIDE + const_export FUCHSIAGYM_KOGA + const_export FUCHSIAGYM_ROCKER1 + const_export FUCHSIAGYM_ROCKER2 + const_export FUCHSIAGYM_ROCKER3 + const_export FUCHSIAGYM_ROCKER4 + const_export FUCHSIAGYM_ROCKER5 + const_export FUCHSIAGYM_ROCKER6 + const_export FUCHSIAGYM_GYM_GUIDE FuchsiaGym_Object: db $3 ; border block diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index b41ba0f6..a961b957 100644 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -1,7 +1,7 @@ object_const_def - const FUCHSIAMART_CLERK - const FUCHSIAMART_MIDDLE_AGED_MAN - const FUCHSIAMART_COOLTRAINER_F + const_export FUCHSIAMART_CLERK + const_export FUCHSIAMART_MIDDLE_AGED_MAN + const_export FUCHSIAMART_COOLTRAINER_F FuchsiaMart_Object: db $0 ; border block diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index c4670a09..c5cc58fe 100644 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -1,7 +1,7 @@ object_const_def - const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 - const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 - const FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 + const_export FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER1 + const_export FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER2 + const_export FUCHSIAMEETINGROOM_SAFARI_ZONE_WORKER3 FuchsiaMeetingRoom_Object: db $17 ; border block diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index efa75643..0d2ee3f1 100644 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const FUCHSIAPOKECENTER_NURSE - const FUCHSIAPOKECENTER_ROCKER - const FUCHSIAPOKECENTER_COOLTRAINER_F - const FUCHSIAPOKECENTER_LINK_RECEPTIONIST + const_export FUCHSIAPOKECENTER_NURSE + const_export FUCHSIAPOKECENTER_ROCKER + const_export FUCHSIAPOKECENTER_COOLTRAINER_F + const_export FUCHSIAPOKECENTER_LINK_RECEPTIONIST FuchsiaPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index 06277a33..121e8a47 100644 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -1,15 +1,15 @@ object_const_def - const GAMECORNER_BEAUTY1 - const GAMECORNER_CLERK1 - const GAMECORNER_MIDDLE_AGED_MAN1 - const GAMECORNER_BEAUTY2 - const GAMECORNER_FISHING_GURU - const GAMECORNER_MIDDLE_AGED_WOMAN - const GAMECORNER_GYM_GUIDE - const GAMECORNER_GAMBLER - const GAMECORNER_CLERK2 - const GAMECORNER_GENTLEMAN - const GAMECORNER_ROCKET + const_export GAMECORNER_BEAUTY1 + const_export GAMECORNER_CLERK1 + const_export GAMECORNER_MIDDLE_AGED_MAN1 + const_export GAMECORNER_BEAUTY2 + const_export GAMECORNER_FISHING_GURU + const_export GAMECORNER_MIDDLE_AGED_WOMAN + const_export GAMECORNER_GYM_GUIDE + const_export GAMECORNER_GAMBLER + const_export GAMECORNER_CLERK2 + const_export GAMECORNER_GENTLEMAN + const_export GAMECORNER_ROCKET GameCorner_Object: db $f ; border block diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm index 14523813..e5d75d12 100644 --- a/data/maps/objects/GameCornerPrizeRoom.asm +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -1,6 +1,6 @@ object_const_def - const GAMECORNERPRIZEROOM_BALDING_GUY - const GAMECORNERPRIZEROOM_GAMBLER + const_export GAMECORNERPRIZEROOM_BALDING_GUY + const_export GAMECORNERPRIZEROOM_GAMBLER GameCornerPrizeRoom_Object: db $f ; border block diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm index 5c711dbe..b40602d5 100644 --- a/data/maps/objects/HallOfFame.asm +++ b/data/maps/objects/HallOfFame.asm @@ -1,5 +1,5 @@ object_const_def - const HALLOFFAME_OAK + const_export HALLOFFAME_OAK HallOfFame_Object: db $3 ; border block diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index 97ced88b..788f70b7 100644 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -1,9 +1,9 @@ object_const_def - const INDIGOPLATEAULOBBY_NURSE - const INDIGOPLATEAULOBBY_GYM_GUIDE - const INDIGOPLATEAULOBBY_COOLTRAINER_F - const INDIGOPLATEAULOBBY_CLERK - const INDIGOPLATEAULOBBY_LINK_RECEPTIONIST + const_export INDIGOPLATEAULOBBY_NURSE + const_export INDIGOPLATEAULOBBY_GYM_GUIDE + const_export INDIGOPLATEAULOBBY_COOLTRAINER_F + const_export INDIGOPLATEAULOBBY_CLERK + const_export INDIGOPLATEAULOBBY_LINK_RECEPTIONIST IndigoPlateauLobby_Object: db $0 ; border block diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm index 9cd2aaf3..ff11435a 100644 --- a/data/maps/objects/LancesRoom.asm +++ b/data/maps/objects/LancesRoom.asm @@ -1,5 +1,5 @@ object_const_def - const LANCESROOM_LANCE + const_export LANCESROOM_LANCE LancesRoom_Object: db $3 ; border block diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index 6ed53923..0b4163da 100644 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -1,6 +1,6 @@ object_const_def - const LAVENDERCUBONEHOUSE_CUBONE - const LAVENDERCUBONEHOUSE_BRUNETTE_GIRL + const_export LAVENDERCUBONEHOUSE_CUBONE + const_export LAVENDERCUBONEHOUSE_BRUNETTE_GIRL LavenderCuboneHouse_Object: db $a ; border block diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 7302981f..4b45ba25 100644 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -1,7 +1,7 @@ object_const_def - const LAVENDERMART_CLERK - const LAVENDERMART_BALDING_GUY - const LAVENDERMART_COOLTRAINER_M + const_export LAVENDERMART_CLERK + const_export LAVENDERMART_BALDING_GUY + const_export LAVENDERMART_COOLTRAINER_M LavenderMart_Object: db $0 ; border block diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 2fb98ec0..c2b14e78 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const LAVENDERPOKECENTER_NURSE - const LAVENDERPOKECENTER_GENTLEMAN - const LAVENDERPOKECENTER_LITTLE_GIRL - const LAVENDERPOKECENTER_LINK_RECEPTIONIST + const_export LAVENDERPOKECENTER_NURSE + const_export LAVENDERPOKECENTER_GENTLEMAN + const_export LAVENDERPOKECENTER_LITTLE_GIRL + const_export LAVENDERPOKECENTER_LINK_RECEPTIONIST LavenderPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 76df4c60..daf2fdff 100644 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -1,7 +1,7 @@ object_const_def - const LAVENDERTOWN_LITTLE_GIRL - const LAVENDERTOWN_COOLTRAINER_M - const LAVENDERTOWN_SUPER_NERD + const_export LAVENDERTOWN_LITTLE_GIRL + const_export LAVENDERTOWN_COOLTRAINER_M + const_export LAVENDERTOWN_SUPER_NERD LavenderTown_Object: db $2c ; border block diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm index 3a24b23c..9a8c6b56 100644 --- a/data/maps/objects/LoreleisRoom.asm +++ b/data/maps/objects/LoreleisRoom.asm @@ -1,5 +1,5 @@ object_const_def - const LORELEISROOM_LORELEI + const_export LORELEISROOM_LORELEI LoreleisRoom_Object: db $3 ; border block diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index 0a816d1e..86939057 100644 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -1,10 +1,10 @@ object_const_def - const MRFUJISHOUSE_SUPER_NERD - const MRFUJISHOUSE_LITTLE_GIRL - const MRFUJISHOUSE_PSYDUCK - const MRFUJISHOUSE_NIDORINO - const MRFUJISHOUSE_MR_FUJI - const MRFUJISHOUSE_POKEDEX + const_export MRFUJISHOUSE_SUPER_NERD + const_export MRFUJISHOUSE_LITTLE_GIRL + const_export MRFUJISHOUSE_PSYDUCK + const_export MRFUJISHOUSE_NIDORINO + const_export MRFUJISHOUSE_MR_FUJI + const_export MRFUJISHOUSE_POKEDEX MrFujisHouse_Object: db $a ; border block diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index f7c009e6..3a072730 100644 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -1,5 +1,5 @@ object_const_def - const MRPSYCHICSHOUSE_MR_PSYCHIC + const_export MRPSYCHICSHOUSE_MR_PSYCHIC MrPsychicsHouse_Object: db $a ; border block diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index bc697395..c13f1379 100644 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -1,18 +1,18 @@ object_const_def - const MTMOON1F_HIKER - const MTMOON1F_YOUNGSTER1 - const MTMOON1F_COOLTRAINER_F1 - const MTMOON1F_SUPER_NERD - const MTMOON1F_COOLTRAINER_F2 - const MTMOON1F_YOUNGSTER2 - const MTMOON1F_YOUNGSTER3 - const MTMOON1F_POTION1 - const MTMOON1F_MOON_STONE - const MTMOON1F_RARE_CANDY - const MTMOON1F_ESCAPE_ROPE - const MTMOON1F_POTION2 - const MTMOON1F_TM_WATER_GUN - const MTMOON1F_BEWARE_ZUBAT_SIGN + const_export MTMOON1F_HIKER + const_export MTMOON1F_YOUNGSTER1 + const_export MTMOON1F_COOLTRAINER_F1 + const_export MTMOON1F_SUPER_NERD + const_export MTMOON1F_COOLTRAINER_F2 + const_export MTMOON1F_YOUNGSTER2 + const_export MTMOON1F_YOUNGSTER3 + const_export MTMOON1F_POTION1 + const_export MTMOON1F_MOON_STONE + const_export MTMOON1F_RARE_CANDY + const_export MTMOON1F_ESCAPE_ROPE + const_export MTMOON1F_POTION2 + const_export MTMOON1F_TM_WATER_GUN + const_export MTMOON1F_BEWARE_ZUBAT_SIGN MtMoon1F_Object: db $3 ; border block diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 5f3bbf76..0eb2d276 100644 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -1,13 +1,13 @@ object_const_def - const MTMOONB2F_SUPER_NERD - const MTMOONB2F_ROCKET1 - const MTMOONB2F_ROCKET2 - const MTMOONB2F_ROCKET3 - const MTMOONB2F_ROCKET4 - const MTMOONB2F_DOME_FOSSIL - const MTMOONB2F_HELIX_FOSSIL - const MTMOONB2F_HP_UP - const MTMOONB2F_TM_MEGA_PUNCH + const_export MTMOONB2F_SUPER_NERD + const_export MTMOONB2F_ROCKET1 + const_export MTMOONB2F_ROCKET2 + const_export MTMOONB2F_ROCKET3 + const_export MTMOONB2F_ROCKET4 + const_export MTMOONB2F_DOME_FOSSIL + const_export MTMOONB2F_HELIX_FOSSIL + const_export MTMOONB2F_HP_UP + const_export MTMOONB2F_TM_MEGA_PUNCH MtMoonB2F_Object: db $3 ; border block diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 28049fef..ee033919 100644 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -1,10 +1,10 @@ object_const_def - const MTMOONPOKECENTER_NURSE - const MTMOONPOKECENTER_YOUNGSTER - const MTMOONPOKECENTER_GENTLEMAN - const MTMOONPOKECENTER_MAGIKARP_SALESMAN - const MTMOONPOKECENTER_CLIPBOARD - const MTMOONPOKECENTER_LINK_RECEPTIONIST + const_export MTMOONPOKECENTER_NURSE + const_export MTMOONPOKECENTER_YOUNGSTER + const_export MTMOONPOKECENTER_GENTLEMAN + const_export MTMOONPOKECENTER_MAGIKARP_SALESMAN + const_export MTMOONPOKECENTER_CLIPBOARD + const_export MTMOONPOKECENTER_LINK_RECEPTIONIST MtMoonPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index d33151a6..7f856f89 100644 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -1,9 +1,9 @@ object_const_def - const MUSEUM1F_SCIENTIST1 - const MUSEUM1F_GAMBLER - const MUSEUM1F_SCIENTIST2 - const MUSEUM1F_SCIENTIST3 - const MUSEUM1F_OLD_AMBER + const_export MUSEUM1F_SCIENTIST1 + const_export MUSEUM1F_GAMBLER + const_export MUSEUM1F_SCIENTIST2 + const_export MUSEUM1F_SCIENTIST3 + const_export MUSEUM1F_OLD_AMBER Museum1F_Object: db $a ; border block diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index e3c27117..f13ce91a 100644 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,9 +1,9 @@ object_const_def - const MUSEUM2F_YOUNGSTER - const MUSEUM2F_GRAMPS - const MUSEUM2F_SCIENTIST - const MUSEUM2F_BRUNETTE_GIRL - const MUSEUM2F_HIKER + const_export MUSEUM2F_YOUNGSTER + const_export MUSEUM2F_GRAMPS + const_export MUSEUM2F_SCIENTIST + const_export MUSEUM2F_BRUNETTE_GIRL + const_export MUSEUM2F_HIKER Museum2F_Object: db $a ; border block diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 0b6375e9..0051e08c 100644 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -1,5 +1,5 @@ object_const_def - const NAMERATERSHOUSE_NAME_RATER + const_export NAMERATERSHOUSE_NAME_RATER NameRatersHouse_Object: db $a ; border block diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index f800e880..4a58aa59 100644 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -1,15 +1,15 @@ object_const_def - const OAKSLAB_RIVAL - const OAKSLAB_CHARMANDER_POKE_BALL - const OAKSLAB_SQUIRTLE_POKE_BALL - const OAKSLAB_BULBASAUR_POKE_BALL - const OAKSLAB_OAK1 - const OAKSLAB_POKEDEX1 - const OAKSLAB_POKEDEX2 - const OAKSLAB_OAK2 - const OAKSLAB_GIRL - const OAKSLAB_SCIENTIST1 - const OAKSLAB_SCIENTIST2 + const_export OAKSLAB_RIVAL + const_export OAKSLAB_CHARMANDER_POKE_BALL + const_export OAKSLAB_SQUIRTLE_POKE_BALL + const_export OAKSLAB_BULBASAUR_POKE_BALL + const_export OAKSLAB_OAK1 + const_export OAKSLAB_POKEDEX1 + const_export OAKSLAB_POKEDEX2 + const_export OAKSLAB_OAK2 + const_export OAKSLAB_GIRL + const_export OAKSLAB_SCIENTIST1 + const_export OAKSLAB_SCIENTIST2 OaksLab_Object: db $3 ; border block diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 793ec164..91516b6e 100644 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -1,7 +1,7 @@ object_const_def - const PALLETTOWN_OAK - const PALLETTOWN_GIRL - const PALLETTOWN_FISHER + const_export PALLETTOWN_OAK + const_export PALLETTOWN_GIRL + const_export PALLETTOWN_FISHER PalletTown_Object: db $b ; border block diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index b734ee40..e2eaced9 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,9 +1,9 @@ object_const_def - const PEWTERCITY_COOLTRAINER_F - const PEWTERCITY_COOLTRAINER_M - const PEWTERCITY_SUPER_NERD1 - const PEWTERCITY_SUPER_NERD2 - const PEWTERCITY_YOUNGSTER + const_export PEWTERCITY_COOLTRAINER_F + const_export PEWTERCITY_COOLTRAINER_M + const_export PEWTERCITY_SUPER_NERD1 + const_export PEWTERCITY_SUPER_NERD2 + const_export PEWTERCITY_YOUNGSTER PewterCity_Object: db $a ; border block diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index ee82ed21..f81ca6d6 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,7 +1,7 @@ object_const_def - const PEWTERGYM_BROCK - const PEWTERGYM_COOLTRAINER_M - const PEWTERGYM_GYM_GUIDE + const_export PEWTERGYM_BROCK + const_export PEWTERGYM_COOLTRAINER_M + const_export PEWTERGYM_GYM_GUIDE PewterGym_Object: db $3 ; border block diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index e5fc199b..0c575366 100644 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -1,7 +1,7 @@ object_const_def - const PEWTERMART_CLERK - const PEWTERMART_YOUNGSTER - const PEWTERMART_SUPER_NERD + const_export PEWTERMART_CLERK + const_export PEWTERMART_YOUNGSTER + const_export PEWTERMART_SUPER_NERD PewterMart_Object: db $0 ; border block diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index d14ee345..15419cba 100644 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -1,7 +1,7 @@ object_const_def - const PEWTERNIDORANHOUSE_NIDORAN - const PEWTERNIDORANHOUSE_LITTLE_BOY - const PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN + const_export PEWTERNIDORANHOUSE_NIDORAN + const_export PEWTERNIDORANHOUSE_LITTLE_BOY + const_export PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN PewterNidoranHouse_Object: db $a ; border block diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 3b3e9cd9..11d449dc 100644 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const PEWTERPOKECENTER_NURSE - const PEWTERPOKECENTER_GENTLEMAN - const PEWTERPOKECENTER_JIGGLYPUFF - const PEWTERPOKECENTER_LINK_RECEPTIONIST + const_export PEWTERPOKECENTER_NURSE + const_export PEWTERPOKECENTER_GENTLEMAN + const_export PEWTERPOKECENTER_JIGGLYPUFF + const_export PEWTERPOKECENTER_LINK_RECEPTIONIST PewterPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index 0e892b60..47f34915 100644 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -1,6 +1,6 @@ object_const_def - const PEWTERSPEECHHOUSE_GAMBLER - const PEWTERSPEECHHOUSE_YOUNGSTER + const_export PEWTERSPEECHHOUSE_GAMBLER + const_export PEWTERSPEECHHOUSE_YOUNGSTER PewterSpeechHouse_Object: db $a ; border block diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 5ee899d3..8bc6098a 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,12 +1,12 @@ object_const_def - const POKEMONFANCLUB_PIKACHU_FAN - const POKEMONFANCLUB_SEEL_FAN - const POKEMONFANCLUB_PIKACHU - const POKEMONFANCLUB_SEEL - const POKEMONFANCLUB_CHAIRMAN - const POKEMONFANCLUB_RECEPTIONIST - const POKEMONFANCLUB_SIGN_1 - const POKEMONFANCLUB_SIGN_2 + const_export POKEMONFANCLUB_PIKACHU_FAN + const_export POKEMONFANCLUB_SEEL_FAN + const_export POKEMONFANCLUB_PIKACHU + const_export POKEMONFANCLUB_SEEL + const_export POKEMONFANCLUB_CHAIRMAN + const_export POKEMONFANCLUB_RECEPTIONIST + const_export POKEMONFANCLUB_SIGN_1 + const_export POKEMONFANCLUB_SIGN_2 PokemonFanClub_Object: db $d ; border block diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 3fb8780e..0487847a 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -1,7 +1,7 @@ object_const_def - const POKEMONMANSION1F_SCIENTIST - const POKEMONMANSION1F_ESCAPE_ROPE - const POKEMONMANSION1F_CARBOS + const_export POKEMONMANSION1F_SCIENTIST + const_export POKEMONMANSION1F_ESCAPE_ROPE + const_export POKEMONMANSION1F_CARBOS PokemonMansion1F_Object: db $2e ; border block diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index a4b71d2c..f251ac8f 100644 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -1,8 +1,8 @@ object_const_def - const POKEMONMANSION2F_SUPER_NERD - const POKEMONMANSION2F_CALCIUM - const POKEMONMANSION2F_DIARY1 - const POKEMONMANSION2F_DIARY2 + const_export POKEMONMANSION2F_SUPER_NERD + const_export POKEMONMANSION2F_CALCIUM + const_export POKEMONMANSION2F_DIARY1 + const_export POKEMONMANSION2F_DIARY2 PokemonMansion2F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index a9ebedc9..4999b61f 100644 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -1,9 +1,9 @@ object_const_def - const POKEMONMANSION3F_SUPER_NERD - const POKEMONMANSION3F_SCIENTIST - const POKEMONMANSION3F_MAX_POTION - const POKEMONMANSION3F_IRON - const POKEMONMANSION3F_DIARY + const_export POKEMONMANSION3F_SUPER_NERD + const_export POKEMONMANSION3F_SCIENTIST + const_export POKEMONMANSION3F_MAX_POTION + const_export POKEMONMANSION3F_IRON + const_export POKEMONMANSION3F_DIARY PokemonMansion3F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 5d70db70..a9055248 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -1,12 +1,12 @@ object_const_def - const POKEMONMANSIONB1F_BURGLAR - const POKEMONMANSIONB1F_SCIENTIST - const POKEMONMANSIONB1F_RARE_CANDY - const POKEMONMANSIONB1F_FULL_RESTORE - const POKEMONMANSIONB1F_TM_BLIZZARD - const POKEMONMANSIONB1F_TM_SOLARBEAM - const POKEMONMANSIONB1F_DIARY - const POKEMONMANSIONB1F_SECRET_KEY + const_export POKEMONMANSIONB1F_BURGLAR + const_export POKEMONMANSIONB1F_SCIENTIST + const_export POKEMONMANSIONB1F_RARE_CANDY + const_export POKEMONMANSIONB1F_FULL_RESTORE + const_export POKEMONMANSIONB1F_TM_BLIZZARD + const_export POKEMONMANSIONB1F_TM_SOLARBEAM + const_export POKEMONMANSIONB1F_DIARY + const_export POKEMONMANSIONB1F_SECRET_KEY PokemonMansionB1F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index 0f8c64c3..936eb6f3 100644 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -1,9 +1,9 @@ object_const_def - const POKEMONTOWER1F_RECEPTIONIST - const POKEMONTOWER1F_MIDDLE_AGED_WOMAN - const POKEMONTOWER1F_BALDING_GUY - const POKEMONTOWER1F_GIRL - const POKEMONTOWER1F_CHANNELER + const_export POKEMONTOWER1F_RECEPTIONIST + const_export POKEMONTOWER1F_MIDDLE_AGED_WOMAN + const_export POKEMONTOWER1F_BALDING_GUY + const_export POKEMONTOWER1F_GIRL + const_export POKEMONTOWER1F_CHANNELER PokemonTower1F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index ecdbc20a..55a22d76 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -1,6 +1,6 @@ object_const_def - const POKEMONTOWER2F_RIVAL - const POKEMONTOWER2F_CHANNELER + const_export POKEMONTOWER2F_RIVAL + const_export POKEMONTOWER2F_CHANNELER PokemonTower2F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 2a5c9b8d..91737022 100644 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -1,8 +1,8 @@ object_const_def - const POKEMONTOWER3F_CHANNELER1 - const POKEMONTOWER3F_CHANNELER2 - const POKEMONTOWER3F_CHANNELER3 - const POKEMONTOWER3F_ESCAPE_ROPE + const_export POKEMONTOWER3F_CHANNELER1 + const_export POKEMONTOWER3F_CHANNELER2 + const_export POKEMONTOWER3F_CHANNELER3 + const_export POKEMONTOWER3F_ESCAPE_ROPE PokemonTower3F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index ad8175eb..e331cc1d 100644 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -1,10 +1,10 @@ object_const_def - const POKEMONTOWER4F_CHANNELER1 - const POKEMONTOWER4F_CHANNELER2 - const POKEMONTOWER4F_CHANNELER3 - const POKEMONTOWER4F_ELIXER - const POKEMONTOWER4F_AWAKENING - const POKEMONTOWER4F_HP_UP + const_export POKEMONTOWER4F_CHANNELER1 + const_export POKEMONTOWER4F_CHANNELER2 + const_export POKEMONTOWER4F_CHANNELER3 + const_export POKEMONTOWER4F_ELIXER + const_export POKEMONTOWER4F_AWAKENING + const_export POKEMONTOWER4F_HP_UP PokemonTower4F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index be27f3c1..1829dd51 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -1,10 +1,10 @@ object_const_def - const POKEMONTOWER5F_CHANNELER1 - const POKEMONTOWER5F_CHANNELER2 - const POKEMONTOWER5F_CHANNELER3 - const POKEMONTOWER5F_CHANNELER4 - const POKEMONTOWER5F_CHANNELER5 - const POKEMONTOWER5F_NUGGET + const_export POKEMONTOWER5F_CHANNELER1 + const_export POKEMONTOWER5F_CHANNELER2 + const_export POKEMONTOWER5F_CHANNELER3 + const_export POKEMONTOWER5F_CHANNELER4 + const_export POKEMONTOWER5F_CHANNELER5 + const_export POKEMONTOWER5F_NUGGET PokemonTower5F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 96e0b5b5..f10aef77 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -1,9 +1,9 @@ object_const_def - const POKEMONTOWER6F_CHANNELER1 - const POKEMONTOWER6F_CHANNELER2 - const POKEMONTOWER6F_CHANNELER3 - const POKEMONTOWER6F_RARE_CANDY - const POKEMONTOWER6F_X_ACCURACY + const_export POKEMONTOWER6F_CHANNELER1 + const_export POKEMONTOWER6F_CHANNELER2 + const_export POKEMONTOWER6F_CHANNELER3 + const_export POKEMONTOWER6F_RARE_CANDY + const_export POKEMONTOWER6F_X_ACCURACY PokemonTower6F_Object: db $1 ; border block diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm index 9f72f3ed..7e1db10b 100644 --- a/data/maps/objects/PokemonTower7F.asm +++ b/data/maps/objects/PokemonTower7F.asm @@ -1,8 +1,8 @@ object_const_def - const POKEMONTOWER7F_ROCKET1 - const POKEMONTOWER7F_ROCKET2 - const POKEMONTOWER7F_ROCKET3 - const POKEMONTOWER7F_MR_FUJI + const_export POKEMONTOWER7F_ROCKET1 + const_export POKEMONTOWER7F_ROCKET2 + const_export POKEMONTOWER7F_ROCKET3 + const_export POKEMONTOWER7F_MR_FUJI PokemonTower7F_Object: db $1 ; border block diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index df3bca01..dcabba03 100644 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -1,18 +1,18 @@ object_const_def - const POWERPLANT_VOLTORB1 - const POWERPLANT_VOLTORB2 - const POWERPLANT_VOLTORB3 - const POWERPLANT_ELECTRODE1 - const POWERPLANT_VOLTORB4 - const POWERPLANT_VOLTORB5 - const POWERPLANT_ELECTRODE2 - const POWERPLANT_VOLTORB6 - const POWERPLANT_ZAPDOS - const POWERPLANT_CARBOS - const POWERPLANT_HP_UP - const POWERPLANT_RARE_CANDY - const POWERPLANT_TM_THUNDER - const POWERPLANT_TM_REFLECT + const_export POWERPLANT_VOLTORB1 + const_export POWERPLANT_VOLTORB2 + const_export POWERPLANT_VOLTORB3 + const_export POWERPLANT_ELECTRODE1 + const_export POWERPLANT_VOLTORB4 + const_export POWERPLANT_VOLTORB5 + const_export POWERPLANT_ELECTRODE2 + const_export POWERPLANT_VOLTORB6 + const_export POWERPLANT_ZAPDOS + const_export POWERPLANT_CARBOS + const_export POWERPLANT_HP_UP + const_export POWERPLANT_RARE_CANDY + const_export POWERPLANT_TM_THUNDER + const_export POWERPLANT_TM_REFLECT PowerPlant_Object: db $2e ; border block diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm index 9b259a99..bfb294b5 100644 --- a/data/maps/objects/RedsHouse1F.asm +++ b/data/maps/objects/RedsHouse1F.asm @@ -1,5 +1,5 @@ object_const_def - const REDSHOUSE1F_MOM + const_export REDSHOUSE1F_MOM RedsHouse1F_Object: db $a ; border block diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 57726be8..c61cbda4 100644 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -1,11 +1,11 @@ object_const_def - const ROCKTUNNEL1F_HIKER1 - const ROCKTUNNEL1F_HIKER2 - const ROCKTUNNEL1F_HIKER3 - const ROCKTUNNEL1F_SUPER_NERD - const ROCKTUNNEL1F_COOLTRAINER_F1 - const ROCKTUNNEL1F_COOLTRAINER_F2 - const ROCKTUNNEL1F_COOLTRAINER_F3 + const_export ROCKTUNNEL1F_HIKER1 + const_export ROCKTUNNEL1F_HIKER2 + const_export ROCKTUNNEL1F_HIKER3 + const_export ROCKTUNNEL1F_SUPER_NERD + const_export ROCKTUNNEL1F_COOLTRAINER_F1 + const_export ROCKTUNNEL1F_COOLTRAINER_F2 + const_export ROCKTUNNEL1F_COOLTRAINER_F3 RockTunnel1F_Object: db $3 ; border block diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index c0905cbc..f3a88feb 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -1,12 +1,12 @@ object_const_def - const ROCKTUNNELB1F_COOLTRAINER_F1 - const ROCKTUNNELB1F_HIKER1 - const ROCKTUNNELB1F_SUPER_NERD1 - const ROCKTUNNELB1F_SUPER_NERD2 - const ROCKTUNNELB1F_HIKER2 - const ROCKTUNNELB1F_COOLTRAINER_F2 - const ROCKTUNNELB1F_HIKER3 - const ROCKTUNNELB1F_SUPER_NERD3 + const_export ROCKTUNNELB1F_COOLTRAINER_F1 + const_export ROCKTUNNELB1F_HIKER1 + const_export ROCKTUNNELB1F_SUPER_NERD1 + const_export ROCKTUNNELB1F_SUPER_NERD2 + const_export ROCKTUNNELB1F_HIKER2 + const_export ROCKTUNNELB1F_COOLTRAINER_F2 + const_export ROCKTUNNELB1F_HIKER3 + const_export ROCKTUNNELB1F_SUPER_NERD3 RockTunnelB1F_Object: db $3 ; border block diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 810fea0b..8823e21c 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const ROCKTUNNELPOKECENTER_NURSE - const ROCKTUNNELPOKECENTER_GENTLEMAN - const ROCKTUNNELPOKECENTER_FISHER - const ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST + const_export ROCKTUNNELPOKECENTER_NURSE + const_export ROCKTUNNELPOKECENTER_GENTLEMAN + const_export ROCKTUNNELPOKECENTER_FISHER + const_export ROCKTUNNELPOKECENTER_LINK_RECEPTIONIST RockTunnelPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 7d720960..8ecbc78e 100644 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -1,11 +1,11 @@ object_const_def - const ROCKETHIDEOUTB1F_ROCKET1 - const ROCKETHIDEOUTB1F_ROCKET2 - const ROCKETHIDEOUTB1F_ROCKET3 - const ROCKETHIDEOUTB1F_ROCKET4 - const ROCKETHIDEOUTB1F_ROCKET5 - const ROCKETHIDEOUTB1F_ESCAPE_ROPE - const ROCKETHIDEOUTB1F_HYPER_POTION + const_export ROCKETHIDEOUTB1F_ROCKET1 + const_export ROCKETHIDEOUTB1F_ROCKET2 + const_export ROCKETHIDEOUTB1F_ROCKET3 + const_export ROCKETHIDEOUTB1F_ROCKET4 + const_export ROCKETHIDEOUTB1F_ROCKET5 + const_export ROCKETHIDEOUTB1F_ESCAPE_ROPE + const_export ROCKETHIDEOUTB1F_HYPER_POTION RocketHideoutB1F_Object: db $2e ; border block diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index 9808f58b..cbbe8d05 100644 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -1,9 +1,9 @@ object_const_def - const ROCKETHIDEOUTB2F_ROCKET - const ROCKETHIDEOUTB2F_MOON_STONE - const ROCKETHIDEOUTB2F_NUGGET - const ROCKETHIDEOUTB2F_TM_HORN_DRILL - const ROCKETHIDEOUTB2F_SUPER_POTION + const_export ROCKETHIDEOUTB2F_ROCKET + const_export ROCKETHIDEOUTB2F_MOON_STONE + const_export ROCKETHIDEOUTB2F_NUGGET + const_export ROCKETHIDEOUTB2F_TM_HORN_DRILL + const_export ROCKETHIDEOUTB2F_SUPER_POTION RocketHideoutB2F_Object: db $2e ; border block diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index ee02d809..e0e843e3 100644 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -1,8 +1,8 @@ object_const_def - const ROCKETHIDEOUTB3F_ROCKET1 - const ROCKETHIDEOUTB3F_ROCKET2 - const ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE - const ROCKETHIDEOUTB3F_RARE_CANDY + const_export ROCKETHIDEOUTB3F_ROCKET1 + const_export ROCKETHIDEOUTB3F_ROCKET2 + const_export ROCKETHIDEOUTB3F_TM_DOUBLE_EDGE + const_export ROCKETHIDEOUTB3F_RARE_CANDY RocketHideoutB3F_Object: db $2e ; border block diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index de862578..57b1342a 100644 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -1,13 +1,13 @@ object_const_def - const ROCKETHIDEOUTB4F_GIOVANNI - const ROCKETHIDEOUTB4F_ROCKET1 - const ROCKETHIDEOUTB4F_ROCKET2 - const ROCKETHIDEOUTB4F_ROCKET3 - const ROCKETHIDEOUTB4F_HP_UP - const ROCKETHIDEOUTB4F_TM_RAZOR_WIND - const ROCKETHIDEOUTB4F_IRON - const ROCKETHIDEOUTB4F_SILPH_SCOPE - const ROCKETHIDEOUTB4F_LIFT_KEY + const_export ROCKETHIDEOUTB4F_GIOVANNI + const_export ROCKETHIDEOUTB4F_ROCKET1 + const_export ROCKETHIDEOUTB4F_ROCKET2 + const_export ROCKETHIDEOUTB4F_ROCKET3 + const_export ROCKETHIDEOUTB4F_HP_UP + const_export ROCKETHIDEOUTB4F_TM_RAZOR_WIND + const_export ROCKETHIDEOUTB4F_IRON + const_export ROCKETHIDEOUTB4F_SILPH_SCOPE + const_export ROCKETHIDEOUTB4F_LIFT_KEY RocketHideoutB4F_Object: db $2e ; border block diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index bb6bcf63..2c610e0d 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE1_YOUNGSTER1 - const ROUTE1_YOUNGSTER2 + const_export ROUTE1_YOUNGSTER1 + const_export ROUTE1_YOUNGSTER2 Route1_Object: db $b ; border block diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 031ae521..7b4d7fe3 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -1,10 +1,10 @@ object_const_def - const ROUTE10_SUPER_NERD1 - const ROUTE10_HIKER1 - const ROUTE10_SUPER_NERD2 - const ROUTE10_COOLTRAINER_F1 - const ROUTE10_HIKER2 - const ROUTE10_COOLTRAINER_F2 + const_export ROUTE10_SUPER_NERD1 + const_export ROUTE10_HIKER1 + const_export ROUTE10_SUPER_NERD2 + const_export ROUTE10_COOLTRAINER_F1 + const_export ROUTE10_HIKER2 + const_export ROUTE10_COOLTRAINER_F2 Route10_Object: db $2c ; border block diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 26487216..0e2ded1f 100644 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE11_GAMBLER1 - const ROUTE11_GAMBLER2 - const ROUTE11_YOUNGSTER1 - const ROUTE11_SUPER_NERD1 - const ROUTE11_YOUNGSTER2 - const ROUTE11_GAMBLER3 - const ROUTE11_GAMBLER4 - const ROUTE11_YOUNGSTER3 - const ROUTE11_SUPER_NERD2 - const ROUTE11_YOUNGSTER4 + const_export ROUTE11_GAMBLER1 + const_export ROUTE11_GAMBLER2 + const_export ROUTE11_YOUNGSTER1 + const_export ROUTE11_SUPER_NERD1 + const_export ROUTE11_YOUNGSTER2 + const_export ROUTE11_GAMBLER3 + const_export ROUTE11_GAMBLER4 + const_export ROUTE11_YOUNGSTER3 + const_export ROUTE11_SUPER_NERD2 + const_export ROUTE11_YOUNGSTER4 Route11_Object: db $f ; border block diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm index 56d2e7f7..0b3a372f 100644 --- a/data/maps/objects/Route11Gate1F.asm +++ b/data/maps/objects/Route11Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE11GATE1F_GUARD + const_export ROUTE11GATE1F_GUARD Route11Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index 7e76288a..3ad10346 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE11GATE2F_YOUNGSTER - const ROUTE11GATE2F_OAKS_AIDE + const_export ROUTE11GATE2F_YOUNGSTER + const_export ROUTE11GATE2F_OAKS_AIDE Route11Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 4884a6f9..7fae0d32 100644 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE12_SNORLAX - const ROUTE12_FISHER1 - const ROUTE12_FISHER2 - const ROUTE12_COOLTRAINER_M - const ROUTE12_SUPER_NERD - const ROUTE12_FISHER3 - const ROUTE12_FISHER4 - const ROUTE12_FISHER5 - const ROUTE12_TM_PAY_DAY - const ROUTE12_IRON + const_export ROUTE12_SNORLAX + const_export ROUTE12_FISHER1 + const_export ROUTE12_FISHER2 + const_export ROUTE12_COOLTRAINER_M + const_export ROUTE12_SUPER_NERD + const_export ROUTE12_FISHER3 + const_export ROUTE12_FISHER4 + const_export ROUTE12_FISHER5 + const_export ROUTE12_TM_PAY_DAY + const_export ROUTE12_IRON Route12_Object: db $43 ; border block diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm index eef1a37d..ad1c4e7a 100644 --- a/data/maps/objects/Route12Gate1F.asm +++ b/data/maps/objects/Route12Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE12GATE1F_GUARD + const_export ROUTE12GATE1F_GUARD Route12Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm index a3fc5c80..f4832eee 100644 --- a/data/maps/objects/Route12Gate2F.asm +++ b/data/maps/objects/Route12Gate2F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE12GATE2F_BRUNETTE_GIRL + const_export ROUTE12GATE2F_BRUNETTE_GIRL Route12Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index b9899c67..49a7c3d6 100644 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE12SUPERRODHOUSE_FISHING_GURU + const_export ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_Object: db $a ; border block diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index ef9d1276..0b640ba5 100644 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE13_COOLTRAINER_M1 - const ROUTE13_COOLTRAINER_F1 - const ROUTE13_COOLTRAINER_F2 - const ROUTE13_COOLTRAINER_F3 - const ROUTE13_COOLTRAINER_F4 - const ROUTE13_COOLTRAINER_M2 - const ROUTE13_BEAUTY1 - const ROUTE13_BEAUTY2 - const ROUTE13_BIKER - const ROUTE13_COOLTRAINER_M3 + const_export ROUTE13_COOLTRAINER_M1 + const_export ROUTE13_COOLTRAINER_F1 + const_export ROUTE13_COOLTRAINER_F2 + const_export ROUTE13_COOLTRAINER_F3 + const_export ROUTE13_COOLTRAINER_F4 + const_export ROUTE13_COOLTRAINER_M2 + const_export ROUTE13_BEAUTY1 + const_export ROUTE13_BEAUTY2 + const_export ROUTE13_BIKER + const_export ROUTE13_COOLTRAINER_M3 Route13_Object: db $43 ; border block diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index 0ca3a40a..1d2aa2ed 100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE14_COOLTRAINER_M1 - const ROUTE14_COOLTRAINER_M2 - const ROUTE14_COOLTRAINER_M3 - const ROUTE14_COOLTRAINER_M4 - const ROUTE14_COOLTRAINER_M5 - const ROUTE14_COOLTRAINER_M6 - const ROUTE14_BIKER1 - const ROUTE14_BIKER2 - const ROUTE14_BIKER3 - const ROUTE14_BIKER4 + const_export ROUTE14_COOLTRAINER_M1 + const_export ROUTE14_COOLTRAINER_M2 + const_export ROUTE14_COOLTRAINER_M3 + const_export ROUTE14_COOLTRAINER_M4 + const_export ROUTE14_COOLTRAINER_M5 + const_export ROUTE14_COOLTRAINER_M6 + const_export ROUTE14_BIKER1 + const_export ROUTE14_BIKER2 + const_export ROUTE14_BIKER3 + const_export ROUTE14_BIKER4 Route14_Object: db $43 ; border block diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index d04c305c..311654c9 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,15 +1,15 @@ object_const_def - const ROUTE15_COOLTRAINER_F1 - const ROUTE15_COOLTRAINER_F2 - const ROUTE15_COOLTRAINER_M1 - const ROUTE15_COOLTRAINER_M2 - const ROUTE15_BEAUTY1 - const ROUTE15_BEAUTY2 - const ROUTE15_BIKER1 - const ROUTE15_BIKER2 - const ROUTE15_COOLTRAINER_F3 - const ROUTE15_COOLTRAINER_F4 - const ROUTE15_TM_RAGE + const_export ROUTE15_COOLTRAINER_F1 + const_export ROUTE15_COOLTRAINER_F2 + const_export ROUTE15_COOLTRAINER_M1 + const_export ROUTE15_COOLTRAINER_M2 + const_export ROUTE15_BEAUTY1 + const_export ROUTE15_BEAUTY2 + const_export ROUTE15_BIKER1 + const_export ROUTE15_BIKER2 + const_export ROUTE15_COOLTRAINER_F3 + const_export ROUTE15_COOLTRAINER_F4 + const_export ROUTE15_TM_RAGE Route15_Object: db $43 ; border block diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm index 7285c23e..59026346 100644 --- a/data/maps/objects/Route15Gate1F.asm +++ b/data/maps/objects/Route15Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE15GATE1F_GUARD + const_export ROUTE15GATE1F_GUARD Route15Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index b2b17285..1d25bc1b 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE15GATE2F_OAKS_AIDE + const_export ROUTE15GATE2F_OAKS_AIDE Route15Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm index 0eff9b2e..de507067 100644 --- a/data/maps/objects/Route16.asm +++ b/data/maps/objects/Route16.asm @@ -1,11 +1,11 @@ object_const_def - const ROUTE16_BIKER1 - const ROUTE16_BIKER2 - const ROUTE16_BIKER3 - const ROUTE16_BIKER4 - const ROUTE16_BIKER5 - const ROUTE16_BIKER6 - const ROUTE16_SNORLAX + const_export ROUTE16_BIKER1 + const_export ROUTE16_BIKER2 + const_export ROUTE16_BIKER3 + const_export ROUTE16_BIKER4 + const_export ROUTE16_BIKER5 + const_export ROUTE16_BIKER6 + const_export ROUTE16_SNORLAX Route16_Object: db $f ; border block diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm index be2f19d4..9c387449 100644 --- a/data/maps/objects/Route16FlyHouse.asm +++ b/data/maps/objects/Route16FlyHouse.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE16FLYHOUSE_BRUNETTE_GIRL - const ROUTE16FLYHOUSE_FEAROW + const_export ROUTE16FLYHOUSE_BRUNETTE_GIRL + const_export ROUTE16FLYHOUSE_FEAROW Route16FlyHouse_Object: db $a ; border block diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm index d703a6e0..d9168c5d 100644 --- a/data/maps/objects/Route16Gate1F.asm +++ b/data/maps/objects/Route16Gate1F.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE16GATE1F_GUARD - const ROUTE16GATE1F_GAMBLER + const_export ROUTE16GATE1F_GUARD + const_export ROUTE16GATE1F_GAMBLER Route16Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 421b5caa..64c5476a 100644 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE16GATE2F_LITTLE_BOY - const ROUTE16GATE2F_LITTLE_GIRL + const_export ROUTE16GATE2F_LITTLE_BOY + const_export ROUTE16GATE2F_LITTLE_GIRL Route16Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index 2f1dbeb1..fb0a1fba 100644 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE17_BIKER1 - const ROUTE17_BIKER2 - const ROUTE17_BIKER3 - const ROUTE17_BIKER4 - const ROUTE17_BIKER5 - const ROUTE17_BIKER6 - const ROUTE17_BIKER7 - const ROUTE17_BIKER8 - const ROUTE17_BIKER9 - const ROUTE17_BIKER10 + const_export ROUTE17_BIKER1 + const_export ROUTE17_BIKER2 + const_export ROUTE17_BIKER3 + const_export ROUTE17_BIKER4 + const_export ROUTE17_BIKER5 + const_export ROUTE17_BIKER6 + const_export ROUTE17_BIKER7 + const_export ROUTE17_BIKER8 + const_export ROUTE17_BIKER9 + const_export ROUTE17_BIKER10 Route17_Object: db $43 ; border block diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 41286afc..bf585e3d 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -1,7 +1,7 @@ object_const_def - const ROUTE18_COOLTRAINER_M1 - const ROUTE18_COOLTRAINER_M2 - const ROUTE18_COOLTRAINER_M3 + const_export ROUTE18_COOLTRAINER_M1 + const_export ROUTE18_COOLTRAINER_M2 + const_export ROUTE18_COOLTRAINER_M3 Route18_Object: db $43 ; border block diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm index f5699ba0..42a5bdc1 100644 --- a/data/maps/objects/Route18Gate1F.asm +++ b/data/maps/objects/Route18Gate1F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE18GATE1F_GUARD + const_export ROUTE18GATE1F_GUARD Route18Gate1F_Object: db $a ; border block diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index 92d42985..beae6a84 100644 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE18GATE2F_YOUNGSTER + const_export ROUTE18GATE2F_YOUNGSTER Route18Gate2F_Object: db $a ; border block diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 7c5f6f7f..ca5a2ffa 100644 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE19_COOLTRAINER_M1 - const ROUTE19_COOLTRAINER_M2 - const ROUTE19_SWIMMER1 - const ROUTE19_SWIMMER2 - const ROUTE19_SWIMMER3 - const ROUTE19_SWIMMER4 - const ROUTE19_SWIMMER5 - const ROUTE19_SWIMMER6 - const ROUTE19_SWIMMER7 - const ROUTE19_SWIMMER8 + const_export ROUTE19_COOLTRAINER_M1 + const_export ROUTE19_COOLTRAINER_M2 + const_export ROUTE19_SWIMMER1 + const_export ROUTE19_SWIMMER2 + const_export ROUTE19_SWIMMER3 + const_export ROUTE19_SWIMMER4 + const_export ROUTE19_SWIMMER5 + const_export ROUTE19_SWIMMER6 + const_export ROUTE19_SWIMMER7 + const_export ROUTE19_SWIMMER8 Route19_Object: db $43 ; border block diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 45e4d2d0..b5a6c628 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE2_MOON_STONE - const ROUTE2_HP_UP + const_export ROUTE2_MOON_STONE + const_export ROUTE2_HP_UP Route2_Object: db $f ; border block diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index eaa80344..e48fead8 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE20_SWIMMER1 - const ROUTE20_SWIMMER2 - const ROUTE20_SWIMMER3 - const ROUTE20_SWIMMER4 - const ROUTE20_SWIMMER5 - const ROUTE20_SWIMMER6 - const ROUTE20_COOLTRAINER_M - const ROUTE20_SWIMMER7 - const ROUTE20_SWIMMER8 - const ROUTE20_SWIMMER9 + const_export ROUTE20_SWIMMER1 + const_export ROUTE20_SWIMMER2 + const_export ROUTE20_SWIMMER3 + const_export ROUTE20_SWIMMER4 + const_export ROUTE20_SWIMMER5 + const_export ROUTE20_SWIMMER6 + const_export ROUTE20_COOLTRAINER_M + const_export ROUTE20_SWIMMER7 + const_export ROUTE20_SWIMMER8 + const_export ROUTE20_SWIMMER9 Route20_Object: db $43 ; border block diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index 94cfa568..47c53046 100644 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm @@ -1,13 +1,13 @@ object_const_def - const ROUTE21_FISHER1 - const ROUTE21_FISHER2 - const ROUTE21_SWIMMER1 - const ROUTE21_SWIMMER2 - const ROUTE21_SWIMMER3 - const ROUTE21_SWIMMER4 - const ROUTE21_SWIMMER5 - const ROUTE21_FISHER3 - const ROUTE21_FISHER4 + const_export ROUTE21_FISHER1 + const_export ROUTE21_FISHER2 + const_export ROUTE21_SWIMMER1 + const_export ROUTE21_SWIMMER2 + const_export ROUTE21_SWIMMER3 + const_export ROUTE21_SWIMMER4 + const_export ROUTE21_SWIMMER5 + const_export ROUTE21_FISHER3 + const_export ROUTE21_FISHER4 Route21_Object: db $43 ; border block diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm index 1fc18704..4c026566 100644 --- a/data/maps/objects/Route22.asm +++ b/data/maps/objects/Route22.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE22_RIVAL1 - const ROUTE22_RIVAL2 + const_export ROUTE22_RIVAL1 + const_export ROUTE22_RIVAL2 Route22_Object: db $2c ; border block diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm index 6ebe7d7e..b633c2a3 100644 --- a/data/maps/objects/Route22Gate.asm +++ b/data/maps/objects/Route22Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE22GATE_GUARD + const_export ROUTE22GATE_GUARD Route22Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index f13409a2..b31aff42 100644 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,11 +1,11 @@ object_const_def - const ROUTE23_GUARD1 - const ROUTE23_GUARD2 - const ROUTE23_SWIMMER1 - const ROUTE23_SWIMMER2 - const ROUTE23_GUARD3 - const ROUTE23_GUARD4 - const ROUTE23_GUARD5 + const_export ROUTE23_GUARD1 + const_export ROUTE23_GUARD2 + const_export ROUTE23_SWIMMER1 + const_export ROUTE23_SWIMMER2 + const_export ROUTE23_GUARD3 + const_export ROUTE23_GUARD4 + const_export ROUTE23_GUARD5 Route23_Object: db $f ; border block diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 6c0b6ad6..f23eb7f8 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -1,12 +1,12 @@ object_const_def - const ROUTE24_COOLTRAINER_M1 - const ROUTE24_COOLTRAINER_M2 - const ROUTE24_COOLTRAINER_M3 - const ROUTE24_COOLTRAINER_F1 - const ROUTE24_YOUNGSTER_1 - const ROUTE24_COOLTRAINER_F2 - const ROUTE24_YOUNGSTER_2 - const ROUTE24_TM_THUNDER_WAVE + const_export ROUTE24_COOLTRAINER_M1 + const_export ROUTE24_COOLTRAINER_M2 + const_export ROUTE24_COOLTRAINER_M3 + const_export ROUTE24_COOLTRAINER_F1 + const_export ROUTE24_YOUNGSTER_1 + const_export ROUTE24_COOLTRAINER_F2 + const_export ROUTE24_YOUNGSTER_2 + const_export ROUTE24_TM_THUNDER_WAVE Route24_Object: db $2c ; border block diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 897c4298..c723a852 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE25_YOUNGSTER1 - const ROUTE25_YOUNGSTER2 - const ROUTE25_COOLTRAINER_M - const ROUTE25_COOLTRAINER_F1 - const ROUTE25_YOUNGSTER3 - const ROUTE25_COOLTRAINER_F2 - const ROUTE25_HIKER1 - const ROUTE25_HIKER2 - const ROUTE25_HIKER3 - const ROUTE25_TM_SEISMIC_TOSS + const_export ROUTE25_YOUNGSTER1 + const_export ROUTE25_YOUNGSTER2 + const_export ROUTE25_COOLTRAINER_M + const_export ROUTE25_COOLTRAINER_F1 + const_export ROUTE25_YOUNGSTER3 + const_export ROUTE25_COOLTRAINER_F2 + const_export ROUTE25_HIKER1 + const_export ROUTE25_HIKER2 + const_export ROUTE25_HIKER3 + const_export ROUTE25_TM_SEISMIC_TOSS Route25_Object: db $2c ; border block diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index acbe73e9..6c46736d 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE2_OAKS_AIDE - const ROUTE2_YOUNGSTER + const_export ROUTE2_OAKS_AIDE + const_export ROUTE2_YOUNGSTER Route2Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index ef2785ba..daedcba3 100644 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -1,6 +1,6 @@ object_const_def - const ROUTE2TRADEHOUSE_SCIENTIST - const ROUTE2TRADEHOUSE_GAMEBOY_KID + const_export ROUTE2TRADEHOUSE_SCIENTIST + const_export ROUTE2TRADEHOUSE_GAMEBOY_KID Route2TradeHouse_Object: db $a ; border block diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index 3db963ad..ce7224b5 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -1,13 +1,13 @@ object_const_def - const ROUTE3_SUPER_NERD - const ROUTE3_YOUNGSTER1 - const ROUTE3_YOUNGSTER2 - const ROUTE3_COOLTRAINER_F1 - const ROUTE3_YOUNGSTER3 - const ROUTE3_COOLTRAINER_F2 - const ROUTE3_YOUNGSTER4 - const ROUTE3_YOUNGSTER5 - const ROUTE3_COOLTRAINER_F3 + const_export ROUTE3_SUPER_NERD + const_export ROUTE3_YOUNGSTER1 + const_export ROUTE3_YOUNGSTER2 + const_export ROUTE3_COOLTRAINER_F1 + const_export ROUTE3_YOUNGSTER3 + const_export ROUTE3_COOLTRAINER_F2 + const_export ROUTE3_YOUNGSTER4 + const_export ROUTE3_YOUNGSTER5 + const_export ROUTE3_COOLTRAINER_F3 Route3_Object: db $2c ; border block diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index b34c913d..63cdefa8 100644 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -1,7 +1,7 @@ object_const_def - const ROUTE4_COOLTRAINER_F1 - const ROUTE4_COOLTRAINER_F2 - const ROUTE4_TM_WHIRLWIND + const_export ROUTE4_COOLTRAINER_F1 + const_export ROUTE4_COOLTRAINER_F2 + const_export ROUTE4_TM_WHIRLWIND Route4_Object: db $2c ; border block diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm index 87b7b5f2..06559f48 100644 --- a/data/maps/objects/Route5Gate.asm +++ b/data/maps/objects/Route5Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE5GATE_GUARD + const_export ROUTE5GATE_GUARD Route5Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 461ccf27..cd666768 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,10 +1,10 @@ object_const_def - const ROUTE6_COOLTRAINER_M1 - const ROUTE6_COOLTRAINER_F1 - const ROUTE6_YOUNGSTER_1 - const ROUTE6_COOLTRAINER_M2 - const ROUTE6_COOLTRAINER_F2 - const ROUTE6_YOUNGSTER_2 + const_export ROUTE6_COOLTRAINER_M1 + const_export ROUTE6_COOLTRAINER_F1 + const_export ROUTE6_YOUNGSTER_1 + const_export ROUTE6_COOLTRAINER_M2 + const_export ROUTE6_COOLTRAINER_F2 + const_export ROUTE6_YOUNGSTER_2 Route6_Object: db $f ; border block diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm index bce3596e..0b1f6359 100644 --- a/data/maps/objects/Route6Gate.asm +++ b/data/maps/objects/Route6Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE6GATE_GUARD + const_export ROUTE6GATE_GUARD Route6Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm index 18931e9e..8aac6e85 100644 --- a/data/maps/objects/Route7Gate.asm +++ b/data/maps/objects/Route7Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE7GATE_GUARD + const_export ROUTE7GATE_GUARD Route7Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index de0a1a26..eed93844 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -1,13 +1,13 @@ object_const_def - const ROUTE8_SUPER_NERD1 - const ROUTE8_GAMBLER1 - const ROUTE8_SUPER_NERD2 - const ROUTE8_COOLTRAINER_F1 - const ROUTE8_SUPER_NERD3 - const ROUTE8_COOLTRAINER_F2 - const ROUTE8_COOLTRAINER_F3 - const ROUTE8_GAMBLER2 - const ROUTE8_COOLTRAINER_F4 + const_export ROUTE8_SUPER_NERD1 + const_export ROUTE8_GAMBLER1 + const_export ROUTE8_SUPER_NERD2 + const_export ROUTE8_COOLTRAINER_F1 + const_export ROUTE8_SUPER_NERD3 + const_export ROUTE8_COOLTRAINER_F2 + const_export ROUTE8_COOLTRAINER_F3 + const_export ROUTE8_GAMBLER2 + const_export ROUTE8_COOLTRAINER_F4 Route8_Object: db $2c ; border block diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm index 37000dd4..64a931e6 100644 --- a/data/maps/objects/Route8Gate.asm +++ b/data/maps/objects/Route8Gate.asm @@ -1,5 +1,5 @@ object_const_def - const ROUTE8GATE_GUARD + const_export ROUTE8GATE_GUARD Route8Gate_Object: db $a ; border block diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 21c742e9..a5c29bef 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -1,14 +1,14 @@ object_const_def - const ROUTE9_COOLTRAINER_F1 - const ROUTE9_COOLTRAINER_M1 - const ROUTE9_COOLTRAINER_M2 - const ROUTE9_COOLTRAINER_F2 - const ROUTE9_HIKER_1 - const ROUTE9_HIKER_2 - const ROUTE9_YOUNGSTER_1 - const ROUTE9_HIKER_3 - const ROUTE9_YOUNGSTER_2 - const ROUTE9_TM_TELEPORT + const_export ROUTE9_COOLTRAINER_F1 + const_export ROUTE9_COOLTRAINER_M1 + const_export ROUTE9_COOLTRAINER_M2 + const_export ROUTE9_COOLTRAINER_F2 + const_export ROUTE9_HIKER_1 + const_export ROUTE9_HIKER_2 + const_export ROUTE9_YOUNGSTER_1 + const_export ROUTE9_HIKER_3 + const_export ROUTE9_YOUNGSTER_2 + const_export ROUTE9_TM_TELEPORT Route9_Object: db $2c ; border block diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 0a00befd..e18e87a2 100644 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -1,6 +1,6 @@ object_const_def - const SSANNE1F_WAITER - const SSANNE1F_SAILOR + const_export SSANNE1F_WAITER + const_export SSANNE1F_SAILOR SSAnne1F_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index c23fe124..9fc7bcbf 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -1,15 +1,15 @@ object_const_def - const SSANNE1FROOMS_GENTLEMAN1 - const SSANNE1FROOMS_GENTLEMAN2 - const SSANNE1FROOMS_YOUNGSTER - const SSANNE1FROOMS_COOLTRAINER_F - const SSANNE1FROOMS_GIRL1 - const SSANNE1FROOMS_MIDDLE_AGED_MAN - const SSANNE1FROOMS_LITTLE_GIRL - const SSANNE1FROOMS_WIGGLYTUFF - const SSANNE1FROOMS_GIRL2 - const SSANNE1FROOMS_TM_BODY_SLAM - const SSANNE1FROOMS_GENTLEMAN3 + const_export SSANNE1FROOMS_GENTLEMAN1 + const_export SSANNE1FROOMS_GENTLEMAN2 + const_export SSANNE1FROOMS_YOUNGSTER + const_export SSANNE1FROOMS_COOLTRAINER_F + const_export SSANNE1FROOMS_GIRL1 + const_export SSANNE1FROOMS_MIDDLE_AGED_MAN + const_export SSANNE1FROOMS_LITTLE_GIRL + const_export SSANNE1FROOMS_WIGGLYTUFF + const_export SSANNE1FROOMS_GIRL2 + const_export SSANNE1FROOMS_TM_BODY_SLAM + const_export SSANNE1FROOMS_GENTLEMAN3 SSAnne1FRooms_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index 283ca70f..0bf5fcbf 100644 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -1,6 +1,6 @@ object_const_def - const SSANNE2F_WAITER - const SSANNE2F_RIVAL + const_export SSANNE2F_WAITER + const_export SSANNE2F_RIVAL SSAnne2F_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 22e59bbe..7418222e 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,17 +1,17 @@ object_const_def - const SSANNE2FROOMS_GENTLEMAN1 - const SSANNE2FROOMS_FISHER - const SSANNE2FROOMS_GENTLEMAN2 - const SSANNE2FROOMS_COOLTRAINER_F - const SSANNE2FROOMS_GENTLEMAN3 - const SSANNE2FROOMS_MAX_ETHER - const SSANNE2FROOMS_GENTLEMAN4 - const SSANNE2FROOMS_GRAMPS - const SSANNE2FROOMS_RARE_CANDY - const SSANNE2FROOMS_GENTLEMAN5 - const SSANNE2FROOMS_LITTLE_BOY - const SSANNE2FROOMS_BRUNETTE_GIRL - const SSANNE2FROOMS_BEAUTY + const_export SSANNE2FROOMS_GENTLEMAN1 + const_export SSANNE2FROOMS_FISHER + const_export SSANNE2FROOMS_GENTLEMAN2 + const_export SSANNE2FROOMS_COOLTRAINER_F + const_export SSANNE2FROOMS_GENTLEMAN3 + const_export SSANNE2FROOMS_MAX_ETHER + const_export SSANNE2FROOMS_GENTLEMAN4 + const_export SSANNE2FROOMS_GRAMPS + const_export SSANNE2FROOMS_RARE_CANDY + const_export SSANNE2FROOMS_GENTLEMAN5 + const_export SSANNE2FROOMS_LITTLE_BOY + const_export SSANNE2FROOMS_BRUNETTE_GIRL + const_export SSANNE2FROOMS_BEAUTY SSAnne2FRooms_Object: db $c ; border block diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm index db904ad6..291cdf69 100644 --- a/data/maps/objects/SSAnne3F.asm +++ b/data/maps/objects/SSAnne3F.asm @@ -1,5 +1,5 @@ object_const_def - const SSANNE3F_SAILOR + const_export SSANNE3F_SAILOR SSAnne3F_Object: db $c ; border block diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index f7654fbb..7846186e 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -1,15 +1,15 @@ object_const_def - const SSANNEB1FROOMS_SAILOR1 - const SSANNEB1FROOMS_SAILOR2 - const SSANNEB1FROOMS_SAILOR3 - const SSANNEB1FROOMS_SAILOR4 - const SSANNEB1FROOMS_SAILOR5 - const SSANNEB1FROOMS_FISHER - const SSANNEB1FROOMS_SUPER_NERD - const SSANNEB1FROOMS_MACHOKE - const SSANNEB1FROOMS_ETHER - const SSANNEB1FROOMS_TM_REST - const SSANNEB1FROOMS_MAX_POTION + const_export SSANNEB1FROOMS_SAILOR1 + const_export SSANNEB1FROOMS_SAILOR2 + const_export SSANNEB1FROOMS_SAILOR3 + const_export SSANNEB1FROOMS_SAILOR4 + const_export SSANNEB1FROOMS_SAILOR5 + const_export SSANNEB1FROOMS_FISHER + const_export SSANNEB1FROOMS_SUPER_NERD + const_export SSANNEB1FROOMS_MACHOKE + const_export SSANNEB1FROOMS_ETHER + const_export SSANNEB1FROOMS_TM_REST + const_export SSANNEB1FROOMS_MAX_POTION SSAnneB1FRooms_Object: db $c ; border block diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 41e5c049..139e09e4 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -1,9 +1,9 @@ object_const_def - const SSANNEBOW_SUPER_NERD - const SSANNEBOW_SAILOR1 - const SSANNEBOW_COOLTRAINER_M - const SSANNEBOW_SAILOR2 - const SSANNEBOW_SAILOR3 + const_export SSANNEBOW_SUPER_NERD + const_export SSANNEBOW_SAILOR1 + const_export SSANNEBOW_COOLTRAINER_M + const_export SSANNEBOW_SAILOR2 + const_export SSANNEBOW_SAILOR3 SSAnneBow_Object: db $23 ; border block diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 7121a7b3..92573dbd 100644 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -1,5 +1,5 @@ object_const_def - const SSANNECAPTAINSROOM_CAPTAIN + const_export SSANNECAPTAINSROOM_CAPTAIN SSAnneCaptainsRoom_Object: db $c ; border block diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index d44e9547..707db866 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,11 +1,11 @@ object_const_def - const SSANNEKITCHEN_COOK1 - const SSANNEKITCHEN_COOK2 - const SSANNEKITCHEN_COOK3 - const SSANNEKITCHEN_COOK4 - const SSANNEKITCHEN_COOK5 - const SSANNEKITCHEN_COOK6 - const SSANNEKITCHEN_COOK7 + const_export SSANNEKITCHEN_COOK1 + const_export SSANNEKITCHEN_COOK2 + const_export SSANNEKITCHEN_COOK3 + const_export SSANNEKITCHEN_COOK4 + const_export SSANNEKITCHEN_COOK5 + const_export SSANNEKITCHEN_COOK6 + const_export SSANNEKITCHEN_COOK7 SSAnneKitchen_Object: db $c ; border block diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index ac176e14..f30ed123 100644 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -1,5 +1,5 @@ object_const_def - const SAFARIZONECENTER_NUGGET + const_export SAFARIZONECENTER_NUGGET SafariZoneCenter_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 06ec0d22..8bb50256 100644 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -1,6 +1,6 @@ object_const_def - const SAFARIZONECENTERRESTHOUSE_GIRL - const SAFARIZONECENTERRESTHOUSE_SCIENTIST + const_export SAFARIZONECENTERRESTHOUSE_GIRL + const_export SAFARIZONECENTERRESTHOUSE_SCIENTIST SafariZoneCenterRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 0b4e26b4..cef466d9 100644 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -1,8 +1,8 @@ object_const_def - const SAFARIZONEEAST_FULL_RESTORE - const SAFARIZONEEAST_MAX_RESTORE - const SAFARIZONEEAST_CARBOS - const SAFARIZONEEAST_TM_EGG_BOMB + const_export SAFARIZONEEAST_FULL_RESTORE + const_export SAFARIZONEEAST_MAX_RESTORE + const_export SAFARIZONEEAST_CARBOS + const_export SAFARIZONEEAST_TM_EGG_BOMB SafariZoneEast_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index 7c89d27e..47a1562c 100644 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -1,7 +1,7 @@ object_const_def - const SAFARIZONEEASTRESTHOUSE_SCIENTIST - const SAFARIZONEEASTRESTHOUSE_ROCKER - const SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M + const_export SAFARIZONEEASTRESTHOUSE_SCIENTIST + const_export SAFARIZONEEASTRESTHOUSE_ROCKER + const_export SAFARIZONEEASTRESTHOUSE_SILPH_WORKER_M SafariZoneEastRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index c9542e69..b4c72c9b 100644 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -1,6 +1,6 @@ object_const_def - const SAFARIZONEGATE_SAFARI_ZONE_WORKER1 - const SAFARIZONEGATE_SAFARI_ZONE_WORKER2 + const_export SAFARIZONEGATE_SAFARI_ZONE_WORKER1 + const_export SAFARIZONEGATE_SAFARI_ZONE_WORKER2 SafariZoneGate_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 2ee7b17a..3433cd6d 100644 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,6 +1,6 @@ object_const_def - const SAFARIZONENORTH_PROTEIN - const SAFARIZONENORTH_TM_SKULL_BASH + const_export SAFARIZONENORTH_PROTEIN + const_export SAFARIZONENORTH_TM_SKULL_BASH SafariZoneNorth_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index edb99c6b..8411f8a5 100644 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -1,7 +1,7 @@ object_const_def - const SAFARIZONENORTHRESTHOUSE_SCIENTIST - const SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER - const SAFARIZONENORTHRESTHOUSE_GENTLEMAN + const_export SAFARIZONENORTHRESTHOUSE_SCIENTIST + const_export SAFARIZONENORTHRESTHOUSE_SAFARI_ZONE_WORKER + const_export SAFARIZONENORTHRESTHOUSE_GENTLEMAN SafariZoneNorthRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 44ebd342..35112326 100644 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -1,5 +1,5 @@ object_const_def - const SAFARIZONESECRETHOUSE_FISHING_GURU + const_export SAFARIZONESECRETHOUSE_FISHING_GURU SafariZoneSecretHouse_Object: db $17 ; border block diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index 284cd244..dbc02825 100644 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -1,8 +1,8 @@ object_const_def - const SAFARIZONEWEST_MAX_POTION - const SAFARIZONEWEST_TM_DOUBLE_TEAM - const SAFARIZONEWEST_MAX_REVIVE - const SAFARIZONEWEST_GOLD_TEETH + const_export SAFARIZONEWEST_MAX_POTION + const_export SAFARIZONEWEST_TM_DOUBLE_TEAM + const_export SAFARIZONEWEST_MAX_REVIVE + const_export SAFARIZONEWEST_GOLD_TEETH SafariZoneWest_Object: db $0 ; border block diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index bf2eabe2..bc77ca4d 100644 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -1,7 +1,7 @@ object_const_def - const SAFARIZONEWESTRESTHOUSE_SCIENTIST - const SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M - const SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F + const_export SAFARIZONEWESTRESTHOUSE_SCIENTIST + const_export SAFARIZONEWESTRESTHOUSE_COOLTRAINER_M + const_export SAFARIZONEWESTRESTHOUSE_SILPH_WORKER_F SafariZoneWestRestHouse_Object: db $a ; border block diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index 181b5c07..8de01fe2 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -1,19 +1,19 @@ object_const_def - const SAFFRONCITY_ROCKET1 - const SAFFRONCITY_ROCKET2 - const SAFFRONCITY_ROCKET3 - const SAFFRONCITY_ROCKET4 - const SAFFRONCITY_ROCKET5 - const SAFFRONCITY_ROCKET6 - const SAFFRONCITY_ROCKET7 - const SAFFRONCTIY_SCIENTIST - const SAFFRONCITY_SILPH_WORKER_M - const SAFFRONCITY_SILPH_WORKER_F - const SAFFRONCITY_GENTLEMAN - const SAFFRONCITY_PIDGEOT - const SAFFRONCITY_ROCKER - const SAFFRONCITY_ROCKET8 - const SAFFRONCITY_ROCKET9 + const_export SAFFRONCITY_ROCKET1 + const_export SAFFRONCITY_ROCKET2 + const_export SAFFRONCITY_ROCKET3 + const_export SAFFRONCITY_ROCKET4 + const_export SAFFRONCITY_ROCKET5 + const_export SAFFRONCITY_ROCKET6 + const_export SAFFRONCITY_ROCKET7 + const_export SAFFRONCTIY_SCIENTIST + const_export SAFFRONCITY_SILPH_WORKER_M + const_export SAFFRONCITY_SILPH_WORKER_F + const_export SAFFRONCITY_GENTLEMAN + const_export SAFFRONCITY_PIDGEOT + const_export SAFFRONCITY_ROCKER + const_export SAFFRONCITY_ROCKET8 + const_export SAFFRONCITY_ROCKET9 SaffronCity_Object: db $f ; border block diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index af4bd68e..839228ad 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -1,13 +1,13 @@ object_const_def - const SAFFRONGYM_SABRINA - const SAFFRONGYM_CHANNELER1 - const SAFFRONGYM_YOUNGSTER1 - const SAFFRONGYM_CHANNELER2 - const SAFFRONGYM_YOUNGSTER2 - const SAFFRONGYM_CHANNELER3 - const SAFFRONGYM_YOUNGSTER3 - const SAFFRONGYM_YOUNGSTER4 - const SAFFRONGYM_GYM_GUIDE + const_export SAFFRONGYM_SABRINA + const_export SAFFRONGYM_CHANNELER1 + const_export SAFFRONGYM_YOUNGSTER1 + const_export SAFFRONGYM_CHANNELER2 + const_export SAFFRONGYM_YOUNGSTER2 + const_export SAFFRONGYM_CHANNELER3 + const_export SAFFRONGYM_YOUNGSTER3 + const_export SAFFRONGYM_YOUNGSTER4 + const_export SAFFRONGYM_GYM_GUIDE SaffronGym_Object: db $2e ; border block diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 7a2d9eb1..56057e28 100644 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -1,7 +1,7 @@ object_const_def - const SAFFRONMART_CLERK - const SAFFRONMART_SUPER_NERD - const SAFFRONMART_COOLTRAINER_F + const_export SAFFRONMART_CLERK + const_export SAFFRONMART_SUPER_NERD + const_export SAFFRONMART_COOLTRAINER_F SaffronMart_Object: db $0 ; border block diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index 3fc0cb9d..4ee23c0f 100644 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -1,8 +1,8 @@ object_const_def - const SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL - const SAFFRONPIDGEYHOUSE_PIDGEY - const SAFFRONPIDGEYHOUSE_YOUNGSTER - const SAFFRONPIDGEYHOUSE_PAPER + const_export SAFFRONPIDGEYHOUSE_BRUNETTE_GIRL + const_export SAFFRONPIDGEYHOUSE_PIDGEY + const_export SAFFRONPIDGEYHOUSE_YOUNGSTER + const_export SAFFRONPIDGEYHOUSE_PAPER SaffronPidgeyHouse_Object: db $a ; border block diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index 3169ea43..51bb2a1d 100644 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const SAFFRONPOKECENTER_NURSE - const SAFFRONPOKECENTER_BEAUTY - const SAFFRONPOKECENTER_GENTLEMAN - const SAFFRONPOKECENTER_LINK_RECEPTIONIST + const_export SAFFRONPOKECENTER_NURSE + const_export SAFFRONPOKECENTER_BEAUTY + const_export SAFFRONPOKECENTER_GENTLEMAN + const_export SAFFRONPOKECENTER_LINK_RECEPTIONIST SaffronPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm index a9004284..3c41d5c9 100644 --- a/data/maps/objects/SeafoamIslands1F.asm +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -1,6 +1,6 @@ object_const_def - const SEAFOAMISLANDS1F_BOULDER1 - const SEAFOAMISLANDS1F_BOULDER2 + const_export SEAFOAMISLANDS1F_BOULDER1 + const_export SEAFOAMISLANDS1F_BOULDER2 SeafoamIslands1F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm index c941ea21..7330333a 100644 --- a/data/maps/objects/SeafoamIslandsB1F.asm +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -1,6 +1,6 @@ object_const_def - const SEAFOAMISLANDSB1F_BOULDER1 - const SEAFOAMISLANDSB1F_BOULDER2 + const_export SEAFOAMISLANDSB1F_BOULDER1 + const_export SEAFOAMISLANDSB1F_BOULDER2 SeafoamIslandsB1F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm index 26bf3b07..c1d5021f 100644 --- a/data/maps/objects/SeafoamIslandsB2F.asm +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -1,6 +1,6 @@ object_const_def - const SEAFOAMISLANDSB2F_BOULDER1 - const SEAFOAMISLANDSB2F_BOULDER2 + const_export SEAFOAMISLANDSB2F_BOULDER1 + const_export SEAFOAMISLANDSB2F_BOULDER2 SeafoamIslandsB2F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm index 667e6ff7..1f099134 100644 --- a/data/maps/objects/SeafoamIslandsB3F.asm +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -1,10 +1,10 @@ object_const_def - const SEAFOAMISLANDSB3F_BOULDER1 - const SEAFOAMISLANDSB3F_BOULDER2 - const SEAFOAMISLANDSB3F_BOULDER3 - const SEAFOAMISLANDSB3F_BOULDER4 - const SEAFOAMISLANDSB3F_BOULDER5 - const SEAFOAMISLANDSB3F_BOULDER6 + const_export SEAFOAMISLANDSB3F_BOULDER1 + const_export SEAFOAMISLANDSB3F_BOULDER2 + const_export SEAFOAMISLANDSB3F_BOULDER3 + const_export SEAFOAMISLANDSB3F_BOULDER4 + const_export SEAFOAMISLANDSB3F_BOULDER5 + const_export SEAFOAMISLANDSB3F_BOULDER6 SeafoamIslandsB3F_Object: db $7d ; border block diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm index 0948200d..b80685fe 100644 --- a/data/maps/objects/SeafoamIslandsB4F.asm +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -1,7 +1,7 @@ object_const_def - const SEAFOAMISLANDSB4F_BOULDER1 - const SEAFOAMISLANDSB4F_BOULDER2 - const SEAFOAMISLANDSB4F_ARTICUNO + const_export SEAFOAMISLANDSB4F_BOULDER1 + const_export SEAFOAMISLANDSB4F_BOULDER2 + const_export SEAFOAMISLANDSB4F_ARTICUNO SeafoamIslandsB4F_Object: db $7d ; border block diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 6904165a..b95d5f09 100644 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -1,10 +1,10 @@ object_const_def - const SILPHCO10F_ROCKET - const SILPHCO10F_SCIENTIST - const SILPHCO10F_SILPH_WORKER_F - const SILPHCO10F_TM_EARTHQUAKE - const SILPHCO10F_RARE_CANDY - const SILPHCO10F_CARBOS + const_export SILPHCO10F_ROCKET + const_export SILPHCO10F_SCIENTIST + const_export SILPHCO10F_SILPH_WORKER_F + const_export SILPHCO10F_TM_EARTHQUAKE + const_export SILPHCO10F_RARE_CANDY + const_export SILPHCO10F_CARBOS SilphCo10F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 1ee5ffe6..c96745d4 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,9 +1,9 @@ object_const_def - const SILPHCO11F_SILPH_PRESIDENT - const SILPHCO11F_BEAUTY - const SILPHCO11F_GIOVANNI - const SILPHCO11F_ROCKET1 - const SILPHCO11F_ROCKET2 + const_export SILPHCO11F_SILPH_PRESIDENT + const_export SILPHCO11F_BEAUTY + const_export SILPHCO11F_GIOVANNI + const_export SILPHCO11F_ROCKET1 + const_export SILPHCO11F_ROCKET2 SilphCo11F_Object: db $d ; border block diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 3d1873b5..07ddb171 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,5 +1,5 @@ object_const_def - const SILPHCO1F_LINK_RECEPTIONIST + const_export SILPHCO1F_LINK_RECEPTIONIST SilphCo1F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index b618708a..0c99d578 100644 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -1,9 +1,9 @@ object_const_def - const SILPHCO2F_SILPH_WORKER_F - const SILPHCO2F_SCIENTIST1 - const SILPHCO2F_SCIENTIST2 - const SILPHCO2F_ROCKET1 - const SILPHCO2F_ROCKET2 + const_export SILPHCO2F_SILPH_WORKER_F + const_export SILPHCO2F_SCIENTIST1 + const_export SILPHCO2F_SCIENTIST2 + const_export SILPHCO2F_ROCKET1 + const_export SILPHCO2F_ROCKET2 SilphCo2F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index f22eee82..a8c568c3 100644 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -1,8 +1,8 @@ object_const_def - const SILPHCO3F_SILPH_WORKER_M - const SILPHCO3F_ROCKET - const SILPHCO3F_SCIENTIST - const SILPHCO3F_HYPER_POTION + const_export SILPHCO3F_SILPH_WORKER_M + const_export SILPHCO3F_ROCKET + const_export SILPHCO3F_SCIENTIST + const_export SILPHCO3F_HYPER_POTION SilphCo3F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index cf471cb4..bf4e1115 100644 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -1,11 +1,11 @@ object_const_def - const SILPHCO4F_SILPH_WORKER_M - const SILPHCO4F_ROCKET1 - const SILPHCO4F_SCIENTIST - const SILPHCO4F_ROCKET2 - const SILPHCO4F_FULL_HEAL - const SILPHCO4F_MAX_REVIVE - const SILPHCO4F_ESCAPE_ROPE + const_export SILPHCO4F_SILPH_WORKER_M + const_export SILPHCO4F_ROCKET1 + const_export SILPHCO4F_SCIENTIST + const_export SILPHCO4F_ROCKET2 + const_export SILPHCO4F_FULL_HEAL + const_export SILPHCO4F_MAX_REVIVE + const_export SILPHCO4F_ESCAPE_ROPE SilphCo4F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index c6cc7e34..bc3a8391 100644 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -1,15 +1,15 @@ object_const_def - const SILPHCO5F_SILPH_WORKER_M - const SILPHCO5F_ROCKET1 - const SILPHCO5F_SCIENTIST - const SILPHCO5F_ROCKER - const SILPHCO5F_ROCKET2 - const SILPHCO5F_TM_TAKE_DOWN - const SILPHCO5F_PROTEIN - const SILPHCO5F_CARD_KEY - const SILPHCO5F_POKEMON_REPORT1 - const SILPHCO5F_POKEMON_REPORT2 - const SILPHCO5F_POKEMON_REPORT3 + const_export SILPHCO5F_SILPH_WORKER_M + const_export SILPHCO5F_ROCKET1 + const_export SILPHCO5F_SCIENTIST + const_export SILPHCO5F_ROCKER + const_export SILPHCO5F_ROCKET2 + const_export SILPHCO5F_TM_TAKE_DOWN + const_export SILPHCO5F_PROTEIN + const_export SILPHCO5F_CARD_KEY + const_export SILPHCO5F_POKEMON_REPORT1 + const_export SILPHCO5F_POKEMON_REPORT2 + const_export SILPHCO5F_POKEMON_REPORT3 SilphCo5F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index 5dc9c87b..26aad741 100644 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -1,14 +1,14 @@ object_const_def - const SILPHCO6F_SILPH_WORKER_M1 - const SILPHCO6F_SILPH_WORKER_M2 - const SILPHCO6F_SILPH_WORKER_F1 - const SILPHCO6F_SILPH_WORKER_F2 - const SILPHCO6F_SILPH_WORKER_M3 - const SILPHCO6F_ROCKET1 - const SILPHCO6F_SCIENTIST - const SILPHCO6F_ROCKET2 - const SILPHCO6F_HP_UP - const SILPHCO6F_X_ACCURACY + const_export SILPHCO6F_SILPH_WORKER_M1 + const_export SILPHCO6F_SILPH_WORKER_M2 + const_export SILPHCO6F_SILPH_WORKER_F1 + const_export SILPHCO6F_SILPH_WORKER_F2 + const_export SILPHCO6F_SILPH_WORKER_M3 + const_export SILPHCO6F_ROCKET1 + const_export SILPHCO6F_SCIENTIST + const_export SILPHCO6F_ROCKET2 + const_export SILPHCO6F_HP_UP + const_export SILPHCO6F_X_ACCURACY SilphCo6F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 2d5ed33c..6f2ca90d 100644 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,15 +1,16 @@ object_const_def - const SILPHCO7F_SILPH_WORKER_M1 - const SILPHCO7F_SILPH_WORKER_M2 - const SILPHCO7F_SILPH_WORKER_M3 - const SILPHCO7F_SILPH_WORKER_M4 - const SILPHCO7F_ROCKET1 - const SILPHCO7F_SCIENTIST - const SILPHCO7F_ROCKET2 - const SILPHCO7F_ROCKET3 - const SILPHCO7F_RIVAL - const SILPHCO7F_CALCIUM - const SILPHCO7F_TM_SWORDS_DANCE + const_export SILPHCO7F_SILPH_WORKER_M1 + const_export SILPHCO7F_SILPH_WORKER_M2 + const_export SILPHCO7F_SILPH_WORKER_M3 + const_export SILPHCO7F_SILPH_WORKER_M4 + const_export SILPHCO7F_ROCKET1 + const_export SILPHCO7F_SCIENTIST + const_export SILPHCO7F_ROCKET2 + const_export SILPHCO7F_ROCKET3 + const_export SILPHCO7F_RIVAL + const_export SILPHCO7F_CALCIUM + const_export SILPHCO7F_TM_SWORDS_DANCE + const_export SILPHCO7F_UNUSED ; referenced in data/maps/hide_show_data.asm, no corresponding object_event SilphCo7F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index 7f0bbc78..46450b5b 100644 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -1,8 +1,8 @@ object_const_def - const SILPHCO8F_SILPH_WORKER_M - const SILPHCO8F_ROCKET1 - const SILPHCO8F_SCIENTIST - const SILPHCO8F_ROCKET2 + const_export SILPHCO8F_SILPH_WORKER_M + const_export SILPHCO8F_ROCKET1 + const_export SILPHCO8F_SCIENTIST + const_export SILPHCO8F_ROCKET2 SilphCo8F_Object: db $2e ; border block diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 59cb2c5b..36a4998d 100644 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -1,8 +1,8 @@ object_const_def - const SILPHCO9F_NURSE - const SILPHCO9F_ROCKET1 - const SILPHCO9F_SCIENTIST - const SILPHCO9F_ROCKET2 + const_export SILPHCO9F_NURSE + const_export SILPHCO9F_ROCKET1 + const_export SILPHCO9F_SCIENTIST + const_export SILPHCO9F_ROCKET2 SilphCo9F_Object: db $2e ; border block diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index edc3e0b5..74613f9a 100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm @@ -1,5 +1,5 @@ object_const_def - const TRADECENTER_OPPONENT + const_export TRADECENTER_OPPONENT TradeCenter_Object: db $e ; border block diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm index 56402b41..250607cf 100644 --- a/data/maps/objects/UndergroundPathRoute5.asm +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE5_LITTLE_GIRL + const_export UNDERGROUNDPATHROUTE5_LITTLE_GIRL UndergroundPathRoute5_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm index a1ac3acf..c9d7b6da 100644 --- a/data/maps/objects/UndergroundPathRoute6.asm +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE6_GIRL + const_export UNDERGROUNDPATHROUTE6_GIRL UndergroundPathRoute6_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index d7772f6c..aad976d3 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN + const_export UNDERGROUNDPATHROUTE7_MIDDLE_AGED_MAN UndergroundPathRoute7_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index 9c3841cb..8e2c70e0 100644 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -1,6 +1,6 @@ object_const_def - const UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL - const UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN + const_export UNDERGROUNDPATHROUTE7COPY_UNUSED_GIRL + const_export UNDERGROUNDPATHROUTE7COPY_UNUSED_MIDDLE_AGED_MAN UndergroundPathRoute7Copy_Object: db $a ; border block diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm index 751690f4..e7bd2891 100644 --- a/data/maps/objects/UndergroundPathRoute8.asm +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -1,5 +1,5 @@ object_const_def - const UNDERGROUNDPATHROUTE8_GIRL + const_export UNDERGROUNDPATHROUTE8_GIRL UndergroundPathRoute8_Object: db $a ; border block diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 1146d2b8..eeeded0c 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,10 +1,10 @@ object_const_def - const VERMILIONCITY_BEAUTY - const VERMILIONCITY_GAMBLER1 - const VERMILIONCITY_SAILOR1 - const VERMILIONCITY_GAMBLER2 - const VERMILIONCITY_MACHOP - const VERMILIONCITY_SAILOR2 + const_export VERMILIONCITY_BEAUTY + const_export VERMILIONCITY_GAMBLER1 + const_export VERMILIONCITY_SAILOR1 + const_export VERMILIONCITY_GAMBLER2 + const_export VERMILIONCITY_MACHOP + const_export VERMILIONCITY_SAILOR2 VermilionCity_Object: db $43 ; border block diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index 0defc08f..5e45d0d5 100644 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -1,9 +1,9 @@ object_const_def - const VERMILIONGYM_LT_SURGE - const VERMILIONGYM_GENTLEMAN - const VERMILIONGYM_SUPER_NERD - const VERMILIONGYM_SAILOR - const VERMILIONGYM_GYM_GUIDE + const_export VERMILIONGYM_LT_SURGE + const_export VERMILIONGYM_GENTLEMAN + const_export VERMILIONGYM_SUPER_NERD + const_export VERMILIONGYM_SAILOR + const_export VERMILIONGYM_GYM_GUIDE VermilionGym_Object: db $3 ; border block diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index 7cab5e7a..465f38d7 100644 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -1,7 +1,7 @@ object_const_def - const VERMILIONMART_CLERK - const VERMILIONMART_COOLTRAINER_M - const VERMILIONMART_COOLTRAINER_F + const_export VERMILIONMART_CLERK + const_export VERMILIONMART_COOLTRAINER_M + const_export VERMILIONMART_COOLTRAINER_F VermilionMart_Object: db $0 ; border block diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index 3efb3956..b84f531f 100644 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -1,5 +1,5 @@ object_const_def - const VERMILIONOLDRODHOUSE_FISHING_GURU + const_export VERMILIONOLDRODHOUSE_FISHING_GURU VermilionOldRodHouse_Object: db $a ; border block diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 6ffd9064..9b56c567 100644 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -1,7 +1,7 @@ object_const_def - const VERMILIONPIDGEYHOUSE_YOUNGSTER - const VERMILIONPIDGEYHOUSE_PIDGEY - const VERMILIONPIDGEYHOUSE_LETTER + const_export VERMILIONPIDGEYHOUSE_YOUNGSTER + const_export VERMILIONPIDGEYHOUSE_PIDGEY + const_export VERMILIONPIDGEYHOUSE_LETTER VermilionPidgeyHouse_Object: db $a ; border block diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index 5793aae0..441ffbb8 100644 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const VERMILIONPOKECENTER_NURSE - const VERMILIONPOKECENTER_FISHING_GURU - const VERMILIONPOKECENTER_SAILOR - const VERMILIONPOKECENTER_LINK_RECEPTIONIST + const_export VERMILIONPOKECENTER_NURSE + const_export VERMILIONPOKECENTER_FISHING_GURU + const_export VERMILIONPOKECENTER_SAILOR + const_export VERMILIONPOKECENTER_LINK_RECEPTIONIST VermilionPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm index 3d83357c..9740dbcb 100644 --- a/data/maps/objects/VermilionTradeHouse.asm +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -1,5 +1,5 @@ object_const_def - const VERMILIONTRADEHOUSE_LITTLE_GIRL + const_export VERMILIONTRADEHOUSE_LITTLE_GIRL VermilionTradeHouse_Object: db $a ; border block diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index 40295c81..267ae00a 100644 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -1,11 +1,11 @@ object_const_def - const VICTORYROAD1F_COOLTRAINER_F - const VICTORYROAD1F_COOLTRAINER_M - const VICTORYROAD1F_TM_SKY_ATTACK - const VICTORYROAD1F_RARE_CANDY - const VICTORYROAD1F_BOULDER1 - const VICTORYROAD1F_BOULDER2 - const VICTORYROAD1F_BOULDER3 + const_export VICTORYROAD1F_COOLTRAINER_F + const_export VICTORYROAD1F_COOLTRAINER_M + const_export VICTORYROAD1F_TM_SKY_ATTACK + const_export VICTORYROAD1F_RARE_CANDY + const_export VICTORYROAD1F_BOULDER1 + const_export VICTORYROAD1F_BOULDER2 + const_export VICTORYROAD1F_BOULDER3 VictoryRoad1F_Object: db $7d ; border block diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 09fc4458..c4de3683 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -1,17 +1,17 @@ object_const_def - const VICTORYROAD2F_HIKER - const VICTORYROAD2F_SUPER_NERD1 - const VICTORYROAD2F_COOLTRAINER_M - const VICTORYROAD2F_SUPER_NERD2 - const VICTORYROAD2F_SUPER_NERD3 - const VICTORYROAD2F_MOLTRES - const VICTORYROAD2F_TM_SUBMISSION - const VICTORYROAD2F_FULL_HEAL - const VICTORYROAD2F_TM_MEGA_KICK - const VICTORYROAD2F_GUARD_SPEC - const VICTORYROAD2F_BOULDER1 - const VICTORYROAD2F_BOULDER2 - const VICTORYROAD2F_BOULDER3 + const_export VICTORYROAD2F_HIKER + const_export VICTORYROAD2F_SUPER_NERD1 + const_export VICTORYROAD2F_COOLTRAINER_M + const_export VICTORYROAD2F_SUPER_NERD2 + const_export VICTORYROAD2F_SUPER_NERD3 + const_export VICTORYROAD2F_MOLTRES + const_export VICTORYROAD2F_TM_SUBMISSION + const_export VICTORYROAD2F_FULL_HEAL + const_export VICTORYROAD2F_TM_MEGA_KICK + const_export VICTORYROAD2F_GUARD_SPEC + const_export VICTORYROAD2F_BOULDER1 + const_export VICTORYROAD2F_BOULDER2 + const_export VICTORYROAD2F_BOULDER3 VictoryRoad2F_Object: db $7d ; border block diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index ad6b4df1..d56f9d65 100644 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -1,14 +1,14 @@ object_const_def - const VICTORYROAD3F_COOLTRAINER_M1 - const VICTORYROAD3F_COOLTRAINER_F1 - const VICTORYROAD3F_COOLTRAINER_M2 - const VICTORYROAD3F_COOLTRAINER_F2 - const VICTORYROAD3F_MAX_REVIVE - const VICTORYROAD3F_TM_EXPLOSION - const VICTORYROAD3F_BOULDER1 - const VICTORYROAD3F_BOULDER2 - const VICTORYROAD3F_BOULDER3 - const VICTORYROAD3F_BOULDER4 + const_export VICTORYROAD3F_COOLTRAINER_M1 + const_export VICTORYROAD3F_COOLTRAINER_F1 + const_export VICTORYROAD3F_COOLTRAINER_M2 + const_export VICTORYROAD3F_COOLTRAINER_F2 + const_export VICTORYROAD3F_MAX_REVIVE + const_export VICTORYROAD3F_TM_EXPLOSION + const_export VICTORYROAD3F_BOULDER1 + const_export VICTORYROAD3F_BOULDER2 + const_export VICTORYROAD3F_BOULDER3 + const_export VICTORYROAD3F_BOULDER4 VictoryRoad3F_Object: db $7d ; border block diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index b3a64f36..854a2788 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -1,11 +1,11 @@ object_const_def - const VIRIDIANCITY_YOUNGSTER1 - const VIRIDIANCITY_GAMBLER1 - const VIRIDIANCITY_YOUNGSTER2 - const VIRIDIANCITY_GIRL - const VIRIDIANCITY_OLD_MAN_SLEEPY - const VIRIDIANCITY_FISHER - const VIRIDIANCITY_OLD_MAN + const_export VIRIDIANCITY_YOUNGSTER1 + const_export VIRIDIANCITY_GAMBLER1 + const_export VIRIDIANCITY_YOUNGSTER2 + const_export VIRIDIANCITY_GIRL + const_export VIRIDIANCITY_OLD_MAN_SLEEPY + const_export VIRIDIANCITY_FISHER + const_export VIRIDIANCITY_OLD_MAN ViridianCity_Object: db $f ; border block diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index ca3fc30b..5002a315 100644 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -1,12 +1,12 @@ object_const_def - const VIRIDIANFOREST_YOUNGSTER1 - const VIRIDIANFOREST_YOUNGSTER2 - const VIRIDIANFOREST_YOUNGSTER3 - const VIRIDIANFOREST_YOUNGSTER4 - const VIRIDIANFOREST_ANTIDOTE - const VIRIDIANFOREST_POTION - const VIRIDIANFOREST_POKE_BALL - const VIRIDIANFOREST_YOUNGSTER5 + const_export VIRIDIANFOREST_YOUNGSTER1 + const_export VIRIDIANFOREST_YOUNGSTER2 + const_export VIRIDIANFOREST_YOUNGSTER3 + const_export VIRIDIANFOREST_YOUNGSTER4 + const_export VIRIDIANFOREST_ANTIDOTE + const_export VIRIDIANFOREST_POTION + const_export VIRIDIANFOREST_POKE_BALL + const_export VIRIDIANFOREST_YOUNGSTER5 ViridianForest_Object: db $3 ; border block diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index bd804359..ad4b9bab 100644 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -1,6 +1,6 @@ object_const_def - const VIRIDIANFORESTNORTHGATE_SUPER_NERD - const VIRIDIANFORESTNORTHGATE_GRAMPS + const_export VIRIDIANFORESTNORTHGATE_SUPER_NERD + const_export VIRIDIANFORESTNORTHGATE_GRAMPS ViridianForestNorthGate_Object: db $a ; border block diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 15ada6ff..dd7f2a26 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -1,6 +1,6 @@ object_const_def - const VIRIDIANFORESTSOUTHGATE_GIRL - const VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL + const_export VIRIDIANFORESTSOUTHGATE_GIRL + const_export VIRIDIANFORESTSOUTHGATE_LITTLE_GIRL ViridianForestSouthGate_Object: db $a ; border block diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index d58736da..87d2ef90 100644 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -1,15 +1,15 @@ object_const_def - const VIRIDIANGYM_GIOVANNI - const VIRIDIANGYM_COOLTRAINER_M1 - const VIRIDIANGYM_HIKER1 - const VIRIDIANGYM_ROCKER1 - const VIRIDIANGYM_HIKER2 - const VIRIDIANGYM_COOLTRAINER_M2 - const VIRIDIANGYM_HIKER3 - const VIRIDIANGYM_ROCKER2 - const VIRIDIANGYM_COOLTRAINER_M3 - const VIRIDIANGYM_GYM_GUIDE - const VIRIDIANGYM_REVIVE + const_export VIRIDIANGYM_GIOVANNI + const_export VIRIDIANGYM_COOLTRAINER_M1 + const_export VIRIDIANGYM_HIKER1 + const_export VIRIDIANGYM_ROCKER1 + const_export VIRIDIANGYM_HIKER2 + const_export VIRIDIANGYM_COOLTRAINER_M2 + const_export VIRIDIANGYM_HIKER3 + const_export VIRIDIANGYM_ROCKER2 + const_export VIRIDIANGYM_COOLTRAINER_M3 + const_export VIRIDIANGYM_GYM_GUIDE + const_export VIRIDIANGYM_REVIVE ViridianGym_Object: db $3 ; border block diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index 05d8048e..6107eff7 100644 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -1,7 +1,7 @@ object_const_def - const VIRIDIANMART_CLERK - const VIRIDIANMART_YOUNGSTER - const VIRIDIANMART_COOLTRAINER_M + const_export VIRIDIANMART_CLERK + const_export VIRIDIANMART_YOUNGSTER + const_export VIRIDIANMART_COOLTRAINER_M ViridianMart_Object: db $0 ; border block diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm index 29e1873c..3021c849 100644 --- a/data/maps/objects/ViridianNicknameHouse.asm +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -1,8 +1,8 @@ object_const_def - const VIRIDIANNICKNAMEHOUSE_BALDING_GUY - const VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL - const VIRIDIANNICKNAMEHOUSE_SPEAROW - const VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN + const_export VIRIDIANNICKNAMEHOUSE_BALDING_GUY + const_export VIRIDIANNICKNAMEHOUSE_LITTLE_GIRL + const_export VIRIDIANNICKNAMEHOUSE_SPEAROW + const_export VIRIDIANNICKNAMEHOUSE_SPEARY_SIGN ViridianNicknameHouse_Object: db $a ; border block diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index e4b564fa..44eb2ece 100644 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -1,8 +1,8 @@ object_const_def - const VIRIDIANPOKECENTER_NURSE - const VIRIDIANPOKECENTER_GENTLEMAN - const VIRIDIANPOKECENTER_COOLTRAINER_M - const VIRIDIANPOKECENTER_LINK_RECEPTIONIST + const_export VIRIDIANPOKECENTER_NURSE + const_export VIRIDIANPOKECENTER_GENTLEMAN + const_export VIRIDIANPOKECENTER_COOLTRAINER_M + const_export VIRIDIANPOKECENTER_LINK_RECEPTIONIST ViridianPokecenter_Object: db $0 ; border block diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index a389cb9d..7e1c3860 100644 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -1,6 +1,6 @@ object_const_def - const VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL - const VIRIDIANSCHOOLHOUSE_COOLTRAINER_F + const_export VIRIDIANSCHOOLHOUSE_BRUNETTE_GIRL + const_export VIRIDIANSCHOOLHOUSE_COOLTRAINER_F ViridianSchoolHouse_Object: db $a ; border block diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index 40aee76d..a4b1181b 100644 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -1,7 +1,7 @@ object_const_def - const WARDENSHOUSE_WARDEN - const WARDENSHOUSE_RARE_CANDY - const WARDENSHOUSE_BOULDER + const_export WARDENSHOUSE_WARDEN + const_export WARDENSHOUSE_RARE_CANDY + const_export WARDENSHOUSE_BOULDER WardensHouse_Object: db $17 ; border block |