diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-23 12:43:43 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2022-07-25 22:45:55 +0200 |
| commit | 852effa474c159398014da736ade6f0fea454de7 (patch) | |
| tree | 97da22c4758ca4156dc9fb7ac123c7a3b0a9e9f5 /data/const | |
| parent | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (diff) | |
Rename objects
Diffstat (limited to 'data/const')
| -rw-r--r-- | data/const/npc/bladeBrothers.s | 8 | ||||
| -rw-r--r-- | data/const/object/cutsceneMiscObject.s | 29 | ||||
| -rw-r--r-- | data/const/object/object6A.s | 29 |
3 files changed, 33 insertions, 33 deletions
diff --git a/data/const/npc/bladeBrothers.s b/data/const/npc/bladeBrothers.s index 1401778f..e96d6f92 100644 --- a/data/const/npc/bladeBrothers.s +++ b/data/const/npc/bladeBrothers.s @@ -18,7 +18,7 @@ gUnk_081115D0:: @ 081115D0 gUnk_081115DC:: @ 081115DC .incbin "bladeBrothers/gUnk_081115DC.bin" -gUnk_081115EC:: @ 081115EC +BladeBrothers_PlayerMacros:: @ 081115EC .4byte gUnk_08004A0C .4byte gUnk_08004A16 .4byte gUnk_08004A24 @@ -28,10 +28,10 @@ gUnk_081115EC:: @ 081115EC .4byte gUnk_08004A8C .4byte gUnk_08004AA6 .4byte 00000000 - .incbin "bladeBrothers/gUnk_081115EC.bin" + .incbin "bladeBrothers/BladeBrothers_PlayerMacros.bin" -gUnk_08111618:: @ 08111618 - .incbin "bladeBrothers/gUnk_08111618.bin" +BladeBrothers_EquippedItem:: @ 08111618 + .incbin "bladeBrothers/BladeBrothers_EquippedItem.bin" gUnk_08111623:: @ 08111623 .incbin "bladeBrothers/gUnk_08111623.bin" diff --git a/data/const/object/cutsceneMiscObject.s b/data/const/object/cutsceneMiscObject.s new file mode 100644 index 00000000..921761b6 --- /dev/null +++ b/data/const/object/cutsceneMiscObject.s @@ -0,0 +1,29 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08122AE0:: @ 08122AE0 + .incbin "cutsceneMiscObject/gUnk_08122AE0.bin" + +gUnk_08122AE8:: @ 08122AE8 + .incbin "cutsceneMiscObject/gUnk_08122AE8.bin" + +gUnk_08122AF8:: @ 08122AF8 + .incbin "cutsceneMiscObject/gUnk_08122AF8.bin" + +gUnk_08122B00:: @ 08122B00 + .incbin "cutsceneMiscObject/gUnk_08122B00.bin" + +gUnk_08122B0E:: @ 08122B0E + .incbin "cutsceneMiscObject/gUnk_08122B0E.bin" + +gUnk_08122B1E:: @ 08122B1E + .incbin "cutsceneMiscObject/gUnk_08122B1E.bin" + +gUnk_08122B2E:: @ 08122B2E + .incbin "cutsceneMiscObject/gUnk_08122B2E.bin" + +gUnk_08122B3C:: @ 08122B3C + .incbin "cutsceneMiscObject/gUnk_08122B3C.bin" diff --git a/data/const/object/object6A.s b/data/const/object/object6A.s deleted file mode 100644 index d2d186f0..00000000 --- a/data/const/object/object6A.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08122AE0:: @ 08122AE0 - .incbin "object6A/gUnk_08122AE0.bin" - -gUnk_08122AE8:: @ 08122AE8 - .incbin "object6A/gUnk_08122AE8.bin" - -gUnk_08122AF8:: @ 08122AF8 - .incbin "object6A/gUnk_08122AF8.bin" - -gUnk_08122B00:: @ 08122B00 - .incbin "object6A/gUnk_08122B00.bin" - -gUnk_08122B0E:: @ 08122B0E - .incbin "object6A/gUnk_08122B0E.bin" - -gUnk_08122B1E:: @ 08122B1E - .incbin "object6A/gUnk_08122B1E.bin" - -gUnk_08122B2E:: @ 08122B2E - .incbin "object6A/gUnk_08122B2E.bin" - -gUnk_08122B3C:: @ 08122B3C - .incbin "object6A/gUnk_08122B3C.bin" |