Link itmarumine (doldecomp#1381)

* dump all functions and add table * 93% of it_802D0B04 * 93% of it_802D0C44 * match `it_802D0D18` * match `it_802D0E30` * match `it_802D0E90` * 92% of `it_802D1320` * match `it_802D13A8` * match `it_802D0A0C` * match `it_802D0BB8` * match `it_802D0DBC` * 93% of `it_802D100C` * match 80% of `it_802D1204` * 83% of `it_802D1204` + cleaning * match `it_802D0CEC` * 82% of `it_802D0F6C` and declaration change for `it_802D1204` * match `it_802D1140` * match `fn_802D0F98` * `const` for `float`s * match `it_802D1320`, `it_802D100C`, and `it_802D0C44` * match `it_802D0F6C` * match `it_802D1204` * function declarations * move declaration for `it_8026E71C` to `it_266F.h` * find/replace `.sdata2` `float`s * update build files * remove `M2C_FIELD` usage in `it_802D09D0` * Revert "update build files" This reverts commit 8a1854f. * change declaration for `it_80274250` * use `itPokemonAttributes` and `itPokemonVars` * retry build files change * revert scope change for `fn_802D0F98` * scopes for `.rodata` and `.sdata2` * remove static keyword for `fn_802D0F98` * Revert "use `itPokemonAttributes` and `itPokemonVars`" This reverts commit bd71b0b. * Reapply "use `itPokemonAttributes` and `itPokemonVars`" This reverts commit 9d83971. * fix relocation diff in `it_802D0C44` * change scope for `fn_802D0F98` (again) * consolidate declarations for `it_802D09D0` * Revert "consolidate declarations for `it_802D09D0`" This reverts commit 302f772. * fix declaration `it_802D09D0` remove declaration in `it_27CF.h`, include `itmarumine.h` where used instead * use `int` in `ItPokemonVars`
wyatt-avilla · Mar 20, 2024 · 7b0f9f1 · 7b0f9f1
1 parent 2cc16ed
commit 7b0f9f1
Show file tree

Hide file tree

Showing 11 changed files with 439 additions and 888 deletions.
diff --git a/asm/melee/it/items/itmarumine.s b/asm/melee/it/items/itmarumine.s
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -16211,41 +16211,41 @@ it_802D0988 = .text:0x802D0988; // type:function size:0x20 scope:global
 it_802D09A8 = .text:0x802D09A8; // type:function size:0x28 scope:global
 it_802D09D0 = .text:0x802D09D0; // type:function size:0x3C scope:global
 it_802D0A0C = .text:0x802D0A0C; // type:function size:0xA0 scope:global
-it_802D0AAC = .text:0x802D0AAC; // type:function size:0x4 scope:global
+it_802D0AAC = .text:0x802D0AAC; // type:function size:0x4 scope:local
 it_802D0AB0 = .text:0x802D0AB0; // type:function size:0x20 scope:global
 it_802D0AD0 = .text:0x802D0AD0; // type:function size:0x34 scope:global
-it_802D0B04 = .text:0x802D0B04; // type:function size:0x70 scope:global
-it_802D0B74 = .text:0x802D0B74; // type:function size:0x40 scope:global
-it_802D0BB4 = .text:0x802D0BB4; // type:function size:0x4 scope:global
-it_802D0BB8 = .text:0x802D0BB8; // type:function size:0x8C scope:global
-it_802D0C44 = .text:0x802D0C44; // type:function size:0x70 scope:global
-it_802D0CB4 = .text:0x802D0CB4; // type:function size:0x8 scope:global
-it_802D0CBC = .text:0x802D0CBC; // type:function size:0x30 scope:global
-it_802D0CEC = .text:0x802D0CEC; // type:function size:0x2C scope:global
+it_802D0B04 = .text:0x802D0B04; // type:function size:0x70 scope:local
+it_802D0B74 = .text:0x802D0B74; // type:function size:0x40 scope:local
+it_802D0BB4 = .text:0x802D0BB4; // type:function size:0x4 scope:local
+it_802D0BB8 = .text:0x802D0BB8; // type:function size:0x8C scope:local
+it_802D0C44 = .text:0x802D0C44; // type:function size:0x70 scope:local
+it_802D0CB4 = .text:0x802D0CB4; // type:function size:0x8 scope:local
+it_802D0CBC = .text:0x802D0CBC; // type:function size:0x30 scope:local
+it_802D0CEC = .text:0x802D0CEC; // type:function size:0x2C scope:local
 it_802D0D18 = .text:0x802D0D18; // type:function size:0x58 scope:global
-it_802D0D70 = .text:0x802D0D70; // type:function size:0x40 scope:global
-it_802D0DB0 = .text:0x802D0DB0; // type:function size:0x4 scope:global
-it_802D0DB4 = .text:0x802D0DB4; // type:function size:0x8 scope:global
-it_802D0DBC = .text:0x802D0DBC; // type:function size:0x74 scope:global
+it_802D0D70 = .text:0x802D0D70; // type:function size:0x40 scope:local
+it_802D0DB0 = .text:0x802D0DB0; // type:function size:0x4 scope:local
+it_802D0DB4 = .text:0x802D0DB4; // type:function size:0x8 scope:local
+it_802D0DBC = .text:0x802D0DBC; // type:function size:0x74 scope:local
 it_802D0E30 = .text:0x802D0E30; // type:function size:0x60 scope:global
 it_802D0E90 = .text:0x802D0E90; // type:function size:0x6C scope:global
-it_802D0EFC = .text:0x802D0EFC; // type:function size:0x40 scope:global
-it_802D0F3C = .text:0x802D0F3C; // type:function size:0x30 scope:global
-it_802D0F6C = .text:0x802D0F6C; // type:function size:0x2C scope:global
-fn_802D0F98 = .text:0x802D0F98; // type:function size:0x74
-it_802D100C = .text:0x802D100C; // type:function size:0x6C scope:global
-it_802D1078 = .text:0x802D1078; // type:function size:0x40 scope:global
-it_802D10B8 = .text:0x802D10B8; // type:function size:0x3C scope:global
-it_802D10F4 = .text:0x802D10F4; // type:function size:0x4C scope:global
-it_802D1140 = .text:0x802D1140; // type:function size:0xC4 scope:global
-it_802D1204 = .text:0x802D1204; // type:function size:0xF0 scope:global
-it_802D12F4 = .text:0x802D12F4; // type:function size:0x20 scope:global
-it_802D1314 = .text:0x802D1314; // type:function size:0x4 scope:global
-it_802D1318 = .text:0x802D1318; // type:function size:0x8 scope:global
-it_802D1320 = .text:0x802D1320; // type:function size:0x64 scope:global
-it_802D1384 = .text:0x802D1384; // type:function size:0x24 scope:global
-it_802D13A8 = .text:0x802D13A8; // type:function size:0x68 scope:global
-it_802D1410 = .text:0x802D1410; // type:function size:0x28 scope:global
+it_802D0EFC = .text:0x802D0EFC; // type:function size:0x40 scope:local
+it_802D0F3C = .text:0x802D0F3C; // type:function size:0x30 scope:local
+it_802D0F6C = .text:0x802D0F6C; // type:function size:0x2C scope:local
+fn_802D0F98 = .text:0x802D0F98; // type:function size:0x74 scope:local
+it_802D100C = .text:0x802D100C; // type:function size:0x6C scope:local
+it_802D1078 = .text:0x802D1078; // type:function size:0x40 scope:local
+it_802D10B8 = .text:0x802D10B8; // type:function size:0x3C scope:local
+it_802D10F4 = .text:0x802D10F4; // type:function size:0x4C scope:local
+it_802D1140 = .text:0x802D1140; // type:function size:0xC4 scope:local
+it_802D1204 = .text:0x802D1204; // type:function size:0xF0 scope:local
+it_802D12F4 = .text:0x802D12F4; // type:function size:0x20 scope:local
+it_802D1314 = .text:0x802D1314; // type:function size:0x4 scope:local
+it_802D1318 = .text:0x802D1318; // type:function size:0x8 scope:local
+it_802D1320 = .text:0x802D1320; // type:function size:0x64 scope:local
+it_802D1384 = .text:0x802D1384; // type:function size:0x24 scope:local
+it_802D13A8 = .text:0x802D13A8; // type:function size:0x68 scope:local
+it_802D1410 = .text:0x802D1410; // type:function size:0x28 scope:local
 it_802D1438 = .text:0x802D1438; // type:function size:0x98 scope:global
 it_802D14D0 = .text:0x802D14D0; // type:function size:0x4 scope:global
 it_802D14D4 = .text:0x802D14D4; // type:function size:0x20 scope:global
@@ -20411,7 +20411,7 @@ it_803B8698 = .rodata:0x803B8698; // type:object size:0xC scope:global data:4byt
 it_803B86A4 = .rodata:0x803B86A4; // type:object size:0xC scope:global data:4byte
 it_803B86B0 = .rodata:0x803B86B0; // type:object size:0xC scope:global data:4byte
 it_803B86BC = .rodata:0x803B86BC; // type:object size:0xC scope:global data:4byte
-it_803B86C8 = .rodata:0x803B86C8; // type:object size:0x10 scope:global data:4byte
+it_803B86C8 = .rodata:0x803B86C8; // type:object size:0x10 scope:local data:4byte
 it_803B86D8 = .rodata:0x803B86D8; // type:object size:0x10 scope:global data:4byte
 it_803B86E8 = .rodata:0x803B86E8; // type:object size:0x10 scope:global data:4byte
 @188 = .rodata:0x803B86F8; // type:object size:0xC scope:local data:4byte
@@ -32798,9 +32798,9 @@ it_804DD418 = .sdata2:0x804DD418; // type:object size:0x4 scope:global data:floa
 @222 = .sdata2:0x804DD430; // type:object size:0x4 scope:local data:float
 it_804DD438 = .sdata2:0x804DD438; // type:object size:0x4 scope:global data:float
 it_804DD43C = .sdata2:0x804DD43C; // type:object size:0x4 scope:global data:float
-it_804DD440 = .sdata2:0x804DD440; // type:object size:0x4 scope:global data:float
-it_804DD444 = .sdata2:0x804DD444; // type:object size:0x4 scope:global data:float
-it_804DD448 = .sdata2:0x804DD448; // type:object size:0x8 scope:global data:double
+it_804DD440 = .sdata2:0x804DD440; // type:object size:0x4 scope:local data:float
+it_804DD444 = .sdata2:0x804DD444; // type:object size:0x4 scope:local data:float
+it_804DD448 = .sdata2:0x804DD448; // type:object size:0x8 scope:local data:double
 it_804DD450 = .sdata2:0x804DD450; // type:object size:0x4 scope:global data:float
 it_804DD454 = .sdata2:0x804DD454; // type:object size:0x4 scope:global data:float
 it_804DD458 = .sdata2:0x804DD458; // type:object size:0x8 scope:global data:double

diff --git a/configure.py b/configure.py
@@ -1007,7 +1007,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(Matching, "melee/it/items/itraikou.c"),
             Object(Matching, "melee/it/items/itsuikun.c"),
             Object(NonMatching, "melee/it/items/itkireihana.c"),
-            Object(NonMatching, "melee/it/items/itmarumine.c"),
+            Object(Matching, "melee/it/items/itmarumine.c"),
             Object(NonMatching, "melee/it/items/itlugia.c"),
             Object(NonMatching, "melee/it/items/ithouou.c"),
             Object(Matching, "melee/it/items/itmetamon.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -688,7 +688,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/src/melee/it/items/itraikou.c.o\
     $(BUILD_DIR)/src/melee/it/items/itsuikun.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itkireihana.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itmarumine.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itmarumine.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itlugia.s.o\
     $(BUILD_DIR)/asm/melee/it/items/ithouou.s.o\
     $(BUILD_DIR)/src/melee/it/items/itmetamon.c.o\

diff --git a/src/melee/it/itCommonItems.h b/src/melee/it/itCommonItems.h
@@ -171,6 +171,7 @@ typedef struct itPokemonAttributes {
 typedef struct {
     u8 padding[0xE34 - 0xDD4];
     s32 timer;
+    int x64;
 } ItPokemonVars;
 
 typedef struct {

diff --git a/src/melee/it/it_266F.h b/src/melee/it/it_266F.h
@@ -23,6 +23,7 @@
 /* 26E15C */ void it_8026E15C(Item_GObj*, HSD_GObjEvent);
 /* 26E248 */ void it_8026E248(Item_GObj*, HSD_GObjEvent);
 /* 26E414 */ void it_8026E414(Item_GObj*, HSD_GObjEvent);
+/* 26E71C */ void it_8026E71C(Item_GObj*, HSD_GObjEvent);
 /* 26E8C4 */ void it_8026E8C4(Item_GObj*, HSD_GObjEvent, HSD_GObjEvent);
 /* 26E9A4 */ bool it_8026E9A4(Item_GObj*, Vec3*, Vec3*, int);
 /* 26EECC */ void it_8026EECC(HSD_GObj*, int);

diff --git a/src/melee/it/it_26B1.c b/src/melee/it/it_26B1.c
@@ -11,6 +11,7 @@
 #include "it/item.h"
 #include "it/items/it_27CF.h"
 #include "it/items/itbat.h"
+#include "it/items/itmarumine.h"
 #include "it/items/itsword.h"
 #include "it/types.h"
 

diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
@@ -13,6 +13,7 @@
 /* 272CC0 */ HSD_JObj* it_80272CC0(Item_GObj*, enum_t);
 /* 273408 */ void it_80273408(Item_GObj* gobj);
 /* 273670 */ void it_80273670(HSD_GObj*, int, float);
+/* 274250 */ void it_80274250(Item_GObj*, Vec3*);
 /* 274C88 */ void it_80274C88(Item_GObj* gobj);
 /* 274ECC */ void it_80274ECC(Item_GObj* gobj, bool);
 /* 274F48 */ void it_80274F48(Item_GObj* gobj, int bone_attach_id, HSD_GObj*,

diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h
@@ -170,7 +170,6 @@
 /* 2C837C */ HSD_GObj* it_802C837C(Item_GObj*, Vec3*, enum_t, u32, float);
 /* 2C8B28 */ HSD_GObj* it_802C8B28(Item_GObj*, Vec3*, u32, float);
 /* 2C8C34 */ void it_802C8C34(Item_GObj*);
-/* 2D09D0 */ void it_802D09D0(Item_GObj*);
 /* 2D8618 */ void it_802D8618(s32, Vec3*, s32, s32);
 /* 2E5F8C */ s32 it_802E5F8C(Item_GObj*, Vec3*, s32, bool, float, float);
 /* 2F0340 */ u32 it_802F0340(Item_GObj*, Vec3*, Vec3*, u32, u32, float);