Merge branch 'collisions-movements' of https://github.com/Pokeglitch/pokegold-spaceworld into master

And that's the last of the manual merges for now! Hooray!

2 files changed, 69 insertions, 102 deletions

diff --git a/data/collision/collision_type_table.asm b/data/collision/collision_type_table.asm
new file mode 100755
index 0000000..aa53802
--- /dev/null
+++ b/data/collision/collision_type_table.asm
@@ -0,0 +1,69 @@
+INCLUDE "constants.asm"

+

+SECTION "Collision Type Table", ROMX[$4664], BANK[$3]

+

+CollisionTypeTable: ; 03:4664

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $00

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     ALWAYS_SOLID    ; $04

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $08

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     ALWAYS_SOLID    ; $0C

+	db NEVER_SOLID,     NEVER_SOLID,     SOMETIMES_SOLID, NEVER_SOLID     ; $10

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $14

+	db NEVER_SOLID,     NEVER_SOLID,     SOMETIMES_SOLID, NEVER_SOLID     ; $18

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $1C

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID ; $20

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, ALWAYS_SOLID    ; $24

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID ; $28

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, ALWAYS_SOLID    ; $30

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID ; $34

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID ; $38

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID ; $3C

+	db SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID, SOMETIMES_SOLID ; $40

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $44

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $48

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $4C

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $50

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $54

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $58

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $5C

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $60

+	db NEVER_SOLID,     NEVER_SOLID,     ALWAYS_SOLID,    NEVER_SOLID     ; $64

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $68

+	db NEVER_SOLID,     NEVER_SOLID,     ALWAYS_SOLID,    NEVER_SOLID     ; $6C

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $70

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $74

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $78

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $7C

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $80

+	db ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID    ; $84

+	db ALWAYS_SOLID,    NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $88

+	db ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID    ; $8C

+	db ALWAYS_SOLID,    NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $90

+	db ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID    ; $94

+	db ALWAYS_SOLID,    ALWAYS_SOLID,    NEVER_SOLID,     ALWAYS_SOLID    ; $98

+	db ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID,    ALWAYS_SOLID    ; $9C

+	db ALWAYS_SOLID,    ALWAYS_SOLID,    NEVER_SOLID,     ALWAYS_SOLID    ; $A0

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $A4

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $A8

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $AC

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $B0

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $B4

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $B8

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $BC

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $C0

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $C4

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $C8

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $CC

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $D0

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $D4

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $D8

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $DC

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $E0

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $E4

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $E8

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $EC

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $F0

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $F4

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $F8

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID     ; $FC

+	db NEVER_SOLID,     NEVER_SOLID,     NEVER_SOLID,     ALWAYS_SOLID    ; $100

diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
deleted file mode 100644
index b901b7a..0000000
--- a/data/sprites/sprites.asm
+++ /dev/null
@@ -1,102 +0,0 @@
-INCLUDE "constants.asm"
-
-SECTION "OverworldSprites", ROMX[$423B], BANK[$05]
-
-overworld_sprite: MACRO
-; pointer, length, bank
-	dw \1
-	db \2 tiles, BANK(\1)
-ENDM
-
-OverworldSprites::
-	overworld_sprite GoldSpriteGFX, 12
-	overworld_sprite GoldBikeSpriteGFX, 12
-	overworld_sprite GoldSkateboardSpriteGFX, 12
-	overworld_sprite SilverSpriteGFX, 12
-	overworld_sprite OkidoSpriteGFX, 12
-	overworld_sprite RedSpriteGFX, 12
-	overworld_sprite BlueSpriteGFX, 12
-	overworld_sprite MasakiSpriteGFX, 12
-	overworld_sprite ElderSpriteGFX, 12
-	overworld_sprite SakakiSpriteGFX, 12
-	overworld_sprite GantetsuSpriteGFX, 12
-	overworld_sprite MomSpriteGFX, 12
-	overworld_sprite SilversMomSpriteGFX, 12
-	overworld_sprite RedsMomSpriteGFX, 12
-	overworld_sprite RedsMomSpriteGFX, 12
-	overworld_sprite NanamiSpriteGFX, 12
-	overworld_sprite EvilOkidoSpriteGFX, 12
-	overworld_sprite KikukoSpriteGFX, 12
-	overworld_sprite HayatoSpriteGFX, 12
-	overworld_sprite TsukushiSpriteGFX, 12
-	overworld_sprite TsukushiSpriteGFX, 12
-	overworld_sprite EnokiSpriteGFX, 12
-	overworld_sprite MikanSpriteGFX, 12
-	overworld_sprite MikanSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerMSpriteGFX, 12
-	overworld_sprite CooltrainerFSpriteGFX, 12
-	overworld_sprite BugCatcherBoySpriteGFX, 12
-	overworld_sprite TwinSpriteGFX, 12
-	overworld_sprite YoungsterSpriteGFX, 12
-	overworld_sprite LassSpriteGFX, 12
-	overworld_sprite TeacherSpriteGFX, 12
-	overworld_sprite GirlSpriteGFX, 12
-	overworld_sprite SuperNerdSpriteGFX, 12
-	overworld_sprite RockerSpriteGFX, 12
-	overworld_sprite PokefanMSpriteGFX, 12
-	overworld_sprite PokefanFSpriteGFX, 12
-	overworld_sprite GrampsSpriteGFX, 12
-	overworld_sprite GrannySpriteGFX, 12
-	overworld_sprite SwimmerMSpriteGFX, 12
-	overworld_sprite SwimmerFSpriteGFX, 12
-	overworld_sprite RocketMSpriteGFX, 12
-	overworld_sprite RocketMSpriteGFX, 12
-	overworld_sprite RocketMSpriteGFX, 12
-	overworld_sprite RocketFSpriteGFX, 12
-	overworld_sprite NurseSpriteGFX, 12
-	overworld_sprite LinkReceptionistSpriteGFX, 12
-	overworld_sprite ClerkSpriteGFX, 12
-	overworld_sprite FisherSpriteGFX, 12
-	overworld_sprite FishingGuruSpriteGFX, 12
-	overworld_sprite ScientistSpriteGFX, 12
-	overworld_sprite MediumSpriteGFX, 12
-	overworld_sprite SageSpriteGFX, 12
-	overworld_sprite FrowningManSpriteGFX, 12
-	overworld_sprite GentlemanSpriteGFX, 12
-	overworld_sprite BlackbeltSpriteGFX, 12
-	overworld_sprite ReceptionistSpriteGFX, 12
-	overworld_sprite OfficerSpriteGFX, 12
-	overworld_sprite CaptainSpriteGFX, 12
-	overworld_sprite CaptainSpriteGFX, 12
-	overworld_sprite CaptainSpriteGFX, 12
-	overworld_sprite MohawkSpriteGFX, 12
-	overworld_sprite GymGuySpriteGFX, 12
-	overworld_sprite SailorSpriteGFX, 12
-	overworld_sprite HelmetSpriteGFX, 12
-	overworld_sprite BurglarSpriteGFX, 12
-	overworld_sprite SidonSpriteGFX, 12
-	overworld_sprite PippiSpriteGFX, 12
-	overworld_sprite PoppoSpriteGFX, 12
-	overworld_sprite LizardonSpriteGFX, 12
-	overworld_sprite KabigonSpriteGFX, 4
-	overworld_sprite PawouSpriteGFX, 12
-	overworld_sprite NyorobonSpriteGFX, 12
-	overworld_sprite LaplaceSpriteGFX, 12
-	overworld_sprite PokeBallSpriteGFX, 4
-	overworld_sprite PokedexSpriteGFX, 4
-	overworld_sprite PaperSpriteGFX, 4
-	overworld_sprite OldLinkReceptionistSpriteGFX, 4
-	overworld_sprite OldLinkReceptionistSpriteGFX, 4
-	overworld_sprite EggSpriteGFX, 4
-	overworld_sprite BoulderSpriteGFX, 4