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/const/object | |
| parent | 5983a9db7f9fee0e9468e4da9d1eed1682b2bf92 (diff) | |
Replace all incbins
Diffstat (limited to 'data/const/object')
107 files changed, 249 insertions, 249 deletions
diff --git a/data/const/object/backgroundCloud.s b/data/const/object/backgroundCloud.s index 1db1df6a..afaae7d5 100644 --- a/data/const/object/backgroundCloud.s +++ b/data/const/object/backgroundCloud.s @@ -10,7 +10,7 @@ gUnk_08121EA4:: @ 08121EA4 .4byte sub_0808F70C gUnk_08121EB0:: @ 08121EB0 - .incbin "baserom.gba", 0x121EB0, 0x0000003 + .incbin "assets/backgroundCloud/gUnk_08121EB0.bin" gUnk_08121EB3:: @ 08121EB3 - .incbin "baserom.gba", 0x121EB3, 0x0000005 + .incbin "assets/backgroundCloud/gUnk_08121EB3.bin" diff --git a/data/const/object/beanstalk.s b/data/const/object/beanstalk.s index a88e9a0f..f1c9ac9f 100644 --- a/data/const/object/beanstalk.s +++ b/data/const/object/beanstalk.s @@ -9,13 +9,13 @@ gUnk_08120DF4:: @ 08120DF4 .4byte sub_08089F08 gUnk_08120DFC:: @ 08120DFC - .incbin "baserom.gba", 0x120DFC, 0x0000018 + .incbin "assets/beanstalk/gUnk_08120DFC.bin" gUnk_08120E14:: @ 08120E14 - .incbin "baserom.gba", 0x120E14, 0x0000028 + .incbin "assets/beanstalk/gUnk_08120E14.bin" gUnk_08120E3C:: @ 08120E3C - .incbin "baserom.gba", 0x120E3C, 0x0000014 + .incbin "assets/beanstalk/gUnk_08120E3C.bin" gUnk_08120E50:: @ 08120E50 .4byte sub_08089F20 @@ -39,7 +39,7 @@ gUnk_08120E84:: @ 08120E84 .4byte nullsub_518 gUnk_08120E8C:: @ 08120E8C - .incbin "baserom.gba", 0x120E8C, 0x0000045 + .incbin "assets/beanstalk/gUnk_08120E8C.bin" gUnk_08120ED1:: @ 08120ED1 - .incbin "baserom.gba", 0x120ED1, 0x0000028 + .incbin "assets/beanstalk/gUnk_08120ED1.bin" diff --git a/data/const/object/bell.s b/data/const/object/bell.s index 6c69eff4..94b8a580 100644 --- a/data/const/object/bell.s +++ b/data/const/object/bell.s @@ -9,8 +9,8 @@ gUnk_08123384:: @ 08123384 .4byte sub_08097DCC gUnk_0812338C:: @ 0812338C - .incbin "baserom.gba", 0x12338C, 0x0000024 + .incbin "assets/bell/gUnk_0812338C.bin" gUnk_081233B0:: @ 081233B0 .4byte gUnk_0812338C - .incbin "baserom.gba", 0x1233B4, 0x0000004 + .incbin "assets/bell/gUnk_081233B0.bin" diff --git a/data/const/object/bigBarrel.s b/data/const/object/bigBarrel.s index 9394c9f0..adbea787 100644 --- a/data/const/object/bigBarrel.s +++ b/data/const/object/bigBarrel.s @@ -5,13 +5,13 @@ .align 2 gUnk_08120C1C:: @ 08120C1C - .incbin "baserom.gba", 0x120C1C, 0x0000009 + .incbin "assets/bigBarrel/gUnk_08120C1C.bin" gUnk_08120C25:: @ 08120C25 - .incbin "baserom.gba", 0x120C25, 0x0000009 + .incbin "assets/bigBarrel/gUnk_08120C25.bin" gUnk_08120C2E:: @ 08120C2E - .incbin "baserom.gba", 0x120C2E, 0x0000006 + .incbin "assets/bigBarrel/gUnk_08120C2E.bin" gUnk_08120C34:: @ 08120C34 .4byte sub_08088A68 @@ -21,16 +21,16 @@ gUnk_08120C34:: @ 08120C34 .4byte sub_08088F20 gUnk_08120C48:: @ 08120C48 - .incbin "baserom.gba", 0x120C48, 0x0000008 + .incbin "assets/bigBarrel/gUnk_08120C48.bin" gUnk_08120C50:: @ 08120C50 - .incbin "baserom.gba", 0x120C50, 0x0000002 + .incbin "assets/bigBarrel/gUnk_08120C50.bin" gUnk_08120C52:: @ 08120C52 - .incbin "baserom.gba", 0x120C52, 0x0000004 + .incbin "assets/bigBarrel/gUnk_08120C52.bin" gUnk_08120C56:: @ 08120C56 - .incbin "baserom.gba", 0x120C56, 0x0000008 + .incbin "assets/bigBarrel/gUnk_08120C56.bin" gUnk_08120C5E:: @ 08120C5E - .incbin "baserom.gba", 0x120C5E, 0x0000008 + .incbin "assets/bigBarrel/gUnk_08120C5E.bin" diff --git a/data/const/object/bigIceBlock.s b/data/const/object/bigIceBlock.s index 061f99c2..7db99cf3 100644 --- a/data/const/object/bigIceBlock.s +++ b/data/const/object/bigIceBlock.s @@ -11,4 +11,4 @@ gUnk_081237A0:: @ 081237A0 .4byte sub_08099880 gUnk_081237B0:: @ 081237B0 - .incbin "baserom.gba", 0x1237B0, 0x000000A + .incbin "assets/bigIceBlock/gUnk_081237B0.bin" diff --git a/data/const/object/bigPushableLever.s b/data/const/object/bigPushableLever.s index 98d2b400..aeb425c2 100644 --- a/data/const/object/bigPushableLever.s +++ b/data/const/object/bigPushableLever.s @@ -10,10 +10,10 @@ gUnk_081236DC:: @ 081236DC .4byte sub_08098F90 gUnk_081236E8:: @ 081236E8 - .incbin "baserom.gba", 0x1236E8, 0x0000004 + .incbin "assets/bigPushableLever/gUnk_081236E8.bin" gUnk_081236EC:: @ 081236EC - .incbin "baserom.gba", 0x1236EC, 0x0000008 + .incbin "assets/bigPushableLever/gUnk_081236EC.bin" gUnk_081236F4:: @ 081236F4 - .incbin "baserom.gba", 0x1236F4, 0x0000008 + .incbin "assets/bigPushableLever/gUnk_081236F4.bin" diff --git a/data/const/object/bigVortex.s b/data/const/object/bigVortex.s index 10714c24..4b7b36e1 100644 --- a/data/const/object/bigVortex.s +++ b/data/const/object/bigVortex.s @@ -12,5 +12,5 @@ gUnk_0812367C:: @ 0812367C .4byte sub_08098E34 gUnk_08123690:: @ 08123690 - .incbin "baserom.gba", 0x123690, 0x0000008 + .incbin "assets/bigVortex/gUnk_08123690.bin" diff --git a/data/const/object/bird.s b/data/const/object/bird.s index 4f26d41b..13b907de 100644 --- a/data/const/object/bird.s +++ b/data/const/object/bird.s @@ -34,8 +34,8 @@ gUnk_08123F04:: @ 08123F04 .4byte sub_0809D130 gUnk_08123F0C:: @ 08123F0C - .incbin "baserom.gba", 0x123F0C, 0x0000014 + .incbin "assets/bird/gUnk_08123F0C.bin" gUnk_08123F20:: @ 08123F20 .4byte gUnk_08123F0C - .incbin "baserom.gba", 0x123F24, 0x0000004 + .incbin "assets/bird/gUnk_08123F20.bin" diff --git a/data/const/object/blockPushed.s b/data/const/object/blockPushed.s index 3547441d..5d9ba2e1 100644 --- a/data/const/object/blockPushed.s +++ b/data/const/object/blockPushed.s @@ -9,16 +9,16 @@ gUnk_0811F624:: @ 0811F624 .4byte sub_08083094 gUnk_0811F62C:: @ 0811F62C - .incbin "baserom.gba", 0x11F62C, 0x0000008 + .incbin "assets/blockPushed/gUnk_0811F62C.bin" gUnk_0811F634:: @ 0811F634 - .incbin "baserom.gba", 0x11F634, 0x0000008 + .incbin "assets/blockPushed/gUnk_0811F634.bin" gUnk_0811F63C:: @ 0811F63C - .incbin "baserom.gba", 0x11F63C, 0x0000008 + .incbin "assets/blockPushed/gUnk_0811F63C.bin" gUnk_0811F644:: @ 0811F644 - .incbin "baserom.gba", 0x11F644, 0x0000008 + .incbin "assets/blockPushed/gUnk_0811F644.bin" gUnk_0811F64C:: @ 0811F64C .4byte gUnk_0811F62C diff --git a/data/const/object/bossDoor.s b/data/const/object/bossDoor.s index adb2f638..efe9bda1 100644 --- a/data/const/object/bossDoor.s +++ b/data/const/object/bossDoor.s @@ -14,10 +14,10 @@ gUnk_081214D8:: @ 081214D8 .4byte sub_0808C4A4 gUnk_081214F4:: @ 081214F4 - .incbin "baserom.gba", 0x1214F4, 0x0000008 + .incbin "assets/bossDoor/gUnk_081214F4.bin" gUnk_081214FC:: @ 081214FC - .incbin "baserom.gba", 0x1214FC, 0x0000010 + .incbin "assets/bossDoor/gUnk_081214FC.bin" gUnk_0812150C:: @ 0812150C - .incbin "baserom.gba", 0x12150C, 0x0000008 + .incbin "assets/bossDoor/gUnk_0812150C.bin" diff --git a/data/const/object/button.s b/data/const/object/button.s index 1a32b057..e98df2ac 100644 --- a/data/const/object/button.s +++ b/data/const/object/button.s @@ -13,4 +13,4 @@ gUnk_0811EE38:: @ 0811EE38 .4byte sub_08081C98 gUnk_0811EE50:: @ 0811EE50 - .incbin "baserom.gba", 0x11EE50, 0x000000C + .incbin "assets/button/gUnk_0811EE50.bin" diff --git a/data/const/object/chestSpawner.s b/data/const/object/chestSpawner.s index 3c3baa5a..478cdd4b 100644 --- a/data/const/object/chestSpawner.s +++ b/data/const/object/chestSpawner.s @@ -31,25 +31,25 @@ gUnk_0811F818:: @ 0811F818 .4byte nullsub_114 gUnk_0811F838:: @ 0811F838 - .incbin "baserom.gba", 0x11F838, 0x0000008 + .incbin "assets/chestSpawner/gUnk_0811F838.bin" gUnk_0811F840:: @ 0811F840 - .incbin "baserom.gba", 0x11F840, 0x0000010 + .incbin "assets/chestSpawner/gUnk_0811F840.bin" gUnk_0811F850:: @ 0811F850 - .incbin "baserom.gba", 0x11F850, 0x0000004 + .incbin "assets/chestSpawner/gUnk_0811F850.bin" gUnk_0811F854:: @ 0811F854 - .incbin "baserom.gba", 0x11F854, 0x0000012 + .incbin "assets/chestSpawner/gUnk_0811F854.bin" gUnk_0811F866:: @ 0811F866 - .incbin "baserom.gba", 0x11F866, 0x000001A + .incbin "assets/chestSpawner/gUnk_0811F866.bin" gUnk_0811F880:: @ 0811F880 - .incbin "baserom.gba", 0x11F880, 0x000000A + .incbin "assets/chestSpawner/gUnk_0811F880.bin" gUnk_0811F88A:: @ 0811F88A - .incbin "baserom.gba", 0x11F88A, 0x000000E + .incbin "assets/chestSpawner/gUnk_0811F88A.bin" gUnk_0811F898:: @ 0811F898 .4byte gUnk_0811F854 @@ -58,7 +58,7 @@ gUnk_0811F898:: @ 0811F898 .4byte gUnk_0811F88A gUnk_0811F8A8:: @ 0811F8A8 - .incbin "baserom.gba", 0x11F8A8, 0x0000008 + .incbin "assets/chestSpawner/gUnk_0811F8A8.bin" gUnk_0811F8B0:: @ 0811F8B0 - .incbin "baserom.gba", 0x11F8B0, 0x0000008 + .incbin "assets/chestSpawner/gUnk_0811F8B0.bin" diff --git a/data/const/object/cloud.s b/data/const/object/cloud.s index cea18461..a909111b 100644 --- a/data/const/object/cloud.s +++ b/data/const/object/cloud.s @@ -21,10 +21,10 @@ gUnk_081247AC:: @ 081247AC .4byte sub_0809F6CC gUnk_081247C0:: @ 081247C0 - .incbin "baserom.gba", 0x1247C0, 0x0000008 + .incbin "assets/cloud/gUnk_081247C0.bin" gUnk_081247C8:: @ 081247C8 - .incbin "baserom.gba", 0x1247C8, 0x0000008 + .incbin "assets/cloud/gUnk_081247C8.bin" gUnk_081247D0:: @ 081247D0 - .incbin "baserom.gba", 0x1247D0, 0x0000028 + .incbin "assets/cloud/gUnk_081247D0.bin" diff --git a/data/const/object/crenalBeanSprout.s b/data/const/object/crenalBeanSprout.s index f1eb0f11..c0739072 100644 --- a/data/const/object/crenalBeanSprout.s +++ b/data/const/object/crenalBeanSprout.s @@ -14,7 +14,7 @@ gUnk_08123168:: @ 08123168 .4byte sub_08096834 gUnk_08123184:: @ 08123184 - .incbin "baserom.gba", 0x123184, 0x0000008 + .incbin "assets/crenalBeanSprout/gUnk_08123184.bin" gUnk_0812318C:: @ 0812318C .4byte sub_0809671C @@ -23,7 +23,7 @@ gUnk_0812318C:: @ 0812318C .4byte sub_08096740 gUnk_0812319C:: @ 0812319C - .incbin "baserom.gba", 0x12319C, 0x0000004 + .incbin "assets/crenalBeanSprout/gUnk_0812319C.bin" gUnk_081231A0:: @ 081231A0 .4byte sub_08096858 @@ -31,10 +31,10 @@ gUnk_081231A0:: @ 081231A0 .4byte sub_08096988 gUnk_081231AC:: @ 081231AC - .incbin "baserom.gba", 0x1231AC, 0x0000002 + .incbin "assets/crenalBeanSprout/gUnk_081231AC.bin" gUnk_081231AE:: @ 081231AE - .incbin "baserom.gba", 0x1231AE, 0x0000006 + .incbin "assets/crenalBeanSprout/gUnk_081231AE.bin" gUnk_081231B4:: @ 081231B4 - .incbin "baserom.gba", 0x1231B4, 0x0000006 + .incbin "assets/crenalBeanSprout/gUnk_081231B4.bin" diff --git a/data/const/object/deathFx.s b/data/const/object/deathFx.s index 55663678..54544f72 100644 --- a/data/const/object/deathFx.s +++ b/data/const/object/deathFx.s @@ -10,10 +10,10 @@ gUnk_0811EBFC:: @ 0811EBFC .4byte sub_08081760 gUnk_0811EC08:: @ 0811EC08 - .incbin "baserom.gba", 0x11EC08, 0x0000018 + .incbin "assets/deathFx/gUnk_0811EC08.bin" gUnk_0811EC20:: @ 0811EC20 - .incbin "baserom.gba", 0x11EC20, 0x0000004 + .incbin "assets/deathFx/gUnk_0811EC20.bin" gUnk_0811EC24:: @ 0811EC24 .4byte sub_080817CC @@ -34,4 +34,4 @@ gUnk_0811EC24:: @ 0811EC24 .4byte sub_080817FC gUnk_0811EC64:: @ 0811EC64 - .incbin "baserom.gba", 0x11EC64, 0x0000070 + .incbin "assets/deathFx/gUnk_0811EC64.bin" diff --git a/data/const/object/evilSpirit.s b/data/const/object/evilSpirit.s index aabda635..4f674468 100644 --- a/data/const/object/evilSpirit.s +++ b/data/const/object/evilSpirit.s @@ -11,22 +11,22 @@ gUnk_08120668:: @ 08120668 .4byte sub_08086594 gUnk_08120678:: @ 08120678 - .incbin "baserom.gba", 0x120678, 0x000000A + .incbin "assets/evilSpirit/gUnk_08120678.bin" gUnk_08120682:: @ 08120682 - .incbin "baserom.gba", 0x120682, 0x0000004 + .incbin "assets/evilSpirit/gUnk_08120682.bin" gUnk_08120686:: @ 08120686 - .incbin "baserom.gba", 0x120686, 0x0000004 + .incbin "assets/evilSpirit/gUnk_08120686.bin" gUnk_0812068A:: @ 0812068A - .incbin "baserom.gba", 0x12068A, 0x0000004 + .incbin "assets/evilSpirit/gUnk_0812068A.bin" gUnk_0812068E:: @ 0812068E - .incbin "baserom.gba", 0x12068E, 0x0000004 + .incbin "assets/evilSpirit/gUnk_0812068E.bin" gUnk_08120692:: @ 08120692 - .incbin "baserom.gba", 0x120692, 0x0000006 + .incbin "assets/evilSpirit/gUnk_08120692.bin" gUnk_08120698:: @ 08120698 .4byte gUnk_08120682 diff --git a/data/const/object/fairy.s b/data/const/object/fairy.s index bb456b41..689494dc 100644 --- a/data/const/object/fairy.s +++ b/data/const/object/fairy.s @@ -17,4 +17,4 @@ gUnk_08121798:: @ 08121798 .4byte sub_0808D7A0 gUnk_081217A4:: @ 081217A4 - .incbin "baserom.gba", 0x1217A4, 0x0000004 + .incbin "assets/fairy/gUnk_081217A4.bin" diff --git a/data/const/object/fan.s b/data/const/object/fan.s index 0c8402e9..94e7cea3 100644 --- a/data/const/object/fan.s +++ b/data/const/object/fan.s @@ -11,7 +11,7 @@ gUnk_081243D4:: @ 081243D4 .4byte sub_0809EDE4 gUnk_081243E4:: @ 081243E4 - .incbin "baserom.gba", 0x1243E4, 0x0000008 + .incbin "assets/fan/gUnk_081243E4.bin" gUnk_081243EC:: @ 081243EC - .incbin "baserom.gba", 0x1243EC, 0x0000008 + .incbin "assets/fan/gUnk_081243EC.bin" diff --git a/data/const/object/figurineDevice.s b/data/const/object/figurineDevice.s index f02bc42d..3e88c666 100644 --- a/data/const/object/figurineDevice.s +++ b/data/const/object/figurineDevice.s @@ -12,26 +12,26 @@ gUnk_08120A94:: @ 08120A94 .4byte sub_08087E5C gUnk_08120AA8:: @ 08120AA8 - .incbin "baserom.gba", 0x120AA8, 0x0000004 + .incbin "assets/figurineDevice/gUnk_08120AA8.bin" gUnk_08120AAC:: @ 08120AAC - .incbin "baserom.gba", 0x120AAC, 0x0000008 + .incbin "assets/figurineDevice/gUnk_08120AAC.bin" gUnk_08120AB4:: @ 08120AB4 .ifdef EU @ TODO only small differences - .incbin "baserom_eu.gba", 0x1201FC, 0x0000018 + .incbin "assets/figurineDevice/gUnk_08120AB4_EU.bin" .else - .incbin "baserom.gba", 0x120AB4, 0x0000018 + .incbin "assets/figurineDevice/gUnk_08120AB4_1_USA-JP-DEMO_USA-DEMO_JP.bin" .endif gUnk_08120ACC:: @ 08120ACC .ifdef EU @ TODO only small differences - .incbin "baserom_eu.gba", 0x120214, 0x0000018 + .incbin "assets/figurineDevice/gUnk_08120ACC_EU.bin" .else - .incbin "baserom.gba", 0x120ACC, 0x0000018 + .incbin "assets/figurineDevice/gUnk_08120ACC_1_USA-JP-DEMO_USA-DEMO_JP.bin" .endif gUnk_08120AE4:: @ 08120AE4 - .incbin "baserom.gba", 0x120AE4, 0x0000004 + .incbin "assets/figurineDevice/gUnk_08120AE4.bin" diff --git a/data/const/object/fileScreenObjects.s b/data/const/object/fileScreenObjects.s index b0efbd2a..48fd2dd0 100644 --- a/data/const/object/fileScreenObjects.s +++ b/data/const/object/fileScreenObjects.s @@ -37,19 +37,19 @@ gUnk_08121CCC:: @ 08121CCC .4byte sub_0808E818 gUnk_08121CD4:: @ 08121CD4 - .incbin "baserom.gba", 0x121CD4, 0x000003C + .incbin "assets/fileScreenObjects/gUnk_08121CD4.bin" gUnk_08121D10:: @ 08121D10 - .incbin "baserom.gba", 0x121D10, 0x0000008 + .incbin "assets/fileScreenObjects/gUnk_08121D10.bin" gUnk_08121D18:: @ 08121D18 - .incbin "baserom.gba", 0x121D18, 0x0000020 + .incbin "assets/fileScreenObjects/gUnk_08121D18.bin" gUnk_08121D38:: @ 08121D38 - .incbin "baserom.gba", 0x121D38, 0x0000010 + .incbin "assets/fileScreenObjects/gUnk_08121D38.bin" gUnk_08121D48:: @ 08121D48 - .incbin "baserom.gba", 0x121D48, 0x000000C + .incbin "assets/fileScreenObjects/gUnk_08121D48.bin" gUnk_08121D54:: @ 08121D54 - .incbin "baserom.gba", 0x121D54, 0x00000D0 + .incbin "assets/fileScreenObjects/gUnk_08121D54.bin" diff --git a/data/const/object/floatingPlatform.s b/data/const/object/floatingPlatform.s index 0fa0ac32..60c62ff7 100644 --- a/data/const/object/floatingPlatform.s +++ b/data/const/object/floatingPlatform.s @@ -9,4 +9,4 @@ gUnk_08120650:: @ 08120650 .4byte sub_0808611C gUnk_08120658:: @ 08120658 - .incbin "baserom.gba", 0x120658, 0x0000008 + .incbin "assets/floatingPlatform/gUnk_08120658.bin" diff --git a/data/const/object/fourElements.s b/data/const/object/fourElements.s index 332213b2..38ebdd38 100644 --- a/data/const/object/fourElements.s +++ b/data/const/object/fourElements.s @@ -14,4 +14,4 @@ gUnk_08124898:: @ 08124898 .4byte sub_080A03E8 gUnk_081248B4:: @ 081248B4 - .incbin "baserom.gba", 0x1248B4, 0x0000008 + .incbin "assets/fourElements/gUnk_081248B4.bin" diff --git a/data/const/object/frozenWaterElement.s b/data/const/object/frozenWaterElement.s index f7439a05..eefc5a84 100644 --- a/data/const/object/frozenWaterElement.s +++ b/data/const/object/frozenWaterElement.s @@ -10,4 +10,4 @@ gUnk_08123DB4:: @ 08123DB4 .4byte sub_0809BF74 gUnk_08123DC0:: @ 08123DC0 - .incbin "baserom.gba", 0x123DC0, 0x000000C + .incbin "assets/frozenWaterElement/gUnk_08123DC0.bin" diff --git a/data/const/object/furniture.s b/data/const/object/furniture.s index a243d7f6..01996b04 100644 --- a/data/const/object/furniture.s +++ b/data/const/object/furniture.s @@ -5,4 +5,4 @@ .align 2 gUnk_08121EF8:: @ 08121EF8 - .incbin "baserom.gba", 0x121EF8, 0x0000230 + .incbin "assets/furniture/gUnk_08121EF8.bin" diff --git a/data/const/object/giantBookLadder.s b/data/const/object/giantBookLadder.s index 3f44de25..0434453d 100644 --- a/data/const/object/giantBookLadder.s +++ b/data/const/object/giantBookLadder.s @@ -5,4 +5,4 @@ .align 2 gUnk_08121C40:: @ 08121C40 - .incbin "baserom.gba", 0x121C40, 0x0000008 + .incbin "assets/giantBookLadder/gUnk_08121C40.bin" diff --git a/data/const/object/giantLeaf.s b/data/const/object/giantLeaf.s index e58996dc..13af4dcc 100644 --- a/data/const/object/giantLeaf.s +++ b/data/const/object/giantLeaf.s @@ -5,7 +5,7 @@ .align 2 gUnk_08121750:: @ 08121750 - .incbin "baserom.gba", 0x121750, 0x000001A + .incbin "assets/giantLeaf/gUnk_08121750.bin" gUnk_0812176A:: @ 0812176A - .incbin "baserom.gba", 0x12176A, 0x000001A + .incbin "assets/giantLeaf/gUnk_0812176A.bin" diff --git a/data/const/object/giantTwig.s b/data/const/object/giantTwig.s index 3974e63c..82101215 100644 --- a/data/const/object/giantTwig.s +++ b/data/const/object/giantTwig.s @@ -21,7 +21,7 @@ gUnk_081228F0:: @ 081228F0 .4byte nullsub_526 gUnk_081228F8:: @ 081228F8 - .incbin "baserom.gba", 0x1228F8, 0x0000026 + .incbin "assets/giantTwig/gUnk_081228F8.bin" gUnk_0812291E:: @ 0812291E - .incbin "baserom.gba", 0x12291E, 0x0000026 + .incbin "assets/giantTwig/gUnk_0812291E.bin" diff --git a/data/const/object/heartContainer.s b/data/const/object/heartContainer.s index 356963e0..b8301d8b 100644 --- a/data/const/object/heartContainer.s +++ b/data/const/object/heartContainer.s @@ -5,4 +5,4 @@ .align 2 gUnk_08121C58:: @ 08121C58 - .incbin "baserom.gba", 0x121C58, 0x000000C + .incbin "assets/heartContainer/gUnk_08121C58.bin" diff --git a/data/const/object/hittableLever.s b/data/const/object/hittableLever.s index a2397b43..cd0ef702 100644 --- a/data/const/object/hittableLever.s +++ b/data/const/object/hittableLever.s @@ -9,4 +9,4 @@ gUnk_08121178:: @ 08121178 .4byte sub_0808A778 gUnk_08121180:: @ 08121180 - .incbin "baserom.gba", 0x121180, 0x0000008 + .incbin "assets/hittableLever/gUnk_08121180.bin" diff --git a/data/const/object/houseDoorExterior.s b/data/const/object/houseDoorExterior.s index 1d7c7d5c..7ad1a5b9 100644 --- a/data/const/object/houseDoorExterior.s +++ b/data/const/object/houseDoorExterior.s @@ -5,7 +5,7 @@ .align 2 gUnk_081206AC:: @ 081206AC - .incbin "baserom.gba", 0x1206AC, 0x0000008 + .incbin "assets/houseDoorExterior/gUnk_081206AC.bin" gUnk_081206B4:: @ 081206B4 .4byte sub_080866D8 diff --git a/data/const/object/houseDoorInterior.s b/data/const/object/houseDoorInterior.s index c6e1eab0..8f916d1f 100644 --- a/data/const/object/houseDoorInterior.s +++ b/data/const/object/houseDoorInterior.s @@ -5,7 +5,7 @@ .align 2 gUnk_081227B4:: @ 081227B4 - .incbin "baserom.gba", 0x1227B4, 0x000000C + .incbin "assets/houseDoorInterior/gUnk_081227B4.bin" gUnk_081227C0:: @ 081227C0 .4byte sub_08092B8C @@ -13,8 +13,8 @@ gUnk_081227C0:: @ 081227C0 .4byte sub_08092C98 gUnk_081227CC:: @ 081227CC - .incbin "baserom.gba", 0x1227CC, 0x0000020 + .incbin "assets/houseDoorInterior/gUnk_081227CC.bin" gUnk_081227EC:: @ 081227EC - .incbin "baserom.gba", 0x1227EC, 0x0000008 + .incbin "assets/houseDoorInterior/gUnk_081227EC.bin" diff --git a/data/const/object/itemOnGround.s b/data/const/object/itemOnGround.s index 78fbd7f4..58705999 100644 --- a/data/const/object/itemOnGround.s +++ b/data/const/object/itemOnGround.s @@ -49,4 +49,4 @@ gUnk_0811E840:: @ 0811E840 .4byte sub_080813F0 gUnk_0811E84C:: @ 0811E84C - .incbin "baserom.gba", 0x11E84C, 0x00003B0 + .incbin "assets/itemOnGround/gUnk_0811E84C.bin" diff --git a/data/const/object/jailBars.s b/data/const/object/jailBars.s index 70d96c8f..cb4f10fb 100644 --- a/data/const/object/jailBars.s +++ b/data/const/object/jailBars.s @@ -11,7 +11,7 @@ gUnk_08124950:: @ 08124950 .4byte nullsub_127 gUnk_08124960:: @ 08124960 - .incbin "baserom.gba", 0x124960, 0x000001A + .incbin "assets/jailBars/gUnk_08124960.bin" gUnk_0812497A:: @ 0812497A - .incbin "baserom.gba", 0x12497A, 0x000001A + .incbin "assets/jailBars/gUnk_0812497A.bin" diff --git a/data/const/object/lavaPlatform.s b/data/const/object/lavaPlatform.s index 7e11d101..bf0c2e3e 100644 --- a/data/const/object/lavaPlatform.s +++ b/data/const/object/lavaPlatform.s @@ -20,12 +20,12 @@ gUnk_08122650:: @ 08122650 .4byte sub_08092590 gUnk_08122670:: @ 08122670 - .incbin "baserom.gba", 0x122670, 0x0000014 + .incbin "assets/lavaPlatform/gUnk_08122670.bin" gUnk_08122684:: @ 08122684 - .incbin "baserom.gba", 0x122684, 0x0000014 + .incbin "assets/lavaPlatform/gUnk_08122684.bin" gUnk_08122698:: @ 08122698 .4byte gUnk_08122670 .4byte gUnk_08122684 - .incbin "baserom.gba", 0x1226A0, 0x0000004 + .incbin "assets/lavaPlatform/gUnk_08122698.bin" diff --git a/data/const/object/lilypadLarge.s b/data/const/object/lilypadLarge.s index 4ae5b95d..05c1ada1 100644 --- a/data/const/object/lilypadLarge.s +++ b/data/const/object/lilypadLarge.s @@ -13,7 +13,7 @@ gUnk_08120608:: @ 08120608 .4byte sub_08085D10 gUnk_08120620:: @ 08120620 - .incbin "baserom.gba", 0x120620, 0x000000C + .incbin "assets/lilypadLarge/gUnk_08120620.bin" gUnk_0812062C:: @ 0812062C .4byte sub_08085A44 @@ -21,7 +21,7 @@ gUnk_0812062C:: @ 0812062C .4byte sub_08085B40 gUnk_08120638:: @ 08120638 - .incbin "baserom.gba", 0x120638, 0x0000008 + .incbin "assets/lilypadLarge/gUnk_08120638.bin" gUnk_08120640:: @ 08120640 - .incbin "baserom.gba", 0x120640, 0x0000008 + .incbin "assets/lilypadLarge/gUnk_08120640.bin" diff --git a/data/const/object/lilypadSmall.s b/data/const/object/lilypadSmall.s index f99b34ca..999b8b04 100644 --- a/data/const/object/lilypadSmall.s +++ b/data/const/object/lilypadSmall.s @@ -5,5 +5,5 @@ .align 2 gUnk_08123318:: @ 08123318 - .incbin "baserom.gba", 0x123318, 0x0000010 + .incbin "assets/lilypadSmall/gUnk_08123318.bin" diff --git a/data/const/object/macroBook.s b/data/const/object/macroBook.s index cbf33538..e27470e4 100644 --- a/data/const/object/macroBook.s +++ b/data/const/object/macroBook.s @@ -11,4 +11,4 @@ gUnk_08123C80:: @ 08123C80 .4byte sub_0809A8A4 gUnk_08123C90:: @ 08123C90 - .incbin "baserom.gba", 0x123C90, 0x0000028 + .incbin "assets/macroBook/gUnk_08123C90.bin" diff --git a/data/const/object/macroDecorations.s b/data/const/object/macroDecorations.s index 20584a0e..d952b928 100644 --- a/data/const/object/macroDecorations.s +++ b/data/const/object/macroDecorations.s @@ -9,4 +9,4 @@ gUnk_081233B8:: @ 081233B8 .4byte sub_08097EA4 gUnk_081233C0:: @ 081233C0 - .incbin "baserom.gba", 0x1233C0, 0x0000050 + .incbin "assets/macroDecorations/gUnk_081233C0.bin" diff --git a/data/const/object/macroPlayer.s b/data/const/object/macroPlayer.s index 62397be5..5425151e 100644 --- a/data/const/object/macroPlayer.s +++ b/data/const/object/macroPlayer.s @@ -22,4 +22,4 @@ gUnk_08121688:: @ 08121688 .4byte sub_0808CEC0 gUnk_081216B4:: @ 081216B4 - .incbin "baserom.gba", 0x1216B4, 0x0000008 + .incbin "assets/macroPlayer/gUnk_081216B4.bin" diff --git a/data/const/object/macroShoes.s b/data/const/object/macroShoes.s index f7902756..c9c76062 100644 --- a/data/const/object/macroShoes.s +++ b/data/const/object/macroShoes.s @@ -9,10 +9,10 @@ gUnk_081234EC:: @ 081234EC .4byte gUnk_081234FC gUnk_081234F4:: @ 081234F4 - .incbin "baserom.gba", 0x1234F4, 0x0000008 + .incbin "assets/macroShoes/gUnk_081234F4.bin" gUnk_081234FC:: @ 081234FC - .incbin "baserom.gba", 0x1234FC, 0x0000008 + .incbin "assets/macroShoes/gUnk_081234FC.bin" gUnk_08123504:: @ 08123504 .4byte sub_080984EC diff --git a/data/const/object/minecart.s b/data/const/object/minecart.s index de790a39..fdbc5d77 100644 --- a/data/const/object/minecart.s +++ b/data/const/object/minecart.s @@ -15,7 +15,7 @@ gUnk_081223A8:: @ 081223A8 .4byte sub_08091D90 gUnk_081223C8:: @ 081223C8 - .incbin "baserom.gba", 0x1223C8, 0x0000008 + .incbin "assets/minecart/gUnk_081223C8.bin" gUnk_081223D0:: @ 081223D0 - .incbin "baserom.gba", 0x1223D0, 0x0000008 + .incbin "assets/minecart/gUnk_081223D0.bin" diff --git a/data/const/object/mineralWaterSource.s b/data/const/object/mineralWaterSource.s index ff4220c9..b7e8f7cf 100644 --- a/data/const/object/mineralWaterSource.s +++ b/data/const/object/mineralWaterSource.s @@ -9,4 +9,4 @@ MineralWaterSourceActionFuncs:: @ 08123298 .4byte sub_080973DC MineralWaterSourceParameters:: @ 081232A0 - .incbin "baserom.gba", 0x1232A0, 0x0000004 + .incbin "assets/mineralWaterSource/MineralWaterSourceParameters.bin" diff --git a/data/const/object/minishSizedEntrance.s b/data/const/object/minishSizedEntrance.s index 7a350fe7..4eed9b50 100644 --- a/data/const/object/minishSizedEntrance.s +++ b/data/const/object/minishSizedEntrance.s @@ -9,4 +9,4 @@ gUnk_08122254:: @ 08122254 .4byte sub_08090F00 gUnk_0812225C:: @ 0812225C - .incbin "baserom.gba", 0x12225C, 0x0000008 + .incbin "assets/minishSizedEntrance/gUnk_0812225C.bin" diff --git a/data/const/object/object10.s b/data/const/object/object10.s index 8a61aba9..6c386288 100644 --- a/data/const/object/object10.s +++ b/data/const/object/object10.s @@ -10,7 +10,7 @@ gUnk_08120560:: @ 08120560 .4byte sub_080849D8 gUnk_0812056C:: @ 0812056C - .incbin "baserom.gba", 0x12056C, 0x0000008 + .incbin "assets/object10/gUnk_0812056C.bin" gUnk_08120574:: @ 08120574 - .incbin "baserom.gba", 0x120574, 0x0000008 + .incbin "assets/object10/gUnk_08120574.bin" diff --git a/data/const/object/object11.s b/data/const/object/object11.s index aae642b9..7aa0e423 100644 --- a/data/const/object/object11.s +++ b/data/const/object/object11.s @@ -10,7 +10,7 @@ gUnk_0812057C:: @ 0812057C .4byte sub_08084EB4 gUnk_08120588:: @ 08120588 - .incbin "baserom.gba", 0x120588, 0x0000014 + .incbin "assets/object11/gUnk_08120588.bin" gUnk_0812059C:: @ 0812059C .4byte sub_08084ECC @@ -21,4 +21,4 @@ gUnk_0812059C:: @ 0812059C .4byte sub_08084F8C gUnk_081205B4:: @ 081205B4 - .incbin "baserom.gba", 0x1205B4, 0x0000008 + .incbin "assets/object11/gUnk_081205B4.bin" diff --git a/data/const/object/object1D.s b/data/const/object/object1D.s index dfc82433..443860ba 100644 --- a/data/const/object/object1D.s +++ b/data/const/object/object1D.s @@ -9,6 +9,6 @@ gUnk_081208A0:: @ 081208A0 .4byte nullsub_117 gUnk_081208A8:: @ 081208A8 - .incbin "baserom.gba", 0x1208A8, 0x0000008 + .incbin "assets/object1D/gUnk_081208A8.bin" .4byte gUnk_081208A8 - .incbin "baserom.gba", 0x1208B4, 0x0000004 + .incbin "assets/object1D/gUnk_081208A8_1.bin" diff --git a/data/const/object/object1E.s b/data/const/object/object1E.s index 2c44500b..6392ddc2 100644 --- a/data/const/object/object1E.s +++ b/data/const/object/object1E.s @@ -9,4 +9,4 @@ gUnk_081208B8:: @ 081208B8 .4byte sub_080875F4 gUnk_081208C0:: @ 081208C0 - .incbin "baserom.gba", 0x1208C0, 0x0000008 + .incbin "assets/object1E/gUnk_081208C0.bin" diff --git a/data/const/object/object1F.s b/data/const/object/object1F.s index 6ef35eca..dfee925c 100644 --- a/data/const/object/object1F.s +++ b/data/const/object/object1F.s @@ -10,7 +10,7 @@ gUnk_08120A0C:: @ 08120A0C .4byte sub_080877A4 gUnk_08120A18:: @ 08120A18 - .incbin "baserom.gba", 0x120A18, 0x0000008 + .incbin "assets/object1F/gUnk_08120A18.bin" gUnk_08120A20:: @ 08120A20 - .incbin "baserom.gba", 0x120A20, 0x0000008 + .incbin "assets/object1F/gUnk_08120A20.bin" diff --git a/data/const/object/object21.s b/data/const/object/object21.s index 1b95f68a..fb6da2fc 100644 --- a/data/const/object/object21.s +++ b/data/const/object/object21.s @@ -11,10 +11,10 @@ gUnk_08120A68:: @ 08120A68 .4byte sub_08087B58 gUnk_08120A78:: @ 08120A78 - .incbin "baserom.gba", 0x120A78, 0x0000002 + .incbin "assets/object21/gUnk_08120A78.bin" gUnk_08120A7A:: @ 08120A7A - .incbin "baserom.gba", 0x120A7A, 0x0000006 + .incbin "assets/object21/gUnk_08120A7A.bin" gUnk_08120A80:: @ 08120A80 .4byte sub_08087B88 @@ -22,4 +22,4 @@ gUnk_08120A80:: @ 08120A80 .4byte sub_08087B9C gUnk_08120A8C:: @ 08120A8C - .incbin "baserom.gba", 0x120A8C, 0x0000008 + .incbin "assets/object21/gUnk_08120A8C.bin" diff --git a/data/const/object/object24.s b/data/const/object/object24.s index 26ebae60..2f7fa47e 100644 --- a/data/const/object/object24.s +++ b/data/const/object/object24.s @@ -10,4 +10,4 @@ gUnk_08120BE0:: @ 08120BE0 .4byte sub_080888F4 gUnk_08120BEC:: @ 08120BEC - .incbin "baserom.gba", 0x120BEC, 0x0000005 + .incbin "assets/object24/gUnk_08120BEC.bin" diff --git a/data/const/object/object26.s b/data/const/object/object26.s index 3929d292..9e6681b7 100644 --- a/data/const/object/object26.s +++ b/data/const/object/object26.s @@ -5,7 +5,7 @@ .align 2 gUnk_08120C80:: @ 08120C80 - .incbin "baserom.gba", 0x120C80, 0x0000012 + .incbin "assets/object26/gUnk_08120C80.bin" gUnk_08120C92:: @ 08120C92 - .incbin "baserom.gba", 0x120C92, 0x0000006 + .incbin "assets/object26/gUnk_08120C92.bin" diff --git a/data/const/object/object30.s b/data/const/object/object30.s index 0e7ee1b1..9d61dd6b 100644 --- a/data/const/object/object30.s +++ b/data/const/object/object30.s @@ -10,4 +10,4 @@ gUnk_08121188:: @ 08121188 .4byte sub_0808A8E0 gUnk_08121194:: @ 08121194 - .incbin "baserom.gba", 0x121194, 0x0000008 + .incbin "assets/object30/gUnk_08121194.bin" diff --git a/data/const/object/object36.s b/data/const/object/object36.s index b089a9db..5c912078 100644 --- a/data/const/object/object36.s +++ b/data/const/object/object36.s @@ -10,7 +10,7 @@ gUnk_08121440:: @ 08121440 .4byte sub_0808BD14 gUnk_0812144C:: @ 0812144C - .incbin "baserom.gba", 0x12144C, 0x0000028 + .incbin "assets/object36/gUnk_0812144C.bin" gUnk_08121474:: @ 08121474 - .incbin "baserom.gba", 0x121474, 0x000000C + .incbin "assets/object36/gUnk_08121474.bin" diff --git a/data/const/object/object3A.s b/data/const/object/object3A.s index e7ce38b9..b5f09047 100644 --- a/data/const/object/object3A.s +++ b/data/const/object/object3A.s @@ -5,7 +5,7 @@ .align 2 gUnk_081215E8:: @ 081215E8 - .incbin "baserom.gba", 0x1215E8, 0x0000050 + .incbin "assets/object3A/gUnk_081215E8.bin" gUnk_08121638:: @ 08121638 .4byte sub_0808C6D4 @@ -16,4 +16,4 @@ gUnk_08121640:: @ 08121640 .4byte sub_0808C8B8 gUnk_08121648:: @ 08121648 - .incbin "baserom.gba", 0x121648, 0x0000020 + .incbin "assets/object3A/gUnk_08121648.bin" diff --git a/data/const/object/object3D.s b/data/const/object/object3D.s index cdbdb782..64e9babc 100644 --- a/data/const/object/object3D.s +++ b/data/const/object/object3D.s @@ -12,7 +12,7 @@ gUnk_081216BC:: @ 081216BC gUnk_081216C8:: @ 081216C8 .ifdef EU @ TODO only small differences - .incbin "baserom_eu.gba", 0x120E10, 0x0000014 + .incbin "assets/object3D/gUnk_081216C8_EU.bin" .else - .incbin "baserom.gba", 0x1216C8, 0x0000014 + .incbin "assets/object3D/gUnk_081216C8_1_USA-JP-DEMO_USA-DEMO_JP.bin" .endif diff --git a/data/const/object/object3E.s b/data/const/object/object3E.s index 8d47e38d..f130aff8 100644 --- a/data/const/object/object3E.s +++ b/data/const/object/object3E.s @@ -17,10 +17,10 @@ gUnk_081216DC:: @ 081216DC .4byte sub_0808D194 gUnk_08121704:: @ 08121704 - .incbin "baserom.gba", 0x121704, 0x000001C + .incbin "assets/object3E/gUnk_08121704.bin" gUnk_08121720:: @ 08121720 - .incbin "baserom.gba", 0x121720, 0x000000C + .incbin "assets/object3E/gUnk_08121720.bin" gUnk_0812172C:: @ 0812172C .4byte sub_0808D474 @@ -28,4 +28,4 @@ gUnk_0812172C:: @ 0812172C .4byte sub_0808D59C gUnk_08121738:: @ 08121738 - .incbin "baserom.gba", 0x121738, 0x0000018 + .incbin "assets/object3E/gUnk_08121738.bin" diff --git a/data/const/object/object42.s b/data/const/object/object42.s index f2cf7fcb..c6502b1a 100644 --- a/data/const/object/object42.s +++ b/data/const/object/object42.s @@ -13,4 +13,4 @@ gUnk_081217B0:: @ 081217B0 .4byte sub_0808DDE8 gUnk_081217B8:: @ 081217B8 - .incbin "baserom.gba", 0x1217B8, 0x0000004 + .incbin "assets/object42/gUnk_081217B8.bin" diff --git a/data/const/object/object43.s b/data/const/object/object43.s index 9a0711bf..b82c0f51 100644 --- a/data/const/object/object43.s +++ b/data/const/object/object43.s @@ -12,7 +12,7 @@ gUnk_081217BC:: @ 081217BC .4byte sub_0808E264 gUnk_081217D0:: @ 081217D0 - .incbin "baserom.gba", 0x1217D0, 0x0000008 + .incbin "assets/object43/gUnk_081217D0.bin" gUnk_081217D8:: @ 081217D8 - .incbin "baserom.gba", 0x1217D8, 0x0000008 + .incbin "assets/object43/gUnk_081217D8.bin" diff --git a/data/const/object/object49.s b/data/const/object/object49.s index a89cc647..0184eff5 100644 --- a/data/const/object/object49.s +++ b/data/const/object/object49.s @@ -28,4 +28,4 @@ gUnk_08121E98:: @ 08121E98 .4byte sub_0808F244 gUnk_08121EA0:: @ 08121EA0 - .incbin "baserom.gba", 0x121EA0, 0x0000004 + .incbin "assets/object49/gUnk_08121EA0.bin" diff --git a/data/const/object/object53.s b/data/const/object/object53.s index f0c96385..42f6e3dd 100644 --- a/data/const/object/object53.s +++ b/data/const/object/object53.s @@ -9,4 +9,4 @@ gUnk_08122280:: @ 08122280 .4byte sub_08091198 gUnk_08122288:: @ 08122288 - .incbin "baserom.gba", 0x122288, 0x000000C + .incbin "assets/object53/gUnk_08122288.bin" diff --git a/data/const/object/object6.s b/data/const/object/object6.s index ff99c0d8..c887a474 100644 --- a/data/const/object/object6.s +++ b/data/const/object/object6.s @@ -19,10 +19,10 @@ gUnk_0811F15C:: @ 0811F15C .4byte sub_08082E6C gUnk_0811F16C:: @ 0811F16C - .incbin "baserom.gba", 0x11F16C, 0x000000C + .incbin "assets/object6/gUnk_0811F16C.bin" gUnk_0811F178:: @ 0811F178 - .incbin "baserom.gba", 0x11F178, 0x0000014 + .incbin "assets/object6/gUnk_0811F178.bin" gUnk_0811F18C:: @ 0811F18C - .incbin "baserom.gba", 0x11F18C, 0x0000004 + .incbin "assets/object6/gUnk_0811F18C.bin" diff --git a/data/const/object/object64.s b/data/const/object/object64.s index 39378cd7..c734d85c 100644 --- a/data/const/object/object64.s +++ b/data/const/object/object64.s @@ -5,7 +5,7 @@ .align 2 gUnk_08122950:: @ 08122950 - .incbin "baserom.gba", 0x122950, 0x000000C + .incbin "assets/object64/gUnk_08122950.bin" gUnk_0812295C:: @ 0812295C .4byte sub_08093E3C diff --git a/data/const/object/object67.s b/data/const/object/object67.s index e0f6e45e..c0cad004 100644 --- a/data/const/object/object67.s +++ b/data/const/object/object67.s @@ -12,7 +12,7 @@ gUnk_081229BC:: @ 081229BC .4byte sub_08094570 gUnk_081229D0:: @ 081229D0 - .incbin "baserom.gba", 0x1229D0, 0x0000020 + .incbin "assets/object67/gUnk_081229D0.bin" gUnk_081229F0:: @ 081229F0 - .incbin "baserom.gba", 0x1229F0, 0x0000020 + .incbin "assets/object67/gUnk_081229F0.bin" diff --git a/data/const/object/object68.s b/data/const/object/object68.s index 0204864b..7dcd59a1 100644 --- a/data/const/object/object68.s +++ b/data/const/object/object68.s @@ -9,12 +9,12 @@ gUnk_08122A10:: @ 08122A10 .4byte sub_080948D0 gUnk_08122A18:: @ 08122A18 - .incbin "baserom.gba", 0x122A18, 0x0000008 + .incbin "assets/object68/gUnk_08122A18.bin" gUnk_08122A20:: @ 08122A20 - .incbin "baserom.gba", 0x122A20, 0x0000004 + .incbin "assets/object68/gUnk_08122A20.bin" .4byte sub_080948E8 gUnk_08122A28:: @ 08122A28 - .incbin "baserom.gba", 0x122A28, 0x000000C + .incbin "assets/object68/gUnk_08122A28.bin" diff --git a/data/const/object/object6A.s b/data/const/object/object6A.s index c5e57501..f66371e3 100644 --- a/data/const/object/object6A.s +++ b/data/const/object/object6A.s @@ -50,25 +50,25 @@ gUnk_08122A34:: @ 08122A34 .4byte sub_08096290 gUnk_08122AE0:: @ 08122AE0 - .incbin "baserom.gba", 0x122AE0, 0x0000008 + .incbin "assets/object6A/gUnk_08122AE0.bin" gUnk_08122AE8:: @ 08122AE8 - .incbin "baserom.gba", 0x122AE8, 0x0000010 + .incbin "assets/object6A/gUnk_08122AE8.bin" gUnk_08122AF8:: @ 08122AF8 - .incbin "baserom.gba", 0x122AF8, 0x0000008 + .incbin "assets/object6A/gUnk_08122AF8.bin" gUnk_08122B00:: @ 08122B00 - .incbin "baserom.gba", 0x122B00, 0x000000E + .incbin "assets/object6A/gUnk_08122B00.bin" gUnk_08122B0E:: @ 08122B0E - .incbin "baserom.gba", 0x122B0E, 0x0000010 + .incbin "assets/object6A/gUnk_08122B0E.bin" gUnk_08122B1E:: @ 08122B1E - .incbin "baserom.gba", 0x122B1E, 0x0000010 + .incbin "assets/object6A/gUnk_08122B1E.bin" gUnk_08122B2E:: @ 08122B2E - .incbin "baserom.gba", 0x122B2E, 0x000000E + .incbin "assets/object6A/gUnk_08122B2E.bin" gUnk_08122B3C:: @ 08122B3C - .incbin "baserom.gba", 0x122B3C, 0x0000010 + .incbin "assets/object6A/gUnk_08122B3C.bin" diff --git a/data/const/object/object72.s b/data/const/object/object72.s index d14ae4c8..336468ff 100644 --- a/data/const/object/object72.s +++ b/data/const/object/object72.s @@ -9,7 +9,7 @@ gUnk_081232E4:: @ 081232E4 .4byte nullsub_529 gUnk_081232EC:: @ 081232EC - .incbin "baserom.gba", 0x1232EC, 0x0000012 + .incbin "assets/object72/gUnk_081232EC.bin" gUnk_081232FE:: @ 081232FE - .incbin "baserom.gba", 0x1232FE, 0x000001A + .incbin "assets/object72/gUnk_081232FE.bin" diff --git a/data/const/object/object74.s b/data/const/object/object74.s index 03aeaaa9..6ad664f7 100644 --- a/data/const/object/object74.s +++ b/data/const/object/object74.s @@ -5,7 +5,7 @@ .align 2 gUnk_08123328:: @ 08123328 - .incbin "baserom.gba", 0x123328, 0x0000008 + .incbin "assets/object74/gUnk_08123328.bin" gUnk_08123330:: @ 08123330 .4byte sub_08097B84 @@ -15,7 +15,7 @@ gUnk_08123330:: @ 08123330 .4byte sub_08097C1C gUnk_08123344:: @ 08123344 - .incbin "baserom.gba", 0x123344, 0x0000026 + .incbin "assets/object74/gUnk_08123344.bin" gUnk_0812336A:: @ 0812336A - .incbin "baserom.gba", 0x12336A, 0x000001A + .incbin "assets/object74/gUnk_0812336A.bin" diff --git a/data/const/object/object79.s b/data/const/object/object79.s index caf4dde7..ddea5e4a 100644 --- a/data/const/object/object79.s +++ b/data/const/object/object79.s @@ -10,4 +10,4 @@ gUnk_08123410:: @ 08123410 .4byte sub_08098084 gUnk_0812341C:: @ 0812341C - .incbin "baserom.gba", 0x12341C, 0x0000006 + .incbin "assets/object79/gUnk_0812341C.bin" diff --git a/data/const/object/object80.s b/data/const/object/object80.s index b85e2715..015b9f46 100644 --- a/data/const/object/object80.s +++ b/data/const/object/object80.s @@ -9,4 +9,4 @@ gUnk_08123664:: @ 08123664 .4byte sub_08098BE0 gUnk_0812366C:: @ 0812366C - .incbin "baserom.gba", 0x12366C, 0x0000008 + .incbin "assets/object80/gUnk_0812366C.bin" diff --git a/data/const/object/object87.s b/data/const/object/object87.s index bd94da79..adeda60c 100644 --- a/data/const/object/object87.s +++ b/data/const/object/object87.s @@ -10,10 +10,10 @@ gUnk_08123840:: @ 08123840 .4byte sub_0809A648 gUnk_0812384C:: @ 0812384C - .incbin "baserom.gba", 0x12384C, 0x0000040 + .incbin "assets/object87/gUnk_0812384C.bin" gUnk_0812388C:: @ 0812388C - .incbin "baserom.gba", 0x12388C, 0x0000014 + .incbin "assets/object87/gUnk_0812388C.bin" gUnk_081238A0:: @ 081238A0 - .incbin "baserom.gba", 0x1238A0, 0x00003E0 + .incbin "assets/object87/gUnk_081238A0.bin" diff --git a/data/const/object/object8B.s b/data/const/object/object8B.s index a2bac996..d713c155 100644 --- a/data/const/object/object8B.s +++ b/data/const/object/object8B.s @@ -11,4 +11,4 @@ gUnk_08123D58:: @ 08123D58 .4byte sub_0809B0A8 gUnk_08123D68:: @ 08123D68 - .incbin "baserom.gba", 0x123D68, 0x0000014 + .incbin "assets/object8B/gUnk_08123D68.bin" diff --git a/data/const/object/object9.s b/data/const/object/object9.s index 0c93d24b..9696df62 100644 --- a/data/const/object/object9.s +++ b/data/const/object/object9.s @@ -7,9 +7,9 @@ gUnk_0811F744:: @ 0811F744 .ifdef EU @ TODO only small differences - .incbin "baserom_eu.gba", 0x11EE8C, 0x0000010 + .incbin "assets/object9/gUnk_0811F744_EU.bin" .else - .incbin "baserom.gba", 0x11F744, 0x0000010 + .incbin "assets/object9/gUnk_0811F744_1_USA-JP-DEMO_USA-DEMO_JP.bin" .endif gUnk_0811F754:: @ 0811F754 diff --git a/data/const/object/object91.s b/data/const/object/object91.s index 1232abbd..ccac6c10 100644 --- a/data/const/object/object91.s +++ b/data/const/object/object91.s @@ -9,7 +9,7 @@ gUnk_08123DD4:: @ 08123DD4 .4byte sub_0809C5C4 gUnk_08123DDC:: @ 08123DDC - .incbin "baserom.gba", 0x123DDC, 0x000001C + .incbin "assets/object91/gUnk_08123DDC.bin" gUnk_08123DF8:: @ 08123DF8 .4byte sub_0809C7E4 @@ -22,7 +22,7 @@ gUnk_08123DF8:: @ 08123DF8 .4byte sub_0809CB4C gUnk_08123E18:: @ 08123E18 - .incbin "baserom.gba", 0x123E18, 0x0000004 + .incbin "assets/object91/gUnk_08123E18.bin" gUnk_08123E1C:: @ 08123E1C - .incbin "baserom.gba", 0x123E1C, 0x0000004 + .incbin "assets/object91/gUnk_08123E1C.bin" diff --git a/data/const/object/object93.s b/data/const/object/object93.s index a2c09bf5..bfe7248b 100644 --- a/data/const/object/object93.s +++ b/data/const/object/object93.s @@ -9,15 +9,15 @@ gUnk_08123E80:: @ 08123E80 .4byte sub_0809CEC0 gUnk_08123E88:: @ 08123E88 - .incbin "baserom.gba", 0x123E88, 0x0000014 + .incbin "assets/object93/gUnk_08123E88.bin" gUnk_08123E9C:: @ 08123E9C .4byte gUnk_08123E88 - .incbin "baserom.gba", 0x123EA0, 0x0000004 + .incbin "assets/object93/gUnk_08123E9C.bin" gUnk_08123EA4:: @ 08123EA4 - .incbin "baserom.gba", 0x123EA4, 0x0000014 + .incbin "assets/object93/gUnk_08123EA4.bin" gUnk_08123EB8:: @ 08123EB8 .4byte gUnk_08123EA4 - .incbin "baserom.gba", 0x123EBC, 0x0000004 + .incbin "assets/object93/gUnk_08123EB8.bin" diff --git a/data/const/object/object96.s b/data/const/object/object96.s index 03c28b99..a4d0a402 100644 --- a/data/const/object/object96.s +++ b/data/const/object/object96.s @@ -73,7 +73,7 @@ gUnk_08123FB0:: @ 08123FB0 .4byte 0x00001800 .4byte 0x00400060 - .incbin "baserom.gba", 0x12408C, 0x0000024 + .incbin "assets/object96/gUnk_08123FB0.bin" gUnk_081240B0:: @ 081240B0 .4byte sub_0809D7A8 diff --git a/data/const/object/object97.s b/data/const/object/object97.s index 8ff1ad1c..f9a86c5b 100644 --- a/data/const/object/object97.s +++ b/data/const/object/object97.s @@ -43,23 +43,23 @@ gUnk_08124118:: @ 08124118 .4byte sub_0809DFE0 gUnk_08124128:: @ 08124128 - .incbin "baserom.gba", 0x124128, 0x0000005 + .incbin "assets/object97/gUnk_08124128.bin" gUnk_0812412D:: @ 0812412D - .incbin "baserom.gba", 0x12412D, 0x0000005 + .incbin "assets/object97/gUnk_0812412D.bin" gUnk_08124132:: @ 08124132 - .incbin "baserom.gba", 0x124132, 0x0000014 + .incbin "assets/object97/gUnk_08124132.bin" gUnk_08124146:: @ 08124146 - .incbin "baserom.gba", 0x124146, 0x000000A + .incbin "assets/object97/gUnk_08124146.bin" gUnk_08124150:: @ 08124150 .4byte sub_0809E050 .4byte sub_0809E088 gUnk_08124158:: @ 08124158 - .incbin "baserom.gba", 0x124158, 0x0000020 + .incbin "assets/object97/gUnk_08124158.bin" gUnk_08124178:: @ 08124178 - .incbin "baserom.gba", 0x124178, 0x0000014 + .incbin "assets/object97/gUnk_08124178.bin" diff --git a/data/const/object/object9B.s b/data/const/object/object9B.s index a9bf16d5..2079fcb5 100644 --- a/data/const/object/object9B.s +++ b/data/const/object/object9B.s @@ -10,4 +10,4 @@ gUnk_081242D0:: @ 081242D0 .4byte sub_0809E7E0 gUnk_081242D8:: @ 081242D8 - .incbin "baserom.gba", 0x1242D8, 0x0000010 + .incbin "assets/object9B/gUnk_081242D8.bin" diff --git a/data/const/object/objectA0.s b/data/const/object/objectA0.s index 7b4851e8..50d19b66 100644 --- a/data/const/object/objectA0.s +++ b/data/const/object/objectA0.s @@ -12,4 +12,4 @@ gUnk_08124670:: @ 08124670 .4byte sub_0809F254 gUnk_08124684:: @ 08124684 - .incbin "baserom.gba", 0x124684, 0x0000008 + .incbin "assets/objectA0/gUnk_08124684.bin" diff --git a/data/const/object/objectA8.s b/data/const/object/objectA8.s index 7a5e4f56..03902138 100644 --- a/data/const/object/objectA8.s +++ b/data/const/object/objectA8.s @@ -19,4 +19,4 @@ gUnk_08124840:: @ 08124840 .4byte sub_0809FBD4 gUnk_0812484C:: @ 0812484C - .incbin "baserom.gba", 0x12484C, 0x0000004 + .incbin "assets/objectA8/gUnk_0812484C.bin" diff --git a/data/const/object/objectA9.s b/data/const/object/objectA9.s index 54108a49..2a39154f 100644 --- a/data/const/object/objectA9.s +++ b/data/const/object/objectA9.s @@ -10,7 +10,7 @@ gUnk_08124850:: @ 08124850 .4byte DeleteEntity gUnk_0812485C:: @ 0812485C - .incbin "baserom.gba", 0x12485C, 0x0000004 + .incbin "assets/objectA9/gUnk_0812485C.bin" gUnk_08124860:: @ 08124860 - .incbin "baserom.gba", 0x124860, 0x0000008 + .incbin "assets/objectA9/gUnk_08124860.bin" diff --git a/data/const/object/objectB4.s b/data/const/object/objectB4.s index d8601c5e..465066ad 100644 --- a/data/const/object/objectB4.s +++ b/data/const/object/objectB4.s @@ -5,7 +5,7 @@ .align 2 gUnk_08124B10:: @ 08124B10 - .incbin "baserom.gba", 0x124B10, 0x0000010 + .incbin "assets/objectB4/gUnk_08124B10.bin" gUnk_08124B20:: @ 08124B20 .4byte sub_080A0BA8 @@ -14,4 +14,4 @@ gUnk_08124B20:: @ 08124B20 .4byte sub_080A0E08 gUnk_08124B30:: @ 08124B30 - .incbin "baserom.gba", 0x124B30, 0x0000008 + .incbin "assets/objectB4/gUnk_08124B30.bin" diff --git a/data/const/object/objectB9.s b/data/const/object/objectB9.s index fb9ad8bd..c01fa451 100644 --- a/data/const/object/objectB9.s +++ b/data/const/object/objectB9.s @@ -5,17 +5,17 @@ .align 2 gUnk_08124C20:: @ 08124C20 - .incbin "baserom.gba", 0x124C20, 0x0000028 + .incbin "assets/objectB9/gUnk_08124C20.bin" gUnk_08124C48:: @ 08124C48 - .incbin "baserom.gba", 0x124C48, 0x0000258 + .incbin "assets/objectB9/gUnk_08124C48.bin" gUnk_08124EA0:: @ 08124EA0 - .incbin "baserom.gba", 0x124EA0, 0x0000028 + .incbin "assets/objectB9/gUnk_08124EA0.bin" gUnk_08124EC8:: @ 08124EC8 - .incbin "baserom.gba", 0x124EC8, 0x0000004 + .incbin "assets/objectB9/gUnk_08124EC8.bin" gUnk_08124ECC:: @ 08124ECC - .incbin "baserom.gba", 0x124ECC, 0x0000004 + .incbin "assets/objectB9/gUnk_08124ECC.bin" diff --git a/data/const/object/objectBA.s b/data/const/object/objectBA.s index cc1c0585..59fe4b17 100644 --- a/data/const/object/objectBA.s +++ b/data/const/object/objectBA.s @@ -17,4 +17,4 @@ gUnk_08124ED0:: @ 08124ED0 .4byte sub_080A1C04 gUnk_08124EF8:: @ 08124EF8 - .incbin "baserom.gba", 0x124EF8, 0x0000010 + .incbin "assets/objectBA/gUnk_08124EF8.bin" diff --git a/data/const/object/objectBD.s b/data/const/object/objectBD.s index bdd249bb..c9a1be0e 100644 --- a/data/const/object/objectBD.s +++ b/data/const/object/objectBD.s @@ -5,7 +5,7 @@ .align 2 gUnk_08125014:: @ 08125014 - .incbin "baserom.gba", 0x125014, 0x0000028 + .incbin "assets/objectBD/gUnk_08125014.bin" gUnk_0812503C:: @ 0812503C .4byte sub_080A2274 diff --git a/data/const/object/objectBlockingStairs.s b/data/const/object/objectBlockingStairs.s index ae3fac83..9e579382 100644 --- a/data/const/object/objectBlockingStairs.s +++ b/data/const/object/objectBlockingStairs.s @@ -12,16 +12,16 @@ gUnk_0812283C:: @ 0812283C .4byte nullsub_120 gUnk_08122850:: @ 08122850 - .incbin "baserom.gba", 0x122850, 0x0000012 + .incbin "assets/objectBlockingStairs/gUnk_08122850.bin" gUnk_08122862:: @ 08122862 - .incbin "baserom.gba", 0x122862, 0x0000012 + .incbin "assets/objectBlockingStairs/gUnk_08122862.bin" gUnk_08122874:: @ 08122874 - .incbin "baserom.gba", 0x122874, 0x0000012 + .incbin "assets/objectBlockingStairs/gUnk_08122874.bin" gUnk_08122886:: @ 08122886 - .incbin "baserom.gba", 0x122886, 0x0000012 + .incbin "assets/objectBlockingStairs/gUnk_08122886.bin" gUnk_08122898:: @ 08122898 - .incbin "baserom.gba", 0x122898, 0x0000010 + .incbin "assets/objectBlockingStairs/gUnk_08122898.bin" diff --git a/data/const/object/objectOnPillar.s b/data/const/object/objectOnPillar.s index f5087b67..68096957 100644 --- a/data/const/object/objectOnPillar.s +++ b/data/const/object/objectOnPillar.s @@ -12,14 +12,14 @@ gUnk_08123250:: @ 08123250 .4byte nullsub_122 gUnk_08123264:: @ 08123264 - .incbin "baserom.gba", 0x123264, 0x0000008 + .incbin "assets/objectOnPillar/gUnk_08123264.bin" gUnk_0812326C:: @ 0812326C .4byte sub_08096F6C .4byte sub_08096FE4 gUnk_08123274:: @ 08123274 - .incbin "baserom.gba", 0x123274, 0x0000008 + .incbin "assets/objectOnPillar/gUnk_08123274.bin" gUnk_0812327C:: @ 0812327C - .incbin "baserom.gba", 0x12327C, 0x000001C + .incbin "assets/objectOnPillar/gUnk_0812327C.bin" diff --git a/data/const/object/objectOnSpinyBeetle.s b/data/const/object/objectOnSpinyBeetle.s index 44af51da..f2cacc5e 100644 --- a/data/const/object/objectOnSpinyBeetle.s +++ b/data/const/object/objectOnSpinyBeetle.s @@ -30,4 +30,4 @@ gUnk_08123540:: @ 08123540 .4byte sub_080988E0 gUnk_08123558:: @ 08123558 - .incbin "baserom.gba", 0x123558, 0x0000010 + .incbin "assets/objectOnSpinyBeetle/gUnk_08123558.bin" diff --git a/data/const/object/picoBloom.s b/data/const/object/picoBloom.s index 296f746d..0f805f26 100644 --- a/data/const/object/picoBloom.s +++ b/data/const/object/picoBloom.s @@ -10,4 +10,4 @@ gUnk_08123568:: @ 08123568 .4byte sub_08098AE8 gUnk_08123574:: @ 08123574 - .incbin "baserom.gba", 0x123574, 0x0000006 + .incbin "assets/picoBloom/gUnk_08123574.bin" diff --git a/data/const/object/pinwheel.s b/data/const/object/pinwheel.s index efba063c..1f1cbdaf 100644 --- a/data/const/object/pinwheel.s +++ b/data/const/object/pinwheel.s @@ -6,15 +6,15 @@ gUnk_08125050:: @ 08125050 .ifdef JP - .incbin "baserom_jp.gba", 0x124D14, 0x000000C + .incbin "assets/pinwheel/gUnk_08125050_JP.bin" .else .ifdef DEMO_JP - .incbin "baserom_jp.gba", 0x124D14, 0x000000C + .incbin "assets/pinwheel/gUnk_08125050_1_DEMO_JP.bin" .else .ifdef EU - .incbin "baserom_jp.gba", 0x124D14, 0x000000C + .incbin "assets/pinwheel/gUnk_08125050_2_EU.bin" .else - .incbin "baserom.gba", 0x125050, 0x000000C + .incbin "assets/pinwheel/gUnk_08125050_3_USA-DEMO_USA.bin" .endif .endif .endif diff --git a/data/const/object/pullableLever.s b/data/const/object/pullableLever.s index fbf52db2..c373ad32 100644 --- a/data/const/object/pullableLever.s +++ b/data/const/object/pullableLever.s @@ -14,14 +14,14 @@ gUnk_081222A0:: @ 081222A0 .4byte sub_08091470 gUnk_081222A8:: @ 081222A8 - .incbin "baserom.gba", 0x1222A8, 0x0000008 + .incbin "assets/pullableLever/gUnk_081222A8.bin" gUnk_081222B0:: @ 081222B0 .4byte sub_08091380 .4byte sub_08091438 gUnk_081222B8:: @ 081222B8 - .incbin "baserom.gba", 0x1222B8, 0x0000008 + .incbin "assets/pullableLever/gUnk_081222B8.bin" gUnk_081222C0:: @ 081222C0 - .incbin "baserom.gba", 0x1222C0, 0x0000004 + .incbin "assets/pullableLever/gUnk_081222C0.bin" diff --git a/data/const/object/pullableMushroom.s b/data/const/object/pullableMushroom.s index efb87e76..86046b4b 100644 --- a/data/const/object/pullableMushroom.s +++ b/data/const/object/pullableMushroom.s @@ -21,27 +21,27 @@ gUnk_081211C0:: @ 081211C0 .4byte sub_0808ADF0 gUnk_081211CC:: @ 081211CC - .incbin "baserom.gba", 0x1211CC, 0x0000010 + .incbin "assets/pullableMushroom/gUnk_081211CC.bin" gUnk_081211DC:: @ 081211DC .4byte sub_0808AEB0 .4byte sub_0808AFD4 gUnk_081211E4:: @ 081211E4 - .incbin "baserom.gba", 0x1211E4, 0x0000008 + .incbin "assets/pullableMushroom/gUnk_081211E4.bin" gUnk_081211EC:: @ 081211EC .4byte sub_0808B05C .4byte sub_0808B0BC gUnk_081211F4:: @ 081211F4 - .incbin "baserom.gba", 0x1211F4, 0x0000001 + .incbin "assets/pullableMushroom/gUnk_081211F4.bin" gUnk_081211F5:: @ 081211F5 - .incbin "baserom.gba", 0x1211F5, 0x0000007 + .incbin "assets/pullableMushroom/gUnk_081211F5.bin" gUnk_081211FC:: @ 081211FC - .incbin "baserom.gba", 0x1211FC, 0x0000001 + .incbin "assets/pullableMushroom/gUnk_081211FC.bin" gUnk_081211FD:: @ 081211FD - .incbin "baserom.gba", 0x1211FD, 0x0000007 + .incbin "assets/pullableMushroom/gUnk_081211FD.bin" diff --git a/data/const/object/pushableFurniture.s b/data/const/object/pushableFurniture.s index 7a17811f..649d6fe0 100644 --- a/data/const/object/pushableFurniture.s +++ b/data/const/object/pushableFurniture.s @@ -10,7 +10,7 @@ gUnk_08121ED8:: @ 08121ED8 .4byte sub_0808FC3C gUnk_08121EE4:: @ 08121EE4 - .incbin "baserom.gba", 0x121EE4, 0x000000C + .incbin "assets/pushableFurniture/gUnk_08121EE4.bin" gUnk_08121EF0:: @ 08121EF0 - .incbin "baserom.gba", 0x121EF0, 0x0000008 + .incbin "assets/pushableFurniture/gUnk_08121EF0.bin" diff --git a/data/const/object/pushableGrave.s b/data/const/object/pushableGrave.s index 6fa8858d..e75eb52c 100644 --- a/data/const/object/pushableGrave.s +++ b/data/const/object/pushableGrave.s @@ -12,7 +12,7 @@ gUnk_081232AC:: @ 081232AC .4byte nullsub_528 gUnk_081232C0:: @ 081232C0 - .incbin "baserom.gba", 0x1232C0, 0x000001E + .incbin "assets/pushableGrave/gUnk_081232C0.bin" gUnk_081232DE:: @ 081232DE - .incbin "baserom.gba", 0x1232DE, 0x0000006 + .incbin "assets/pushableGrave/gUnk_081232DE.bin" diff --git a/data/const/object/pushableLever.s b/data/const/object/pushableLever.s index 7ea2e6d7..3fde5fbf 100644 --- a/data/const/object/pushableLever.s +++ b/data/const/object/pushableLever.s @@ -10,10 +10,10 @@ gUnk_08123494:: @ 08123494 .4byte sub_08098304 gUnk_081234A0:: @ 081234A0 - .incbin "baserom.gba", 0x1234A0, 0x0000004 + .incbin "assets/pushableLever/gUnk_081234A0.bin" gUnk_081234A4:: @ 081234A4 - .incbin "baserom.gba", 0x1234A4, 0x0000008 + .incbin "assets/pushableLever/gUnk_081234A4.bin" gUnk_081234AC:: @ 081234AC - .incbin "baserom.gba", 0x1234AC, 0x0000008 + .incbin "assets/pushableLever/gUnk_081234AC.bin" diff --git a/data/const/object/pushableRock.s b/data/const/object/pushableRock.s index 3cd58525..ec3f17d0 100644 --- a/data/const/object/pushableRock.s +++ b/data/const/object/pushableRock.s @@ -11,4 +11,4 @@ gUnk_08121078:: @ 08121078 .4byte sub_0808A61C gUnk_08121088:: @ 08121088 - .incbin "baserom.gba", 0x121088, 0x0000008 + .incbin "assets/pushableRock/gUnk_08121088.bin" diff --git a/data/const/object/pushableStatue.s b/data/const/object/pushableStatue.s index 409e89f0..c5cae48c 100644 --- a/data/const/object/pushableStatue.s +++ b/data/const/object/pushableStatue.s @@ -16,13 +16,13 @@ gUnk_08120CAC:: @ 08120CAC .4byte sub_080893E0 gUnk_08120CB4:: @ 08120CB4 - .incbin "baserom.gba", 0x120CB4, 0x0000008 + .incbin "assets/pushableStatue/gUnk_08120CB4.bin" gUnk_08120CBC:: @ 08120CBC - .incbin "baserom.gba", 0x120CBC, 0x0000010 + .incbin "assets/pushableStatue/gUnk_08120CBC.bin" gUnk_08120CCC:: @ 08120CCC - .incbin "baserom.gba", 0x120CCC, 0x00000A0 + .incbin "assets/pushableStatue/gUnk_08120CCC.bin" gUnk_08120D6C:: @ 08120D6C - .incbin "baserom.gba", 0x120D6C, 0x000001A + .incbin "assets/pushableStatue/gUnk_08120D6C.bin" diff --git a/data/const/object/railtrack.s b/data/const/object/railtrack.s index e888518f..099600f9 100644 --- a/data/const/object/railtrack.s +++ b/data/const/object/railtrack.s @@ -11,4 +11,4 @@ gUnk_081205D0:: @ 081205D0 .4byte sub_08085308 gUnk_081205E0:: @ 081205E0 - .incbin "baserom.gba", 0x1205E0, 0x0000004 + .incbin "assets/railtrack/gUnk_081205E0.bin" diff --git a/data/const/object/smallIceBlock.s b/data/const/object/smallIceBlock.s index cb4c7b4c..a5ca2b60 100644 --- a/data/const/object/smallIceBlock.s +++ b/data/const/object/smallIceBlock.s @@ -12,7 +12,7 @@ gUnk_08123734:: @ 08123734 .4byte sub_080993CC gUnk_08123748:: @ 08123748 - .incbin "baserom.gba", 0x123748, 0x0000008 + .incbin "assets/smallIceBlock/gUnk_08123748.bin" gUnk_08123750:: @ 08123750 - .incbin "baserom.gba", 0x123750, 0x000001A + .incbin "assets/smallIceBlock/gUnk_08123750.bin" diff --git a/data/const/object/smoke.s b/data/const/object/smoke.s index f8d64022..ebf42d3f 100644 --- a/data/const/object/smoke.s +++ b/data/const/object/smoke.s @@ -9,7 +9,7 @@ gUnk_08121060:: @ 08121060 .4byte sub_0808A46C gUnk_08121068:: @ 08121068 - .incbin "baserom.gba", 0x121068, 0x0000008 + .incbin "assets/smoke/gUnk_08121068.bin" gUnk_08121070:: @ 08121070 .4byte sub_0808A484 diff --git a/data/const/object/specialFx.s b/data/const/object/specialFx.s index d31924b1..196c0117 100644 --- a/data/const/object/specialFx.s +++ b/data/const/object/specialFx.s @@ -5,12 +5,12 @@ .align 2 gUnk_0811F960:: @ 0811F960 - .incbin "baserom.gba", 0x11F960, 0x000009B + .incbin "assets/specialFx/gUnk_0811F960.bin" .ifdef EU @ TODO only small differences - .incbin "baserom_eu.gba", 0x11F143, 0x00000C5 + .incbin "assets/specialFx/gUnk_0811F960_1_EU.bin" .else - .incbin "baserom.gba", 0x11F9FB, 0x00000C5 + .incbin "assets/specialFx/gUnk_0811F960_2_USA-JP-DEMO_USA-DEMO_JP.bin" .endif gUnk_0811FAC0:: @ 0811FAC0 @@ -18,10 +18,10 @@ gUnk_0811FAC0:: @ 0811FAC0 .4byte sub_080845B8 gUnk_0811FAC8:: @ 0811FAC8 - .incbin "baserom.gba", 0x11FAC8, 0x0000004 + .incbin "assets/specialFx/gUnk_0811FAC8.bin" gUnk_0811FACC:: @ 0811FACC - .incbin "baserom.gba", 0x11FACC, 0x0000004 + .incbin "assets/specialFx/gUnk_0811FACC.bin" gUnk_0811FAD0:: @ 0811FAD0 .4byte sub_080845DC @@ -40,4 +40,4 @@ gUnk_0811FAD0:: @ 0811FAD0 .4byte sub_080847E0 gUnk_0811FB08:: @ 0811FB08 - .incbin "baserom.gba", 0x11FB08, 0x0000008 + .incbin "assets/specialFx/gUnk_0811FB08.bin" diff --git a/data/const/object/steam.s b/data/const/object/steam.s index 772c593f..90f8f1c1 100644 --- a/data/const/object/steam.s +++ b/data/const/object/steam.s @@ -5,6 +5,6 @@ .align 2 gUnk_08123484:: @ 08123484 - .incbin "baserom.gba", 0x123484, 0x0000010 + .incbin "assets/steam/gUnk_08123484.bin" diff --git a/data/const/object/swordsmanNewsletter.s b/data/const/object/swordsmanNewsletter.s index 770806ef..30c52c74 100644 --- a/data/const/object/swordsmanNewsletter.s +++ b/data/const/object/swordsmanNewsletter.s @@ -5,11 +5,11 @@ .align 2 gUnk_081228A8:: @ 081228A8 - .incbin "baserom.gba", 0x1228A8, 0x0000008 + .incbin "assets/swordsmanNewsletter/gUnk_081228A8.bin" gUnk_081228B0:: @ 081228B0 .4byte sub_080933D8 .4byte sub_080933FC gUnk_081228B8:: @ 081228B8 - .incbin "baserom.gba", 0x1228B8, 0x0000010 + .incbin "assets/swordsmanNewsletter/gUnk_081228B8.bin" diff --git a/data/const/object/thoughtBubble.s b/data/const/object/thoughtBubble.s index 0f740e47..21637ea7 100644 --- a/data/const/object/thoughtBubble.s +++ b/data/const/object/thoughtBubble.s @@ -5,7 +5,7 @@ .align 2 ThoughtBubble_SFX:: @ 08122590 - .incbin "baserom.gba", 0x122590, 0x0000008 + .incbin "assets/thoughtBubble/ThoughtBubble_SFX.bin" ThoughtBubble_Behaviors:: @ 08122598 .4byte ThoughtBubble_Init diff --git a/data/const/object/treeHidingPortal.s b/data/const/object/treeHidingPortal.s index 1640e413..9d9a25bf 100644 --- a/data/const/object/treeHidingPortal.s +++ b/data/const/object/treeHidingPortal.s @@ -11,5 +11,5 @@ gUnk_08124354:: @ 08124354 .4byte sub_0809E8EC gUnk_08124364:: @ 08124364 - .incbin "baserom.gba", 0x124364, 0x0000050 + .incbin "assets/treeHidingPortal/gUnk_08124364.bin" diff --git a/data/const/object/warpPoint.s b/data/const/object/warpPoint.s index c9c1ed84..4656b26f 100644 --- a/data/const/object/warpPoint.s +++ b/data/const/object/warpPoint.s @@ -13,4 +13,4 @@ gUnk_08121368:: @ 08121368 .4byte sub_0808B684 gUnk_08121380:: @ 08121380 - .incbin "baserom.gba", 0x121380, 0x0000003 + .incbin "assets/warpPoint/gUnk_08121380.bin" diff --git a/data/const/object/waterfallOpening.s b/data/const/object/waterfallOpening.s index 7f2a44ad..eeacdc8a 100644 --- a/data/const/object/waterfallOpening.s +++ b/data/const/object/waterfallOpening.s @@ -5,4 +5,4 @@ .align 2 gUnk_08124868:: @ 08124868 - .incbin "baserom.gba", 0x124868, 0x0000004 + .incbin "assets/waterfallOpening/gUnk_08124868.bin" diff --git a/data/const/object/windcrest.s b/data/const/object/windcrest.s index 33bd7747..88f51573 100644 --- a/data/const/object/windcrest.s +++ b/data/const/object/windcrest.s @@ -5,5 +5,5 @@ .align 2 gUnk_08125010:: @ 08125010 - .incbin "baserom.gba", 0x125010, 0x0000004 + .incbin "assets/windcrest/gUnk_08125010.bin" |