diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-04-17 12:38:11 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-04-18 22:04:16 +0200 |
| commit | cfc4cd8238b282aaf4d2933f8bbc9f161e250729 (patch) | |
| tree | 17ee3cf7f3fa75ece4332127d4fe34607a1c80c5 /data/const/object | |
| parent | f82b7976912a5bfbe4d6ecb2c0f9bccbfbc4d86b (diff) | |
Extract more pointers from data section
Diffstat (limited to 'data/const/object')
| -rw-r--r-- | data/const/object/bell.s | 3 | ||||
| -rw-r--r-- | data/const/object/bird.s | 3 | ||||
| -rw-r--r-- | data/const/object/itemOnGround.s | 34 | ||||
| -rw-r--r-- | data/const/object/lavaPlatform.s | 4 | ||||
| -rw-r--r-- | data/const/object/object1D.s | 7 | ||||
| -rw-r--r-- | data/const/object/object68.s | 3 | ||||
| -rw-r--r-- | data/const/object/object93.s | 6 | ||||
| -rw-r--r-- | data/const/object/swordsmanNewsletter.s | 3 |
8 files changed, 50 insertions, 13 deletions
diff --git a/data/const/object/bell.s b/data/const/object/bell.s index 34f1a8a5..6c69eff4 100644 --- a/data/const/object/bell.s +++ b/data/const/object/bell.s @@ -12,4 +12,5 @@ gUnk_0812338C:: @ 0812338C .incbin "baserom.gba", 0x12338C, 0x0000024 gUnk_081233B0:: @ 081233B0 - .incbin "baserom.gba", 0x1233B0, 0x0000008 + .4byte gUnk_0812338C + .incbin "baserom.gba", 0x1233B4, 0x0000004 diff --git a/data/const/object/bird.s b/data/const/object/bird.s index 6d6afb49..4f26d41b 100644 --- a/data/const/object/bird.s +++ b/data/const/object/bird.s @@ -37,4 +37,5 @@ gUnk_08123F0C:: @ 08123F0C .incbin "baserom.gba", 0x123F0C, 0x0000014 gUnk_08123F20:: @ 08123F20 - .incbin "baserom.gba", 0x123F20, 0x0000008 + .4byte gUnk_08123F0C + .incbin "baserom.gba", 0x123F24, 0x0000004 diff --git a/data/const/object/itemOnGround.s b/data/const/object/itemOnGround.s index e17d1d64..453a2575 100644 --- a/data/const/object/itemOnGround.s +++ b/data/const/object/itemOnGround.s @@ -11,16 +11,42 @@ gUnk_0811E7C4:: @ 0811E7C4 .4byte sub_08080910 gUnk_0811E7D4:: @ 0811E7D4 - .incbin "baserom.gba", 0x11E7D4, 0x0000014 + .4byte sub_08080F20 + .4byte sub_080811EC + .4byte sub_0808122C + .4byte sub_08081328 + .4byte sub_0808136C gUnk_0811E7E8:: @ 0811E7E8 - .incbin "baserom.gba", 0x11E7E8, 0x000002C + .4byte sub_080810A8 + .4byte sub_080810FC + .4byte sub_08081150 + .4byte sub_08081134 + .4byte sub_08081188 + .4byte sub_080810A8 + .4byte sub_080810A8 + .4byte sub_080811AC + .4byte sub_080811C8 + .4byte sub_080811D8 + .4byte sub_080810A8 gUnk_0811E814:: @ 0811E814 - .incbin "baserom.gba", 0x11E814, 0x000002C + .4byte sub_08081248 + .4byte sub_08081248 + .4byte sub_0808126C + .4byte sub_0808127C + .4byte nullsub_113 + .4byte sub_080812A0 + .4byte sub_08081248 + .4byte sub_080812A8 + .4byte sub_080812E8 + .4byte nullsub_510 + .4byte sub_08081248 gUnk_0811E840:: @ 0811E840 - .incbin "baserom.gba", 0x11E840, 0x000000C + .4byte sub_080813D4 + .4byte sub_080813E8 + .4byte sub_080813F0 gUnk_0811E84C:: @ 0811E84C .incbin "baserom.gba", 0x11E84C, 0x00000B0 diff --git a/data/const/object/lavaPlatform.s b/data/const/object/lavaPlatform.s index 56e9bd30..7e11d101 100644 --- a/data/const/object/lavaPlatform.s +++ b/data/const/object/lavaPlatform.s @@ -26,4 +26,6 @@ gUnk_08122684:: @ 08122684 .incbin "baserom.gba", 0x122684, 0x0000014 gUnk_08122698:: @ 08122698 - .incbin "baserom.gba", 0x122698, 0x000000C + .4byte gUnk_08122670 + .4byte gUnk_08122684 + .incbin "baserom.gba", 0x1226A0, 0x0000004 diff --git a/data/const/object/object1D.s b/data/const/object/object1D.s index 99b553b5..dfc82433 100644 --- a/data/const/object/object1D.s +++ b/data/const/object/object1D.s @@ -5,7 +5,10 @@ .align 2 gUnk_081208A0:: @ 081208A0 - .incbin "baserom.gba", 0x1208A0, 0x0000008 + .4byte sub_080874F8 + .4byte nullsub_117 gUnk_081208A8:: @ 081208A8 - .incbin "baserom.gba", 0x1208A8, 0x0000010 + .incbin "baserom.gba", 0x1208A8, 0x0000008 + .4byte gUnk_081208A8 + .incbin "baserom.gba", 0x1208B4, 0x0000004 diff --git a/data/const/object/object68.s b/data/const/object/object68.s index 525ba8a1..0204864b 100644 --- a/data/const/object/object68.s +++ b/data/const/object/object68.s @@ -12,7 +12,8 @@ gUnk_08122A18:: @ 08122A18 .incbin "baserom.gba", 0x122A18, 0x0000008 gUnk_08122A20:: @ 08122A20 - .incbin "baserom.gba", 0x122A20, 0x0000008 + .incbin "baserom.gba", 0x122A20, 0x0000004 + .4byte sub_080948E8 gUnk_08122A28:: @ 08122A28 .incbin "baserom.gba", 0x122A28, 0x000000C diff --git a/data/const/object/object93.s b/data/const/object/object93.s index f38c1928..a2c09bf5 100644 --- a/data/const/object/object93.s +++ b/data/const/object/object93.s @@ -12,10 +12,12 @@ gUnk_08123E88:: @ 08123E88 .incbin "baserom.gba", 0x123E88, 0x0000014 gUnk_08123E9C:: @ 08123E9C - .incbin "baserom.gba", 0x123E9C, 0x0000008 + .4byte gUnk_08123E88 + .incbin "baserom.gba", 0x123EA0, 0x0000004 gUnk_08123EA4:: @ 08123EA4 .incbin "baserom.gba", 0x123EA4, 0x0000014 gUnk_08123EB8:: @ 08123EB8 - .incbin "baserom.gba", 0x123EB8, 0x0000008 + .4byte gUnk_08123EA4 + .incbin "baserom.gba", 0x123EBC, 0x0000004 diff --git a/data/const/object/swordsmanNewsletter.s b/data/const/object/swordsmanNewsletter.s index 24d6a10e..770806ef 100644 --- a/data/const/object/swordsmanNewsletter.s +++ b/data/const/object/swordsmanNewsletter.s @@ -8,7 +8,8 @@ gUnk_081228A8:: @ 081228A8 .incbin "baserom.gba", 0x1228A8, 0x0000008 gUnk_081228B0:: @ 081228B0 - .incbin "baserom.gba", 0x1228B0, 0x0000008 + .4byte sub_080933D8 + .4byte sub_080933FC gUnk_081228B8:: @ 081228B8 .incbin "baserom.gba", 0x1228B8, 0x0000010 |