Remove the duplicate tileset headers, and include the real ones.

Also relabel some shared map assets.
This commit is contained in:
yenatch 2016-06-28 23:31:47 -04:00
parent b9762fbc83
commit d6e352aff8
68 changed files with 1040 additions and 2098 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
DewfordTown_PokemonCenter_1F:: @ 8305B64
.4byte DewfordTown_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte DewfordTown_PokemonCenter_1F_MapEvents
.4byte DewfordTown_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
DewfordTown_PokemonCenter_2F:: @ 8305B80
.4byte DewfordTown_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte DewfordTown_PokemonCenter_2F_MapEvents
.4byte DewfordTown_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
EverGrandeCity_PokemonCenter_1F:: @ 8306BE8
.4byte EverGrandeCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
EverGrandeCity_PokemonCenter_2F:: @ 8306C04
.4byte EverGrandeCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FallarborTown_House1:: @ 8305D40
.4byte FallarborTown_House1_MapAttributes
.4byte House1_MapAttributes
.4byte FallarborTown_House1_MapEvents
.4byte FallarborTown_House1_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FallarborTown_House2:: @ 8305D5C
.4byte FallarborTown_House2_MapAttributes
.4byte House2_MapAttributes
.4byte FallarborTown_House2_MapEvents
.4byte FallarborTown_House2_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FallarborTown_Mart:: @ 8305CB4
.4byte FallarborTown_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte FallarborTown_Mart_MapEvents
.4byte FallarborTown_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FallarborTown_PokemonCenter_1F:: @ 8305D08
.4byte FallarborTown_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte FallarborTown_PokemonCenter_1F_MapEvents
.4byte FallarborTown_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FallarborTown_PokemonCenter_2F:: @ 8305D24
.4byte FallarborTown_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte FallarborTown_PokemonCenter_2F_MapEvents
.4byte FallarborTown_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FortreeCity_Mart:: @ 8306478
.4byte FortreeCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte FortreeCity_Mart_MapEvents
.4byte FortreeCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FortreeCity_PokemonCenter_1F:: @ 8306440
.4byte FortreeCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte FortreeCity_PokemonCenter_1F_MapEvents
.4byte FortreeCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
FortreeCity_PokemonCenter_2F:: @ 830645C
.4byte FortreeCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte FortreeCity_PokemonCenter_2F_MapEvents
.4byte FortreeCity_PokemonCenter_2F_MapScripts
.4byte 0x0

BIN
data/maps/House1/border.bin Normal file

Binary file not shown.

1
data/maps/House1/map.bin Normal file
View File

@ -0,0 +1 @@
yzŽŹ<06>   <06>2<EFBFBD>22—2‰2Š2$2$2$2$2<><06>9252626262626272#2#292=H6I6â2>2>2?2#2#292=P6Q6â2>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2 #2#2#2#2*6

BIN
data/maps/House2/border.bin Normal file

Binary file not shown.

1
data/maps/House2/map.bin Normal file
View File

@ -0,0 +1 @@
0xŽ<06>   hlm2—282$2$2$2$2p2t2u2ˆ292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#22#2#2#2#2#2#2#2#2#2"2™#2#2 #2#2#2#2#2*

View File

