summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics.s90
1 files changed, 61 insertions, 29 deletions
diff --git a/data/graphics.s b/data/graphics.s
index 360338b53..a4189b70a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -30,78 +30,103 @@ gSmokescreenImpactTiles:: @ 8D02410
gSmokescreenImpactPalette:: @ 8D024F0
.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
+ .align 2
gInterfaceGfx_PokeBall::
.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_PokeBall::
.incbin "graphics/interface/ball/poke.gbapal.lz"
+ .align 2
gInterfaceGfx_GreatBall::
.incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_GreatBall::
.incbin "graphics/interface/ball/great.gbapal.lz"
+ .align 2
gInterfaceGfx_SafariBall::
.incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_SafariBall::
.incbin "graphics/interface/ball/safari.gbapal.lz"
+ .align 2
gInterfaceGfx_UltraBall::
.incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_UltraBall::
.incbin "graphics/interface/ball/ultra.gbapal.lz"
+ .align 2
gInterfaceGfx_MasterBall::
.incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_MasterBall::
.incbin "graphics/interface/ball/master.gbapal.lz"
+ .align 2
gInterfaceGfx_NetBall::
.incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_NetBall::
.incbin "graphics/interface/ball/net.gbapal.lz"
+ .align 2
gInterfaceGfx_DiveBall::
.incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_DiveBall::
.incbin "graphics/interface/ball/dive.gbapal.lz"
+ .align 2
gInterfaceGfx_NestBall::
.incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_NestBall::
.incbin "graphics/interface/ball/nest.gbapal.lz"
+ .align 2
gInterfaceGfx_RepeatBall::
.incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_RepeatBall::
.incbin "graphics/interface/ball/repeat.gbapal.lz"
+ .align 2
gInterfaceGfx_TimerBall::
.incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_TimerBall::
.incbin "graphics/interface/ball/timer.gbapal.lz"
+ .align 2
gInterfaceGfx_LuxuryBall::
.incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_LuxuryBall::
.incbin "graphics/interface/ball/luxury.gbapal.lz"
+ .align 2
gInterfaceGfx_PremierBall::
.incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC
+ .align 2
gInterfacePal_PremierBall::
.incbin "graphics/interface/ball/premier.gbapal.lz"
+ .align 2
gUnknown_08D030D0:: @ 8D030D0
.incbin "graphics/interface/ball_open.4bpp.lz"
@@ -393,33 +418,35 @@ gBattleAnimSpriteSheet_036:: @ 8D07448
.align 2
gBattleAnimSpriteSheet_037:: @ 8D0781C
.incbin "graphics/battle_anims/sprites/037.4bpp.lz"
+
+@ old battle interface data, unused
.align 2
- .incbin "baserom.gba", 0xD07B68, 0x42 @ LZ, uncomp. size = 0xA0
-
+ .incbin "graphics/unknown/unknown_D07B68.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07BAC, 0x14 @ LZ, uncomp. size = 0x20
-
+ .incbin "graphics/unknown/unknown_D07B68.gbapal.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07BC0, 0x33 @ LZ, uncomp. size = 0x40
-
+ .incbin "graphics/unknown/unknown_D07B68_2.gbapal.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07BF4, 0x362 @ LZ, uncomp. size = 0x800
-
+ .incbin "graphics/unused/obi1.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD07F58, 0x41 @ LZ, uncomp. size = 0x60
-
+ .incbin "graphics/unused/obi_palpak1.gbapal.lz" @ palettes 1-3
+
.align 2
- .incbin "baserom.gba", 0xD07F9C, 0x16 @ LZ, uncomp. size = 0x20
-
+ .incbin "graphics/unused/obi_pal4.gbapal.lz" @ 4 is by itself
+
.align 2
- .incbin "baserom.gba", 0xD07FB4, 0x57 @ LZ, uncomp. size = 0x60
-
+ .incbin "graphics/unused/obi_palpak3.gbapal.lz" @ palettes 5-7
+
.align 2
- .incbin "baserom.gba", 0xD0800C, 0x5C6 @ LZ, uncomp. size = 0x1400
-
+ .incbin "graphics/unused/obi2.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD085D4, 0x10D @ LZ, uncomp. size = 0x800
+ .incbin "graphics/unused/obi_tilemap.bin.lz"
.align 2
gBattleAnimSpritePalette_038:: @ 8D086E4
@@ -479,7 +506,7 @@ gBattleAnimSpriteSheet_045:: @ 8D099DC
.align 2
gUnknown_08D09C48:: @ 8D09C48
- .incbin "baserom.gba", 0xD09C48, 0x211 @ LZ, uncomp. size = 0x520
+ .incbin "graphics/interface/hp_numbers.4bpp.lz"
.align 2
gBattleAnimSpriteSheet_046:: @ 8D09E5C
@@ -522,10 +549,10 @@ gBattleAnimSpriteSheet_052:: @ 8D0A6D8
.incbin "graphics/battle_anims/sprites/052.4bpp.lz"
.align 2
- .incbin "baserom.gba", 0xD0A7A4, 0x181 @ LZ, uncomp. size = 0x600
-
+ .incbin "graphics/unused/line_sketch.4bpp.lz" @ unused
+
.align 2
- .incbin "baserom.gba", 0xD0A928, 0xF @ LZ, uncomp. size = 0x20
+ .incbin "graphics/unused/line_sketch.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_054:: @ 8D0A938
@@ -604,7 +631,7 @@ gBattleAnimSpritePalette_063:: @ 8D0BB90
.incbin "graphics/battle_anims/sprites/063.gbapal.lz"
.align 2
- .incbin "baserom.gba", 0xD0BBB8, 0x6D @ LZ, uncomp. size = 0x80
+ .incbin "graphics/unused/metronome_hand_small.4bpp.lz" @ unused, was for metronome at one point
.align 2
gBattleAnimSpritePalette_091:: @ 8D0BC28
@@ -934,18 +961,18 @@ gBattleAnimSpriteSheet_114:: @ 8D10F78
.align 2
gBattleAnimSpritePalette_114:: @ 8D1106C
.incbin "graphics/battle_anims/sprites/114.gbapal.lz"
-
+
.align 2
- .incbin "baserom.gba", 0xD11094, 0x115 @ LZ, uncomp. size = 0x800
+ .incbin "graphics/unused/blue_frame.bin.lz" @ P1, P2, P3 and P4 tilemaps?
.align 2
- .incbin "baserom.gba", 0xD111AC, 0x3FE @ LZ, uncomp. size = 0x2000
-
+ .incbin "graphics/unused/redyellowgreen_frame.bin.lz"
+
.align 2
- .incbin "baserom.gba", 0xD115AC, 0x59F @ LZ, uncomp. size = 0x2C20
-
+ .incbin "graphics/unused/color_frames.4bpp.lz"
+
.align 2
- .incbin "baserom.gba", 0xD11B4C, 0x28 @ LZ, uncomp. size = 0x20
+ .incbin "graphics/unused/color_frames.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_115:: @ 8D11B74
@@ -969,10 +996,15 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74
.align 2
.incbin "baserom.gba", 0xD12020, 0x10C @ LZ, uncomp. size = 0x800
+ .align 2
gUnknown_08D1212C::
.incbin "graphics/interface/battle_window.gbapal"
+
+ .align 2
gUnknown_08D1214C::
.incbin "baserom.gba", 0xd1214c, 0x20
+
+ .align 2
gUnknown_08D1216C:: @ 8D1216C
.incbin "baserom.gba", 0xd1216c, 0x840