diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 15:14:25 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 15:14:25 -0500 |
commit | b7db9b3ceec4a1ba87b01db7f7b05a0c11993234 (patch) | |
tree | fda998d1821062748bbe0734e904ffaae14bf3cd | |
parent | 470e41e5852bbf4f7eaf5d3bf546f02b9704e9bd (diff) |
Move Ball palettes into separate file
-rwxr-xr-x | data/ball_palettes.asm | 23 | ||||
-rwxr-xr-x | main.asm | 22 |
2 files changed, 24 insertions, 21 deletions
diff --git a/data/ball_palettes.asm b/data/ball_palettes.asm new file mode 100755 index 0000000..bcc2162 --- /dev/null +++ b/data/ball_palettes.asm @@ -0,0 +1,23 @@ +PokeBallObjPalette: ; 0xdd168
+ RGB 21, 21, 21
+ RGB 31, 31, 31
+ RGB 31, 5, 4
+ RGB 0, 0, 0
+
+GreatBallObjPalette: ; 0xdd170
+ RGB 21, 21, 21
+ RGB 31, 31, 31
+ RGB 2, 8, 31
+ RGB 0, 0, 0
+
+UltraBallObjPalette: ; 0xdd178
+ RGB 21, 21, 21
+ RGB 31, 31, 31
+ RGB 27, 21, 0
+ RGB 0, 0, 0
+
+MasterBallObjPalette: ; 0xdd180
+ RGB 21, 21, 21
+ RGB 31, 31, 31
+ RGB 21, 3, 21
+ RGB 0, 0, 0
@@ -38735,27 +38735,7 @@ StageMeowthBonusCollisionMasks: ; 0xdc600 INCLUDE "data/mon_gfx/mon_billboard_palettes_6.asm" INCLUDE "data/stage_palettes.asm" INCLUDE "data/billboard/map_palettes_2.asm" - -PokeBallObjPalette: ; 0xdd168 - RGB 21, 21, 21 - RGB 31, 31, 31 - RGB 31, 5, 4 - RGB 0, 0, 0 -GreatBallObjPalette: ; 0xdd170 - RGB 21, 21, 21 - RGB 31, 31, 31 - RGB 2, 8, 31 - RGB 0, 0, 0 -UltraBallObjPalette: ; 0xdd178 - RGB 21, 21, 21 - RGB 31, 31, 31 - RGB 27, 21, 0 - RGB 0, 0, 0 -MasterBallObjPalette: ; 0xdd180 - RGB 21, 21, 21 - RGB 31, 31, 31 - RGB 21, 3, 21 - RGB 0, 0, 0 +INCLUDE "data/ball_palettes.asm" PaletteData_dd188: ; 0xdd188 RGB 31, 31, 31 |