diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-02 17:23:54 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-02 17:23:54 -0700 |
| commit | e05dad6a8669896a7e101525d6d1e85e0f6f7cb9 (patch) | |
| tree | 4999639f2aebacc1bdb3e031059296b9ee207375 | |
| parent | cc3b50909d43d2e38136b8f5d9702442e98a110f (diff) | |
organize pokedex graphics incbins
| -rw-r--r-- | asm/rom5.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index b11fc1bb9..b1257dc97 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 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 |