diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-20 23:40:47 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-20 23:40:47 +0100 |
| commit | db763950bbccb1e1d8034ecd6e7f06f8fadecf47 (patch) | |
| tree | e9131cfc32cb1711b20d600fed2b495fe26c2ec5 /data | |
| parent | 74e416b578f203f5f3b2ca9e76d066ce5c7009e2 (diff) | |
Fix clang warnings and remove remaining baserom references
Diffstat (limited to 'data')
| -rw-r--r-- | data/animations/projectile/torchTrapProjectile.s | 2 | ||||
| -rw-r--r-- | data/data_080B7B74.s | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/animations/projectile/torchTrapProjectile.s b/data/animations/projectile/torchTrapProjectile.s index 68f30f1f..4faa9d09 100644 --- a/data/animations/projectile/torchTrapProjectile.s +++ b/data/animations/projectile/torchTrapProjectile.s @@ -5,7 +5,7 @@ .align 2 gSpriteAnimations_TorchTrapProjectile_0_0:: @ 0812A3E0 - .incbin "baserom.gba", 0x12A3E0, 0x0000014 + .include "animations/gSpriteAnimations_TorchTrapProjectile_0_0.s" gSpriteAnimations_TorchTrapProjectile_0:: @ 0812A3F4 .4byte gSpriteAnimations_TorchTrapProjectile_0_0 diff --git a/data/data_080B7B74.s b/data/data_080B7B74.s index d206a13e..fe27fb40 100644 --- a/data/data_080B7B74.s +++ b/data/data_080B7B74.s @@ -5,13 +5,13 @@ .align 2 gCollisionMtx:: @ 080B7B74 - .incbin "baserom.gba", 0x0B7B74, 0x00004BA + .incbin "data_080B7B74/gCollisionMtx.bin" gUnk_080B802E:: @ 080B802E - .incbin "baserom.gba", 0x0B802E, 0x0002292 + .incbin "data_080B7B74/gUnk_080B802E.bin" gUnk_080BA2C0:: @ 080BA2C0 - .incbin "baserom.gba", 0x0BA2C0, 0x0000FE0 + .incbin "data_080B7B74/gUnk_080BA2C0.bin" gUnk_080BB2A0:: @ 080BB2A0 .ifdef EU |