diff options
| -rw-r--r-- | asm/rom5.s | 6 | ||||
| -rw-r--r-- | data/data2.s | 23 | ||||
| -rw-r--r-- | graphics/pokedex/national.pal | 99 | ||||
| -rw-r--r-- | graphics/pokedex/search.pal | 99 | ||||
| -rw-r--r-- | graphics/slot_machine/reel_time_window_map.bin | 1 |
5 files changed, 218 insertions, 10 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 2f0c387fa..11afc0a3f 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -38125,7 +38125,7 @@ sub_808D640: @ 808D640 .align 2, 0 _0808D658: .4byte 0x0202ffb4 _0808D65C: .4byte 0x0000064c -_0808D660: .4byte gUnknown_0839F67E +_0808D660: .4byte gUnknown_0839F67C + 0x2 _0808D664: bl sub_806912C cmp r0, 0 @@ -38147,7 +38147,7 @@ _0808D686: pop {r0} bx r0 .align 2, 0 -_0808D68C: .4byte gUnknown_0839F73E +_0808D68C: .4byte gUnknown_0839F73C + 0x2 thumb_func_end sub_808D640 thumb_func_start sub_808D690 @@ -283466,7 +283466,7 @@ _08104A50: pop {r0} bx r0 .align 2, 0 -_08104A80: .4byte gUnknown_083EEFE0 +_08104A80: .4byte gReelTimeWindowTilemap _08104A84: .4byte 0x0600e000 thumb_func_end sub_8104A40 diff --git a/data/data2.s b/data/data2.s index a2ed60913..e2b486164 100644 --- a/data/data2.s +++ b/data/data2.s @@ -12402,21 +12402,29 @@ gUnknown_0839F58C:: @ 839F58C .4byte sub_8133CCC, 0x10 .4byte sub_812BFB4, 0x9 + .align 2 gUnknown_0839F5FC:: @ 839F5FC .incbin "baserom.gba", 0x0039f5fc, 0x40 + .align 2 gUnknown_0839F63C:: @ 839F63C - .incbin "baserom.gba", 0x0039f63c, 0x42 + .incbin "baserom.gba", 0x0039f63c, 0x40 + + .align 2 +gUnknown_0839F67C:: @ 839F67C + .incbin "graphics/pokedex/search.gbapal" -gUnknown_0839F67E:: @ 839F67E - .incbin "baserom.gba", 0x0039f67e, 0xc0 + .align 2 +gUnknown_0839F73C:: @ 839F73C + .incbin "graphics/pokedex/national.gbapal" -gUnknown_0839F73E:: @ 839F73E - .incbin "baserom.gba", 0x0039f73e, 0x162 + .space 0xA4 + .align 2 gUnknown_0839F8A0:: @ 839F8A0 .incbin "baserom.gba", 0x0039f8a0, 0xe8 + .align 2 gUnknown_0839F988:: @ 839F988 .incbin "baserom.gba", 0x0039f988, 0xf4 @@ -24492,8 +24500,9 @@ gSlotMachineSpritePalettes:: @ 83EDE44 gUnknown_083EDE8C:: @ 83EDE8C .incbin "graphics/slot_machine/reel_time.4bpp.lz" -gUnknown_083EEFE0:: @ 83EEFE0 - .incbin "baserom.gba", 0x003eefe0, 0x1b8 + .align 2 +gReelTimeWindowTilemap:: @ 83EEFE0 + .incbin "graphics/slot_machine/reel_time_window_map.bin" .align 2 gPictureFramePalettes:: @ 83EF198 diff --git a/graphics/pokedex/national.pal b/graphics/pokedex/national.pal new file mode 100644 index 000000000..b1bf3fa9a --- /dev/null +++ b/graphics/pokedex/national.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +123 131 0 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +255 197 90 +255 32 32 +164 164 164 +98 98 115 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +255 197 90 +255 32 32 +164 164 164 +98 98 115 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +255 197 90 +255 32 32 +156 230 0 +123 172 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +255 131 255 +255 74 189 +255 16 123 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +255 197 90 +255 32 32 +164 164 164 +98 98 115 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +255 197 90 +189 0 0 +90 164 0 +57 106 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +164 164 164 +41 57 65 +255 255 255 +255 197 90 +255 32 32 +156 230 0 +123 172 0 +189 156 90 +0 0 0 diff --git a/graphics/pokedex/search.pal b/graphics/pokedex/search.pal new file mode 100644 index 000000000..fe007d73e --- /dev/null +++ b/graphics/pokedex/search.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +123 131 0 +255 255 255 +222 222 222 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +98 98 115 +255 255 255 +255 197 90 +255 32 32 +49 49 49 +0 0 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +98 98 115 +255 255 255 +255 197 90 +255 32 32 +49 49 49 +0 0 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +98 98 115 +255 255 255 +255 197 90 +255 32 32 +156 230 0 +123 172 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +255 131 255 +255 74 189 +255 16 123 +98 98 115 +41 57 65 +98 98 115 +98 98 115 +255 255 255 +255 197 90 +255 32 32 +49 49 49 +0 0 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +98 98 115 +255 255 255 +255 197 90 +189 0 0 +90 164 0 +57 106 0 +189 156 90 +0 0 0 +123 131 0 +255 255 255 +197 32 32 +189 189 189 +164 164 164 +98 98 115 +41 57 65 +98 98 115 +98 98 115 +255 255 255 +255 197 90 +255 32 32 +156 230 0 +123 172 0 +189 156 90 +0 0 0 diff --git a/graphics/slot_machine/reel_time_window_map.bin b/graphics/slot_machine/reel_time_window_map.bin new file mode 100644 index 000000000..3aa89e7b4 --- /dev/null +++ b/graphics/slot_machine/reel_time_window_map.bin @@ -0,0 +1 @@ +
\ No newline at end of file |