diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-02-11 15:27:31 +0100 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-02-11 15:32:45 +0100 |
| commit | 4cd4b8dc0b7926fb8e9901159edae1d077ee3841 (patch) | |
| tree | a5f894d7e22b94b8594eac03d5887133d7f4921f /data | |
| parent | f21587ea9eb1190ac2136d72deb7929c1e1169eb (diff) | |
Dump intro palettes
Diffstat (limited to 'data')
| -rw-r--r-- | data/intro_credits_graphics.s | 16 | ||||
| -rw-r--r-- | data/pokemon_storage_system.s | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s index 6320bc332..d7f62cc78 100644 --- a/data/intro_credits_graphics.s +++ b/data/intro_credits_graphics.s @@ -7,10 +7,10 @@ gUnknown_084121FC:: @ 84121FC .incbin "graphics/intro/intro2_grass.gbapal" gUnknown_0841221C:: @ 841221C - .incbin "baserom.gba", 0x0041221c, 0x20 + .incbin "graphics/intro/intro2_grass_afternoon.gbapal" gUnknown_0841223C:: @ 841223C - .incbin "baserom.gba", 0x0041223c, 0x20 + .incbin "graphics/intro/intro2_grass_night.gbapal" .align 2 gUnknown_0841225C:: @ 841225C @@ -21,10 +21,10 @@ gUnknown_084126DC:: @ 84126DC .incbin "graphics/intro/intro2_grass_map.bin.lz" gUnknown_08412818:: @ 8412818 - .incbin "baserom.gba", 0x00412818, 0x60 + .incbin "graphics/intro/8412818.gbapal" gUnknown_08412878:: @ 8412878 - .incbin "baserom.gba", 0x00412878, 0x60 + .incbin "graphics/intro/8412878.gbapal" .align 2 gUnknown_084128D8:: @ 84128D8 @@ -38,16 +38,16 @@ gUnknown_08413184:: @ 8413184 .incbin "graphics/intro/intro2_bgclouds.gbapal" gUnknown_084131A4:: @ 84131A4 - .incbin "baserom.gba", 0x004131a4, 0x20 + .incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal" gUnknown_084131C4:: @ 84131C4 .incbin "graphics/intro/intro2_bgclouds2.4bpp.lz" gUnknown_08413300:: @ 8413300 - .incbin "baserom.gba", 0x00413300, 0x20 + .incbin "graphics/intro/intro2_bgtrees2.gbapal" gUnknown_08413320:: @ 8413320 - .incbin "baserom.gba", 0x00413320, 0x20 + .incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal" .align 2 gUnknown_08413340:: @ 8413340 @@ -66,7 +66,7 @@ gIntro2TreeTiles:: @ 8413CEC .incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz" gUnknown_08413E38:: @ 8413E38 - .incbin "baserom.gba", 0x00413e38, 0x40 @ two palettes? + .incbin "graphics/intro/8413E38.gbapal" .align 2 gUnknown_08413E78:: @ 8413E78 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 584b818cd..563aebf0a 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -82,11 +82,11 @@ WaveformTiles: @ 83B6BB4 .align 2 gUnknown_083B6D74:: @ 83B6D74 - .incbin "baserom.gba", 0x003b6d74, 0x20 + .incbin "graphics/pokemon_storage/83B6D74.gbapal" .align 2 gUnknown_083B6D94:: @ 83B6D94 - .incbin "baserom.gba", 0x003b6d94, 0x20 + .incbin "graphics/pokemon_storage/83B6D94.gbapal" .align 2 gUnknown_083B6DB4:: @ 83B6DB4 |