diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-28 15:25:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 15:25:31 -0700 |
| commit | 0eeb5fa33d5fbda1a014b9df69ce8aa98415fa6d (patch) | |
| tree | 12a8b3848cd7f4323cce8869d5d78285e719d9d3 /data | |
| parent | 270476488f5beee2fec7bf0b8b160cb72cbade70 (diff) | |
| parent | 7c16e8d50ae048d47e55b9d13c23be21dbae423a (diff) | |
Merge pull request #475 from notyourav/pitems
identify all player items
Diffstat (limited to 'data')
| -rw-r--r-- | data/const/playerItem/playerItem10.s | 9 | ||||
| -rw-r--r-- | data/const/playerItem/playerItemFireRodProjectile.s (renamed from data/const/playerItem/playerItem15.s) | 2 | ||||
| -rw-r--r-- | data/const/playerItem/playerItemGustBig.s (renamed from data/const/playerItem/playerItem11.s) | 10 | ||||
| -rw-r--r-- | data/const/playerItem/playerItemHeldObject.s (renamed from data/const/playerItem/playerItem13.s) | 10 | ||||
| -rw-r--r-- | data/const/playerItem/playerItemSpiralBeam.s (renamed from data/const/playerItem/playerItem14.s) | 2 |
5 files changed, 12 insertions, 21 deletions
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/playerItem15.s b/data/const/playerItem/playerItemFireRodProjectile.s index 092c03b4..d38fda70 100644 --- a/data/const/playerItem/playerItem15.s +++ b/data/const/playerItem/playerItemFireRodProjectile.s @@ -9,5 +9,5 @@ gUnk_08127270:: @ 08127270 .4byte sub_080A310C gUnk_08127278:: @ 08127278 - .incbin "playerItem15/gUnk_08127278.bin" + .incbin "playerItemFireRodProjectile/gUnk_08127278.bin" diff --git a/data/const/playerItem/playerItem11.s b/data/const/playerItem/playerItemGustBig.s index b4c6e710..2e439ed3 100644 --- a/data/const/playerItem/playerItem11.s +++ b/data/const/playerItem/playerItemGustBig.s @@ -12,7 +12,7 @@ gUnk_080B3DD0:: @ 080B3DD0 .4byte sub_08018F6C gUnk_080B3DE0:: @ 080B3DE0 - .incbin "playerItem11/gUnk_080B3DE0.bin" + .incbin "playerItemGustBig/gUnk_080B3DE0.bin" gUnk_080B3DE8:: @ 080B3DE8 .4byte gUnk_080B3E18 @@ -20,13 +20,13 @@ gUnk_080B3DE8:: @ 080B3DE8 .4byte gUnk_080B3E28 gUnk_080B3DF4:: @ 080B3DF4 - .incbin "playerItem11/gUnk_080B3DF4.bin" + .incbin "playerItemGustBig/gUnk_080B3DF4.bin" gUnk_080B3E18:: @ 080B3E18 - .incbin "playerItem11/gUnk_080B3E18.bin" + .incbin "playerItemGustBig/gUnk_080B3E18.bin" gUnk_080B3E20:: @ 080B3E20 - .incbin "playerItem11/gUnk_080B3E20.bin" + .incbin "playerItemGustBig/gUnk_080B3E20.bin" gUnk_080B3E28:: @ 080B3E28 - .incbin "playerItem11/gUnk_080B3E28.bin" + .incbin "playerItemGustBig/gUnk_080B3E28.bin" diff --git a/data/const/playerItem/playerItem13.s b/data/const/playerItem/playerItemHeldObject.s index 60174e9b..3df0b29b 100644 --- a/data/const/playerItem/playerItem13.s +++ b/data/const/playerItem/playerItemHeldObject.s @@ -11,16 +11,16 @@ gUnk_081320A8:: @ 081320A8 .4byte sub_080AD274 gUnk_081320B8:: @ 081320B8 - .incbin "playerItem13/gUnk_081320B8.bin" + .incbin "playerItemHeldObject/gUnk_081320B8.bin" gUnk_081320C4:: @ 081320C4 - .incbin "playerItem13/gUnk_081320C4.bin" + .incbin "playerItemHeldObject/gUnk_081320C4.bin" gUnk_081320CC:: @ 081320CC - .incbin "playerItem13/gUnk_081320CC.bin" + .incbin "playerItemHeldObject/gUnk_081320CC.bin" gUnk_081320D4:: @ 081320D4 - .incbin "playerItem13/gUnk_081320D4.bin" + .incbin "playerItemHeldObject/gUnk_081320D4.bin" gUnk_081320E4:: @ 081320E4 - .incbin "playerItem13/gUnk_081320E4.bin" + .incbin "playerItemHeldObject/gUnk_081320E4.bin" diff --git a/data/const/playerItem/playerItem14.s b/data/const/playerItem/playerItemSpiralBeam.s index dfc35a84..0ce9c6d0 100644 --- a/data/const/playerItem/playerItem14.s +++ b/data/const/playerItem/playerItemSpiralBeam.s @@ -9,4 +9,4 @@ gUnk_08109AC8:: @ 08109AC8 .4byte sub_0805FC74 gUnk_08109AD0:: @ 08109AD0 - .incbin "playerItem14/gUnk_08109AD0.bin" + .incbin "playerItemSpiralBeam/gUnk_08109AD0.bin" |