Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use map object consts in data/maps/hide_show_data.asm #432

Merged
merged 1 commit into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
456 changes: 228 additions & 228 deletions data/maps/hide_show_data.asm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/maps/objects/AgathasRoom.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object_const_def
const AGATHASROOM_AGATHA
const_export AGATHASROOM_AGATHA

AgathasRoom_Object:
db $0 ; border block
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/BikeShop.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/BillsHouse.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/BluesHouse.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/maps/objects/BrunosRoom.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object_const_def
const BRUNOSROOM_BRUNO
const_export BRUNOSROOM_BRUNO

BrunosRoom_Object:
db $3 ; border block
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeladonChiefHouse.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions data/maps/objects/CeladonCity.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions data/maps/objects/CeladonDiner.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions data/maps/objects/CeladonGym.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeladonHotel.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeladonMansion1F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeladonMansion3F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/maps/objects/CeladonMansionRoofHouse.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/maps/objects/CeladonMart1F.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object_const_def
const CELADONMART1F_RECEPTIONIST
const_export CELADONMART1F_RECEPTIONIST

CeladonMart1F_Object:
db $f ; border block
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeladonMart2F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions data/maps/objects/CeladonMart3F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeladonMart4F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeladonMart5F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/maps/objects/CeladonMartRoof.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeladonPokecenter.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/maps/objects/CeruleanBadgeHouse.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object_const_def
const CERULEANBADGEHOUSE_MIDDLE_AGED_MAN
const_export CERULEANBADGEHOUSE_MIDDLE_AGED_MAN

CeruleanBadgeHouse_Object:
db $c ; border block
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeruleanCave1F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeruleanCave2F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeruleanCaveB1F.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
22 changes: 11 additions & 11 deletions data/maps/objects/CeruleanCity.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeruleanGym.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions data/maps/objects/CeruleanMart.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions data/maps/objects/CeruleanPokecenter.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/maps/objects/CeruleanTradeHouse.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/maps/objects/CeruleanTrashedHouse.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions data/maps/objects/ChampionsRoom.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions data/maps/objects/CinnabarGym.asm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading