From c2ba47d796dfdbd091d534ee70456fd47d2ef4b6 Mon Sep 17 00:00:00 2001 From: theo3 Date: Fri, 17 Dec 2021 11:26:16 -0800 Subject: identify more objects --- data/const/object/ambientClouds.s | 11 +++++++++++ data/const/object/angryStatue.s | 15 +++++++++++++++ data/const/object/barrelInside.s | 11 +++++++++++ data/const/object/board.s | 12 ++++++++++++ data/const/object/cabinFurniture.s | 10 ++++++++++ data/const/object/doubleBookshelf.s | 14 ++++++++++++++ data/const/object/giantRock2.s | 9 +++++++++ data/const/object/gyorgBossObject.s | 20 ++++++++++++++++++++ data/const/object/mazaalBossObject.s | 16 ++++++++++++++++ data/const/object/minishEmoticon.s | 9 +++++++++ data/const/object/object24.s | 13 ------------- data/const/object/object26.s | 11 ----------- data/const/object/object29.s | 11 ----------- data/const/object/object4.s | 9 --------- data/const/object/object51.s | 9 --------- data/const/object/object5A.s | 14 -------------- data/const/object/object72.s | 15 --------------- data/const/object/object80.s | 12 ------------ data/const/object/object89.s | 16 ---------------- data/const/object/object8A.s | 10 ---------- data/const/object/object8B.s | 14 -------------- data/const/object/objectA0.s | 15 --------------- data/const/object/objectBA.s | 20 -------------------- data/const/object/paper.s | 14 ++++++++++++++ data/const/object/pressurePlate.s | 13 +++++++++++++ data/const/object/stoneTablet.s | 15 +++++++++++++++ 26 files changed, 169 insertions(+), 169 deletions(-) create mode 100644 data/const/object/ambientClouds.s create mode 100644 data/const/object/angryStatue.s create mode 100644 data/const/object/barrelInside.s create mode 100644 data/const/object/board.s create mode 100644 data/const/object/cabinFurniture.s create mode 100644 data/const/object/doubleBookshelf.s create mode 100644 data/const/object/giantRock2.s create mode 100644 data/const/object/gyorgBossObject.s create mode 100644 data/const/object/mazaalBossObject.s create mode 100644 data/const/object/minishEmoticon.s delete mode 100644 data/const/object/object24.s delete mode 100644 data/const/object/object26.s delete mode 100644 data/const/object/object29.s delete mode 100644 data/const/object/object4.s delete mode 100644 data/const/object/object51.s delete mode 100644 data/const/object/object5A.s delete mode 100644 data/const/object/object72.s delete mode 100644 data/const/object/object80.s delete mode 100644 data/const/object/object89.s delete mode 100644 data/const/object/object8A.s delete mode 100644 data/const/object/object8B.s delete mode 100644 data/const/object/objectA0.s delete mode 100644 data/const/object/objectBA.s create mode 100644 data/const/object/paper.s create mode 100644 data/const/object/pressurePlate.s create mode 100644 data/const/object/stoneTablet.s (limited to 'data/const/object') diff --git a/data/const/object/ambientClouds.s b/data/const/object/ambientClouds.s new file mode 100644 index 00000000..64113d09 --- /dev/null +++ b/data/const/object/ambientClouds.s @@ -0,0 +1,11 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08120D90:: @ 08120D90 + .4byte sub_08089874 + .4byte sub_08089944 + .4byte sub_08089A7C + .4byte sub_08089AE0 diff --git a/data/const/object/angryStatue.s b/data/const/object/angryStatue.s new file mode 100644 index 00000000..01589469 --- /dev/null +++ b/data/const/object/angryStatue.s @@ -0,0 +1,15 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08124670:: @ 08124670 + .4byte sub_0809F144 + .4byte sub_0809F194 + .4byte sub_0809F1B0 + .4byte sub_0809F220 + .4byte sub_0809F254 + +gUnk_08124684:: @ 08124684 + .incbin "angryStatue/gUnk_08124684.bin" diff --git a/data/const/object/barrelInside.s b/data/const/object/barrelInside.s new file mode 100644 index 00000000..13e148d9 --- /dev/null +++ b/data/const/object/barrelInside.s @@ -0,0 +1,11 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08120C80:: @ 08120C80 + .incbin "barrelInside/gUnk_08120C80.bin" + +gUnk_08120C92:: @ 08120C92 + .incbin "barrelInside/gUnk_08120C92.bin" diff --git a/data/const/object/board.s b/data/const/object/board.s new file mode 100644 index 00000000..2f569052 --- /dev/null +++ b/data/const/object/board.s @@ -0,0 +1,12 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08123664:: @ 08123664 + .4byte sub_08098B28 + .4byte sub_08098BE0 + +gUnk_0812366C:: @ 0812366C + .incbin "board/gUnk_0812366C.bin" diff --git a/data/const/object/cabinFurniture.s b/data/const/object/cabinFurniture.s new file mode 100644 index 00000000..db3fb95d --- /dev/null +++ b/data/const/object/cabinFurniture.s @@ -0,0 +1,10 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08123D4C:: @ 08123D4C + .4byte sub_0809ADCC + .4byte nullsub_535 + .4byte sub_0809AF50 diff --git a/data/const/object/doubleBookshelf.s b/data/const/object/doubleBookshelf.s new file mode 100644 index 00000000..9bd699f0 --- /dev/null +++ b/data/const/object/doubleBookshelf.s @@ -0,0 +1,14 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08123D58:: @ 08123D58 + .4byte sub_0809AF74 + .4byte sub_0809B034 + .4byte sub_0809B050 + .4byte sub_0809B0A8 + +gUnk_08123D68:: @ 08123D68 + .incbin "doubleBookshelf/gUnk_08123D68.bin" diff --git a/data/const/object/giantRock2.s b/data/const/object/giantRock2.s new file mode 100644 index 00000000..a95e84f8 --- /dev/null +++ b/data/const/object/giantRock2.s @@ -0,0 +1,9 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08122278:: @ 08122278 + .4byte sub_08091010 + .4byte nullsub_523 diff --git a/data/const/object/gyorgBossObject.s b/data/const/object/gyorgBossObject.s new file mode 100644 index 00000000..eb5c2617 --- /dev/null +++ b/data/const/object/gyorgBossObject.s @@ -0,0 +1,20 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08124ED0:: @ 08124ED0 + .4byte sub_080A1704 + .4byte sub_080A184C + .4byte sub_080A189C + .4byte sub_080A190C + .4byte sub_080A1990 + .4byte sub_080A19FC + .4byte sub_080A1A80 + .4byte sub_080A1AE8 + .4byte sub_080A1B4C + .4byte sub_080A1C04 + +gUnk_08124EF8:: @ 08124EF8 + .incbin "gyorgBossObject/gUnk_08124EF8.bin" diff --git a/data/const/object/mazaalBossObject.s b/data/const/object/mazaalBossObject.s new file mode 100644 index 00000000..a58e800e --- /dev/null +++ b/data/const/object/mazaalBossObject.s @@ -0,0 +1,16 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08123D28:: @ 08123D28 + .4byte sub_0809AB04 + .4byte sub_0809ABA4 + .4byte sub_0809ABB0 + .4byte sub_0809ABD4 + .4byte sub_0809ABF4 + .4byte sub_0809AC3C + .4byte sub_0809ACA0 + .4byte sub_0809ACCC + .4byte sub_0809ACE8 diff --git a/data/const/object/minishEmoticon.s b/data/const/object/minishEmoticon.s new file mode 100644 index 00000000..2cf717cb --- /dev/null +++ b/data/const/object/minishEmoticon.s @@ -0,0 +1,9 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_0811EE5C:: @ 0811EE5C + .4byte sub_08082058 + .4byte sub_08082098 diff --git a/data/const/object/object24.s b/data/const/object/object24.s deleted file mode 100644 index f0e129bb..00000000 --- a/data/const/object/object24.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08120BE0:: @ 08120BE0 - .4byte sub_08088840 - .4byte sub_0808886C - .4byte sub_080888F4 - -gUnk_08120BEC:: @ 08120BEC - .incbin "object24/gUnk_08120BEC.bin" diff --git a/data/const/object/object26.s b/data/const/object/object26.s deleted file mode 100644 index fabcda59..00000000 --- a/data/const/object/object26.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08120C80:: @ 08120C80 - .incbin "object26/gUnk_08120C80.bin" - -gUnk_08120C92:: @ 08120C92 - .incbin "object26/gUnk_08120C92.bin" diff --git a/data/const/object/object29.s b/data/const/object/object29.s deleted file mode 100644 index 64113d09..00000000 --- a/data/const/object/object29.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08120D90:: @ 08120D90 - .4byte sub_08089874 - .4byte sub_08089944 - .4byte sub_08089A7C - .4byte sub_08089AE0 diff --git a/data/const/object/object4.s b/data/const/object/object4.s deleted file mode 100644 index 2cf717cb..00000000 --- a/data/const/object/object4.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_0811EE5C:: @ 0811EE5C - .4byte sub_08082058 - .4byte sub_08082098 diff --git a/data/const/object/object51.s b/data/const/object/object51.s deleted file mode 100644 index a95e84f8..00000000 --- a/data/const/object/object51.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08122278:: @ 08122278 - .4byte sub_08091010 - .4byte nullsub_523 diff --git a/data/const/object/object5A.s b/data/const/object/object5A.s deleted file mode 100644 index 212f6de6..00000000 --- a/data/const/object/object5A.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08122780:: @ 08122780 - .4byte sub_08092734 - .4byte sub_08092850 - -gUnk_08122788:: @ 08122788 - .4byte sub_0809274C - .4byte sub_080927AC - .4byte sub_080927D4 diff --git a/data/const/object/object72.s b/data/const/object/object72.s deleted file mode 100644 index f211569e..00000000 --- a/data/const/object/object72.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_081232E4:: @ 081232E4 - .4byte sub_080979CC - .4byte nullsub_529 - -gUnk_081232EC:: @ 081232EC - .incbin "object72/gUnk_081232EC.bin" - -gUnk_081232FE:: @ 081232FE - .incbin "object72/gUnk_081232FE.bin" diff --git a/data/const/object/object80.s b/data/const/object/object80.s deleted file mode 100644 index 2d5c1c1d..00000000 --- a/data/const/object/object80.s +++ /dev/null @@ -1,12 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08123664:: @ 08123664 - .4byte sub_08098B28 - .4byte sub_08098BE0 - -gUnk_0812366C:: @ 0812366C - .incbin "object80/gUnk_0812366C.bin" diff --git a/data/const/object/object89.s b/data/const/object/object89.s deleted file mode 100644 index a58e800e..00000000 --- a/data/const/object/object89.s +++ /dev/null @@ -1,16 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08123D28:: @ 08123D28 - .4byte sub_0809AB04 - .4byte sub_0809ABA4 - .4byte sub_0809ABB0 - .4byte sub_0809ABD4 - .4byte sub_0809ABF4 - .4byte sub_0809AC3C - .4byte sub_0809ACA0 - .4byte sub_0809ACCC - .4byte sub_0809ACE8 diff --git a/data/const/object/object8A.s b/data/const/object/object8A.s deleted file mode 100644 index db3fb95d..00000000 --- a/data/const/object/object8A.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08123D4C:: @ 08123D4C - .4byte sub_0809ADCC - .4byte nullsub_535 - .4byte sub_0809AF50 diff --git a/data/const/object/object8B.s b/data/const/object/object8B.s deleted file mode 100644 index e450780d..00000000 --- a/data/const/object/object8B.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08123D58:: @ 08123D58 - .4byte sub_0809AF74 - .4byte sub_0809B034 - .4byte sub_0809B050 - .4byte sub_0809B0A8 - -gUnk_08123D68:: @ 08123D68 - .incbin "object8B/gUnk_08123D68.bin" diff --git a/data/const/object/objectA0.s b/data/const/object/objectA0.s deleted file mode 100644 index d3b0f552..00000000 --- a/data/const/object/objectA0.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08124670:: @ 08124670 - .4byte sub_0809F144 - .4byte sub_0809F194 - .4byte sub_0809F1B0 - .4byte sub_0809F220 - .4byte sub_0809F254 - -gUnk_08124684:: @ 08124684 - .incbin "objectA0/gUnk_08124684.bin" diff --git a/data/const/object/objectBA.s b/data/const/object/objectBA.s deleted file mode 100644 index c6ab4a1f..00000000 --- a/data/const/object/objectBA.s +++ /dev/null @@ -1,20 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08124ED0:: @ 08124ED0 - .4byte sub_080A1704 - .4byte sub_080A184C - .4byte sub_080A189C - .4byte sub_080A190C - .4byte sub_080A1990 - .4byte sub_080A19FC - .4byte sub_080A1A80 - .4byte sub_080A1AE8 - .4byte sub_080A1B4C - .4byte sub_080A1C04 - -gUnk_08124EF8:: @ 08124EF8 - .incbin "objectBA/gUnk_08124EF8.bin" diff --git a/data/const/object/paper.s b/data/const/object/paper.s new file mode 100644 index 00000000..212f6de6 --- /dev/null +++ b/data/const/object/paper.s @@ -0,0 +1,14 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08122780:: @ 08122780 + .4byte sub_08092734 + .4byte sub_08092850 + +gUnk_08122788:: @ 08122788 + .4byte sub_0809274C + .4byte sub_080927AC + .4byte sub_080927D4 diff --git a/data/const/object/pressurePlate.s b/data/const/object/pressurePlate.s new file mode 100644 index 00000000..15f9e807 --- /dev/null +++ b/data/const/object/pressurePlate.s @@ -0,0 +1,13 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_08120BE0:: @ 08120BE0 + .4byte sub_08088840 + .4byte sub_0808886C + .4byte sub_080888F4 + +gUnk_08120BEC:: @ 08120BEC + .incbin "PressurePlate/gUnk_08120BEC.bin" diff --git a/data/const/object/stoneTablet.s b/data/const/object/stoneTablet.s new file mode 100644 index 00000000..13bd0ece --- /dev/null +++ b/data/const/object/stoneTablet.s @@ -0,0 +1,15 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_081232E4:: @ 081232E4 + .4byte sub_080979CC + .4byte nullsub_529 + +gUnk_081232EC:: @ 081232EC + .incbin "stoneTablet/gUnk_081232EC.bin" + +gUnk_081232FE:: @ 081232FE + .incbin "stoneTablet/gUnk_081232FE.bin" -- cgit v1.2.3