From cc3b50909d43d2e38136b8f5d9702442e98a110f Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 17:00:23 -0700 Subject: reel time window tilemap --- data/data2.s | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 06c9fe868..9101b6845 100644 --- a/data/data2.s +++ b/data/data2.s @@ -24481,8 +24481,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 -- cgit v1.2.3 From e05dad6a8669896a7e101525d6d1e85e0f6f7cb9 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 17:23:54 -0700 Subject: organize pokedex graphics incbins --- data/data2.s | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 9101b6845..d0b55aab8 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 -gUnknown_0839F67E:: @ 839F67E - .incbin "baserom.gba", 0x0039f67e, 0xc0 + .align 2 +gUnknown_0839F67C:: @ 839F67C + .incbin "baserom.gba", 0x0039f67c, 0xc0 -gUnknown_0839F73E:: @ 839F73E - .incbin "baserom.gba", 0x0039f73e, 0x162 + .align 2 +gUnknown_0839F73C:: @ 839F73C + .incbin "baserom.gba", 0x0039f73c, 0xc0 + .space 0xA4 + + .align 2 gUnknown_0839F8A0:: @ 839F8A0 .incbin "baserom.gba", 0x0039f8a0, 0xe8 + .align 2 gUnknown_0839F988:: @ 839F988 .incbin "baserom.gba", 0x0039f988, 0xf4 -- cgit v1.2.3 From fc23707dc64abdc3219f72e7cb7992890737d00d Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 2 Sep 2016 19:15:59 -0700 Subject: national pokedex and pokedex search palettes --- data/data2.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index d0b55aab8..ac8806eba 100644 --- a/data/data2.s +++ b/data/data2.s @@ -12412,11 +12412,11 @@ gUnknown_0839F63C:: @ 839F63C .align 2 gUnknown_0839F67C:: @ 839F67C - .incbin "baserom.gba", 0x0039f67c, 0xc0 + .incbin "graphics/pokedex/search.gbapal" .align 2 gUnknown_0839F73C:: @ 839F73C - .incbin "baserom.gba", 0x0039f73c, 0xc0 + .incbin "graphics/pokedex/national.gbapal" .space 0xA4 -- cgit v1.2.3