@ -1,5 +1,5 @@
LavaridgeTown_Mart:: @ 8305C60
.4byte LavaridgeTown_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte LavaridgeTown_Mart_MapEvents
.4byte LavaridgeTown_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LavaridgeTown_PokemonCenter_2F:: @ 8305C98
.4byte LavaridgeTown_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_House1:: @ 830668C
.4byte LilycoveCity_House1_MapAttributes
.4byte House1_MapAttributes
.4byte LilycoveCity_House1_MapEvents
.4byte LilycoveCity_House1_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_House3:: @ 83066C4
.4byte LilycoveCity_House3_MapAttributes
.4byte House2_MapAttributes
.4byte LilycoveCity_House3_MapEvents
.4byte LilycoveCity_House3_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_House4:: @ 83066E0
.4byte LilycoveCity_House4_MapAttributes
.4byte House1_MapAttributes
.4byte LilycoveCity_House4_MapEvents
.4byte LilycoveCity_House4_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_MoveDeletersHouse:: @ 8306670
.4byte LilycoveCity_MoveDeletersHouse_MapAttributes
.4byte House2_MapAttributes
.4byte LilycoveCity_MoveDeletersHouse_MapEvents
.4byte LilycoveCity_MoveDeletersHouse_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_PokemonCenter_1F:: @ 83065C8
.4byte LilycoveCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte LilycoveCity_PokemonCenter_1F_MapEvents
.4byte LilycoveCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_PokemonCenter_2F:: @ 83065E4
.4byte LilycoveCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte LilycoveCity_PokemonCenter_2F_MapEvents
.4byte LilycoveCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
LilycoveCity_UnusedMart:: @ 8306600
.4byte LilycoveCity_UnusedMart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte LilycoveCity_UnusedMart_MapEvents
.4byte LilycoveCity_UnusedMart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MauvilleCity_House1:: @ 8306184
.4byte MauvilleCity_House1_MapAttributes
.4byte House2_MapAttributes
.4byte MauvilleCity_House1_MapEvents
.4byte MauvilleCity_House1_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MauvilleCity_House2:: @ 83061BC
.4byte MauvilleCity_House2_MapAttributes
.4byte House1_MapAttributes
.4byte MauvilleCity_House2_MapEvents
.4byte MauvilleCity_House2_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MauvilleCity_Mart:: @ 8306210
.4byte MauvilleCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte MauvilleCity_Mart_MapEvents
.4byte MauvilleCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_1F:: @ 83061D8
.4byte MauvilleCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte MauvilleCity_PokemonCenter_1F_MapEvents
.4byte MauvilleCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MauvilleCity_PokemonCenter_2F:: @ 83061F4
.4byte MauvilleCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte MauvilleCity_PokemonCenter_2F_MapEvents
.4byte MauvilleCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MossdeepCity_House1:: @ 83067DC
.4byte MossdeepCity_House1_MapAttributes
.4byte House2_MapAttributes
.4byte MossdeepCity_House1_MapEvents
.4byte MossdeepCity_House1_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MossdeepCity_House2:: @ 83067F8
.4byte MossdeepCity_House2_MapAttributes
.4byte House1_MapAttributes
.4byte MossdeepCity_House2_MapEvents
.4byte MossdeepCity_House2_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MossdeepCity_House3:: @ 8306868
.4byte MossdeepCity_House3_MapAttributes
.4byte House2_MapAttributes
.4byte MossdeepCity_House3_MapEvents
.4byte MossdeepCity_House3_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MossdeepCity_Mart:: @ 830684C
.4byte MossdeepCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte MossdeepCity_Mart_MapEvents
.4byte MossdeepCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MossdeepCity_PokemonCenter_1F:: @ 8306814
.4byte MossdeepCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte MossdeepCity_PokemonCenter_1F_MapEvents
.4byte MossdeepCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
MossdeepCity_PokemonCenter_2F:: @ 8306830
.4byte MossdeepCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte MossdeepCity_PokemonCenter_2F_MapEvents
.4byte MossdeepCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
OldaleTown_House1:: @ 8305ABC
.4byte OldaleTown_House1_MapAttributes
.4byte House1_MapAttributes
.4byte OldaleTown_House1_MapEvents
.4byte OldaleTown_House1_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
OldaleTown_House2:: @ 8305AD8
.4byte OldaleTown_House2_MapAttributes
.4byte House2_MapAttributes
.4byte OldaleTown_House2_MapEvents
.4byte OldaleTown_House2_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
OldaleTown_Mart:: @ 8305B2C
.4byte OldaleTown_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte OldaleTown_Mart_MapEvents
.4byte OldaleTown_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
OldaleTown_PokemonCenter_1F:: @ 8305AF4
.4byte OldaleTown_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte OldaleTown_PokemonCenter_1F_MapEvents
.4byte OldaleTown_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
OldaleTown_PokemonCenter_2F:: @ 8305B10
.4byte OldaleTown_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte OldaleTown_PokemonCenter_2F_MapEvents
.4byte OldaleTown_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PacifidlogTown_PokemonCenter_1F:: @ 8305E58
.4byte PacifidlogTown_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PacifidlogTown_PokemonCenter_2F:: @ 8305E74
.4byte PacifidlogTown_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PetalburgCity_House1:: @ 8305F54
.4byte PetalburgCity_House1_MapAttributes
.4byte House1_MapAttributes
.4byte PetalburgCity_House1_MapEvents
.4byte PetalburgCity_House1_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PetalburgCity_Mart:: @ 8305FC4
.4byte PetalburgCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte PetalburgCity_Mart_MapEvents
.4byte PetalburgCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PetalburgCity_PokemonCenter_1F:: @ 8305F8C
.4byte PetalburgCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte PetalburgCity_PokemonCenter_1F_MapEvents
.4byte PetalburgCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PetalburgCity_PokemonCenter_2F:: @ 8305FA8
.4byte PetalburgCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte PetalburgCity_PokemonCenter_2F_MapEvents
.4byte PetalburgCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
PetalburgCity_WallysHouse:: @ 8305F1C
.4byte PetalburgCity_WallysHouse_MapAttributes
.4byte House2_MapAttributes
.4byte PetalburgCity_WallysHouse_MapEvents
.4byte PetalburgCity_WallysHouse_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
Route111_WinstrateFamilysHouse:: @ 8306C58
.4byte Route111_WinstrateFamilysHouse_MapAttributes
.4byte House2_MapAttributes
.4byte Route111_WinstrateFamilysHouse_MapEvents
.4byte Route111_WinstrateFamilysHouse_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
Route119_House:: @ 8307F28
.4byte Route119_House_MapAttributes
.4byte House1_MapAttributes
.4byte Route119_House_MapEvents
.4byte Route119_House_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
Route123_BerryMastersHouse:: @ 8307ED4
.4byte Route123_BerryMastersHouse_MapAttributes
.4byte House2_MapAttributes
.4byte Route123_BerryMastersHouse_MapEvents
.4byte Route123_BerryMastersHouse_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
RustboroCity_Mart:: @ 83062F0
.4byte RustboroCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte RustboroCity_Mart_MapEvents
.4byte RustboroCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
RustboroCity_PokemonCenter_1F:: @ 83062B8
.4byte RustboroCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte RustboroCity_PokemonCenter_1F_MapEvents
.4byte RustboroCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
RustboroCity_PokemonCenter_2F:: @ 83062D4
.4byte RustboroCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte RustboroCity_PokemonCenter_2F_MapEvents
.4byte RustboroCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SlateportCity_House2:: @ 83060DC
.4byte SlateportCity_House2_MapAttributes
.4byte House2_MapAttributes
.4byte SlateportCity_House2_MapEvents
.4byte SlateportCity_House2_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SlateportCity_Mart:: @ 8306130
.4byte SlateportCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte SlateportCity_Mart_MapEvents
.4byte SlateportCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SlateportCity_PokemonCenter_1F:: @ 83060F8
.4byte SlateportCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte SlateportCity_PokemonCenter_1F_MapEvents
.4byte SlateportCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SlateportCity_PokemonCenter_2F:: @ 8306114
.4byte SlateportCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte SlateportCity_PokemonCenter_2F_MapEvents
.4byte SlateportCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SootopolisCity_Mart:: @ 830699C
.4byte SootopolisCity_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte SootopolisCity_Mart_MapEvents
.4byte SootopolisCity_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SootopolisCity_PokemonCenter_1F:: @ 8306964
.4byte SootopolisCity_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte SootopolisCity_PokemonCenter_1F_MapEvents
.4byte SootopolisCity_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
SootopolisCity_PokemonCenter_2F:: @ 8306980
.4byte SootopolisCity_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte SootopolisCity_PokemonCenter_2F_MapEvents
.4byte SootopolisCity_PokemonCenter_2F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
.4byte VerdanturfTown_FriendshipRatersHouse_MapAttributes
.4byte House2_MapAttributes
.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
VerdanturfTown_House:: @ 8305E3C
.4byte VerdanturfTown_House_MapAttributes
.4byte House1_MapAttributes
.4byte VerdanturfTown_House_MapEvents
.4byte VerdanturfTown_House_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
VerdanturfTown_Mart:: @ 8305DB0
.4byte VerdanturfTown_Mart_MapAttributes
.4byte PokeMart_MapAttributes
.4byte VerdanturfTown_Mart_MapEvents
.4byte VerdanturfTown_Mart_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
VerdanturfTown_PokemonCenter_1F:: @ 8305DCC
.4byte VerdanturfTown_PokemonCenter_1F_MapAttributes
.4byte PokemonCenter_1F_MapAttributes
.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
.4byte 0x0

View File

@ -1,5 +1,5 @@
VerdanturfTown_PokemonCenter_2F:: @ 8305DE8
.4byte VerdanturfTown_PokemonCenter_2F_MapAttributes
.4byte PokemonCenter_2F_MapAttributes
.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
.4byte 0x0

File diff suppressed because it is too large Load Diff