Revert Interface_AddMagic to Parameter_AddMagic

include/functions.h

@@ -1934,7 +1934,7 @@ s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange);
 void Health_GiveHearts(s16 hearts);
 void Rupees_ChangeBy(s16 rupeeChange);
 void Inventory_ChangeAmmo(s16 item, s16 ammoChange);
-void Interface_AddMagic(GlobalContext* globalCtx, s16 arg1);
+void Parameter_AddMagic(GlobalContext* globalCtx, s16 arg1);
 void func_80115D5C(GameState* gamestate);
 // void func_80115DB4(void);
 // void func_80116088(void);

src/code/z_parameter.c

@@ -596,7 +596,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
         return item;
 
     } else if (item == ITEM_MAGIC_SMALL) {
-        Interface_AddMagic(globalCtx, 0x18);
+        Parameter_AddMagic(globalCtx, 0x18);
         if (!(gSaveContext.save.weekEventReg[12] & 0x80)) {
             gSaveContext.save.weekEventReg[12] |= 0x80;
             return ITEM_NONE;
@@ -604,7 +604,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) {
         return item;
 
     } else if (item == ITEM_MAGIC_LARGE) {
-        Interface_AddMagic(globalCtx, 0x30);
+        Parameter_AddMagic(globalCtx, 0x30);
         if (!(gSaveContext.save.weekEventReg[12] & 0x80)) {
             gSaveContext.save.weekEventReg[12] |= 0x80;
             return ITEM_NONE;
@@ -1138,7 +1138,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
     }
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_AddMagic.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Parameter_AddMagic.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115D5C.s")
 

src/overlays/actors/ovl_En_Elf/z_en_elf.c

@@ -675,7 +675,7 @@ void func_8088DD34(EnElf* this, GlobalContext* globalCtx) {
         !func_8088C804(&this->actor.world.pos, &refActor->actor.world.pos, 10.0f)) {
         Health_ChangeBy(globalCtx, 0x80);
         if (this->fairyFlags & 0x200) {
-            Interface_AddMagic(globalCtx, ((void)0, gSaveContext.unk_3F30) +
+            Parameter_AddMagic(globalCtx, ((void)0, gSaveContext.unk_3F30) +
                                               (gSaveContext.save.playerData.doubleMagic * 0x30) + 0x30);
         }
         gSaveContext.jinxTimer = 0;

src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

@@ -481,7 +481,7 @@ void func_80A3A610(EnElfgrp* this, GlobalContext* globalCtx) {
     Player* player = GET_PLAYER(globalCtx);
 
     if (this->unk_144 == 60) {
-        Interface_AddMagic(globalCtx,
+        Parameter_AddMagic(globalCtx,
                            ((void)0, gSaveContext.unk_3F30) + (gSaveContext.save.playerData.doubleMagic * 0x30) + 0x30);
         gSaveContext.healthAccumulator = 320;
     }

src/overlays/actors/ovl_En_Fu/z_en_fu.c

@@ -654,7 +654,7 @@ void func_80962A10(EnFu* this, GlobalContext* globalCtx) {
     if ((gSaveContext.save.playerForm == PLAYER_FORM_DEKU) && gSaveContext.save.playerData.magicAcquired) {
         s16 temp = gSaveContext.unk_3F30;
 
-        Interface_AddMagic(globalCtx, temp + (gSaveContext.save.playerData.doubleMagic * 48) + 48);
+        Parameter_AddMagic(globalCtx, temp + (gSaveContext.save.playerData.doubleMagic * 48) + 48);
     }
 
     func_80962F10(this);

src/overlays/actors/ovl_En_Gk/z_en_gk.c

@@ -727,7 +727,7 @@ void func_80B51B40(EnGk* this, GlobalContext* globalCtx) {
                     globalCtx->sceneLoadFlag = 0x14;
                     globalCtx->unk_1887F = 3;
                     gSaveContext.nextTransition = 3;
-                    Interface_AddMagic(globalCtx, ((void)0, gSaveContext.unk_3F30) +
+                    Parameter_AddMagic(globalCtx, ((void)0, gSaveContext.unk_3F30) +
                                                       (gSaveContext.save.playerData.doubleMagic * 0x30) + 0x30);
                 } else {
                     this->actionFunc = func_80B51760;

src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c

@@ -433,7 +433,7 @@ void EnMttag_PotentiallyRestartRace(EnMttag* this, GlobalContext* globalCtx) {
             gSaveContext.nextTransition = 2;
             func_801477B4(globalCtx);
             func_800B7298(globalCtx, &this->actor, 7);
-            Interface_AddMagic(globalCtx,
+            Parameter_AddMagic(globalCtx,
                                ((void)0, gSaveContext.unk_3F30) + (gSaveContext.save.playerData.doubleMagic * 48) + 48);
 
             gSaveContext.eventInf[1] &= (u8)~1;

tools/disasm/functions.txt

@@ -2134,7 +2134,7 @@
     0x801159C0:("Health_GiveHearts",),
     0x801159EC:("Rupees_ChangeBy",),
     0x80115A14:("Inventory_ChangeAmmo",),
-    0x80115D14:("Interface_AddMagic",),
+    0x80115D14:("Parameter_AddMagic",),
     0x80115D5C:("func_80115D5C",),
     0x80115DB4:("func_80115DB4",),
     0x80116088:("func_80116088",),

tools/namefixer.py

@@ -437,7 +437,6 @@ wordReplace = {
     "func_801159c0": "Health_GiveHearts",
     "func_801159EC": "Rupees_ChangeBy",
     "func_80115A14": "Inventory_ChangeAmmo",
-    "Parameter_AddMagic": "Interface_AddMagic",
     "func_8017D2FC": "Math3D_LineSegVsPlane",
     "func_8013A7C0": "SubS_FindDoor",
     "func_8013E640": "SubS_FindActorCustom",

tools/sizes/code_functions.csv

@@ -1648,7 +1648,7 @@ asm/non_matchings/code/z_parameter/Health_ChangeBy.s,Health_ChangeBy,0x80115908,
 asm/non_matchings/code/z_parameter/Health_GiveHearts.s,Health_GiveHearts,0x801159C0,0xB
 asm/non_matchings/code/z_parameter/Rupees_ChangeBy.s,Rupees_ChangeBy,0x801159EC,0xA
 asm/non_matchings/code/z_parameter/Inventory_ChangeAmmo.s,Inventory_ChangeAmmo,0x80115A14,0xC0
-asm/non_matchings/code/z_parameter/Interface_AddMagic.s,Interface_AddMagic,0x80115D14,0x12
+asm/non_matchings/code/z_parameter/Parameter_AddMagic.s,Parameter_AddMagic,0x80115D14,0x12
 asm/non_matchings/code/z_parameter/func_80115D5C.s,func_80115D5C,0x80115D5C,0x16
 asm/non_matchings/code/z_parameter/func_80115DB4.s,func_80115DB4,0x80115DB4,0xB5
 asm/non_matchings/code/z_parameter/func_80116088.s,func_80116088,0x80116088,0x23