diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-11 08:48:05 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-11 08:48:05 +0800 |
| commit | e61343049278df73a0da8da70a50dea88da0bdae (patch) | |
| tree | a717a605b7a9a229696f351ce4db587500453746 /data | |
| parent | 2ea9fe6bde0cf62d4e6a3447aa3bcccce788db39 (diff) | |
rock
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_835B488.s | 21 | ||||
| -rw-r--r-- | data/graphics.s | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index fd6f9c209..cf435e174 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -843,13 +843,19 @@ gUnknown_83E4410:: @ 83E4410 .incbin "baserom.gba", 0x3E4410, 0x1488 gUnknown_83E5898:: @ 83E5898 - .incbin "baserom.gba", 0x3E5898, 0x248 + .incbin "baserom.gba", 0x3E5898, 0xC0 + +gUnknown_83E5958:: @ 83E5958 + .incbin "baserom.gba", 0x3E5958, 0x188 gUnknown_83E5AE0:: @ 83E5AE0 .incbin "baserom.gba", 0x3E5AE0, 0xA8 gUnknown_83E5B88:: @ 83E5B88 - .incbin "baserom.gba", 0x3E5B88, 0x2A4 + .incbin "baserom.gba", 0x3E5B88, 0x1C0 + +gUnknown_83E5D48:: @ 83E5D48 + .incbin "baserom.gba", 0x3E5D48, 0xE4 gUnknown_83E5E2C:: @ 83E5E2C .incbin "baserom.gba", 0x3E5E2C, 0x18 @@ -915,16 +921,7 @@ gUnknown_83E7044:: @ 83E7044 .incbin "baserom.gba", 0x3E7044, 0xD0 gUnknown_83E7114:: @ 83E7114 - .incbin "baserom.gba", 0x3E7114, 0x35C - -gUnknown_83E7470:: @ 83E7470 - .incbin "baserom.gba", 0x3E7470, 0x68 - -gUnknown_83E74D8:: @ 83E74D8 - .incbin "baserom.gba", 0x3E74D8, 0x18 - -gUnknown_83E74F0:: @ 83E74F0 - .incbin "baserom.gba", 0x3E74F0, 0xB8 + .incbin "baserom.gba", 0x3E7114, 0x27C .section .rodata.83E7CFC diff --git a/data/graphics.s b/data/graphics.s index 79b622cfa..379411a67 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13554,7 +13554,7 @@ gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0 .incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_261_palette:: @ 8E799FC +gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC .incbin "graphics/battle_anims/sprites/261.gbapal.lz" .align 2 |