diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-12-18 17:52:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 17:52:01 -0500 |
| commit | 7f5addc626584ab24c8da1760d64ef3b8e5c24b7 (patch) | |
| tree | 594a78b48ab1280e477fe39b6d2b01e51fa06ab7 /asm/battle_gfx_sfx_util.s | |
| parent | 74137d7448c62e462e39b373693bc4b9f0d72055 (diff) | |
| parent | f04f8baa5b3c4f5d239d8be4da4d9a99141bbf9b (diff) | |
Merge pull request #33 from Missingmew/master
Dump most graphics that are common between firered and emerald/ruby plus some exclusives
Diffstat (limited to 'asm/battle_gfx_sfx_util.s')
| -rw-r--r-- | asm/battle_gfx_sfx_util.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index 868883bab..9ae7accdc 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -1466,7 +1466,7 @@ _0803495A: thumb_func_start LoadBattleBarGfx LoadBattleBarGfx: @ 8034964 push {lr} - ldr r0, _0803497C @ =gUnknown_8D093D8 + ldr r0, _0803497C @ =gFile_graphics_interface_hp_numbers ldr r1, _08034980 @ =gMonSpritesGfxPtr ldr r1, [r1] movs r2, 0xBA @@ -1477,7 +1477,7 @@ LoadBattleBarGfx: @ 8034964 pop {r0} bx r0 .align 2, 0 -_0803497C: .4byte gUnknown_8D093D8 +_0803497C: .4byte gFile_graphics_interface_hp_numbers _08034980: .4byte gMonSpritesGfxPtr thumb_func_end LoadBattleBarGfx @@ -2351,7 +2351,7 @@ sub_80350BC: @ 80350BC lsls r0, 24 cmp r0, 0 beq _080350FC - ldr r0, _080350F4 @ =gUnknown_8D2D0B4 + ldr r0, _080350F4 @ =gFile_graphics_battle_anims_sprites_substitute_sheet ldr r1, _080350F8 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2361,10 +2361,10 @@ sub_80350BC: @ 80350BC bl LZDecompressVram b _0803510E .align 2, 0 -_080350F4: .4byte gUnknown_8D2D0B4 +_080350F4: .4byte gFile_graphics_battle_anims_sprites_substitute_sheet _080350F8: .4byte gMonSpritesGfxPtr _080350FC: - ldr r0, _08035144 @ =gUnknown_8D2D2F4 + ldr r0, _08035144 @ =gFile_graphics_battle_anims_sprites_substitute_tilemap ldr r1, _08035148 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2375,7 +2375,7 @@ _080350FC: _0803510E: movs r3, 0x1 lsls r6, 4 - ldr r7, _0803514C @ =gUnknown_8D2D090 + ldr r7, _0803514C @ =gFile_graphics_battle_anims_sprites_substitute_palette ldr r0, _08035148 @ =gMonSpritesGfxPtr ldr r0, [r0] adds r0, 0x4 @@ -2401,9 +2401,9 @@ _08035120: bl LoadCompressedPalette b _0803519A .align 2, 0 -_08035144: .4byte gUnknown_8D2D2F4 +_08035144: .4byte gFile_graphics_battle_anims_sprites_substitute_tilemap _08035148: .4byte gMonSpritesGfxPtr -_0803514C: .4byte gUnknown_8D2D090 +_0803514C: .4byte gFile_graphics_battle_anims_sprites_substitute_palette _08035150: .4byte 0x040000d4 _08035154: .4byte 0x84000200 _08035158: |