summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-09-18 21:31:40 -0400
committeryenatch <yenatch@gmail.com>2013-09-18 21:31:40 -0400
commit5249fd9773c603e727618eb58167c9804870af2b (patch)
treee1e7c5f338ada0d627b18cd768972d24db0a4c5f
parent663c523ac40cb13f53c4939f5a13aecccd0be0f2 (diff)
fix padding in .lz files for attack graphics
-rw-r--r--gfx/fx/000.lzbin231 -> 240 bytes
-rw-r--r--gfx/fx/001.lzbin231 -> 240 bytes
-rw-r--r--gfx/fx/002.lzbin92 -> 96 bytes
-rw-r--r--gfx/fx/003.lzbin82 -> 96 bytes
-rw-r--r--gfx/fx/004.lzbin199 -> 208 bytes
-rw-r--r--gfx/fx/005.lzbin308 -> 320 bytes
-rw-r--r--gfx/fx/006.lzbin222 -> 224 bytes
-rw-r--r--gfx/fx/007.lzbin130 -> 144 bytes
-rw-r--r--gfx/fx/008.lzbin86 -> 96 bytes
-rw-r--r--gfx/fx/009.lzbin235 -> 240 bytes
-rw-r--r--gfx/fx/010.lzbin53 -> 64 bytes
-rw-r--r--gfx/fx/011.lzbin79 -> 80 bytes
-rw-r--r--gfx/fx/012.lzbin97 -> 112 bytes
-rw-r--r--gfx/fx/013.lzbin149 -> 160 bytes
-rw-r--r--gfx/fx/014.lzbin177 -> 192 bytes
-rw-r--r--gfx/fx/015.lzbin28 -> 32 bytes
-rw-r--r--gfx/fx/016.lzbin143 -> 144 bytes
-rw-r--r--gfx/fx/017.lzbin73 -> 80 bytes
-rw-r--r--gfx/fx/018.lzbin109 -> 112 bytes
-rw-r--r--gfx/fx/019.lzbin187 -> 192 bytes
-rw-r--r--gfx/fx/020.lzbin121 -> 128 bytes
-rw-r--r--gfx/fx/021.lzbin121 -> 128 bytes
-rw-r--r--gfx/fx/022.lzbin190 -> 192 bytes
-rw-r--r--gfx/fx/023.lzbin98 -> 112 bytes
-rw-r--r--gfx/fx/024.lzbin110 -> 112 bytes
-rw-r--r--gfx/fx/025.lzbin282 -> 288 bytes
-rw-r--r--gfx/fx/026.lzbin90 -> 96 bytes
-rw-r--r--gfx/fx/027.lzbin114 -> 128 bytes
-rw-r--r--gfx/fx/028.lzbin138 -> 144 bytes
-rw-r--r--gfx/fx/029.lzbin90 -> 96 bytes
-rw-r--r--gfx/fx/030.lzbin81 -> 96 bytes
-rw-r--r--gfx/fx/031.lzbin403 -> 416 bytes
-rw-r--r--gfx/fx/032.lzbin347 -> 352 bytes
-rw-r--r--gfx/fx/033.lzbin225 -> 240 bytes
-rw-r--r--gfx/fx/034.lzbin152 -> 160 bytes
-rw-r--r--gfx/fx/035.lzbin219 -> 224 bytes
-rw-r--r--gfx/fx/036.lzbin214 -> 224 bytes
-rw-r--r--gfx/fx/037.lzbin365 -> 368 bytes
-rw-r--r--gfx/fx/038.lzbin145 -> 160 bytes
-rw-r--r--gfx/fx/039.lzbin125 -> 128 bytes
-rw-r--r--main.asm156
41 files changed, 39 insertions, 117 deletions
diff --git a/gfx/fx/000.lz b/gfx/fx/000.lz
index 55aac9909..5d9ffbe5d 100644
--- a/gfx/fx/000.lz
+++ b/gfx/fx/000.lz
Binary files differ
diff --git a/gfx/fx/001.lz b/gfx/fx/001.lz
index 55aac9909..5d9ffbe5d 100644
--- a/gfx/fx/001.lz
+++ b/gfx/fx/001.lz
Binary files differ
diff --git a/gfx/fx/002.lz b/gfx/fx/002.lz
index 228008426..740a48799 100644
--- a/gfx/fx/002.lz
+++ b/gfx/fx/002.lz
Binary files differ
diff --git a/gfx/fx/003.lz b/gfx/fx/003.lz
index 85fedf741..e15e9f9bb 100644
--- a/gfx/fx/003.lz
+++ b/gfx/fx/003.lz
Binary files differ
diff --git a/gfx/fx/004.lz b/gfx/fx/004.lz
index be5245a3c..6a81bbb65 100644
--- a/gfx/fx/004.lz
+++ b/gfx/fx/004.lz
Binary files differ
diff --git a/gfx/fx/005.lz b/gfx/fx/005.lz
index 77843898b..81de5850f 100644
--- a/gfx/fx/005.lz
+++ b/gfx/fx/005.lz
Binary files differ
diff --git a/gfx/fx/006.lz b/gfx/fx/006.lz
index 8712f70d6..589fc48b6 100644
--- a/gfx/fx/006.lz
+++ b/gfx/fx/006.lz
Binary files differ
diff --git a/gfx/fx/007.lz b/gfx/fx/007.lz
index ca84efefd..bf26fed2b 100644
--- a/gfx/fx/007.lz
+++ b/gfx/fx/007.lz
Binary files differ
diff --git a/gfx/fx/008.lz b/gfx/fx/008.lz
index 20a184595..4303302a1 100644
--- a/gfx/fx/008.lz
+++ b/gfx/fx/008.lz
Binary files differ
diff --git a/gfx/fx/009.lz b/gfx/fx/009.lz
index e32b7f6d9..d5481ea6e 100644
--- a/gfx/fx/009.lz
+++ b/gfx/fx/009.lz
Binary files differ
diff --git a/gfx/fx/010.lz b/gfx/fx/010.lz
index bd76b904f..3d059700b 100644
--- a/gfx/fx/010.lz
+++ b/gfx/fx/010.lz
Binary files differ
diff --git a/gfx/fx/011.lz b/gfx/fx/011.lz
index 7964d7256..e09b082db 100644
--- a/gfx/fx/011.lz
+++ b/gfx/fx/011.lz
Binary files differ
diff --git a/gfx/fx/012.lz b/gfx/fx/012.lz
index 04f8d695c..df2cbe604 100644
--- a/gfx/fx/012.lz
+++ b/gfx/fx/012.lz
Binary files differ
diff --git a/gfx/fx/013.lz b/gfx/fx/013.lz
index b8b8c1c0b..3d546191a 100644
--- a/gfx/fx/013.lz
+++ b/gfx/fx/013.lz
Binary files differ
diff --git a/gfx/fx/014.lz b/gfx/fx/014.lz
index 877c1ffd6..e195da453 100644
--- a/gfx/fx/014.lz
+++ b/gfx/fx/014.lz
Binary files differ
diff --git a/gfx/fx/015.lz b/gfx/fx/015.lz
index 50deefe19..375d0bf9c 100644
--- a/gfx/fx/015.lz
+++ b/gfx/fx/015.lz
Binary files differ
diff --git a/gfx/fx/016.lz b/gfx/fx/016.lz
index a04b7f0e5..1ce9ab82c 100644
--- a/gfx/fx/016.lz
+++ b/gfx/fx/016.lz
Binary files differ
diff --git a/gfx/fx/017.lz b/gfx/fx/017.lz
index d1771567d..5d09f9a6a 100644
--- a/gfx/fx/017.lz
+++ b/gfx/fx/017.lz
Binary files differ
diff --git a/gfx/fx/018.lz b/gfx/fx/018.lz
index 65cf5d34d..32c82243c 100644
--- a/gfx/fx/018.lz
+++ b/gfx/fx/018.lz
Binary files differ
diff --git a/gfx/fx/019.lz b/gfx/fx/019.lz
index 28d733cac..9c2769b83 100644
--- a/gfx/fx/019.lz
+++ b/gfx/fx/019.lz
Binary files differ
diff --git a/gfx/fx/020.lz b/gfx/fx/020.lz
index 6093cbeb5..da62ba918 100644
--- a/gfx/fx/020.lz
+++ b/gfx/fx/020.lz
Binary files differ
diff --git a/gfx/fx/021.lz b/gfx/fx/021.lz
index 5bb06c6f5..fb55f2edc 100644
--- a/gfx/fx/021.lz
+++ b/gfx/fx/021.lz
Binary files differ
diff --git a/gfx/fx/022.lz b/gfx/fx/022.lz
index c54453263..f7d6a480f 100644
--- a/gfx/fx/022.lz
+++ b/gfx/fx/022.lz
Binary files differ
diff --git a/gfx/fx/023.lz b/gfx/fx/023.lz
index 6ce94f0e2..d6402dd3d 100644
--- a/gfx/fx/023.lz
+++ b/gfx/fx/023.lz
Binary files differ
diff --git a/gfx/fx/024.lz b/gfx/fx/024.lz
index 890303edb..a563de1a8 100644
--- a/gfx/fx/024.lz
+++ b/gfx/fx/024.lz
Binary files differ
diff --git a/gfx/fx/025.lz b/gfx/fx/025.lz
index 0274acb7a..e5ce7df8a 100644
--- a/gfx/fx/025.lz
+++ b/gfx/fx/025.lz
Binary files differ
diff --git a/gfx/fx/026.lz b/gfx/fx/026.lz
index 8052d1717..3508a1f58 100644
--- a/gfx/fx/026.lz
+++ b/gfx/fx/026.lz
Binary files differ
diff --git a/gfx/fx/027.lz b/gfx/fx/027.lz
index 67fe88b78..84b4018e5 100644
--- a/gfx/fx/027.lz
+++ b/gfx/fx/027.lz
Binary files differ
diff --git a/gfx/fx/028.lz b/gfx/fx/028.lz
index 006ada64a..e0cdc644c 100644
--- a/gfx/fx/028.lz
+++ b/gfx/fx/028.lz
Binary files differ
diff --git a/gfx/fx/029.lz b/gfx/fx/029.lz
index 88dc33c3c..a92f74796 100644
--- a/gfx/fx/029.lz
+++ b/gfx/fx/029.lz
Binary files differ
diff --git a/gfx/fx/030.lz b/gfx/fx/030.lz
index 0494eef74..ef628afb4 100644
--- a/gfx/fx/030.lz
+++ b/gfx/fx/030.lz
Binary files differ
diff --git a/gfx/fx/031.lz b/gfx/fx/031.lz
index 88752e23f..d0c5f0dfc 100644
--- a/gfx/fx/031.lz
+++ b/gfx/fx/031.lz
Binary files differ
diff --git a/gfx/fx/032.lz b/gfx/fx/032.lz
index d11ceb277..e0412dd81 100644
--- a/gfx/fx/032.lz
+++ b/gfx/fx/032.lz
Binary files differ
diff --git a/gfx/fx/033.lz b/gfx/fx/033.lz
index a0cc350f7..99fa15c6f 100644
--- a/gfx/fx/033.lz
+++ b/gfx/fx/033.lz
Binary files differ
diff --git a/gfx/fx/034.lz b/gfx/fx/034.lz
index 58b30a0e1..d7d48020f 100644
--- a/gfx/fx/034.lz
+++ b/gfx/fx/034.lz
Binary files differ
diff --git a/gfx/fx/035.lz b/gfx/fx/035.lz
index 9b1adb23d..1a52d6350 100644
--- a/gfx/fx/035.lz
+++ b/gfx/fx/035.lz
Binary files differ
diff --git a/gfx/fx/036.lz b/gfx/fx/036.lz
index 66eb67572..3e47170b1 100644
--- a/gfx/fx/036.lz
+++ b/gfx/fx/036.lz
Binary files differ
diff --git a/gfx/fx/037.lz b/gfx/fx/037.lz
index 3d2da8e1f..61d89d224 100644
--- a/gfx/fx/037.lz
+++ b/gfx/fx/037.lz
Binary files differ
diff --git a/gfx/fx/038.lz b/gfx/fx/038.lz
index ef37872c6..d94a5cb35 100644
--- a/gfx/fx/038.lz
+++ b/gfx/fx/038.lz
Binary files differ
diff --git a/gfx/fx/039.lz b/gfx/fx/039.lz
index b1c4c6a1c..5e203cb63 100644
--- a/gfx/fx/039.lz
+++ b/gfx/fx/039.lz
Binary files differ
diff --git a/main.asm b/main.asm
index e406ef082..5fd2a7aa5 100644
--- a/main.asm
+++ b/main.asm
@@ -58007,237 +58007,159 @@ INCBIN "baserom.gbc", $847bd, $84a2e - $847bd
FX00GFX:
FX01GFX: ; 84a2e
INCBIN "gfx/fx/001.lz"
-; 84b15
-
-INCBIN "baserom.gbc", $84b15, $84b1e - $84b15
+; 84b1e
FX02GFX: ; 84b1e
INCBIN "gfx/fx/002.lz"
-; 84b7a
-
-INCBIN "baserom.gbc", $84b7a, $84b7e - $84b7a
+; 84b7e
FX03GFX: ; 84b7e
INCBIN "gfx/fx/003.lz"
-; 84bd0
-
-INCBIN "baserom.gbc", $84bd0, $84bde - $84bd0
+; 84bde
FX04GFX: ; 84bde
INCBIN "gfx/fx/004.lz"
-; 84ca5
-
-INCBIN "baserom.gbc", $84ca5, $84cae - $84ca5
+; 84cae
FX05GFX: ; 84cae
INCBIN "gfx/fx/005.lz"
-; 84de2
-
-INCBIN "baserom.gbc", $84de2, $84dee - $84de2
+; 84dee
FX07GFX: ; 84dee
INCBIN "gfx/fx/007.lz"
-; 84e70
-
-INCBIN "baserom.gbc", $84e70, $84e7e - $84e70
+; 84e7e
FX08GFX: ; 84e7e
INCBIN "gfx/fx/008.lz"
-; 84ed4
-
-INCBIN "baserom.gbc", $84ed4, $84ede - $84ed4
+; 84ede
FX10GFX: ; 84ede
INCBIN "gfx/fx/010.lz"
-; 84f13
-
-INCBIN "baserom.gbc", $84f13, $84f1e - $84f13
+; 84f1e
FX09GFX: ; 84f1e
INCBIN "gfx/fx/009.lz"
-; 85009
-
-INCBIN "baserom.gbc", $85009, $8500e - $85009
+; 8500e
FX12GFX: ; 8500e
INCBIN "gfx/fx/012.lz"
-; 8506f
-
-INCBIN "baserom.gbc", $8506f, $8507e - $8506f
+; 8507e
FX06GFX: ; 8507e
INCBIN "gfx/fx/006.lz"
-; 8515c
-
-INCBIN "baserom.gbc", $8515c, $8515e - $8515c
+; 8515e
FX11GFX: ; 8515e
INCBIN "gfx/fx/011.lz"
-; 851ad
-
-INCBIN "baserom.gbc", $851ad, $851ae - $851ad
+; 851ae
FX13GFX: ; 851ae
INCBIN "gfx/fx/013.lz"
-; 85243
-
-INCBIN "baserom.gbc", $85243, $8524e - $85243
+; 8524e
FX14GFX: ; 8524e
INCBIN "gfx/fx/014.lz"
-; 852ff
-
-INCBIN "baserom.gbc", $852ff, $8530e - $852ff
+; 8520e
FX24GFX: ; 8530e
INCBIN "gfx/fx/024.lz"
-; 8537c
-
-INCBIN "baserom.gbc", $8537c, $8537e - $8537c
+; 8537e
FX15GFX: ; 8537e
INCBIN "gfx/fx/015.lz"
-; 8539a
-
-INCBIN "baserom.gbc", $8539a, $8539e - $8539a
+; 8539e
FX16GFX: ; 8539e
INCBIN "gfx/fx/016.lz"
-; 8542d
-
-INCBIN "baserom.gbc", $8542d, $8542e - $8542d
+; 8542e
FX17GFX: ; 8542e
INCBIN "gfx/fx/017.lz"
-; 85477
-
-INCBIN "baserom.gbc", $85477, $8547e - $85477
+; 8547e
FX18GFX: ; 8547e
INCBIN "gfx/fx/018.lz"
-; 854eb
-
-INCBIN "baserom.gbc", $854eb, $854ee - $854eb
+; 854ee
FX19GFX: ; 854ee
INCBIN "gfx/fx/019.lz"
-; 855a9
-
-INCBIN "baserom.gbc", $855a9, $855ae - $855a9
+; 855ae
FX20GFX: ; 855ae
INCBIN "gfx/fx/020.lz"
-; 85627
-
-INCBIN "baserom.gbc", $85627, $8562e - $85627
+; 8562e
FX22GFX: ; 8562e
INCBIN "gfx/fx/022.lz"
-; 856ec
-
-INCBIN "baserom.gbc", $856ec, $856ee - $856ec
+; 856ee
FX21GFX: ; 856ee
INCBIN "gfx/fx/021.lz"
-; 85767
-
-INCBIN "baserom.gbc", $85767, $8576e - $85767
+; 8576e
FX23GFX: ; 8576e
INCBIN "gfx/fx/023.lz"
-; 857d0
-
-INCBIN "baserom.gbc", $857d0, $857de - $857d0
+; 857de
FX26GFX: ; 857de
INCBIN "gfx/fx/026.lz"
-; 85838
-
-INCBIN "baserom.gbc", $85838, $8583e - $85838
+; 8583e
FX27GFX: ; 8583e
INCBIN "gfx/fx/027.lz"
-; 858b0
-
-INCBIN "baserom.gbc", $858b0, $858be - $858b0
+; 858be
FX28GFX: ; 858be
INCBIN "gfx/fx/028.lz"
-; 85948
-
-INCBIN "baserom.gbc", $85948, $8594e - $85948
+; 8594e
FX29GFX: ; 8594e
INCBIN "gfx/fx/029.lz"
-; 859a8
-
-INCBIN "baserom.gbc", $859a8, $859ae - $859a8
+; 859ae
FX30GFX: ; 859ae
INCBIN "gfx/fx/030.lz"
-; 859ff
-
-INCBIN "baserom.gbc", $859ff, $85a0e - $859ff
+; 8590e
FX31GFX: ; 85a0e
INCBIN "gfx/fx/031.lz"
-; 85ba1
-
-INCBIN "baserom.gbc", $85ba1, $85bae - $85ba1
+; 85bae
FX32GFX: ; 85bae
INCBIN "gfx/fx/032.lz"
-; 85d09
-
-INCBIN "baserom.gbc", $85d09, $85d0e - $85d09
+; 85d0e
FX33GFX: ; 85d0e
INCBIN "gfx/fx/033.lz"
-; 85def
-
-INCBIN "baserom.gbc", $85def, $85dfe - $85def
+; 85dfe
FX34GFX: ; 85dfe
INCBIN "gfx/fx/034.lz"
-; 85e96
-
-INCBIN "baserom.gbc", $85e96, $85e9e - $85e96
+; 85e9e
FX25GFX: ; 85e9e
INCBIN "gfx/fx/025.lz"
-; 85fb8
-
-INCBIN "baserom.gbc", $85fb8, $85fbe - $85fb8
+; 85fbe
FX35GFX: ; 85fbe
INCBIN "gfx/fx/035.lz"
-; 86099
-
-INCBIN "baserom.gbc", $86099, $8609e - $86099
+; 8609e
FX36GFX: ; 8609e
INCBIN "gfx/fx/036.lz"
-; 86174
-
-INCBIN "baserom.gbc", $86174, $8617e - $86174
+; 8617e
FX37GFX: ; 8617e
INCBIN "gfx/fx/037.lz"
-; 862eb
-
-INCBIN "baserom.gbc", $862eb, $862ee - $862eb
+; 862ee
FX38GFX: ; 862ee
INCBIN "gfx/fx/038.lz"
-; 8637f
-
-INCBIN "baserom.gbc", $8637f, $8638e - $8637f
+; 8638e
FX39GFX: ; 8638e
INCBIN "gfx/fx/039.lz"
-; 8640b
-
-INCBIN "baserom.gbc", $8640b, $8640e - $8640b
+; 8640e
HallOfFame: ; 0x8640e
call Function8648e