diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-09-11 12:26:39 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-16 22:44:26 +0200 |
| commit | c98cc56f9288faa3c8b95ce9730d4d9fc94f2877 (patch) | |
| tree | 85088558a0a6dc66a438dbf2921069adb22fe7f9 /data/animations/object | |
| parent | 5983a9db7f9fee0e9468e4da9d1eed1682b2bf92 (diff) | |
Replace all incbins
Diffstat (limited to 'data/animations/object')
66 files changed, 504 insertions, 504 deletions
diff --git a/data/animations/object/bakerOven.s b/data/animations/object/bakerOven.s index 6d3a4443..b3e8a089 100644 --- a/data/animations/object/bakerOven.s +++ b/data/animations/object/bakerOven.s @@ -5,7 +5,7 @@ .align 2 gUnk_08123E2C:: @ 08123E2C - .incbin "baserom.gba", 0x123E2C, 0x000004C + .incbin "assets/bakerOven/gUnk_08123E2C.bin" gUnk_08123E78:: @ 08123E78 .4byte gUnk_08123E2C diff --git a/data/animations/object/beanstalk.s b/data/animations/object/beanstalk.s index f98756a0..c8f69762 100644 --- a/data/animations/object/beanstalk.s +++ b/data/animations/object/beanstalk.s @@ -5,43 +5,43 @@ @ .align 2 gUnk_08120EF9:: @ 08120EF9 - .incbin "baserom.gba", 0x120EF9, 0x0000031 + .incbin "assets/beanstalk/gUnk_08120EF9.bin" gUnk_08120F2A:: @ 08120F2A - .incbin "baserom.gba", 0x120F2A, 0x0000004 + .incbin "assets/beanstalk/gUnk_08120F2A.bin" gUnk_08120F2E:: @ 08120F2E - .incbin "baserom.gba", 0x120F2E, 0x0000004 + .incbin "assets/beanstalk/gUnk_08120F2E.bin" gUnk_08120F32:: @ 08120F32 - .incbin "baserom.gba", 0x120F32, 0x0000028 + .incbin "assets/beanstalk/gUnk_08120F32.bin" gUnk_08120F5A:: @ 08120F5A - .incbin "baserom.gba", 0x120F5A, 0x0000004 + .incbin "assets/beanstalk/gUnk_08120F5A.bin" gUnk_08120F5E:: @ 08120F5E - .incbin "baserom.gba", 0x120F5E, 0x0000020 + .incbin "assets/beanstalk/gUnk_08120F5E.bin" gUnk_08120F7E:: @ 08120F7E - .incbin "baserom.gba", 0x120F7E, 0x0000028 + .incbin "assets/beanstalk/gUnk_08120F7E.bin" gUnk_08120FA6:: @ 08120FA6 - .incbin "baserom.gba", 0x120FA6, 0x0000004 + .incbin "assets/beanstalk/gUnk_08120FA6.bin" gUnk_08120FAA:: @ 08120FAA - .incbin "baserom.gba", 0x120FAA, 0x0000020 + .incbin "assets/beanstalk/gUnk_08120FAA.bin" gUnk_08120FCA:: @ 08120FCA - .incbin "baserom.gba", 0x120FCA, 0x0000028 + .incbin "assets/beanstalk/gUnk_08120FCA.bin" gUnk_08120FF2:: @ 08120FF2 - .incbin "baserom.gba", 0x120FF2, 0x0000004 + .incbin "assets/beanstalk/gUnk_08120FF2.bin" gUnk_08120FF6:: @ 08120FF6 - .incbin "baserom.gba", 0x120FF6, 0x0000020 + .incbin "assets/beanstalk/gUnk_08120FF6.bin" gUnk_08121016:: @ 08121016 - .incbin "baserom.gba", 0x121016, 0x0000006 + .incbin "assets/beanstalk/gUnk_08121016.bin" gUnk_0812101C:: @ 0812101C .4byte gUnk_08120E8C diff --git a/data/animations/object/bigBarrel.s b/data/animations/object/bigBarrel.s index 1db11d7f..d5d8ad07 100644 --- a/data/animations/object/bigBarrel.s +++ b/data/animations/object/bigBarrel.s @@ -5,10 +5,10 @@ @ .align 2 gUnk_08120C66:: @ 08120C66 - .incbin "baserom.gba", 0x120C66, 0x0000009 + .incbin "assets/bigBarrel/gUnk_08120C66.bin" gUnk_08120C6F:: @ 08120C6F - .incbin "baserom.gba", 0x120C6F, 0x0000009 + .incbin "assets/bigBarrel/gUnk_08120C6F.bin" gUnk_08120C78:: @ 08120C78 .4byte gUnk_08120C66 diff --git a/data/animations/object/bigIceBlock.s b/data/animations/object/bigIceBlock.s index c10bcf91..c7a76c53 100644 --- a/data/animations/object/bigIceBlock.s +++ b/data/animations/object/bigIceBlock.s @@ -5,19 +5,19 @@ @ .align 2 gUnk_081237BA:: @ 081237BA - .incbin "baserom.gba", 0x1237BA, 0x0000004 + .incbin "assets/bigIceBlock/gUnk_081237BA.bin" gUnk_081237BE:: @ 081237BE - .incbin "baserom.gba", 0x1237BE, 0x0000004 + .incbin "assets/bigIceBlock/gUnk_081237BE.bin" gUnk_081237C2:: @ 081237C2 - .incbin "baserom.gba", 0x1237C2, 0x0000004 + .incbin "assets/bigIceBlock/gUnk_081237C2.bin" gUnk_081237C6:: @ 081237C6 - .incbin "baserom.gba", 0x1237C6, 0x0000004 + .incbin "assets/bigIceBlock/gUnk_081237C6.bin" gUnk_081237CA:: @ 081237CA - .incbin "baserom.gba", 0x1237CA, 0x0000016 + .incbin "assets/bigIceBlock/gUnk_081237CA.bin" gUnk_081237E0:: @ 081237E0 .4byte gUnk_081237BA diff --git a/data/animations/object/bigPushableLever.s b/data/animations/object/bigPushableLever.s index 2201d31f..06c49d6d 100644 --- a/data/animations/object/bigPushableLever.s +++ b/data/animations/object/bigPushableLever.s @@ -5,10 +5,10 @@ .align 2 gUnk_081236FC:: @ 081236FC - .incbin "baserom.gba", 0x1236FC, 0x0000015 + .incbin "assets/bigPushableLever/gUnk_081236FC.bin" gUnk_08123711:: @ 08123711 - .incbin "baserom.gba", 0x123711, 0x0000017 + .incbin "assets/bigPushableLever/gUnk_08123711.bin" gUnk_08123728:: @ 08123728 .4byte gUnk_081236FC diff --git a/data/animations/object/bigVortex.s b/data/animations/object/bigVortex.s index beeb6256..bb3a4f38 100644 --- a/data/animations/object/bigVortex.s +++ b/data/animations/object/bigVortex.s @@ -5,13 +5,13 @@ .align 2 gUnk_08123698:: @ 08123698 - .incbin "baserom.gba", 0x123698, 0x0000011 + .incbin "assets/bigVortex/gUnk_08123698.bin" gUnk_081236A9:: @ 081236A9 - .incbin "baserom.gba", 0x1236A9, 0x0000011 + .incbin "assets/bigVortex/gUnk_081236A9.bin" gUnk_081236BA:: @ 081236BA - .incbin "baserom.gba", 0x1236BA, 0x0000012 + .incbin "assets/bigVortex/gUnk_081236BA.bin" gUnk_081236CC:: @ 081236CC .4byte gUnk_08123698 diff --git a/data/animations/object/bird.s b/data/animations/object/bird.s index f996fdea..bba96b4e 100644 --- a/data/animations/object/bird.s +++ b/data/animations/object/bird.s @@ -5,16 +5,16 @@ .align 2 gUnk_08123F28:: @ 08123F28 - .incbin "baserom.gba", 0x123F28, 0x0000021 + .incbin "assets/bird/gUnk_08123F28.bin" gUnk_08123F49:: @ 08123F49 - .incbin "baserom.gba", 0x123F49, 0x0000019 + .incbin "assets/bird/gUnk_08123F49.bin" gUnk_08123F62:: @ 08123F62 - .incbin "baserom.gba", 0x123F62, 0x0000019 + .incbin "assets/bird/gUnk_08123F62.bin" gUnk_08123F7B:: @ 08123F7B - .incbin "baserom.gba", 0x123F7B, 0x0000021 + .incbin "assets/bird/gUnk_08123F7B.bin" gUnk_08123F9C:: @ 08123F9C .4byte gUnk_08123F28 diff --git a/data/animations/object/bollard.s b/data/animations/object/bollard.s index 0dbfe6fe..78b1cffd 100644 --- a/data/animations/object/bollard.s +++ b/data/animations/object/bollard.s @@ -5,16 +5,16 @@ .align 2 gUnk_08121314:: @ 08121314 - .incbin "baserom.gba", 0x121314, 0x0000004 + .incbin "assets/bollard/gUnk_08121314.bin" gUnk_08121318:: @ 08121318 - .incbin "baserom.gba", 0x121318, 0x0000004 + .incbin "assets/bollard/gUnk_08121318.bin" gUnk_0812131C:: @ 0812131C - .incbin "baserom.gba", 0x12131C, 0x0000020 + .incbin "assets/bollard/gUnk_0812131C.bin" gUnk_0812133C:: @ 0812133C - .incbin "baserom.gba", 0x12133C, 0x000001C + .incbin "assets/bollard/gUnk_0812133C.bin" gUnk_08121358:: @ 08121358 .4byte gUnk_08121314 diff --git a/data/animations/object/bossDoor.s b/data/animations/object/bossDoor.s index 84c57ba4..af67d9ab 100644 --- a/data/animations/object/bossDoor.s +++ b/data/animations/object/bossDoor.s @@ -5,28 +5,28 @@ .align 2 gUnk_08121514:: @ 08121514 - .incbin "baserom.gba", 0x121514, 0x0000024 + .incbin "assets/bossDoor/gUnk_08121514.bin" gUnk_08121538:: @ 08121538 - .incbin "baserom.gba", 0x121538, 0x0000024 + .incbin "assets/bossDoor/gUnk_08121538.bin" gUnk_0812155C:: @ 0812155C - .incbin "baserom.gba", 0x12155C, 0x0000024 + .incbin "assets/bossDoor/gUnk_0812155C.bin" gUnk_08121580:: @ 08121580 - .incbin "baserom.gba", 0x121580, 0x0000024 + .incbin "assets/bossDoor/gUnk_08121580.bin" gUnk_081215A4:: @ 081215A4 - .incbin "baserom.gba", 0x1215A4, 0x0000004 + .incbin "assets/bossDoor/gUnk_081215A4.bin" gUnk_081215A8:: @ 081215A8 - .incbin "baserom.gba", 0x1215A8, 0x0000004 + .incbin "assets/bossDoor/gUnk_081215A8.bin" gUnk_081215AC:: @ 081215AC - .incbin "baserom.gba", 0x1215AC, 0x0000004 + .incbin "assets/bossDoor/gUnk_081215AC.bin" gUnk_081215B0:: @ 081215B0 - .incbin "baserom.gba", 0x1215B0, 0x0000004 + .incbin "assets/bossDoor/gUnk_081215B0.bin" gUnk_081215B4:: @ 081215B4 .4byte gUnk_08121514 diff --git a/data/animations/object/chestSpawner.s b/data/animations/object/chestSpawner.s index 704a9f94..5c824fa6 100644 --- a/data/animations/object/chestSpawner.s +++ b/data/animations/object/chestSpawner.s @@ -5,19 +5,19 @@ .align 2 gUnk_0811F8B8:: @ 0811F8B8 - .incbin "baserom.gba", 0x11F8B8, 0x0000011 + .incbin "assets/chestSpawner/gUnk_0811F8B8.bin" gUnk_0811F8C9:: @ 0811F8C9 - .incbin "baserom.gba", 0x11F8C9, 0x0000005 + .incbin "assets/chestSpawner/gUnk_0811F8C9.bin" gUnk_0811F8CE:: @ 0811F8CE - .incbin "baserom.gba", 0x11F8CE, 0x0000005 + .incbin "assets/chestSpawner/gUnk_0811F8CE.bin" gUnk_0811F8D3:: @ 0811F8D3 - .incbin "baserom.gba", 0x11F8D3, 0x0000015 + .incbin "assets/chestSpawner/gUnk_0811F8D3.bin" gUnk_0811F8E8:: @ 0811F8E8 - .incbin "baserom.gba", 0x11F8E8, 0x0000008 + .incbin "assets/chestSpawner/gUnk_0811F8E8.bin" gUnk_0811F8F0:: @ 0811F8F0 .4byte gUnk_0811F8B8 diff --git a/data/animations/object/crenalBeanSprout.s b/data/animations/object/crenalBeanSprout.s index 83b17cb3..958fe5c8 100644 --- a/data/animations/object/crenalBeanSprout.s +++ b/data/animations/object/crenalBeanSprout.s @@ -5,25 +5,25 @@ @ .align 2 gUnk_081231BA:: @ 081231BA - .incbin "baserom.gba", 0x1231BA, 0x0000005 + .incbin "assets/crenalBeanSprout/gUnk_081231BA.bin" gUnk_081231BF:: @ 081231BF - .incbin "baserom.gba", 0x1231BF, 0x000000D + .incbin "assets/crenalBeanSprout/gUnk_081231BF.bin" gUnk_081231CC:: @ 081231CC - .incbin "baserom.gba", 0x1231CC, 0x0000009 + .incbin "assets/crenalBeanSprout/gUnk_081231CC.bin" gUnk_081231D5:: @ 081231D5 - .incbin "baserom.gba", 0x1231D5, 0x0000011 + .incbin "assets/crenalBeanSprout/gUnk_081231D5.bin" gUnk_081231E6:: @ 081231E6 - .incbin "baserom.gba", 0x1231E6, 0x0000015 + .incbin "assets/crenalBeanSprout/gUnk_081231E6.bin" gUnk_081231FB:: @ 081231FB - .incbin "baserom.gba", 0x1231FB, 0x0000009 + .incbin "assets/crenalBeanSprout/gUnk_081231FB.bin" gUnk_08123204:: @ 08123204 - .incbin "baserom.gba", 0x123204, 0x0000004 + .incbin "assets/crenalBeanSprout/gUnk_08123204.bin" gUnk_08123208:: @ 08123208 .4byte gUnk_081231BA diff --git a/data/animations/object/deathFx.s b/data/animations/object/deathFx.s index 8c456e43..4cf66474 100644 --- a/data/animations/object/deathFx.s +++ b/data/animations/object/deathFx.s @@ -5,16 +5,16 @@ .align 2 gUnk_0811ECD4:: @ 0811ECD4 - .incbin "baserom.gba", 0x11ECD4, 0x0000079 + .incbin "assets/deathFx/gUnk_0811ECD4.bin" gUnk_0811ED4D:: @ 0811ED4D - .incbin "baserom.gba", 0x11ED4D, 0x0000039 + .incbin "assets/deathFx/gUnk_0811ED4D.bin" gUnk_0811ED86:: @ 0811ED86 - .incbin "baserom.gba", 0x11ED86, 0x0000031 + .incbin "assets/deathFx/gUnk_0811ED86.bin" gUnk_0811EDB7:: @ 0811EDB7 - .incbin "baserom.gba", 0x11EDB7, 0x0000059 + .incbin "assets/deathFx/gUnk_0811EDB7.bin" gUnk_0811EE10:: @ 0811EE10 .4byte gUnk_0811ECD4 diff --git a/data/animations/object/eyeSwitch.s b/data/animations/object/eyeSwitch.s index 549aac79..4c47f348 100644 --- a/data/animations/object/eyeSwitch.s +++ b/data/animations/object/eyeSwitch.s @@ -5,28 +5,28 @@ .align 2 gUnk_08120B34:: @ 08120B34 - .incbin "baserom.gba", 0x120B34, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B34.bin" gUnk_08120B45:: @ 08120B45 - .incbin "baserom.gba", 0x120B45, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B45.bin" gUnk_08120B56:: @ 08120B56 - .incbin "baserom.gba", 0x120B56, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B56.bin" gUnk_08120B67:: @ 08120B67 - .incbin "baserom.gba", 0x120B67, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B67.bin" gUnk_08120B78:: @ 08120B78 - .incbin "baserom.gba", 0x120B78, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B78.bin" gUnk_08120B89:: @ 08120B89 - .incbin "baserom.gba", 0x120B89, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B89.bin" gUnk_08120B9A:: @ 08120B9A - .incbin "baserom.gba", 0x120B9A, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120B9A.bin" gUnk_08120BAB:: @ 08120BAB - .incbin "baserom.gba", 0x120BAB, 0x0000011 + .incbin "assets/eyeSwitch/gUnk_08120BAB.bin" gUnk_08120BBC:: @ 08120BBC .4byte gUnk_08120B34 diff --git a/data/animations/object/fan.s b/data/animations/object/fan.s index 5785aee0..49782fd3 100644 --- a/data/animations/object/fan.s +++ b/data/animations/object/fan.s @@ -5,28 +5,28 @@ .align 2 gUnk_081243F4:: @ 081243F4 - .incbin "baserom.gba", 0x1243F4, 0x0000071 + .incbin "assets/fan/gUnk_081243F4.bin" gUnk_08124465:: @ 08124465 - .incbin "baserom.gba", 0x124465, 0x0000071 + .incbin "assets/fan/gUnk_08124465.bin" gUnk_081244D6:: @ 081244D6 - .incbin "baserom.gba", 0x1244D6, 0x0000071 + .incbin "assets/fan/gUnk_081244D6.bin" gUnk_08124547:: @ 08124547 - .incbin "baserom.gba", 0x124547, 0x0000071 + .incbin "assets/fan/gUnk_08124547.bin" gUnk_081245B8:: @ 081245B8 - .incbin "baserom.gba", 0x1245B8, 0x0000025 + .incbin "assets/fan/gUnk_081245B8.bin" gUnk_081245DD:: @ 081245DD - .incbin "baserom.gba", 0x1245DD, 0x0000025 + .incbin "assets/fan/gUnk_081245DD.bin" gUnk_08124602:: @ 08124602 - .incbin "baserom.gba", 0x124602, 0x0000025 + .incbin "assets/fan/gUnk_08124602.bin" gUnk_08124627:: @ 08124627 - .incbin "baserom.gba", 0x124627, 0x0000025 + .incbin "assets/fan/gUnk_08124627.bin" gUnk_0812464C:: @ 0812464C .4byte gUnk_081243F4 diff --git a/data/animations/object/figurineDevice.s b/data/animations/object/figurineDevice.s index 83a7946f..b820729c 100644 --- a/data/animations/object/figurineDevice.s +++ b/data/animations/object/figurineDevice.s @@ -5,13 +5,13 @@ .align 2 gUnk_08120AE8:: @ 08120AE8 - .incbin "baserom.gba", 0x120AE8, 0x0000005 + .incbin "assets/figurineDevice/gUnk_08120AE8.bin" gUnk_08120AED:: @ 08120AED - .incbin "baserom.gba", 0x120AED, 0x0000014 + .incbin "assets/figurineDevice/gUnk_08120AED.bin" gUnk_08120B01:: @ 08120B01 - .incbin "baserom.gba", 0x120B01, 0x000000F + .incbin "assets/figurineDevice/gUnk_08120B01.bin" gUnk_08120B10:: @ 08120B10 .4byte gUnk_08120AE8 diff --git a/data/animations/object/fileScreenObjects.s b/data/animations/object/fileScreenObjects.s index be90ed5a..fff390d6 100644 --- a/data/animations/object/fileScreenObjects.s +++ b/data/animations/object/fileScreenObjects.s @@ -5,10 +5,10 @@ .align 2 gUnk_08121E24:: @ 08121E24 - .incbin "baserom.gba", 0x121E24, 0x000000D + .incbin "assets/fileScreenObjects/gUnk_08121E24.bin" gUnk_08121E31:: @ 08121E31 - .incbin "baserom.gba", 0x121E31, 0x000001F + .incbin "assets/fileScreenObjects/gUnk_08121E31.bin" gUnk_08121E50:: @ 08121E50 .4byte gUnk_08121E24 diff --git a/data/animations/object/furniture.s b/data/animations/object/furniture.s index e4bd071e..b930cab1 100644 --- a/data/animations/object/furniture.s +++ b/data/animations/object/furniture.s @@ -5,31 +5,31 @@ .align 2 gUnk_08122128:: @ 08122128 - .incbin "baserom.gba", 0x122128, 0x0000070 + .incbin "assets/furniture/gUnk_08122128.bin" gUnk_08122198:: @ 08122198 - .incbin "baserom.gba", 0x122198, 0x0000010 + .incbin "assets/furniture/gUnk_08122198.bin" gUnk_081221A8:: @ 081221A8 - .incbin "baserom.gba", 0x1221A8, 0x0000010 + .incbin "assets/furniture/gUnk_081221A8.bin" gUnk_081221B8:: @ 081221B8 - .incbin "baserom.gba", 0x1221B8, 0x0000010 + .incbin "assets/furniture/gUnk_081221B8.bin" gUnk_081221C8:: @ 081221C8 - .incbin "baserom.gba", 0x1221C8, 0x0000010 + .incbin "assets/furniture/gUnk_081221C8.bin" gUnk_081221D8:: @ 081221D8 - .incbin "baserom.gba", 0x1221D8, 0x0000010 + .incbin "assets/furniture/gUnk_081221D8.bin" gUnk_081221E8:: @ 081221E8 - .incbin "baserom.gba", 0x1221E8, 0x0000010 + .incbin "assets/furniture/gUnk_081221E8.bin" gUnk_081221F8:: @ 081221F8 - .incbin "baserom.gba", 0x1221F8, 0x0000010 + .incbin "assets/furniture/gUnk_081221F8.bin" gUnk_08122208:: @ 08122208 - .incbin "baserom.gba", 0x122208, 0x0000010 + .incbin "assets/furniture/gUnk_08122208.bin" gUnk_08122218:: @ 08122218 .4byte sub_080905B8 @@ -47,4 +47,4 @@ gUnk_08122220:: @ 08122220 .4byte gUnk_08122208 gUnk_08122244:: @ 08122244 - .incbin "baserom.gba", 0x122244, 0x0000010 + .incbin "assets/furniture/gUnk_08122244.bin" diff --git a/data/animations/object/gentariCurtains.s b/data/animations/object/gentariCurtains.s index b52a88ef..78000fb9 100644 --- a/data/animations/object/gentariCurtains.s +++ b/data/animations/object/gentariCurtains.s @@ -5,10 +5,10 @@ .align 2 gUnk_0812261C:: @ 0812261C - .incbin "baserom.gba", 0x12261C, 0x0000015 + .incbin "assets/gentariCurtains/gUnk_0812261C.bin" gUnk_08122631:: @ 08122631 - .incbin "baserom.gba", 0x122631, 0x0000007 + .incbin "assets/gentariCurtains/gUnk_08122631.bin" gUnk_08122638:: @ 08122638 .4byte gUnk_0812261C diff --git a/data/animations/object/jailBars.s b/data/animations/object/jailBars.s index 79d0df96..b6d46d9b 100644 --- a/data/animations/object/jailBars.s +++ b/data/animations/object/jailBars.s @@ -5,10 +5,10 @@ .align 2 gUnk_08124994:: @ 08124994 - .incbin "baserom.gba", 0x124994, 0x000000C + .incbin "assets/jailBars/gUnk_08124994.bin" gUnk_081249A0:: @ 081249A0 - .incbin "baserom.gba", 0x1249A0, 0x000000C + .incbin "assets/jailBars/gUnk_081249A0.bin" gUnk_081249AC:: @ 081249AC .4byte gUnk_08124994 diff --git a/data/animations/object/jarPortal.s b/data/animations/object/jarPortal.s index 5e07501f..9c40b829 100644 --- a/data/animations/object/jarPortal.s +++ b/data/animations/object/jarPortal.s @@ -5,16 +5,16 @@ .align 2 gUnk_0812149C:: @ 0812149C - .incbin "baserom.gba", 0x12149C, 0x0000004 + .incbin "assets/jarPortal/gUnk_0812149C.bin" gUnk_081214A0:: @ 081214A0 - .incbin "baserom.gba", 0x1214A0, 0x0000004 + .incbin "assets/jarPortal/gUnk_081214A0.bin" gUnk_081214A4:: @ 081214A4 - .incbin "baserom.gba", 0x1214A4, 0x0000011 + .incbin "assets/jarPortal/gUnk_081214A4.bin" gUnk_081214B5:: @ 081214B5 - .incbin "baserom.gba", 0x1214B5, 0x0000013 + .incbin "assets/jarPortal/gUnk_081214B5.bin" gUnk_081214C8:: @ 081214C8 .4byte gUnk_0812149C diff --git a/data/animations/object/lavaPlatform.s b/data/animations/object/lavaPlatform.s index 66e32b26..479af797 100644 --- a/data/animations/object/lavaPlatform.s +++ b/data/animations/object/lavaPlatform.s @@ -5,22 +5,22 @@ .align 2 gUnk_081226A4:: @ 081226A4 - .incbin "baserom.gba", 0x1226A4, 0x0000004 + .incbin "assets/lavaPlatform/gUnk_081226A4.bin" gUnk_081226A8:: @ 081226A8 - .incbin "baserom.gba", 0x1226A8, 0x0000004 + .incbin "assets/lavaPlatform/gUnk_081226A8.bin" gUnk_081226AC:: @ 081226AC - .incbin "baserom.gba", 0x1226AC, 0x0000091 + .incbin "assets/lavaPlatform/gUnk_081226AC.bin" gUnk_0812273D:: @ 0812273D - .incbin "baserom.gba", 0x12273D, 0x0000005 + .incbin "assets/lavaPlatform/gUnk_0812273D.bin" gUnk_08122742:: @ 08122742 - .incbin "baserom.gba", 0x122742, 0x0000011 + .incbin "assets/lavaPlatform/gUnk_08122742.bin" gUnk_08122753:: @ 08122753 - .incbin "baserom.gba", 0x122753, 0x0000011 + .incbin "assets/lavaPlatform/gUnk_08122753.bin" gUnk_08122764:: @ 08122764 .4byte gUnk_081226A4 diff --git a/data/animations/object/macroBook.s b/data/animations/object/macroBook.s index d287dcc8..cb6d8ae7 100644 --- a/data/animations/object/macroBook.s +++ b/data/animations/object/macroBook.s @@ -5,16 +5,16 @@ .align 2 gUnk_08123CB8:: @ 08123CB8 - .incbin "baserom.gba", 0x123CB8, 0x0000005 + .incbin "assets/macroBook/gUnk_08123CB8.bin" gUnk_08123CBD:: @ 08123CBD - .incbin "baserom.gba", 0x123CBD, 0x0000011 + .incbin "assets/macroBook/gUnk_08123CBD.bin" gUnk_08123CCE:: @ 08123CCE - .incbin "baserom.gba", 0x123CCE, 0x000001D + .incbin "assets/macroBook/gUnk_08123CCE.bin" gUnk_08123CEB:: @ 08123CEB - .incbin "baserom.gba", 0x123CEB, 0x0000029 + .incbin "assets/macroBook/gUnk_08123CEB.bin" gUnk_08123D14:: @ 08123D14 .4byte gUnk_08123CB8 diff --git a/data/animations/object/minecart.s b/data/animations/object/minecart.s index ee51437c..15465df9 100644 --- a/data/animations/object/minecart.s +++ b/data/animations/object/minecart.s @@ -11,64 +11,64 @@ gUnk_081223D8:: @ 081223D8 .4byte gUnk_08122436 gUnk_081223E8:: @ 081223E8 - .incbin "baserom.gba", 0x1223E8, 0x000001A + .incbin "assets/minecart/gUnk_081223E8.bin" gUnk_08122402:: @ 08122402 - .incbin "baserom.gba", 0x122402, 0x000001A + .incbin "assets/minecart/gUnk_08122402.bin" gUnk_0812241C:: @ 0812241C - .incbin "baserom.gba", 0x12241C, 0x000001A + .incbin "assets/minecart/gUnk_0812241C.bin" gUnk_08122436:: @ 08122436 - .incbin "baserom.gba", 0x122436, 0x000001A + .incbin "assets/minecart/gUnk_08122436.bin" gUnk_08122450:: @ 08122450 - .incbin "baserom.gba", 0x122450, 0x0000009 + .incbin "assets/minecart/gUnk_08122450.bin" gUnk_08122459:: @ 08122459 - .incbin "baserom.gba", 0x122459, 0x0000009 + .incbin "assets/minecart/gUnk_08122459.bin" gUnk_08122462:: @ 08122462 - .incbin "baserom.gba", 0x122462, 0x0000009 + .incbin "assets/minecart/gUnk_08122462.bin" gUnk_0812246B:: @ 0812246B - .incbin "baserom.gba", 0x12246B, 0x0000009 + .incbin "assets/minecart/gUnk_0812246B.bin" gUnk_08122474:: @ 08122474 - .incbin "baserom.gba", 0x122474, 0x0000015 + .incbin "assets/minecart/gUnk_08122474.bin" gUnk_08122489:: @ 08122489 - .incbin "baserom.gba", 0x122489, 0x0000015 + .incbin "assets/minecart/gUnk_08122489.bin" gUnk_0812249E:: @ 0812249E - .incbin "baserom.gba", 0x12249E, 0x0000015 + .incbin "assets/minecart/gUnk_0812249E.bin" gUnk_081224B3:: @ 081224B3 - .incbin "baserom.gba", 0x1224B3, 0x0000015 + .incbin "assets/minecart/gUnk_081224B3.bin" gUnk_081224C8:: @ 081224C8 - .incbin "baserom.gba", 0x1224C8, 0x0000019 + .incbin "assets/minecart/gUnk_081224C8.bin" gUnk_081224E1:: @ 081224E1 - .incbin "baserom.gba", 0x1224E1, 0x0000018 + .incbin "assets/minecart/gUnk_081224E1.bin" gUnk_081224F9:: @ 081224F9 - .incbin "baserom.gba", 0x1224F9, 0x0000018 + .incbin "assets/minecart/gUnk_081224F9.bin" gUnk_08122511:: @ 08122511 - .incbin "baserom.gba", 0x122511, 0x0000018 + .incbin "assets/minecart/gUnk_08122511.bin" gUnk_08122529:: @ 08122529 - .incbin "baserom.gba", 0x122529, 0x0000005 + .incbin "assets/minecart/gUnk_08122529.bin" gUnk_0812252E:: @ 0812252E - .incbin "baserom.gba", 0x12252E, 0x0000005 + .incbin "assets/minecart/gUnk_0812252E.bin" gUnk_08122533:: @ 08122533 - .incbin "baserom.gba", 0x122533, 0x0000005 + .incbin "assets/minecart/gUnk_08122533.bin" gUnk_08122538:: @ 08122538 - .incbin "baserom.gba", 0x122538, 0x0000008 + .incbin "assets/minecart/gUnk_08122538.bin" gUnk_08122540:: @ 08122540 .4byte gUnk_08122450 diff --git a/data/animations/object/minishSizedEntrance.s b/data/animations/object/minishSizedEntrance.s index 3b8dcace..84c615cf 100644 --- a/data/animations/object/minishSizedEntrance.s +++ b/data/animations/object/minishSizedEntrance.s @@ -6,10 +6,10 @@ @ TODO might as well be giantRock or archway gUnk_08122264:: @ 08122264 - .incbin "baserom.gba", 0x122264, 0x0000004 + .incbin "assets/minishSizedEntrance/gUnk_08122264.bin" gUnk_08122268:: @ 08122268 - .incbin "baserom.gba", 0x122268, 0x0000004 + .incbin "assets/minishSizedEntrance/gUnk_08122268.bin" gUnk_0812226C:: @ 0812226C .4byte gUnk_08122264 diff --git a/data/animations/object/object1E.s b/data/animations/object/object1E.s index fe78dc8a..a98fc406 100644 --- a/data/animations/object/object1E.s +++ b/data/animations/object/object1E.s @@ -5,22 +5,22 @@ .align 2 gUnk_081208C8:: @ 081208C8 - .incbin "baserom.gba", 0x1208C8, 0x0000034 + .incbin "assets/object1E/gUnk_081208C8.bin" gUnk_081208FC:: @ 081208FC - .incbin "baserom.gba", 0x1208FC, 0x0000034 + .incbin "assets/object1E/gUnk_081208FC.bin" gUnk_08120930:: @ 08120930 - .incbin "baserom.gba", 0x120930, 0x0000034 + .incbin "assets/object1E/gUnk_08120930.bin" gUnk_08120964:: @ 08120964 - .incbin "baserom.gba", 0x120964, 0x000002C + .incbin "assets/object1E/gUnk_08120964.bin" gUnk_08120990:: @ 08120990 - .incbin "baserom.gba", 0x120990, 0x000002C + .incbin "assets/object1E/gUnk_08120990.bin" gUnk_081209BC:: @ 081209BC - .incbin "baserom.gba", 0x1209BC, 0x000002C + .incbin "assets/object1E/gUnk_081209BC.bin" gUnk_081209E8:: @ 081209E8 .4byte gUnk_08120930 diff --git a/data/animations/object/object20.s b/data/animations/object/object20.s index a584c534..25204228 100644 --- a/data/animations/object/object20.s +++ b/data/animations/object/object20.s @@ -5,13 +5,13 @@ .align 2 gUnk_08120A30:: @ 08120A30 - .incbin "baserom.gba", 0x120A30, 0x000000C + .incbin "assets/object20/gUnk_08120A30.bin" gUnk_08120A3C:: @ 08120A3C - .incbin "baserom.gba", 0x120A3C, 0x000000C + .incbin "assets/object20/gUnk_08120A3C.bin" gUnk_08120A48:: @ 08120A48 - .incbin "baserom.gba", 0x120A48, 0x000000C + .incbin "assets/object20/gUnk_08120A48.bin" gUnk_08120A54:: @ 08120A54 .4byte gUnk_08120A30 diff --git a/data/animations/object/object24.s b/data/animations/object/object24.s index ac45287b..cf81a60a 100644 --- a/data/animations/object/object24.s +++ b/data/animations/object/object24.s @@ -5,19 +5,19 @@ @ .align 2 gUnk_08120BF1:: @ 08120BF1 - .incbin "baserom.gba", 0x120BF1, 0x0000004 + .incbin "assets/object24/gUnk_08120BF1.bin" gUnk_08120BF5:: @ 08120BF5 - .incbin "baserom.gba", 0x120BF5, 0x0000004 + .incbin "assets/object24/gUnk_08120BF5.bin" gUnk_08120BF9:: @ 08120BF9 - .incbin "baserom.gba", 0x120BF9, 0x0000004 + .incbin "assets/object24/gUnk_08120BF9.bin" gUnk_08120BFD:: @ 08120BFD - .incbin "baserom.gba", 0x120BFD, 0x0000004 + .incbin "assets/object24/gUnk_08120BFD.bin" gUnk_08120C01:: @ 08120C01 - .incbin "baserom.gba", 0x120C01, 0x0000007 + .incbin "assets/object24/gUnk_08120C01.bin" gUnk_08120C08:: @ 08120C08 .4byte gUnk_08120BF1 diff --git a/data/animations/object/object29.s b/data/animations/object/object29.s index 37dd1c36..25d28d4d 100644 --- a/data/animations/object/object29.s +++ b/data/animations/object/object29.s @@ -5,10 +5,10 @@ .align 2 gUnk_08120DA0:: @ 08120DA0 - .incbin "baserom.gba", 0x120DA0, 0x0000011 + .incbin "assets/object29/gUnk_08120DA0.bin" gUnk_08120DB1:: @ 08120DB1 - .incbin "baserom.gba", 0x120DB1, 0x0000013 + .incbin "assets/object29/gUnk_08120DB1.bin" gUnk_08120DC4:: @ 08120DC4 .4byte gUnk_08120DA0 diff --git a/data/animations/object/object2A.s b/data/animations/object/object2A.s index 311fb6b2..47790e6b 100644 --- a/data/animations/object/object2A.s +++ b/data/animations/object/object2A.s @@ -5,7 +5,7 @@ .align 2 gUnk_08120DD8:: @ 08120DD8 - .incbin "baserom.gba", 0x120DD8, 0x0000014 + .incbin "assets/object2A/gUnk_08120DD8.bin" gUnk_08120DEC:: @ 08120DEC .4byte gUnk_08120DD8 diff --git a/data/animations/object/object35.s b/data/animations/object/object35.s index 0948e415..e54bff4a 100644 --- a/data/animations/object/object35.s +++ b/data/animations/object/object35.s @@ -5,13 +5,13 @@ .align 2 gUnk_081213FC:: @ 081213FC - .incbin "baserom.gba", 0x1213FC, 0x0000011 + .incbin "assets/object35/gUnk_081213FC.bin" gUnk_0812140D:: @ 0812140D - .incbin "baserom.gba", 0x12140D, 0x0000011 + .incbin "assets/object35/gUnk_0812140D.bin" gUnk_0812141E:: @ 0812141E - .incbin "baserom.gba", 0x12141E, 0x0000012 + .incbin "assets/object35/gUnk_0812141E.bin" gUnk_08121430:: @ 08121430 .4byte gUnk_081213FC diff --git a/data/animations/object/object4.s b/data/animations/object/object4.s index 34b7d891..1ca96b53 100644 --- a/data/animations/object/object4.s +++ b/data/animations/object/object4.s @@ -5,79 +5,79 @@ .align 2 gUnk_0811EE64:: @ 0811EE64 - .incbin "baserom.gba", 0x11EE64, 0x0000029 + .incbin "assets/object4/gUnk_0811EE64.bin" gUnk_0811EE8D:: @ 0811EE8D - .incbin "baserom.gba", 0x11EE8D, 0x0000004 + .incbin "assets/object4/gUnk_0811EE8D.bin" gUnk_0811EE91:: @ 0811EE91 - .incbin "baserom.gba", 0x11EE91, 0x0000029 + .incbin "assets/object4/gUnk_0811EE91.bin" gUnk_0811EEBA:: @ 0811EEBA - .incbin "baserom.gba", 0x11EEBA, 0x0000004 + .incbin "assets/object4/gUnk_0811EEBA.bin" gUnk_0811EEBE:: @ 0811EEBE - .incbin "baserom.gba", 0x11EEBE, 0x0000005 + .incbin "assets/object4/gUnk_0811EEBE.bin" gUnk_0811EEC3:: @ 0811EEC3 - .incbin "baserom.gba", 0x11EEC3, 0x0000004 + .incbin "assets/object4/gUnk_0811EEC3.bin" gUnk_0811EEC7:: @ 0811EEC7 - .incbin "baserom.gba", 0x11EEC7, 0x0000029 + .incbin "assets/object4/gUnk_0811EEC7.bin" gUnk_0811EEF0:: @ 0811EEF0 - .incbin "baserom.gba", 0x11EEF0, 0x0000004 + .incbin "assets/object4/gUnk_0811EEF0.bin" gUnk_0811EEF4:: @ 0811EEF4 - .incbin "baserom.gba", 0x11EEF4, 0x0000009 + .incbin "assets/object4/gUnk_0811EEF4.bin" gUnk_0811EEFD:: @ 0811EEFD - .incbin "baserom.gba", 0x11EEFD, 0x0000009 + .incbin "assets/object4/gUnk_0811EEFD.bin" gUnk_0811EF06:: @ 0811EF06 - .incbin "baserom.gba", 0x11EF06, 0x0000009 + .incbin "assets/object4/gUnk_0811EF06.bin" gUnk_0811EF0F:: @ 0811EF0F - .incbin "baserom.gba", 0x11EF0F, 0x0000028 + .incbin "assets/object4/gUnk_0811EF0F.bin" gUnk_0811EF37:: @ 0811EF37 - .incbin "baserom.gba", 0x11EF37, 0x0000018 + .incbin "assets/object4/gUnk_0811EF37.bin" gUnk_0811EF4F:: @ 0811EF4F - .incbin "baserom.gba", 0x11EF4F, 0x0000018 + .incbin "assets/object4/gUnk_0811EF4F.bin" gUnk_0811EF67:: @ 0811EF67 - .incbin "baserom.gba", 0x11EF67, 0x0000018 + .incbin "assets/object4/gUnk_0811EF67.bin" gUnk_0811EF7F:: @ 0811EF7F - .incbin "baserom.gba", 0x11EF7F, 0x0000018 + .incbin "assets/object4/gUnk_0811EF7F.bin" gUnk_0811EF97:: @ 0811EF97 - .incbin "baserom.gba", 0x11EF97, 0x0000009 + .incbin "assets/object4/gUnk_0811EF97.bin" gUnk_0811EFA0:: @ 0811EFA0 - .incbin "baserom.gba", 0x11EFA0, 0x0000009 + .incbin "assets/object4/gUnk_0811EFA0.bin" gUnk_0811EFA9:: @ 0811EFA9 - .incbin "baserom.gba", 0x11EFA9, 0x0000009 + .incbin "assets/object4/gUnk_0811EFA9.bin" gUnk_0811EFB2:: @ 0811EFB2 - .incbin "baserom.gba", 0x11EFB2, 0x0000009 + .incbin "assets/object4/gUnk_0811EFB2.bin" gUnk_0811EFBB:: @ 0811EFBB - .incbin "baserom.gba", 0x11EFBB, 0x0000009 + .incbin "assets/object4/gUnk_0811EFBB.bin" gUnk_0811EFC4:: @ 0811EFC4 - .incbin "baserom.gba", 0x11EFC4, 0x0000015 + .incbin "assets/object4/gUnk_0811EFC4.bin" gUnk_0811EFD9:: @ 0811EFD9 - .incbin "baserom.gba", 0x11EFD9, 0x0000015 + .incbin "assets/object4/gUnk_0811EFD9.bin" gUnk_0811EFEE:: @ 0811EFEE - .incbin "baserom.gba", 0x11EFEE, 0x0000015 + .incbin "assets/object4/gUnk_0811EFEE.bin" gUnk_0811F003:: @ 0811F003 - .incbin "baserom.gba", 0x11F003, 0x0000015 + .incbin "assets/object4/gUnk_0811F003.bin" gUnk_0811F018:: @ 0811F018 .4byte gUnk_0811EEBE diff --git a/data/animations/object/object43.s b/data/animations/object/object43.s index 1bf13295..5ad5bc91 100644 --- a/data/animations/object/object43.s +++ b/data/animations/object/object43.s @@ -5,43 +5,43 @@ .align 2 gUnk_081217E0:: @ 081217E0 - .incbin "baserom.gba", 0x1217E0, 0x0000084 + .incbin "assets/object43/gUnk_081217E0.bin" gUnk_08121864:: @ 08121864 - .incbin "baserom.gba", 0x121864, 0x0000084 + .incbin "assets/object43/gUnk_08121864.bin" gUnk_081218E8:: @ 081218E8 - .incbin "baserom.gba", 0x1218E8, 0x0000084 + .incbin "assets/object43/gUnk_081218E8.bin" gUnk_0812196C:: @ 0812196C - .incbin "baserom.gba", 0x12196C, 0x0000084 + .incbin "assets/object43/gUnk_0812196C.bin" gUnk_081219F0:: @ 081219F0 - .incbin "baserom.gba", 0x1219F0, 0x000003D + .incbin "assets/object43/gUnk_081219F0.bin" gUnk_08121A2D:: @ 08121A2D - .incbin "baserom.gba", 0x121A2D, 0x000003D + .incbin "assets/object43/gUnk_08121A2D.bin" gUnk_08121A6A:: @ 08121A6A - .incbin "baserom.gba", 0x121A6A, 0x000003D + .incbin "assets/object43/gUnk_08121A6A.bin" gUnk_08121AA7:: @ 08121AA7 - .incbin "baserom.gba", 0x121AA7, 0x000003D + .incbin "assets/object43/gUnk_08121AA7.bin" gUnk_08121AE4:: @ 08121AE4 - .incbin "baserom.gba", 0x121AE4, 0x0000010 + .incbin "assets/object43/gUnk_08121AE4.bin" gUnk_08121AF4:: @ 08121AF4 - .incbin "baserom.gba", 0x121AF4, 0x0000010 + .incbin "assets/object43/gUnk_08121AF4.bin" gUnk_08121B04:: @ 08121B04 - .incbin "baserom.gba", 0x121B04, 0x0000010 + .incbin "assets/object43/gUnk_08121B04.bin" gUnk_08121B14:: @ 08121B14 - .incbin "baserom.gba", 0x121B14, 0x0000010 + .incbin "assets/object43/gUnk_08121B14.bin" gUnk_08121B24:: @ 08121B24 - .incbin "baserom.gba", 0x121B24, 0x0000024 + .incbin "assets/object43/gUnk_08121B24.bin" gUnk_08121B48:: @ 08121B48 .4byte gUnk_081217E0 diff --git a/data/animations/object/object44.s b/data/animations/object/object44.s index 23880d7b..d31c3a01 100644 --- a/data/animations/object/object44.s +++ b/data/animations/object/object44.s @@ -5,7 +5,7 @@ .align 2 gUnk_08121B94:: @ 08121B94 - .incbin "baserom.gba", 0x121B94, 0x000003C + .incbin "assets/object44/gUnk_08121B94.bin" gUnk_08121BD0:: @ 08121BD0 .4byte gUnk_08121B94 diff --git a/data/animations/object/object45.s b/data/animations/object/object45.s index a9077f5d..a597c9df 100644 --- a/data/animations/object/object45.s +++ b/data/animations/object/object45.s @@ -5,10 +5,10 @@ .align 2 gUnk_08121BE0:: @ 08121BE0 - .incbin "baserom.gba", 0x121BE0, 0x0000018 + .incbin "assets/object45/gUnk_08121BE0.bin" gUnk_08121BF8:: @ 08121BF8 - .incbin "baserom.gba", 0x121BF8, 0x000003C + .incbin "assets/object45/gUnk_08121BF8.bin" gUnk_08121C34:: @ 08121C34 .4byte gUnk_08121BE0 diff --git a/data/animations/object/object6.s b/data/animations/object/object6.s index 10160e9a..d1ecf238 100644 --- a/data/animations/object/object6.s +++ b/data/animations/object/object6.s @@ -5,112 +5,112 @@ .align 2 gUnk_0811F190:: @ 0811F190 - .incbin "baserom.gba", 0x11F190, 0x000001D + .incbin "assets/object6/gUnk_0811F190.bin" gUnk_0811F1AD:: @ 0811F1AD - .incbin "baserom.gba", 0x11F1AD, 0x000001D + .incbin "assets/object6/gUnk_0811F1AD.bin" gUnk_0811F1CA:: @ 0811F1CA - .incbin "baserom.gba", 0x11F1CA, 0x000001D + .incbin "assets/object6/gUnk_0811F1CA.bin" gUnk_0811F1E7:: @ 0811F1E7 - .incbin "baserom.gba", 0x11F1E7, 0x0000029 + .incbin "assets/object6/gUnk_0811F1E7.bin" gUnk_0811F210:: @ 0811F210 - .incbin "baserom.gba", 0x11F210, 0x000001D + .incbin "assets/object6/gUnk_0811F210.bin" gUnk_0811F22D:: @ 0811F22D - .incbin "baserom.gba", 0x11F22D, 0x000001D + .incbin "assets/object6/gUnk_0811F22D.bin" gUnk_0811F24A:: @ 0811F24A - .incbin "baserom.gba", 0x11F24A, 0x000001D + .incbin "assets/object6/gUnk_0811F24A.bin" gUnk_0811F267:: @ 0811F267 - .incbin "baserom.gba", 0x11F267, 0x0000029 + .incbin "assets/object6/gUnk_0811F267.bin" gUnk_0811F290:: @ 0811F290 - .incbin "baserom.gba", 0x11F290, 0x000001D + .incbin "assets/object6/gUnk_0811F290.bin" gUnk_0811F2AD:: @ 0811F2AD - .incbin "baserom.gba", 0x11F2AD, 0x000001D + .incbin "assets/object6/gUnk_0811F2AD.bin" gUnk_0811F2CA:: @ 0811F2CA - .incbin "baserom.gba", 0x11F2CA, 0x000001D + .incbin "assets/object6/gUnk_0811F2CA.bin" gUnk_0811F2E7:: @ 0811F2E7 - .incbin "baserom.gba", 0x11F2E7, 0x0000029 + .incbin "assets/object6/gUnk_0811F2E7.bin" gUnk_0811F310:: @ 0811F310 - .incbin "baserom.gba", 0x11F310, 0x000000D + .incbin "assets/object6/gUnk_0811F310.bin" gUnk_0811F31D:: @ 0811F31D - .incbin "baserom.gba", 0x11F31D, 0x000000D + .incbin "assets/object6/gUnk_0811F31D.bin" gUnk_0811F32A:: @ 0811F32A - .incbin "baserom.gba", 0x11F32A, 0x000000D + .incbin "assets/object6/gUnk_0811F32A.bin" gUnk_0811F337:: @ 0811F337 - .incbin "baserom.gba", 0x11F337, 0x0000029 + .incbin "assets/object6/gUnk_0811F337.bin" gUnk_0811F360:: @ 0811F360 - .incbin "baserom.gba", 0x11F360, 0x000000D + .incbin "assets/object6/gUnk_0811F360.bin" gUnk_0811F36D:: @ 0811F36D - .incbin "baserom.gba", 0x11F36D, 0x000000D + .incbin "assets/object6/gUnk_0811F36D.bin" gUnk_0811F37A:: @ 0811F37A - .incbin "baserom.gba", 0x11F37A, 0x000000D + .incbin "assets/object6/gUnk_0811F37A.bin" gUnk_0811F387:: @ 0811F387 - .incbin "baserom.gba", 0x11F387, 0x0000029 + .incbin "assets/object6/gUnk_0811F387.bin" gUnk_0811F3B0:: @ 0811F3B0 - .incbin "baserom.gba", 0x11F3B0, 0x000000D + .incbin "assets/object6/gUnk_0811F3B0.bin" gUnk_0811F3BD:: @ 0811F3BD - .incbin "baserom.gba", 0x11F3BD, 0x000000D + .incbin "assets/object6/gUnk_0811F3BD.bin" gUnk_0811F3CA:: @ 0811F3CA - .incbin "baserom.gba", 0x11F3CA, 0x000000D + .incbin "assets/object6/gUnk_0811F3CA.bin" gUnk_0811F3D7:: @ 0811F3D7 - .incbin "baserom.gba", 0x11F3D7, 0x0000029 + .incbin "assets/object6/gUnk_0811F3D7.bin" gUnk_0811F400:: @ 0811F400 - .incbin "baserom.gba", 0x11F400, 0x0000005 + .incbin "assets/object6/gUnk_0811F400.bin" gUnk_0811F405:: @ 0811F405 - .incbin "baserom.gba", 0x11F405, 0x0000011 + .incbin "assets/object6/gUnk_0811F405.bin" gUnk_0811F416:: @ 0811F416 - .incbin "baserom.gba", 0x11F416, 0x0000029 + .incbin "assets/object6/gUnk_0811F416.bin" gUnk_0811F43F:: @ 0811F43F - .incbin "baserom.gba", 0x11F43F, 0x0000029 + .incbin "assets/object6/gUnk_0811F43F.bin" gUnk_0811F468:: @ 0811F468 - .incbin "baserom.gba", 0x11F468, 0x0000051 + .incbin "assets/object6/gUnk_0811F468.bin" gUnk_0811F4B9:: @ 0811F4B9 - .incbin "baserom.gba", 0x11F4B9, 0x0000019 + .incbin "assets/object6/gUnk_0811F4B9.bin" gUnk_0811F4D2:: @ 0811F4D2 - .incbin "baserom.gba", 0x11F4D2, 0x0000005 + .incbin "assets/object6/gUnk_0811F4D2.bin" gUnk_0811F4D7:: @ 0811F4D7 - .incbin "baserom.gba", 0x11F4D7, 0x0000074 + .incbin "assets/object6/gUnk_0811F4D7.bin" gUnk_0811F54B:: @ 0811F54B - .incbin "baserom.gba", 0x11F54B, 0x0000015 + .incbin "assets/object6/gUnk_0811F54B.bin" gUnk_0811F560:: @ 0811F560 - .incbin "baserom.gba", 0x11F560, 0x0000015 + .incbin "assets/object6/gUnk_0811F560.bin" gUnk_0811F575:: @ 0811F575 - .incbin "baserom.gba", 0x11F575, 0x0000015 + .incbin "assets/object6/gUnk_0811F575.bin" gUnk_0811F58A:: @ 0811F58A - .incbin "baserom.gba", 0x11F58A, 0x0000006 + .incbin "assets/object6/gUnk_0811F58A.bin" gUnk_0811F590:: @ 0811F590 .4byte gUnk_0811F190 diff --git a/data/animations/object/object64.s b/data/animations/object/object64.s index 05203994..18a4919e 100644 --- a/data/animations/object/object64.s +++ b/data/animations/object/object64.s @@ -5,13 +5,13 @@ .align 2 gUnk_0812296C:: @ 0812296C - .incbin "baserom.gba", 0x12296C, 0x0000010 + .incbin "assets/object64/gUnk_0812296C.bin" gUnk_0812297C:: @ 0812297C - .incbin "baserom.gba", 0x12297C, 0x000000C + .incbin "assets/object64/gUnk_0812297C.bin" gUnk_08122988:: @ 08122988 - .incbin "baserom.gba", 0x122988, 0x000001C + .incbin "assets/object64/gUnk_08122988.bin" gUnk_081229A4:: @ 081229A4 .4byte gUnk_0812296C diff --git a/data/animations/object/object6A.s b/data/animations/object/object6A.s index ff0da8bd..308e4a2f 100644 --- a/data/animations/object/object6A.s +++ b/data/animations/object/object6A.s @@ -6,10 +6,10 @@ gUnk_08122B4C:: @ 08122B4C - .incbin "baserom.gba", 0x122B4C, 0x0000009 + .incbin "assets/object6A/gUnk_08122B4C.bin" gUnk_08122B55:: @ 08122B55 - .incbin "baserom.gba", 0x122B55, 0x000000F + .incbin "assets/object6A/gUnk_08122B55.bin" gUnk_08122B64:: @ 08122B64 .4byte gUnk_08122B4C @@ -17,34 +17,34 @@ gUnk_08122B64:: @ 08122B64 .4byte 00000000 gUnk_08122B70:: @ 08122B70 - .incbin "baserom.gba", 0x122B70, 0x0000005 + .incbin "assets/object6A/gUnk_08122B70.bin" gUnk_08122B75:: @ 08122B75 - .incbin "baserom.gba", 0x122B75, 0x0000005 + .incbin "assets/object6A/gUnk_08122B75.bin" gUnk_08122B7A:: @ 08122B7A - .incbin "baserom.gba", 0x122B7A, 0x0000005 + .incbin "assets/object6A/gUnk_08122B7A.bin" gUnk_08122B7F:: @ 08122B7F - .incbin "baserom.gba", 0x122B7F, 0x0000005 + .incbin "assets/object6A/gUnk_08122B7F.bin" gUnk_08122B84:: @ 08122B84 - .incbin "baserom.gba", 0x122B84, 0x0000005 + .incbin "assets/object6A/gUnk_08122B84.bin" gUnk_08122B89:: @ 08122B89 - .incbin "baserom.gba", 0x122B89, 0x0000005 + .incbin "assets/object6A/gUnk_08122B89.bin" gUnk_08122B8E:: @ 08122B8E - .incbin "baserom.gba", 0x122B8E, 0x0000005 + .incbin "assets/object6A/gUnk_08122B8E.bin" gUnk_08122B93:: @ 08122B93 - .incbin "baserom.gba", 0x122B93, 0x0000005 + .incbin "assets/object6A/gUnk_08122B93.bin" gUnk_08122B98:: @ 08122B98 - .incbin "baserom.gba", 0x122B98, 0x0000019 + .incbin "assets/object6A/gUnk_08122B98.bin" gUnk_08122BB1:: @ 08122BB1 - .incbin "baserom.gba", 0x122BB1, 0x0000017 + .incbin "assets/object6A/gUnk_08122BB1.bin" gUnk_08122BC8:: @ 08122BC8 .4byte gUnk_08122B98 @@ -60,22 +60,22 @@ gUnk_08122BC8:: @ 08122BC8 .4byte 00000000 gUnk_08122BF4:: @ 08122BF4 - .incbin "baserom.gba", 0x122BF4, 0x0000009 + .incbin "assets/object6A/gUnk_08122BF4.bin" gUnk_08122BFD:: @ 08122BFD - .incbin "baserom.gba", 0x122BFD, 0x0000009 + .incbin "assets/object6A/gUnk_08122BFD.bin" gUnk_08122C06:: @ 08122C06 - .incbin "baserom.gba", 0x122C06, 0x0000005 + .incbin "assets/object6A/gUnk_08122C06.bin" gUnk_08122C0B:: @ 08122C0B - .incbin "baserom.gba", 0x122C0B, 0x0000069 + .incbin "assets/object6A/gUnk_08122C0B.bin" gUnk_08122C74:: @ 08122C74 - .incbin "baserom.gba", 0x122C74, 0x0000015 + .incbin "assets/object6A/gUnk_08122C74.bin" gUnk_08122C89:: @ 08122C89 - .incbin "baserom.gba", 0x122C89, 0x0000007 + .incbin "assets/object6A/gUnk_08122C89.bin" gUnk_08122C90:: @ 08122C90 .4byte gUnk_08122BF4 @@ -87,10 +87,10 @@ gUnk_08122C90:: @ 08122C90 .4byte 00000000 gUnk_08122CAC:: @ 08122CAC - .incbin "baserom.gba", 0x122CAC, 0x0000009 + .incbin "assets/object6A/gUnk_08122CAC.bin" gUnk_08122CB5:: @ 08122CB5 - .incbin "baserom.gba", 0x122CB5, 0x0000007 + .incbin "assets/object6A/gUnk_08122CB5.bin" gUnk_08122CBC:: @ 08122CBC .4byte gUnk_08122CAC @@ -98,16 +98,16 @@ gUnk_08122CBC:: @ 08122CBC .4byte 00000000 gUnk_08122CC8:: @ 08122CC8 - .incbin "baserom.gba", 0x122CC8, 0x0000009 + .incbin "assets/object6A/gUnk_08122CC8.bin" gUnk_08122CD1:: @ 08122CD1 - .incbin "baserom.gba", 0x122CD1, 0x0000005 + .incbin "assets/object6A/gUnk_08122CD1.bin" gUnk_08122CD6:: @ 08122CD6 - .incbin "baserom.gba", 0x122CD6, 0x0000005 + .incbin "assets/object6A/gUnk_08122CD6.bin" gUnk_08122CDB:: @ 08122CDB - .incbin "baserom.gba", 0x122CDB, 0x0000009 + .incbin "assets/object6A/gUnk_08122CDB.bin" gUnk_08122CE4:: @ 08122CE4 .4byte gUnk_08122CC8 @@ -117,10 +117,10 @@ gUnk_08122CE4:: @ 08122CE4 .4byte 00000000 gUnk_08122CF8:: @ 08122CF8 - .incbin "baserom.gba", 0x122CF8, 0x0000005 + .incbin "assets/object6A/gUnk_08122CF8.bin" gUnk_08122CFD:: @ 08122CFD - .incbin "baserom.gba", 0x122CFD, 0x0000007 + .incbin "assets/object6A/gUnk_08122CFD.bin" gUnk_08122D04:: @ 08122D04 .4byte gUnk_08122CF8 @@ -128,70 +128,70 @@ gUnk_08122D04:: @ 08122D04 .4byte 00000000 gUnk_08122D10:: @ 08122D10 - .incbin "baserom.gba", 0x122D10, 0x0000009 + .incbin "assets/object6A/gUnk_08122D10.bin" gUnk_08122D19:: @ 08122D19 - .incbin "baserom.gba", 0x122D19, 0x0000009 + .incbin "assets/object6A/gUnk_08122D19.bin" gUnk_08122D22:: @ 08122D22 - .incbin "baserom.gba", 0x122D22, 0x0000009 + .incbin "assets/object6A/gUnk_08122D22.bin" gUnk_08122D2B:: @ 08122D2B - .incbin "baserom.gba", 0x122D2B, 0x0000009 + .incbin "assets/object6A/gUnk_08122D2B.bin" gUnk_08122D34:: @ 08122D34 - .incbin "baserom.gba", 0x122D34, 0x0000021 + .incbin "assets/object6A/gUnk_08122D34.bin" gUnk_08122D55:: @ 08122D55 - .incbin "baserom.gba", 0x122D55, 0x0000021 + .incbin "assets/object6A/gUnk_08122D55.bin" gUnk_08122D76:: @ 08122D76 - .incbin "baserom.gba", 0x122D76, 0x0000021 + .incbin "assets/object6A/gUnk_08122D76.bin" gUnk_08122D97:: @ 08122D97 - .incbin "baserom.gba", 0x122D97, 0x0000021 + .incbin "assets/object6A/gUnk_08122D97.bin" gUnk_08122DB8:: @ 08122DB8 - .incbin "baserom.gba", 0x122DB8, 0x000000D + .incbin "assets/object6A/gUnk_08122DB8.bin" gUnk_08122DC5:: @ 08122DC5 - .incbin "baserom.gba", 0x122DC5, 0x000000D + .incbin "assets/object6A/gUnk_08122DC5.bin" gUnk_08122DD2:: @ 08122DD2 - .incbin "baserom.gba", 0x122DD2, 0x000000D + .incbin "assets/object6A/gUnk_08122DD2.bin" gUnk_08122DDF:: @ 08122DDF - .incbin "baserom.gba", 0x122DDF, 0x000000D + .incbin "assets/object6A/gUnk_08122DDF.bin" gUnk_08122DEC:: @ 08122DEC - .incbin "baserom.gba", 0x122DEC, 0x0000019 + .incbin "assets/object6A/gUnk_08122DEC.bin" gUnk_08122E05:: @ 08122E05 - .incbin "baserom.gba", 0x122E05, 0x0000019 + .incbin "assets/object6A/gUnk_08122E05.bin" gUnk_08122E1E:: @ 08122E1E - .incbin "baserom.gba", 0x122E1E, 0x0000019 + .incbin "assets/object6A/gUnk_08122E1E.bin" gUnk_08122E37:: @ 08122E37 - .incbin "baserom.gba", 0x122E37, 0x0000019 + .incbin "assets/object6A/gUnk_08122E37.bin" gUnk_08122E50:: @ 08122E50 - .incbin "baserom.gba", 0x122E50, 0x0000015 + .incbin "assets/object6A/gUnk_08122E50.bin" gUnk_08122E65:: @ 08122E65 - .incbin "baserom.gba", 0x122E65, 0x0000015 + .incbin "assets/object6A/gUnk_08122E65.bin" gUnk_08122E7A:: @ 08122E7A - .incbin "baserom.gba", 0x122E7A, 0x0000015 + .incbin "assets/object6A/gUnk_08122E7A.bin" gUnk_08122E8F:: @ 08122E8F - .incbin "baserom.gba", 0x122E8F, 0x0000015 + .incbin "assets/object6A/gUnk_08122E8F.bin" gUnk_08122EA4:: @ 08122EA4 - .incbin "baserom.gba", 0x122EA4, 0x0000009 + .incbin "assets/object6A/gUnk_08122EA4.bin" gUnk_08122EAD:: @ 08122EAD - .incbin "baserom.gba", 0x122EAD, 0x0000023 + .incbin "assets/object6A/gUnk_08122EAD.bin" gUnk_08122ED0:: @ 08122ED0 .4byte gUnk_08122D10 @@ -219,46 +219,46 @@ gUnk_08122ED0:: @ 08122ED0 .4byte 00000000 gUnk_08122F2C:: @ 08122F2C - .incbin "baserom.gba", 0x122F2C, 0x0000005 + .incbin "assets/object6A/gUnk_08122F2C.bin" gUnk_08122F31:: @ 08122F31 - .incbin "baserom.gba", 0x122F31, 0x0000021 + .incbin "assets/object6A/gUnk_08122F31.bin" gUnk_08122F52:: @ 08122F52 - .incbin "baserom.gba", 0x122F52, 0x0000005 + .incbin "assets/object6A/gUnk_08122F52.bin" gUnk_08122F57:: @ 08122F57 - .incbin "baserom.gba", 0x122F57, 0x0000021 + .incbin "assets/object6A/gUnk_08122F57.bin" gUnk_08122F78:: @ 08122F78 - .incbin "baserom.gba", 0x122F78, 0x0000005 + .incbin "assets/object6A/gUnk_08122F78.bin" gUnk_08122F7D:: @ 08122F7D - .incbin "baserom.gba", 0x122F7D, 0x0000021 + .incbin "assets/object6A/gUnk_08122F7D.bin" gUnk_08122F9E:: @ 08122F9E - .incbin "baserom.gba", 0x122F9E, 0x0000005 + .incbin "assets/object6A/gUnk_08122F9E.bin" gUnk_08122FA3:: @ 08122FA3 - .incbin "baserom.gba", 0x122FA3, 0x0000021 + .incbin "assets/object6A/gUnk_08122FA3.bin" gUnk_08122FC4:: @ 08122FC4 - .incbin "baserom.gba", 0x122FC4, 0x0000005 + .incbin "assets/object6A/gUnk_08122FC4.bin" gUnk_08122FC9:: @ 08122FC9 - .incbin "baserom.gba", 0x122FC9, 0x0000005 + .incbin "assets/object6A/gUnk_08122FC9.bin" gUnk_08122FCE:: @ 08122FCE - .incbin "baserom.gba", 0x122FCE, 0x0000005 + .incbin "assets/object6A/gUnk_08122FCE.bin" gUnk_08122FD3:: @ 08122FD3 - .incbin "baserom.gba", 0x122FD3, 0x0000059 + .incbin "assets/object6A/gUnk_08122FD3.bin" gUnk_0812302C:: @ 0812302C - .incbin "baserom.gba", 0x12302C, 0x000002D + .incbin "assets/object6A/gUnk_0812302C.bin" gUnk_08123059:: @ 08123059 - .incbin "baserom.gba", 0x123059, 0x0000033 + .incbin "assets/object6A/gUnk_08123059.bin" gUnk_0812308C:: @ 0812308C .4byte gUnk_08122F2C @@ -278,20 +278,20 @@ gUnk_0812308C:: @ 0812308C .4byte 00000000 gUnk_081230C8:: @ 081230C8 - .incbin "baserom.gba", 0x1230C8, 0x0000054 + .incbin "assets/object6A/gUnk_081230C8.bin" gUnk_0812311C:: @ 0812311C .4byte gUnk_081230C8 - .incbin "baserom.gba", 0x123120, 0x0000004 + .incbin "assets/object6A/gUnk_0812311C.bin" gUnk_08123124:: @ 08123124 - .incbin "baserom.gba", 0x123124, 0x0000005 + .incbin "assets/object6A/gUnk_08123124.bin" gUnk_08123129:: @ 08123129 - .incbin "baserom.gba", 0x123129, 0x0000005 + .incbin "assets/object6A/gUnk_08123129.bin" gUnk_0812312E:: @ 0812312E - .incbin "baserom.gba", 0x12312E, 0x0000012 + .incbin "assets/object6A/gUnk_0812312E.bin" gUnk_08123140:: @ 08123140 .4byte gUnk_08123124 @@ -300,7 +300,7 @@ gUnk_08123140:: @ 08123140 .4byte 00000000 gUnk_08123150:: @ 08123150 - .incbin "baserom.gba", 0x123150, 0x0000010 + .incbin "assets/object6A/gUnk_08123150.bin" gUnk_08123160:: @ 08123160 .4byte gUnk_08123150 diff --git a/data/animations/object/object79.s b/data/animations/object/object79.s index 97d8d942..a7266451 100644 --- a/data/animations/object/object79.s +++ b/data/animations/object/object79.s @@ -5,13 +5,13 @@ @ .align 2 gUnk_08123422:: @ 08123422 - .incbin "baserom.gba", 0x123422, 0x0000019 + .incbin "assets/object79/gUnk_08123422.bin" gUnk_0812343B:: @ 0812343B - .incbin "baserom.gba", 0x12343B, 0x0000011 + .incbin "assets/object79/gUnk_0812343B.bin" gUnk_0812344C:: @ 0812344C - .incbin "baserom.gba", 0x12344C, 0x0000028 + .incbin "assets/object79/gUnk_0812344C.bin" gUnk_08123474:: @ 08123474 .4byte gUnk_08123422 diff --git a/data/animations/object/object86.s b/data/animations/object/object86.s index dfc9e4b2..974e46d3 100644 --- a/data/animations/object/object86.s +++ b/data/animations/object/object86.s @@ -5,10 +5,10 @@ .align 2 gUnk_0812380C:: @ 0812380C - .incbin "baserom.gba", 0x12380C, 0x0000014 + .incbin "assets/object86/gUnk_0812380C.bin" gUnk_08123820:: @ 08123820 - .incbin "baserom.gba", 0x123820, 0x0000014 + .incbin "assets/object86/gUnk_08123820.bin" gUnk_08123834:: @ 08123834 .4byte gUnk_0812380C diff --git a/data/animations/object/object9.s b/data/animations/object/object9.s index 0cd363a5..b8d6b125 100644 --- a/data/animations/object/object9.s +++ b/data/animations/object/object9.s @@ -5,10 +5,10 @@ .align 2 gUnk_0811F760:: @ 0811F760 - .incbin "baserom.gba", 0x11F760, 0x0000035 + .incbin "assets/object9/gUnk_0811F760.bin" gUnk_0811F795:: @ 0811F795 - .incbin "baserom.gba", 0x11F795, 0x0000037 + .incbin "assets/object9/gUnk_0811F795.bin" gUnk_0811F7CC:: @ 0811F7CC .4byte gUnk_0811F760 diff --git a/data/animations/object/object98.s b/data/animations/object/object98.s index 435b0ae9..10309e4e 100644 --- a/data/animations/object/object98.s +++ b/data/animations/object/object98.s @@ -5,16 +5,16 @@ .align 2 gUnk_08124194:: @ 08124194 - .incbin "baserom.gba", 0x124194, 0x0000048 + .incbin "assets/object98/gUnk_08124194.bin" gUnk_081241DC:: @ 081241DC - .incbin "baserom.gba", 0x1241DC, 0x0000048 + .incbin "assets/object98/gUnk_081241DC.bin" gUnk_08124224:: @ 08124224 - .incbin "baserom.gba", 0x124224, 0x0000048 + .incbin "assets/object98/gUnk_08124224.bin" gUnk_0812426C:: @ 0812426C - .incbin "baserom.gba", 0x12426C, 0x0000048 + .incbin "assets/object98/gUnk_0812426C.bin" gUnk_081242B4:: @ 081242B4 .4byte gUnk_08124194 diff --git a/data/animations/object/object9B.s b/data/animations/object/object9B.s index 2664994b..9c61a6bc 100644 --- a/data/animations/object/object9B.s +++ b/data/animations/object/object9B.s @@ -5,10 +5,10 @@ .align 2 gUnk_081242E8:: @ 081242E8 - .incbin "baserom.gba", 0x1242E8, 0x0000038 + .incbin "assets/object9B/gUnk_081242E8.bin" gUnk_08124320:: @ 08124320 - .incbin "baserom.gba", 0x124320, 0x0000028 + .incbin "assets/object9B/gUnk_08124320.bin" gUnk_08124348:: @ 08124348 .4byte gUnk_081242E8 diff --git a/data/animations/object/objectA0.s b/data/animations/object/objectA0.s index dd11024b..763a2cc3 100644 --- a/data/animations/object/objectA0.s +++ b/data/animations/object/objectA0.s @@ -5,22 +5,22 @@ .align 2 gUnk_0812468C:: @ 0812468C - .incbin "baserom.gba", 0x12468C, 0x0000004 + .incbin "assets/objectA0/gUnk_0812468C.bin" gUnk_08124690:: @ 08124690 - .incbin "baserom.gba", 0x124690, 0x0000004 + .incbin "assets/objectA0/gUnk_08124690.bin" gUnk_08124694:: @ 08124694 - .incbin "baserom.gba", 0x124694, 0x0000004 + .incbin "assets/objectA0/gUnk_08124694.bin" gUnk_08124698:: @ 08124698 - .incbin "baserom.gba", 0x124698, 0x0000010 + .incbin "assets/objectA0/gUnk_08124698.bin" gUnk_081246A8:: @ 081246A8 - .incbin "baserom.gba", 0x1246A8, 0x0000010 + .incbin "assets/objectA0/gUnk_081246A8.bin" gUnk_081246B8:: @ 081246B8 - .incbin "baserom.gba", 0x1246B8, 0x0000010 + .incbin "assets/objectA0/gUnk_081246B8.bin" gUnk_081246C8:: @ 081246C8 .4byte gUnk_08124690 diff --git a/data/animations/object/objectA2.s b/data/animations/object/objectA2.s index 4d84687a..5e736753 100644 --- a/data/animations/object/objectA2.s +++ b/data/animations/object/objectA2.s @@ -6,13 +6,13 @@ @ TODO might as well be palaceArchway gUnk_08124712:: @ 08124712 - .incbin "baserom.gba", 0x124712, 0x0000031 + .incbin "assets/objectA2/gUnk_08124712.bin" gUnk_08124743:: @ 08124743 - .incbin "baserom.gba", 0x124743, 0x0000021 + .incbin "assets/objectA2/gUnk_08124743.bin" gUnk_08124764:: @ 08124764 - .incbin "baserom.gba", 0x124764, 0x0000024 + .incbin "assets/objectA2/gUnk_08124764.bin" gUnk_08124788:: @ 08124788 .4byte gUnk_08124712 diff --git a/data/animations/object/objectA6.s b/data/animations/object/objectA6.s index 893698fc..a1159538 100644 --- a/data/animations/object/objectA6.s +++ b/data/animations/object/objectA6.s @@ -5,7 +5,7 @@ .align 2 gUnk_08124808:: @ 08124808 - .incbin "baserom.gba", 0x124808, 0x0000014 + .incbin "assets/objectA6/gUnk_08124808.bin" gUnk_0812481C:: @ 0812481C .4byte gUnk_08124808 diff --git a/data/animations/object/objectAB.s b/data/animations/object/objectAB.s index 18c65b3c..7057aa7b 100644 --- a/data/animations/object/objectAB.s +++ b/data/animations/object/objectAB.s @@ -5,7 +5,7 @@ .align 2 gUnk_08124878:: @ 08124878 - .incbin "baserom.gba", 0x124878, 0x0000018 + .incbin "assets/objectAB/gUnk_08124878.bin" gUnk_08124890:: @ 08124890 .4byte gUnk_08124878 diff --git a/data/animations/object/objectAF.s b/data/animations/object/objectAF.s index 9fc54ea9..296983ea 100644 --- a/data/animations/object/objectAF.s +++ b/data/animations/object/objectAF.s @@ -5,16 +5,16 @@ .align 2 gUnk_081248D0:: @ 081248D0 - .incbin "baserom.gba", 0x1248D0, 0x0000011 + .incbin "assets/objectAF/gUnk_081248D0.bin" gUnk_081248E1:: @ 081248E1 - .incbin "baserom.gba", 0x1248E1, 0x0000011 + .incbin "assets/objectAF/gUnk_081248E1.bin" gUnk_081248F2:: @ 081248F2 - .incbin "baserom.gba", 0x1248F2, 0x000001C + .incbin "assets/objectAF/gUnk_081248F2.bin" gUnk_0812490E:: @ 0812490E - .incbin "baserom.gba", 0x12490E, 0x000001A + .incbin "assets/objectAF/gUnk_0812490E.bin" gUnk_08124928:: @ 08124928 .4byte gUnk_081248D0 diff --git a/data/animations/object/objectB2.s b/data/animations/object/objectB2.s index c96424cd..597234b4 100644 --- a/data/animations/object/objectB2.s +++ b/data/animations/object/objectB2.s @@ -5,16 +5,16 @@ .align 2 gUnk_081249B8:: @ 081249B8 - .incbin "baserom.gba", 0x1249B8, 0x0000011 + .incbin "assets/objectB2/gUnk_081249B8.bin" gUnk_081249C9:: @ 081249C9 - .incbin "baserom.gba", 0x1249C9, 0x0000011 + .incbin "assets/objectB2/gUnk_081249C9.bin" gUnk_081249DA:: @ 081249DA - .incbin "baserom.gba", 0x1249DA, 0x0000011 + .incbin "assets/objectB2/gUnk_081249DA.bin" gUnk_081249EB:: @ 081249EB - .incbin "baserom.gba", 0x1249EB, 0x0000011 + .incbin "assets/objectB2/gUnk_081249EB.bin" gUnk_081249FC:: @ 081249FC .4byte gUnk_081249B8 diff --git a/data/animations/object/objectB3.s b/data/animations/object/objectB3.s index 47b17f75..d3dd968d 100644 --- a/data/animations/object/objectB3.s +++ b/data/animations/object/objectB3.s @@ -5,22 +5,22 @@ .align 2 gUnk_08124A2C:: @ 08124A2C - .incbin "baserom.gba", 0x124A2C, 0x0000051 + .incbin "assets/objectB3/gUnk_08124A2C.bin" gUnk_08124A7D:: @ 08124A7D - .incbin "baserom.gba", 0x124A7D, 0x0000005 + .incbin "assets/objectB3/gUnk_08124A7D.bin" gUnk_08124A82:: @ 08124A82 - .incbin "baserom.gba", 0x124A82, 0x0000005 + .incbin "assets/objectB3/gUnk_08124A82.bin" gUnk_08124A87:: @ 08124A87 - .incbin "baserom.gba", 0x124A87, 0x0000005 + .incbin "assets/objectB3/gUnk_08124A87.bin" gUnk_08124A8C:: @ 08124A8C - .incbin "baserom.gba", 0x124A8C, 0x0000021 + .incbin "assets/objectB3/gUnk_08124A8C.bin" gUnk_08124AAD:: @ 08124AAD - .incbin "baserom.gba", 0x124AAD, 0x000004B + .incbin "assets/objectB3/gUnk_08124AAD.bin" gUnk_08124AF8:: @ 08124AF8 .4byte gUnk_08124A2C diff --git a/data/animations/object/objectB4.s b/data/animations/object/objectB4.s index 9f995c2e..b3a25161 100644 --- a/data/animations/object/objectB4.s +++ b/data/animations/object/objectB4.s @@ -5,14 +5,14 @@ .align 2 gUnk_08124B38:: @ 08124B38 - .incbin "baserom.gba", 0x124B38, 0x0000071 + .incbin "assets/objectB4/gUnk_08124B38.bin" gUnk_08124BA9:: @ 08124BA9 .ifdef EU @ TODO only small differences - .incbin "baserom_eu.gba", 0x1242F1, 0x0000053 + .incbin "assets/objectB4/gUnk_08124BA9_EU.bin" .else - .incbin "baserom.gba", 0x124BA9, 0x0000053 + .incbin "assets/objectB4/gUnk_08124BA9_1_USA-JP-DEMO_USA-DEMO_JP.bin" .endif gUnk_08124BFC:: @ 08124BFC diff --git a/data/animations/object/objectBA.s b/data/animations/object/objectBA.s index 4f9d51ad..217b504a 100644 --- a/data/animations/object/objectBA.s +++ b/data/animations/object/objectBA.s @@ -5,28 +5,28 @@ .align 2 gUnk_08124F08:: @ 08124F08 - .incbin "baserom.gba", 0x124F08, 0x0000020 + .incbin "assets/objectBA/gUnk_08124F08.bin" gUnk_08124F28:: @ 08124F28 - .incbin "baserom.gba", 0x124F28, 0x0000020 + .incbin "assets/objectBA/gUnk_08124F28.bin" gUnk_08124F48:: @ 08124F48 - .incbin "baserom.gba", 0x124F48, 0x0000020 + .incbin "assets/objectBA/gUnk_08124F48.bin" gUnk_08124F68:: @ 08124F68 - .incbin "baserom.gba", 0x124F68, 0x0000020 + .incbin "assets/objectBA/gUnk_08124F68.bin" gUnk_08124F88:: @ 08124F88 - .incbin "baserom.gba", 0x124F88, 0x0000020 + .incbin "assets/objectBA/gUnk_08124F88.bin" gUnk_08124FA8:: @ 08124FA8 - .incbin "baserom.gba", 0x124FA8, 0x0000020 + .incbin "assets/objectBA/gUnk_08124FA8.bin" gUnk_08124FC8:: @ 08124FC8 - .incbin "baserom.gba", 0x124FC8, 0x0000014 + .incbin "assets/objectBA/gUnk_08124FC8.bin" gUnk_08124FDC:: @ 08124FDC - .incbin "baserom.gba", 0x124FDC, 0x0000014 + .incbin "assets/objectBA/gUnk_08124FDC.bin" gUnk_08124FF0:: @ 08124FF0 .4byte gUnk_08124F08 diff --git a/data/animations/object/objectD.s b/data/animations/object/objectD.s index c9153b2e..e795ae03 100644 --- a/data/animations/object/objectD.s +++ b/data/animations/object/objectD.s @@ -5,10 +5,10 @@ .align 2 gUnk_0811F918:: @ 0811F918 - .incbin "baserom.gba", 0x11F918, 0x000002D + .incbin "assets/objectD/gUnk_0811F918.bin" gUnk_0811F945:: @ 0811F945 - .incbin "baserom.gba", 0x11F945, 0x000000F + .incbin "assets/objectD/gUnk_0811F945.bin" gUnk_0811F954:: @ 0811F954 .4byte gUnk_0811F918 diff --git a/data/animations/object/picoBloom.s b/data/animations/object/picoBloom.s index 0ac0d001..8abdc617 100644 --- a/data/animations/object/picoBloom.s +++ b/data/animations/object/picoBloom.s @@ -5,22 +5,22 @@ @ .align 2 gUnk_0812357A:: @ 0812357A - .incbin "baserom.gba", 0x12357A, 0x0000019 + .incbin "assets/picoBloom/gUnk_0812357A.bin" gUnk_08123593:: @ 08123593 - .incbin "baserom.gba", 0x123593, 0x0000019 + .incbin "assets/picoBloom/gUnk_08123593.bin" gUnk_081235AC:: @ 081235AC - .incbin "baserom.gba", 0x1235AC, 0x0000005 + .incbin "assets/picoBloom/gUnk_081235AC.bin" gUnk_081235B1:: @ 081235B1 - .incbin "baserom.gba", 0x1235B1, 0x0000005 + .incbin "assets/picoBloom/gUnk_081235B1.bin" gUnk_081235B6:: @ 081235B6 - .incbin "baserom.gba", 0x1235B6, 0x0000035 + .incbin "assets/picoBloom/gUnk_081235B6.bin" gUnk_081235EB:: @ 081235EB - .incbin "baserom.gba", 0x1235EB, 0x0000035 + .incbin "assets/picoBloom/gUnk_081235EB.bin" gUnk_08123620:: @ 08123620 .4byte gUnk_0812357A @@ -32,6 +32,6 @@ gUnk_08123620:: @ 08123620 .4byte 00000000 gUnk_0812363C:: @ 0812363C - .incbin "baserom.gba", 0x12363C, 0x0000020 + .incbin "assets/picoBloom/gUnk_0812363C.bin" .4byte gUnk_0812363C .4byte 00000000 diff --git a/data/animations/object/pinwheel.s b/data/animations/object/pinwheel.s index ce1b8640..a6158172 100644 --- a/data/animations/object/pinwheel.s +++ b/data/animations/object/pinwheel.s @@ -5,7 +5,7 @@ .align 2 gUnk_08125068:: @ 08125068 - .incbin "baserom.gba", 0x125068, 0x0000014 + .incbin "assets/pinwheel/gUnk_08125068.bin" gUnk_0812507C:: @ 0812507C .4byte gUnk_08125068 diff --git a/data/animations/object/pot.s b/data/animations/object/pot.s index 73b08ea1..dbe69396 100644 --- a/data/animations/object/pot.s +++ b/data/animations/object/pot.s @@ -5,40 +5,40 @@ .align 2 gUnk_0811F0DC:: @ 0811F0DC - .incbin "baserom.gba", 0x11F0DC, 0x0000005 + .incbin "assets/pot/gUnk_0811F0DC.bin" gUnk_0811F0E1:: @ 0811F0E1 - .incbin "baserom.gba", 0x11F0E1, 0x0000005 + .incbin "assets/pot/gUnk_0811F0E1.bin" gUnk_0811F0E6:: @ 0811F0E6 - .incbin "baserom.gba", 0x11F0E6, 0x0000005 + .incbin "assets/pot/gUnk_0811F0E6.bin" gUnk_0811F0EB:: @ 0811F0EB - .incbin "baserom.gba", 0x11F0EB, 0x0000005 + .incbin "assets/pot/gUnk_0811F0EB.bin" gUnk_0811F0F0:: @ 0811F0F0 - .incbin "baserom.gba", 0x11F0F0, 0x0000005 + .incbin "assets/pot/gUnk_0811F0F0.bin" gUnk_0811F0F5:: @ 0811F0F5 - .incbin "baserom.gba", 0x11F0F5, 0x0000005 + .incbin "assets/pot/gUnk_0811F0F5.bin" gUnk_0811F0FA:: @ 0811F0FA - .incbin "baserom.gba", 0x11F0FA, 0x0000005 + .incbin "assets/pot/gUnk_0811F0FA.bin" gUnk_0811F0FF:: @ 0811F0FF - .incbin "baserom.gba", 0x11F0FF, 0x0000005 + .incbin "assets/pot/gUnk_0811F0FF.bin" gUnk_0811F104:: @ 0811F104 - .incbin "baserom.gba", 0x11F104, 0x0000005 + .incbin "assets/pot/gUnk_0811F104.bin" gUnk_0811F109:: @ 0811F109 - .incbin "baserom.gba", 0x11F109, 0x0000005 + .incbin "assets/pot/gUnk_0811F109.bin" gUnk_0811F10E:: @ 0811F10E - .incbin "baserom.gba", 0x11F10E, 0x0000005 + .incbin "assets/pot/gUnk_0811F10E.bin" gUnk_0811F113:: @ 0811F113 - .incbin "baserom.gba", 0x11F113, 0x0000005 + .incbin "assets/pot/gUnk_0811F113.bin" gUnk_0811F118:: @ 0811F118 .4byte gUnk_0811F0DC diff --git a/data/animations/object/pullableLever.s b/data/animations/object/pullableLever.s index 3aa4daa4..8a9b8325 100644 --- a/data/animations/object/pullableLever.s +++ b/data/animations/object/pullableLever.s @@ -5,88 +5,88 @@ .align 2 gUnk_081222C4:: @ 081222C4 - .incbin "baserom.gba", 0x1222C4, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222C4.bin" gUnk_081222C8:: @ 081222C8 - .incbin "baserom.gba", 0x1222C8, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222C8.bin" gUnk_081222CC:: @ 081222CC - .incbin "baserom.gba", 0x1222CC, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222CC.bin" gUnk_081222D0:: @ 081222D0 - .incbin "baserom.gba", 0x1222D0, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222D0.bin" gUnk_081222D4:: @ 081222D4 - .incbin "baserom.gba", 0x1222D4, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222D4.bin" gUnk_081222D8:: @ 081222D8 - .incbin "baserom.gba", 0x1222D8, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222D8.bin" gUnk_081222DC:: @ 081222DC - .incbin "baserom.gba", 0x1222DC, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222DC.bin" gUnk_081222E0:: @ 081222E0 - .incbin "baserom.gba", 0x1222E0, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222E0.bin" gUnk_081222E4:: @ 081222E4 - .incbin "baserom.gba", 0x1222E4, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222E4.bin" gUnk_081222E8:: @ 081222E8 - .incbin "baserom.gba", 0x1222E8, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222E8.bin" gUnk_081222EC:: @ 081222EC - .incbin "baserom.gba", 0x1222EC, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222EC.bin" gUnk_081222F0:: @ 081222F0 - .incbin "baserom.gba", 0x1222F0, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222F0.bin" gUnk_081222F4:: @ 081222F4 - .incbin "baserom.gba", 0x1222F4, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222F4.bin" gUnk_081222F8:: @ 081222F8 - .incbin "baserom.gba", 0x1222F8, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222F8.bin" gUnk_081222FC:: @ 081222FC - .incbin "baserom.gba", 0x1222FC, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222FC.bin" gUnk_08122300:: @ 08122300 - .incbin "baserom.gba", 0x122300, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122300.bin" gUnk_08122304:: @ 08122304 - .incbin "baserom.gba", 0x122304, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122304.bin" gUnk_08122308:: @ 08122308 - .incbin "baserom.gba", 0x122308, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122308.bin" gUnk_0812230C:: @ 0812230C - .incbin "baserom.gba", 0x12230C, 0x0000004 + .incbin "assets/pullableLever/gUnk_0812230C.bin" gUnk_08122310:: @ 08122310 - .incbin "baserom.gba", 0x122310, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122310.bin" gUnk_08122314:: @ 08122314 - .incbin "baserom.gba", 0x122314, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122314.bin" gUnk_08122318:: @ 08122318 - .incbin "baserom.gba", 0x122318, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122318.bin" gUnk_0812231C:: @ 0812231C - .incbin "baserom.gba", 0x12231C, 0x0000004 + .incbin "assets/pullableLever/gUnk_0812231C.bin" gUnk_08122320:: @ 08122320 - .incbin "baserom.gba", 0x122320, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122320.bin" gUnk_08122324:: @ 08122324 - .incbin "baserom.gba", 0x122324, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122324.bin" gUnk_08122328:: @ 08122328 - .incbin "baserom.gba", 0x122328, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122328.bin" gUnk_0812232C:: @ 0812232C - .incbin "baserom.gba", 0x12232C, 0x0000004 + .incbin "assets/pullableLever/gUnk_0812232C.bin" gUnk_08122330:: @ 08122330 - .incbin "baserom.gba", 0x122330, 0x0000004 + .incbin "assets/pullableLever/gUnk_08122330.bin" gUnk_08122334:: @ 08122334 .4byte gUnk_081222C4 diff --git a/data/animations/object/pullableMushroom.s b/data/animations/object/pullableMushroom.s index ab8154da..1633a920 100644 --- a/data/animations/object/pullableMushroom.s +++ b/data/animations/object/pullableMushroom.s @@ -5,43 +5,43 @@ .align 2 gUnk_08121204:: @ 08121204 - .incbin "baserom.gba", 0x121204, 0x0000004 + .incbin "assets/pullableMushroom/gUnk_08121204.bin" gUnk_08121208:: @ 08121208 - .incbin "baserom.gba", 0x121208, 0x000001D + .incbin "assets/pullableMushroom/gUnk_08121208.bin" gUnk_08121225:: @ 08121225 - .incbin "baserom.gba", 0x121225, 0x0000010 + .incbin "assets/pullableMushroom/gUnk_08121225.bin" gUnk_08121235:: @ 08121235 - .incbin "baserom.gba", 0x121235, 0x000001D + .incbin "assets/pullableMushroom/gUnk_08121235.bin" gUnk_08121252:: @ 08121252 - .incbin "baserom.gba", 0x121252, 0x0000011 + .incbin "assets/pullableMushroom/gUnk_08121252.bin" gUnk_08121263:: @ 08121263 - .incbin "baserom.gba", 0x121263, 0x000001D + .incbin "assets/pullableMushroom/gUnk_08121263.bin" gUnk_08121280:: @ 08121280 - .incbin "baserom.gba", 0x121280, 0x0000011 + .incbin "assets/pullableMushroom/gUnk_08121280.bin" gUnk_08121291:: @ 08121291 - .incbin "baserom.gba", 0x121291, 0x0000009 + .incbin "assets/pullableMushroom/gUnk_08121291.bin" gUnk_0812129A:: @ 0812129A - .incbin "baserom.gba", 0x12129A, 0x0000009 + .incbin "assets/pullableMushroom/gUnk_0812129A.bin" gUnk_081212A3:: @ 081212A3 - .incbin "baserom.gba", 0x1212A3, 0x0000009 + .incbin "assets/pullableMushroom/gUnk_081212A3.bin" gUnk_081212AC:: @ 081212AC - .incbin "baserom.gba", 0x1212AC, 0x0000004 + .incbin "assets/pullableMushroom/gUnk_081212AC.bin" gUnk_081212B0:: @ 081212B0 - .incbin "baserom.gba", 0x1212B0, 0x0000004 + .incbin "assets/pullableMushroom/gUnk_081212B0.bin" gUnk_081212B4:: @ 081212B4 - .incbin "baserom.gba", 0x1212B4, 0x0000004 + .incbin "assets/pullableMushroom/gUnk_081212B4.bin" gUnk_081212B8:: @ 081212B8 .4byte gUnk_08121204 diff --git a/data/animations/object/pushableLever.s b/data/animations/object/pushableLever.s index d5bb23c7..52216930 100644 --- a/data/animations/object/pushableLever.s +++ b/data/animations/object/pushableLever.s @@ -5,10 +5,10 @@ .align 2 gUnk_081234B4:: @ 081234B4 - .incbin "baserom.gba", 0x1234B4, 0x0000015 + .incbin "assets/pushableLever/gUnk_081234B4.bin" gUnk_081234C9:: @ 081234C9 - .incbin "baserom.gba", 0x1234C9, 0x0000017 + .incbin "assets/pushableLever/gUnk_081234C9.bin" gUnk_081234E0:: @ 081234E0 .4byte gUnk_081234B4 diff --git a/data/animations/object/pushableRock.s b/data/animations/object/pushableRock.s index 0b7a0b11..c9aac645 100644 --- a/data/animations/object/pushableRock.s +++ b/data/animations/object/pushableRock.s @@ -5,22 +5,22 @@ .align 2 gUnk_08121090:: @ 08121090 - .incbin "baserom.gba", 0x121090, 0x0000004 + .incbin "assets/pushableRock/gUnk_08121090.bin" gUnk_08121094:: @ 08121094 - .incbin "baserom.gba", 0x121094, 0x000003C + .incbin "assets/pushableRock/gUnk_08121094.bin" gUnk_081210D0:: @ 081210D0 - .incbin "baserom.gba", 0x1210D0, 0x000003C + .incbin "assets/pushableRock/gUnk_081210D0.bin" gUnk_0812110C:: @ 0812110C - .incbin "baserom.gba", 0x12110C, 0x000003C + .incbin "assets/pushableRock/gUnk_0812110C.bin" gUnk_08121148:: @ 08121148 - .incbin "baserom.gba", 0x121148, 0x000000C + .incbin "assets/pushableRock/gUnk_08121148.bin" gUnk_08121154:: @ 08121154 - .incbin "baserom.gba", 0x121154, 0x0000004 + .incbin "assets/pushableRock/gUnk_08121154.bin" gUnk_08121158:: @ 08121158 .4byte gUnk_08121090 diff --git a/data/animations/object/pushableStatue.s b/data/animations/object/pushableStatue.s index 9f5db495..709cbfd7 100644 --- a/data/animations/object/pushableStatue.s +++ b/data/animations/object/pushableStatue.s @@ -5,7 +5,7 @@ @ .align 2 gUnk_08120D86:: @ 08120D86 - .incbin "baserom.gba", 0x120D86, 0x0000006 + .incbin "assets/pushableStatue/gUnk_08120D86.bin" gUnk_08120D8C:: @ 08120D8C .4byte gUnk_08120D86 diff --git a/data/animations/object/railtrack.s b/data/animations/object/railtrack.s index ebc09ac9..6700a0bd 100644 --- a/data/animations/object/railtrack.s +++ b/data/animations/object/railtrack.s @@ -5,16 +5,16 @@ .align 2 gUnk_081205E4:: @ 081205E4 - .incbin "baserom.gba", 0x1205E4, 0x0000004 + .incbin "assets/railtrack/gUnk_081205E4.bin" gUnk_081205E8:: @ 081205E8 - .incbin "baserom.gba", 0x1205E8, 0x0000004 + .incbin "assets/railtrack/gUnk_081205E8.bin" gUnk_081205EC:: @ 081205EC - .incbin "baserom.gba", 0x1205EC, 0x0000004 + .incbin "assets/railtrack/gUnk_081205EC.bin" gUnk_081205F0:: @ 081205F0 - .incbin "baserom.gba", 0x1205F0, 0x0000004 + .incbin "assets/railtrack/gUnk_081205F0.bin" gUnk_081205F4:: @ 081205F4 .4byte gUnk_081205E4 diff --git a/data/animations/object/smallIceBlock.s b/data/animations/object/smallIceBlock.s index f939e1b0..3f3758a1 100644 --- a/data/animations/object/smallIceBlock.s +++ b/data/animations/object/smallIceBlock.s @@ -5,16 +5,16 @@ @ .align 2 gUnk_0812376A:: @ 0812376A - .incbin "baserom.gba", 0x12376A, 0x0000004 + .incbin "assets/smallIceBlock/gUnk_0812376A.bin" gUnk_0812376E:: @ 0812376E - .incbin "baserom.gba", 0x12376E, 0x0000004 + .incbin "assets/smallIceBlock/gUnk_0812376E.bin" gUnk_08123772:: @ 08123772 - .incbin "baserom.gba", 0x123772, 0x0000004 + .incbin "assets/smallIceBlock/gUnk_08123772.bin" gUnk_08123776:: @ 08123776 - .incbin "baserom.gba", 0x123776, 0x0000016 + .incbin "assets/smallIceBlock/gUnk_08123776.bin" gUnk_0812378C:: @ 0812378C .4byte gUnk_0812376A diff --git a/data/animations/object/specialFx.s b/data/animations/object/specialFx.s index 9e6a1ede..b163354d 100644 --- a/data/animations/object/specialFx.s +++ b/data/animations/object/specialFx.s @@ -5,217 +5,217 @@ .align 2 gUnk_0811FB10:: @ 0811FB10 - .incbin "baserom.gba", 0x11FB10, 0x0000015 + .incbin "assets/specialFx/gUnk_0811FB10.bin" gUnk_0811FB25:: @ 0811FB25 - .incbin "baserom.gba", 0x11FB25, 0x0000058 + .incbin "assets/specialFx/gUnk_0811FB25.bin" gUnk_0811FB7D:: @ 0811FB7D - .incbin "baserom.gba", 0x11FB7D, 0x0000044 + .incbin "assets/specialFx/gUnk_0811FB7D.bin" gUnk_0811FBC1:: @ 0811FBC1 - .incbin "baserom.gba", 0x11FBC1, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FBC1.bin" gUnk_0811FBE1:: @ 0811FBE1 - .incbin "baserom.gba", 0x11FBE1, 0x000001C + .incbin "assets/specialFx/gUnk_0811FBE1.bin" gUnk_0811FBFD:: @ 0811FBFD - .incbin "baserom.gba", 0x11FBFD, 0x0000014 + .incbin "assets/specialFx/gUnk_0811FBFD.bin" gUnk_0811FC11:: @ 0811FC11 - .incbin "baserom.gba", 0x11FC11, 0x000001C + .incbin "assets/specialFx/gUnk_0811FC11.bin" gUnk_0811FC2D:: @ 0811FC2D - .incbin "baserom.gba", 0x11FC2D, 0x0000024 + .incbin "assets/specialFx/gUnk_0811FC2D.bin" gUnk_0811FC51:: @ 0811FC51 - .incbin "baserom.gba", 0x11FC51, 0x0000021 + .incbin "assets/specialFx/gUnk_0811FC51.bin" gUnk_0811FC72:: @ 0811FC72 - .incbin "baserom.gba", 0x11FC72, 0x0000015 + .incbin "assets/specialFx/gUnk_0811FC72.bin" gUnk_0811FC87:: @ 0811FC87 - .incbin "baserom.gba", 0x11FC87, 0x0000024 + .incbin "assets/specialFx/gUnk_0811FC87.bin" gUnk_0811FCAB:: @ 0811FCAB - .incbin "baserom.gba", 0x11FCAB, 0x0000034 + .incbin "assets/specialFx/gUnk_0811FCAB.bin" gUnk_0811FCDF:: @ 0811FCDF - .incbin "baserom.gba", 0x11FCDF, 0x0000044 + .incbin "assets/specialFx/gUnk_0811FCDF.bin" gUnk_0811FD23:: @ 0811FD23 - .incbin "baserom.gba", 0x11FD23, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FD23.bin" gUnk_0811FD3B:: @ 0811FD3B - .incbin "baserom.gba", 0x11FD3B, 0x000001C + .incbin "assets/specialFx/gUnk_0811FD3B.bin" gUnk_0811FD57:: @ 0811FD57 - .incbin "baserom.gba", 0x11FD57, 0x000001C + .incbin "assets/specialFx/gUnk_0811FD57.bin" gUnk_0811FD73:: @ 0811FD73 - .incbin "baserom.gba", 0x11FD73, 0x000000C + .incbin "assets/specialFx/gUnk_0811FD73.bin" gUnk_0811FD7F:: @ 0811FD7F - .incbin "baserom.gba", 0x11FD7F, 0x0000010 + .incbin "assets/specialFx/gUnk_0811FD7F.bin" gUnk_0811FD8F:: @ 0811FD8F - .incbin "baserom.gba", 0x11FD8F, 0x0000014 + .incbin "assets/specialFx/gUnk_0811FD8F.bin" gUnk_0811FDA3:: @ 0811FDA3 - .incbin "baserom.gba", 0x11FDA3, 0x0000015 + .incbin "assets/specialFx/gUnk_0811FDA3.bin" gUnk_0811FDB8:: @ 0811FDB8 - .incbin "baserom.gba", 0x11FDB8, 0x0000014 + .incbin "assets/specialFx/gUnk_0811FDB8.bin" gUnk_0811FDCC:: @ 0811FDCC - .incbin "baserom.gba", 0x11FDCC, 0x0000008 + .incbin "assets/specialFx/gUnk_0811FDCC.bin" gUnk_0811FDD4:: @ 0811FDD4 - .incbin "baserom.gba", 0x11FDD4, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FDD4.bin" gUnk_0811FDEC:: @ 0811FDEC - .incbin "baserom.gba", 0x11FDEC, 0x0000010 + .incbin "assets/specialFx/gUnk_0811FDEC.bin" gUnk_0811FDFC:: @ 0811FDFC - .incbin "baserom.gba", 0x11FDFC, 0x0000019 + .incbin "assets/specialFx/gUnk_0811FDFC.bin" gUnk_0811FE15:: @ 0811FE15 - .incbin "baserom.gba", 0x11FE15, 0x0000041 + .incbin "assets/specialFx/gUnk_0811FE15.bin" gUnk_0811FE56:: @ 0811FE56 - .incbin "baserom.gba", 0x11FE56, 0x0000008 + .incbin "assets/specialFx/gUnk_0811FE56.bin" gUnk_0811FE5E:: @ 0811FE5E - .incbin "baserom.gba", 0x11FE5E, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FE5E.bin" gUnk_0811FE76:: @ 0811FE76 - .incbin "baserom.gba", 0x11FE76, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FE76.bin" gUnk_0811FE8E:: @ 0811FE8E - .incbin "baserom.gba", 0x11FE8E, 0x0000014 + .incbin "assets/specialFx/gUnk_0811FE8E.bin" gUnk_0811FEA2:: @ 0811FEA2 - .incbin "baserom.gba", 0x11FEA2, 0x000000C + .incbin "assets/specialFx/gUnk_0811FEA2.bin" gUnk_0811FEAE:: @ 0811FEAE - .incbin "baserom.gba", 0x11FEAE, 0x000000C + .incbin "assets/specialFx/gUnk_0811FEAE.bin" gUnk_0811FEBA:: @ 0811FEBA - .incbin "baserom.gba", 0x11FEBA, 0x0000028 + .incbin "assets/specialFx/gUnk_0811FEBA.bin" gUnk_0811FEE2:: @ 0811FEE2 - .incbin "baserom.gba", 0x11FEE2, 0x000000D + .incbin "assets/specialFx/gUnk_0811FEE2.bin" gUnk_0811FEEF:: @ 0811FEEF - .incbin "baserom.gba", 0x11FEEF, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FEEF.bin" gUnk_0811FF0F:: @ 0811FF0F - .incbin "baserom.gba", 0x11FF0F, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FF0F.bin" gUnk_0811FF2F:: @ 0811FF2F - .incbin "baserom.gba", 0x11FF2F, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FF2F.bin" gUnk_0811FF4F:: @ 0811FF4F - .incbin "baserom.gba", 0x11FF4F, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FF4F.bin" gUnk_0811FF6F:: @ 0811FF6F - .incbin "baserom.gba", 0x11FF6F, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FF6F.bin" gUnk_0811FF8F:: @ 0811FF8F - .incbin "baserom.gba", 0x11FF8F, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FF8F.bin" gUnk_0811FFA7:: @ 0811FFA7 - .incbin "baserom.gba", 0x11FFA7, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FFA7.bin" gUnk_0811FFC7:: @ 0811FFC7 - .incbin "baserom.gba", 0x11FFC7, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FFC7.bin" gUnk_0811FFDF:: @ 0811FFDF - .incbin "baserom.gba", 0x11FFDF, 0x0000018 + .incbin "assets/specialFx/gUnk_0811FFDF.bin" gUnk_0811FFF7:: @ 0811FFF7 - .incbin "baserom.gba", 0x11FFF7, 0x0000020 + .incbin "assets/specialFx/gUnk_0811FFF7.bin" gUnk_08120017:: @ 08120017 - .incbin "baserom.gba", 0x120017, 0x0000024 + .incbin "assets/specialFx/gUnk_08120017.bin" gUnk_0812003B:: @ 0812003B - .incbin "baserom.gba", 0x12003B, 0x0000028 + .incbin "assets/specialFx/gUnk_0812003B.bin" gUnk_08120063:: @ 08120063 - .incbin "baserom.gba", 0x120063, 0x000001C + .incbin "assets/specialFx/gUnk_08120063.bin" gUnk_0812007F:: @ 0812007F - .incbin "baserom.gba", 0x12007F, 0x000001C + .incbin "assets/specialFx/gUnk_0812007F.bin" gUnk_0812009B:: @ 0812009B - .incbin "baserom.gba", 0x12009B, 0x0000014 + .incbin "assets/specialFx/gUnk_0812009B.bin" gUnk_081200AF:: @ 081200AF - .incbin "baserom.gba", 0x1200AF, 0x000001C + .incbin "assets/specialFx/gUnk_081200AF.bin" gUnk_081200CB:: @ 081200CB - .incbin "baserom.gba", 0x1200CB, 0x0000020 + .incbin "assets/specialFx/gUnk_081200CB.bin" gUnk_081200EB:: @ 081200EB - .incbin "baserom.gba", 0x1200EB, 0x0000014 + .incbin "assets/specialFx/gUnk_081200EB.bin" gUnk_081200FF:: @ 081200FF - .incbin "baserom.gba", 0x1200FF, 0x0000024 + .incbin "assets/specialFx/gUnk_081200FF.bin" gUnk_08120123:: @ 08120123 - .incbin "baserom.gba", 0x120123, 0x0000024 + .incbin "assets/specialFx/gUnk_08120123.bin" gUnk_08120147:: @ 08120147 - .incbin "baserom.gba", 0x120147, 0x0000020 + .incbin "assets/specialFx/gUnk_08120147.bin" gUnk_08120167:: @ 08120167 - .incbin "baserom.gba", 0x120167, 0x0000018 + .incbin "assets/specialFx/gUnk_08120167.bin" gUnk_0812017F:: @ 0812017F - .incbin "baserom.gba", 0x12017F, 0x0000018 + .incbin "assets/specialFx/gUnk_0812017F.bin" gUnk_08120197:: @ 08120197 - .incbin "baserom.gba", 0x120197, 0x0000018 + .incbin "assets/specialFx/gUnk_08120197.bin" gUnk_081201AF:: @ 081201AF - .incbin "baserom.gba", 0x1201AF, 0x0000031 + .incbin "assets/specialFx/gUnk_081201AF.bin" gUnk_081201E0:: @ 081201E0 - .incbin "baserom.gba", 0x1201E0, 0x0000029 + .incbin "assets/specialFx/gUnk_081201E0.bin" gUnk_08120209:: @ 08120209 - .incbin "baserom.gba", 0x120209, 0x0000038 + .incbin "assets/specialFx/gUnk_08120209.bin" gUnk_08120241:: @ 08120241 - .incbin "baserom.gba", 0x120241, 0x0000038 + .incbin "assets/specialFx/gUnk_08120241.bin" gUnk_08120279:: @ 08120279 - .incbin "baserom.gba", 0x120279, 0x0000034 + .incbin "assets/specialFx/gUnk_08120279.bin" gUnk_081202AD:: @ 081202AD - .incbin "baserom.gba", 0x1202AD, 0x0000011 + .incbin "assets/specialFx/gUnk_081202AD.bin" gUnk_081202BE:: @ 081202BE - .incbin "baserom.gba", 0x1202BE, 0x0000025 + .incbin "assets/specialFx/gUnk_081202BE.bin" gUnk_081202E3:: @ 081202E3 - .incbin "baserom.gba", 0x1202E3, 0x0000029 + .incbin "assets/specialFx/gUnk_081202E3.bin" gUnk_0812030C:: @ 0812030C - .incbin "baserom.gba", 0x12030C, 0x0000044 + .incbin "assets/specialFx/gUnk_0812030C.bin" gUnk_08120350:: @ 08120350 - .incbin "baserom.gba", 0x120350, 0x000001C + .incbin "assets/specialFx/gUnk_08120350.bin" gUnk_0812036C:: @ 0812036C - .incbin "baserom.gba", 0x12036C, 0x0000020 + .incbin "assets/specialFx/gUnk_0812036C.bin" gUnk_0812038C:: @ 0812038C - .incbin "baserom.gba", 0x12038C, 0x0000038 + .incbin "assets/specialFx/gUnk_0812038C.bin" gUnk_081203C4:: @ 081203C4 - .incbin "baserom.gba", 0x1203C4, 0x0000038 + .incbin "assets/specialFx/gUnk_081203C4.bin" gUnk_081203FC:: @ 081203FC .4byte gUnk_0811FB10 diff --git a/data/animations/object/thoughtBubble.s b/data/animations/object/thoughtBubble.s index 026a95a6..be4a2658 100644 --- a/data/animations/object/thoughtBubble.s +++ b/data/animations/object/thoughtBubble.s @@ -5,13 +5,13 @@ .align 2 gUnk_081225A0:: @ 081225A0 - .incbin "baserom.gba", 0x1225A0, 0x000001C + .incbin "assets/thoughtBubble/gUnk_081225A0.bin" gUnk_081225BC:: @ 081225BC - .incbin "baserom.gba", 0x1225BC, 0x000001C + .incbin "assets/thoughtBubble/gUnk_081225BC.bin" gUnk_081225D8:: @ 081225D8 - .incbin "baserom.gba", 0x1225D8, 0x000001C + .incbin "assets/thoughtBubble/gUnk_081225D8.bin" gUnk_081225F4:: @ 081225F4 .4byte gUnk_081225A0 diff --git a/data/animations/object/warpPoint.s b/data/animations/object/warpPoint.s index dbf7cf79..17df90c2 100644 --- a/data/animations/object/warpPoint.s +++ b/data/animations/object/warpPoint.s @@ -5,10 +5,10 @@ @ .align 2 gUnk_08121383:: @ 08121383 - .incbin "baserom.gba", 0x121383, 0x0000011 + .incbin "assets/warpPoint/gUnk_08121383.bin" gUnk_08121394:: @ 08121394 - .incbin "baserom.gba", 0x121394, 0x0000024 + .incbin "assets/warpPoint/gUnk_08121394.bin" gUnk_081213B8:: @ 081213B8 .4byte gUnk_08121383 diff --git a/data/animations/object/whirlwind.s b/data/animations/object/whirlwind.s index 9d6abefc..503ac991 100644 --- a/data/animations/object/whirlwind.s +++ b/data/animations/object/whirlwind.s @@ -5,10 +5,10 @@ .align 2 gUnk_08122800:: @ 08122800 - .incbin "baserom.gba", 0x122800, 0x0000019 + .incbin "assets/whirlwind/gUnk_08122800.bin" gUnk_08122819:: @ 08122819 - .incbin "baserom.gba", 0x122819, 0x000001B + .incbin "assets/whirlwind/gUnk_08122819.bin" gUnk_08122834:: @ 08122834 .4byte gUnk_08122800 |