diff options
| -rw-r--r-- | asm/macros.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 123 | ||||
| -rw-r--r-- | data/graphics.s | 20 | ||||
| -rw-r--r-- | graphics/roulette/credit.pal | 19 | ||||
| -rw-r--r-- | graphics/roulette/credit.png | bin | 0 -> 325 bytes | |||
| -rw-r--r-- | graphics/roulette/headers.png | bin | 0 -> 1060 bytes | |||
| -rw-r--r-- | graphics/roulette/multiplier.png | bin | 0 -> 399 bytes | |||
| -rw-r--r-- | graphics/roulette/numbers.png | bin | 0 -> 300 bytes |
8 files changed, 152 insertions, 14 deletions
diff --git a/asm/macros.s b/asm/macros.s index 83a9aa44c..fbead93b9 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -20,6 +20,10 @@ .2byte \tag .endm + .macro null_obj_tiles + obj_tiles 0, 0, 0 + .endm + .macro obj_pal address, tag .4byte \address .2byte \tag diff --git a/data/data2.s b/data/data2.s index 798317f99..aa6760f4b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -20881,39 +20881,119 @@ gUnknown_083F8EE8:: @ 83F8EE8 .incbin "baserom.gba", 0x003f8ee8, 0xc gUnknown_083F8EF4:: @ 83F8EF4 - .incbin "baserom.gba", 0x003f8ef4, 0x8 + .byte 0, 3, 4, 6, 12 + + .align 2 +RouletteSpritePalette_01: .incbin "graphics/roulette/shadow.gbapal" + + .align 2 +RouletteSpritePalette_02: .incbin "graphics/roulette/ball.gbapal" + + .align 2 +RouletteSpritePalette_03: .incbin "graphics/roulette/ball_counter.gbapal" + + .align 2 +RouletteSpritePalette_04: .incbin "graphics/roulette/cursor.gbapal" - .incbin "baserom.gba", 0x003F8F7C, 0x20 + + .align 2 +RouletteSpritePalette_05: + .incbin "graphics/roulette/credit.gbapal" + + .align 2 +RouletteSpritePalette_06: .incbin "graphics/roulette/shroomish.gbapal" + + .align 2 +RouletteSpritePalette_07: .incbin "graphics/roulette/tailow.gbapal" + + .align 2 +RouletteSpritePalette_08: .incbin "graphics/roulette/poke_icons.gbapal" + + .align 2 +RouletteSpritePalette_09: .incbin "graphics/roulette/wynaut.gbapal" + + .align 2 +RouletteSpritePalette_10: .incbin "graphics/roulette/azurill.gbapal" + + .align 2 +RouletteSpritePalette_11: .incbin "graphics/roulette/skitty.gbapal" + + .align 2 +RouletteSpritePalette_12: .incbin "graphics/roulette/makuhita.gbapal" + + .align 2 +RouletteSpritePalette_13: .incbin "baserom.gba", 0x003F907C, 0x20 + + .align 2 +RouletteSpritePalette_14: .incbin "baserom.gba", 0x003F909C, 0x20 + + .align 2 +RouletteSpritePalette_15: .incbin "baserom.gba", 0x003F90BC, 0x20 + + .align 2 +RouletteSpritePalette_16: .incbin "baserom.gba", 0x003F90DC, 0x20 + .align 2 gUnknown_083F90FC:: @ 83F90FC .incbin "graphics/roulette/ball.4bpp.lz" + + .align 2 +RouletteBallCounterTiles: @ 83F9244 .incbin "graphics/roulette/ball_counter.4bpp.lz" + .align 2 gUnknown_083F92A8:: @ 83F92A8 .incbin "graphics/roulette/roulette_tilt.4bpp.lz" + + .align 2 +RoulettePokeIconsTiles: @ 83F9698 .incbin "graphics/roulette/poke_icons.4bpp.lz" + + .align 2 +RoulettePokeIcons2Tiles: @ 83F983C .incbin "graphics/roulette/poke_icons2.4bpp.lz" + .align 2 gUnknown_083F9D3C:: @ 83F9D3C .incbin "graphics/roulette/shadow.4bpp.lz" + + .align 2 +RouletteCursorTiles: @ 83F9DD4 .incbin "graphics/roulette/cursor.4bpp.lz" + .align 2 gUnknown_083F9E30:: @ 83F9E30 - .incbin "baserom.gba", 0x003f9e30, 0x88 + obj_pal RouletteSpritePalette_01, 1 + obj_pal RouletteSpritePalette_02, 2 + obj_pal RouletteSpritePalette_03, 3 + obj_pal RouletteSpritePalette_04, 4 + obj_pal RouletteSpritePalette_05, 5 + obj_pal RouletteSpritePalette_06, 6 + obj_pal RouletteSpritePalette_07, 7 + obj_pal RouletteSpritePalette_08, 8 + obj_pal RouletteSpritePalette_09, 9 + obj_pal RouletteSpritePalette_10, 10 + obj_pal RouletteSpritePalette_11, 11 + obj_pal RouletteSpritePalette_12, 12 + obj_pal RouletteSpritePalette_13, 13 + obj_pal RouletteSpritePalette_14, 14 + obj_pal RouletteSpritePalette_15, 15 + obj_pal RouletteSpritePalette_16, 16 + null_obj_pal .align 2 gOamData_83F9EB8:: @ 83F9EB8 @@ -20943,10 +21023,16 @@ gSpriteAnimTable_83F9ED8:: @ 83F9ED8 .4byte gSpriteAnim_83F9ED0 .align 2 - .incbin "baserom.gba", 0x3f9edc, 0xc +gSpriteAffineAnim_83F9EDC:: @ 83F9EDC + obj_rot_scal_anim_end + .align 2 +gSpriteAffineAnimTable_83F9EE4:: @ 83F9EE4 + .4byte gSpriteAffineAnim_83F9EDC + + .align 2 gUnknown_083F9EE8:: @ 83F9EE8 - .incbin "baserom.gba", 0x003f9ee8, 0x8 + obj_tiles RoulettePokeIcons2Tiles, 0xC00, 0 .align 2 gSpriteAnim_83F9EF0:: @ 83F9EF0 @@ -21014,10 +21100,11 @@ gSpriteAnimTable_83F9F50:: @ 83F9F50 .align 2 gUnknown_083F9F54:: @ 83F9F54 - obj_tiles 0x08e824bc, 5632, 0x0004 + obj_tiles gRouletteHeadersTiles, 0x1600, 4 + .align 2 gUnknown_083F9F5C:: @ 83F9F5C - .incbin "baserom.gba", 0x003f9f5c, 0x8 + obj_tiles RoulettePokeIconsTiles, 0x400, 5 .align 2 gSpriteAnim_83F9F64:: @ 83F9F64 @@ -21035,7 +21122,12 @@ gSpriteAnim_83F9F64:: @ 83F9F64 obj_image_anim_end .align 2 - .incbin "baserom.gba", 0x3f9f94, 0x14 +gSpriteAnim_83F9F94:: @ 83F9F94 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 12, 0 + obj_image_anim_end .align 2 gSpriteAnimTable_83F9FA8:: @ 83F9FA8 @@ -21067,19 +21159,19 @@ gSpriteAnimTable_83F9FC0:: @ 83F9FC0 .align 2 gSpriteAnimTable_83F9FC4:: @ 83F9FC4 - .4byte gSpriteAnim_83F9F64 + 0x30 + .4byte gSpriteAnim_83F9F94 .align 2 gSpriteAnimTable_83F9FC8:: @ 83F9FC8 - .4byte gSpriteAnim_83F9F64 + 0x34 + .4byte gSpriteAnim_83F9F94 + 0x4 .align 2 gSpriteAnimTable_83F9FCC:: @ 83F9FCC - .4byte gSpriteAnim_83F9F64 + 0x38 + .4byte gSpriteAnim_83F9F94 + 0x8 .align 2 gSpriteAnimTable_83F9FD0:: @ 83F9FD0 - .4byte gSpriteAnim_83F9F64 + 0x3C + .4byte gSpriteAnim_83F9F94 + 0xC .align 2 gSpriteTemplate_83F9FD4:: @ 83F9FD4 @@ -21199,7 +21291,12 @@ gOamData_83FA214:: @ 83FA214 .align 2 gUnknown_083FA21C:: @ 83FA21C - .incbin "baserom.gba", 0x003fa21c, 0x30 + obj_tiles gRouletteCreditTiles, 0x400, 7 + obj_tiles gRouletteNumbersTiles, 0x280, 8 + obj_tiles gRouletteMultiplierTiles, 0x500, 9 + obj_tiles RouletteBallCounterTiles, 0x140, 10 + obj_tiles RouletteCursorTiles, 0x200, 11 + null_obj_tiles .align 2 gSpriteAnim_83FA24C:: @ 83FA24C diff --git a/data/graphics.s b/data/graphics.s index 4ea76879f..2e6c5599b 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2916,7 +2916,25 @@ gUnknown_08E8096C:: @ 8E8096C .incbin "baserom.gba", 0x00e8096c, 0x72c gUnknown_08E81098:: @ 8E81098 - .incbin "baserom.gba", 0x00e81098, 0x4900 + .incbin "baserom.gba", 0x00e81098, 0x1424 + + .align 2 +gRouletteHeadersTiles:: @ 8E824BC + .incbin "graphics/roulette/headers.4bpp.lz" + + .align 2 +gRouletteCreditTiles:: @ 8E82AE0 + .incbin "graphics/roulette/credit.4bpp.lz" + + .align 2 +gRouletteNumbersTiles:: @ 8E82C30 + .incbin "graphics/roulette/numbers.4bpp.lz" + + .align 2 +gRouletteMultiplierTiles:: @ 8E82D14 + .incbin "graphics/roulette/multiplier.4bpp.lz" + + .incbin "baserom.gba", 0x00e82e9c, 0x2afc gUnknown_08E85998:: @ 8E85998 .incbin "baserom.gba", 0x00e85998, 0x800 diff --git a/graphics/roulette/credit.pal b/graphics/roulette/credit.pal new file mode 100644 index 000000000..4794c9622 --- /dev/null +++ b/graphics/roulette/credit.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +74 106 156 +41 41 41 +98 98 115 +205 205 213 +255 255 255 +123 238 139 +255 172 139 +16 156 74 +197 164 255 +49 106 32 +115 197 131 +197 139 189 +255 82 57 +255 238 82 +205 180 8 +255 205 8 diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png Binary files differnew file mode 100644 index 000000000..687d47934 --- /dev/null +++ b/graphics/roulette/credit.png diff --git a/graphics/roulette/headers.png b/graphics/roulette/headers.png Binary files differnew file mode 100644 index 000000000..70f5fec90 --- /dev/null +++ b/graphics/roulette/headers.png diff --git a/graphics/roulette/multiplier.png b/graphics/roulette/multiplier.png Binary files differnew file mode 100644 index 000000000..b993f8091 --- /dev/null +++ b/graphics/roulette/multiplier.png diff --git a/graphics/roulette/numbers.png b/graphics/roulette/numbers.png Binary files differnew file mode 100644 index 000000000..97d0b0e03 --- /dev/null +++ b/graphics/roulette/numbers.png |
