diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-06-17 00:10:00 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-06-17 00:10:00 +0200 |
| commit | c317fe3f18325fec54c0d76df450f132945449f7 (patch) | |
| tree | 553de6f2d0b1a1ed2a988ffb8a306dd3a138e88a /data | |
| parent | 551cb7209393d06e302a5bda489c341f38efd1f3 (diff) | |
Extract KeyValuePairs
Diffstat (limited to 'data')
| -rw-r--r-- | data/animations/object/minecart.s | 17 | ||||
| -rw-r--r-- | data/const/playerItem/playerItemCellOverwriteSet.s | 21 | ||||
| -rw-r--r-- | data/data_080046A4.s | 41 |
3 files changed, 41 insertions, 38 deletions
diff --git a/data/animations/object/minecart.s b/data/animations/object/minecart.s index 21b6acbb..c05e1d01 100644 --- a/data/animations/object/minecart.s +++ b/data/animations/object/minecart.s @@ -4,23 +4,6 @@ .section .rodata .align 2 -gUnk_081223D8:: @ 081223D8 - .4byte gUnk_081223E8 - .4byte gUnk_08122402 - .4byte gUnk_0812241C - .4byte gUnk_08122436 - -gUnk_081223E8:: @ 081223E8 - .incbin "minecart/gUnk_081223E8.bin" - -gUnk_08122402:: @ 08122402 - .incbin "minecart/gUnk_08122402.bin" - -gUnk_0812241C:: @ 0812241C - .incbin "minecart/gUnk_0812241C.bin" - -gUnk_08122436:: @ 08122436 - .incbin "minecart/gUnk_08122436.bin" gSpriteAnimations_Minecart_0:: @ 08122450 .include "animations/gSpriteAnimations_Minecart_0.s" diff --git a/data/const/playerItem/playerItemCellOverwriteSet.s b/data/const/playerItem/playerItemCellOverwriteSet.s deleted file mode 100644 index 97280cad..00000000 --- a/data/const/playerItem/playerItemCellOverwriteSet.s +++ /dev/null @@ -1,21 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - @.align 2 - -@ before: playerItemBottle -@ after: playerItemCellOverwriteSet - -@ scroll.c, intr.s, veener.s -gUnk_080B7910:: @ 080B7910 - .incbin "data_080B7910/gUnk_080B7910.bin" - -@ veener.s, playerUtils.c -gUnk_080B79A7:: @ 080B79A7 - .incbin "data_080B7910/gUnk_080B79A7.bin" - -@ intr.s -gUnk_080B7A3E:: @ 080B7A3E - .incbin "data_080B7910/gUnk_080B7A3E.bin" - diff --git a/data/data_080046A4.s b/data/data_080046A4.s new file mode 100644 index 00000000..bca2f8f1 --- /dev/null +++ b/data/data_080046A4.s @@ -0,0 +1,41 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata +@ .align 2 + + +@ TODO PlayerMacros + +gUnk_080049D6:: @ 080049D6 + .incbin "code_080043E8/gUnk_080049D6.bin" + +gUnk_080049F6:: @ 080049F6 + .incbin "code_080043E8/gUnk_080049F6.bin" + +gUnk_080049FE:: @ gUnk_080049FE + .incbin "code_080043E8/gUnk_080049FE.bin" + +gUnk_08004A0C:: @ 08004A0C + .incbin "code_080043E8/gUnk_08004A0C.bin" + +gUnk_08004A16:: @ 08004A16 + .incbin "code_080043E8/gUnk_08004A16.bin" + +gUnk_08004A24:: @ 08004A24 + .incbin "code_080043E8/gUnk_08004A24.bin" + +gUnk_08004A32:: @ 08004A32 + .incbin "code_080043E8/gUnk_08004A32.bin" + +gUnk_08004A48:: @ 08004A48 + .incbin "code_080043E8/gUnk_08004A48.bin" + +gUnk_08004A72:: @ 08004A72 + .incbin "code_080043E8/gUnk_08004A72.bin" + +gUnk_08004A8C:: @ 08004A8C + .incbin "code_080043E8/gUnk_08004A8C.bin" + +gUnk_08004AA6:: @ 08004AA6 + .incbin "code_080043E8/gUnk_08004AA6.bin" |