From 7c16e8d50ae048d47e55b9d13c23be21dbae423a Mon Sep 17 00:00:00 2001 From: theo3 Date: Mon, 28 Mar 2022 15:08:37 -0700 Subject: identify all player items --- data/const/playerItem/playerItem10.s | 9 ------ data/const/playerItem/playerItem11.s | 32 ---------------------- data/const/playerItem/playerItem13.s | 26 ------------------ data/const/playerItem/playerItem14.s | 12 -------- data/const/playerItem/playerItem15.s | 13 --------- .../const/playerItem/playerItemFireRodProjectile.s | 13 +++++++++ data/const/playerItem/playerItemGustBig.s | 32 ++++++++++++++++++++++ data/const/playerItem/playerItemHeldObject.s | 26 ++++++++++++++++++ data/const/playerItem/playerItemSpiralBeam.s | 12 ++++++++ 9 files changed, 83 insertions(+), 92 deletions(-) delete mode 100644 data/const/playerItem/playerItem10.s delete mode 100644 data/const/playerItem/playerItem11.s delete mode 100644 data/const/playerItem/playerItem13.s delete mode 100644 data/const/playerItem/playerItem14.s delete mode 100644 data/const/playerItem/playerItem15.s create mode 100644 data/const/playerItem/playerItemFireRodProjectile.s create mode 100644 data/const/playerItem/playerItemGustBig.s create mode 100644 data/const/playerItem/playerItemHeldObject.s create mode 100644 data/const/playerItem/playerItemSpiralBeam.s (limited to 'data') diff --git a/data/const/playerItem/playerItem10.s b/data/const/playerItem/playerItem10.s deleted file mode 100644 index 49a982a3..00000000 --- a/data/const/playerItem/playerItem10.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0812AA80:: @ 0812AA80 - .4byte sub_080ACC04 - .4byte sub_080ACC5C diff --git a/data/const/playerItem/playerItem11.s b/data/const/playerItem/playerItem11.s deleted file mode 100644 index b4c6e710..00000000 --- a/data/const/playerItem/playerItem11.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - - -gUnk_080B3DD0:: @ 080B3DD0 - .4byte sub_08018CBC - .4byte sub_08018DE8 - .4byte sub_08018E68 - .4byte sub_08018F6C - -gUnk_080B3DE0:: @ 080B3DE0 - .incbin "playerItem11/gUnk_080B3DE0.bin" - -gUnk_080B3DE8:: @ 080B3DE8 - .4byte gUnk_080B3E18 - .4byte gUnk_080B3E20 - .4byte gUnk_080B3E28 - -gUnk_080B3DF4:: @ 080B3DF4 - .incbin "playerItem11/gUnk_080B3DF4.bin" - -gUnk_080B3E18:: @ 080B3E18 - .incbin "playerItem11/gUnk_080B3E18.bin" - -gUnk_080B3E20:: @ 080B3E20 - .incbin "playerItem11/gUnk_080B3E20.bin" - -gUnk_080B3E28:: @ 080B3E28 - .incbin "playerItem11/gUnk_080B3E28.bin" diff --git a/data/const/playerItem/playerItem13.s b/data/const/playerItem/playerItem13.s deleted file mode 100644 index 60174e9b..00000000 --- a/data/const/playerItem/playerItem13.s +++ /dev/null @@ -1,26 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_081320A8:: @ 081320A8 - .4byte sub_080ACF2C - .4byte sub_080ACFCC - .4byte sub_080AD040 - .4byte sub_080AD274 - -gUnk_081320B8:: @ 081320B8 - .incbin "playerItem13/gUnk_081320B8.bin" - -gUnk_081320C4:: @ 081320C4 - .incbin "playerItem13/gUnk_081320C4.bin" - -gUnk_081320CC:: @ 081320CC - .incbin "playerItem13/gUnk_081320CC.bin" - -gUnk_081320D4:: @ 081320D4 - .incbin "playerItem13/gUnk_081320D4.bin" - -gUnk_081320E4:: @ 081320E4 - .incbin "playerItem13/gUnk_081320E4.bin" diff --git a/data/const/playerItem/playerItem14.s b/data/const/playerItem/playerItem14.s deleted file mode 100644 index dfc35a84..00000000 --- a/data/const/playerItem/playerItem14.s +++ /dev/null @@ -1,12 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08109AC8:: @ 08109AC8 - .4byte sub_0805FBE8 - .4byte sub_0805FC74 - -gUnk_08109AD0:: @ 08109AD0 - .incbin "playerItem14/gUnk_08109AD0.bin" diff --git a/data/const/playerItem/playerItem15.s b/data/const/playerItem/playerItem15.s deleted file mode 100644 index 092c03b4..00000000 --- a/data/const/playerItem/playerItem15.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08127270:: @ 08127270 - .4byte sub_080A3084 - .4byte sub_080A310C - -gUnk_08127278:: @ 08127278 - .incbin "playerItem15/gUnk_08127278.bin" - diff --git a/data/const/playerItem/playerItemFireRodProjectile.s b/data/const/playerItem/playerItemFireRodProjectile.s new file mode 100644 index 00000000..d38fda70 --- /dev/null +++ b/data/const/playerItem/playerItemFireRodProjectile.s @@ -0,0 +1,13 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08127270:: @ 08127270 + .4byte sub_080A3084 + .4byte sub_080A310C + +gUnk_08127278:: @ 08127278 + .incbin "playerItemFireRodProjectile/gUnk_08127278.bin" + diff --git a/data/const/playerItem/playerItemGustBig.s b/data/const/playerItem/playerItemGustBig.s new file mode 100644 index 00000000..2e439ed3 --- /dev/null +++ b/data/const/playerItem/playerItemGustBig.s @@ -0,0 +1,32 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + + +gUnk_080B3DD0:: @ 080B3DD0 + .4byte sub_08018CBC + .4byte sub_08018DE8 + .4byte sub_08018E68 + .4byte sub_08018F6C + +gUnk_080B3DE0:: @ 080B3DE0 + .incbin "playerItemGustBig/gUnk_080B3DE0.bin" + +gUnk_080B3DE8:: @ 080B3DE8 + .4byte gUnk_080B3E18 + .4byte gUnk_080B3E20 + .4byte gUnk_080B3E28 + +gUnk_080B3DF4:: @ 080B3DF4 + .incbin "playerItemGustBig/gUnk_080B3DF4.bin" + +gUnk_080B3E18:: @ 080B3E18 + .incbin "playerItemGustBig/gUnk_080B3E18.bin" + +gUnk_080B3E20:: @ 080B3E20 + .incbin "playerItemGustBig/gUnk_080B3E20.bin" + +gUnk_080B3E28:: @ 080B3E28 + .incbin "playerItemGustBig/gUnk_080B3E28.bin" diff --git a/data/const/playerItem/playerItemHeldObject.s b/data/const/playerItem/playerItemHeldObject.s new file mode 100644 index 00000000..3df0b29b --- /dev/null +++ b/data/const/playerItem/playerItemHeldObject.s @@ -0,0 +1,26 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_081320A8:: @ 081320A8 + .4byte sub_080ACF2C + .4byte sub_080ACFCC + .4byte sub_080AD040 + .4byte sub_080AD274 + +gUnk_081320B8:: @ 081320B8 + .incbin "playerItemHeldObject/gUnk_081320B8.bin" + +gUnk_081320C4:: @ 081320C4 + .incbin "playerItemHeldObject/gUnk_081320C4.bin" + +gUnk_081320CC:: @ 081320CC + .incbin "playerItemHeldObject/gUnk_081320CC.bin" + +gUnk_081320D4:: @ 081320D4 + .incbin "playerItemHeldObject/gUnk_081320D4.bin" + +gUnk_081320E4:: @ 081320E4 + .incbin "playerItemHeldObject/gUnk_081320E4.bin" diff --git a/data/const/playerItem/playerItemSpiralBeam.s b/data/const/playerItem/playerItemSpiralBeam.s new file mode 100644 index 00000000..0ce9c6d0 --- /dev/null +++ b/data/const/playerItem/playerItemSpiralBeam.s @@ -0,0 +1,12 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08109AC8:: @ 08109AC8 + .4byte sub_0805FBE8 + .4byte sub_0805FC74 + +gUnk_08109AD0:: @ 08109AD0 + .incbin "playerItemSpiralBeam/gUnk_08109AD0.bin" -- cgit v1.2.3