mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-10-18 04:56:24 +13:00
5ea0fc5de9
Please stop asking me about the sprite limit i beg u Ok so this commit does the following; - Oak's Lab now uses the Fossil Lab tileset, featuring lots of new contraptions etc to make up for the old removed aides. - Places the Pikachu and Eevee starters in a new place, which results in a slightly blocky mess, but does the job. - Fossil Lab tileset graphic has many new things. Lots of bad tiles in the blockset in case we want to use this more. - Changes the rival's pathing so he, y'know, works on the new map... - Re-adds the Oak email thing, but I had to do like 4 stupid workarounds because it was broken for unknown reasons. Just made it a generic bg event with no issues. - Removed the old oak email event; no visible difference.
93 lines
2.3 KiB
NASM
93 lines
2.3 KiB
NASM
MACRO coll_tiles
|
|
IF _NARG
|
|
db \# ; all args
|
|
ENDC
|
|
db -1 ; end
|
|
ENDM
|
|
|
|
Underground_Coll::
|
|
coll_tiles $0b, $0c, $13, $15, $18
|
|
|
|
Overworld_Coll::
|
|
coll_tiles $00, $10, $1b, $20, $21, $23, $2c, $2d, $2e, $30, $31, $33, $39, $3c, $3e, $52, $54, $58, $5b
|
|
|
|
RedsHouse1_Coll::
|
|
RedsHouse2_Coll::
|
|
coll_tiles $01, $02, $03, $11, $12, $13, $14, $1c, $1a
|
|
|
|
Mart_Coll::
|
|
Pokecenter_Coll::
|
|
coll_tiles $11, $1a, $1c, $3c, $5e
|
|
|
|
Dojo_Coll::
|
|
Gym_Coll::
|
|
coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03
|
|
|
|
Forest_Coll::
|
|
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $30
|
|
|
|
House_Coll::
|
|
coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c
|
|
|
|
ForestGate_Coll::
|
|
Museum_Coll::
|
|
Gate_Coll::
|
|
coll_tiles $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e
|
|
|
|
Ship_Coll::
|
|
coll_tiles $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a
|
|
|
|
ShipPort_Coll::
|
|
coll_tiles $0a, $1a, $32, $3b
|
|
|
|
Cemetery_Coll::
|
|
coll_tiles $01, $10, $13, $1b, $22, $42, $52
|
|
|
|
Interior_Coll::
|
|
coll_tiles $04, $0f, $15, $1f, $3b, $45, $47, $55, $56
|
|
|
|
Cavern_Coll::
|
|
coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30, $38
|
|
|
|
Lobby_Coll::
|
|
coll_tiles $14, $17, $1a, $1c, $20, $38, $45
|
|
|
|
Mansion_Coll::
|
|
coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53
|
|
|
|
Lab_Coll::
|
|
coll_tiles $0c, $26, $16, $1e, $34, $37
|
|
|
|
FossilLab_Coll:: ; Originally just the Lab collision, but now that Oak uses it, it's using separate collision. Added plenty just to be sure.
|
|
coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D
|
|
|
|
Club_Coll::
|
|
coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41
|
|
|
|
Facility_Coll::
|
|
coll_tiles $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e
|
|
|
|
Plateau_Coll::
|
|
coll_tiles $1b, $23, $2c, $2d, $3b, $45
|
|
|
|
PreGym_Coll::
|
|
coll_tiles $0B, $0E, $1E, $1F, $11
|
|
|
|
Citrine_Coll::
|
|
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
|
|
|
|
Celeste_Coll::
|
|
coll_tiles $20, $2e, $30, $37, $39, $40, $51, $53, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
|
|
|
|
RocketHouse_Coll::
|
|
coll_tiles $13, $31, $01, $53
|
|
|
|
BetaMart_Coll::
|
|
coll_tiles $01, $11, $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4D, $4C
|
|
|
|
Jacky_Coll::
|
|
coll_tiles $01, $40, $11, $04, $14, $02, $03, $13, $12,
|
|
|
|
SeagallopPort_Coll::
|
|
coll_tiles $1C, $0E, $1E
|