Actually working postgame warps!

FINALLY managed to get this working. The bugged warps are now working and the jank ones are less jank. Also removed the cocoon's pre-evolved moves again.
This commit is contained in:
Martha Schilling 2023-12-08 17:37:41 +00:00
parent bed705ac0d
commit 2b2c95e52b
20 changed files with 32 additions and 27 deletions

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions
dw KakunaPicFront, KakunaPicBack
db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions
dw MetapodPicFront, MetapodPicBack
db TACKLE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions
dw PerrserkerPicFront, PerrserkerPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions
dw PupalPicFront, PupalPicBack
db LEECH_LIFE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

View file

@ -75,7 +75,7 @@ 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 $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
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

View file

@ -15,7 +15,6 @@ DoorTileIDPointers:
dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co.
dbw CITRINE, .CitrineDoorTileIDs
dbw CELESTE, .CelesteDoorTileIDs
dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs
db -1 ; end
MACRO door_tiles
@ -66,6 +65,3 @@ ENDM
.CelesteDoorTileIDs:
door_tiles $0C, $1C
.SeagallopPortDoorTileIDs:
door_tiles $0E, $1E

View file

@ -6,6 +6,9 @@
TilePairCollisionsLand::
db CAVERN, $20, $05
db CAVERN, $41, $05
db CELESTE, $30, $2E
db CELESTE, $18, $2E
db CELESTE, $5E, $2E
db FOREST, $30, $2E
db CAVERN, $2A, $05
db CAVERN, $05, $21

View file

@ -12,10 +12,10 @@ MACRO warp_carpet_tiles
ENDM
.FacingDownWarpTiles:
warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33
warp_carpet_tiles $01, $0B, $12, $16, $23, $17, $3D, $04, $18, $33, $51, $52
.FacingUpWarpTiles:
warp_carpet_tiles $01, $5C
warp_carpet_tiles $01, $34, $36, $5C, $5F,
.FacingLeftWarpTiles:
warp_carpet_tiles $1A, $4B

View file

@ -107,7 +107,7 @@ ENDM
warp_tiles $1B, $1C, $0B, $0C, $58, $59
.CelesteWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
warp_tiles $5A, $5C
.RocketHouseWarpTileIDs:
warp_tiles