More item cleanup...

src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c

@@ -221,36 +221,36 @@ s16 func_80BECF6C(Path* path) {
 s32 func_80BECFBC(EnAkindonuts* this) {
     switch (ENAKINDONUTS_GET_3(&this->actor)) {
         case 0:
-            return 0x98;
+            return GI_DEED_SWAMP;
 
         case 1:
-            return 0x99;
+            return GI_DEED_MOUNTAIN;
 
         case 2:
-            return 0x9A;
+            return GI_DEED_OCEAN;
 
         case 3:
             Inventory_DeleteItem(ITEM_DEED_OCEAN, SLOT(ITEM_DEED_OCEAN));
-            return 0x7;
+            return GI_RUPEE_HUGE;
     }
-    return 0;
+    return GI_NONE;
 }
 
 s32 func_80BED034(EnAkindonuts* this) {
     switch (ENAKINDONUTS_GET_3(&this->actor)) {
         case 0:
-            return 0x35;
+            return GI_MAGIC_BEANS;
 
         case 1:
-            return 0x1D;
+            return GI_BOMB_BAG_40;
 
         case 2:
-            return 0x5C;
+            return GI_POTION_GREEN;
 
         case 3:
-            return 0x5D;
+            return GI_POTION_BLUE;
     }
-    return 0;
+    return GI_NONE;
 }
 
 void func_80BED090(GlobalContext* globalCtx) {

src/overlays/actors/ovl_En_Zos/z_en_zos.c

@@ -232,7 +232,7 @@ void func_80BBB2C4(EnZos* this, GlobalContext* globalCtx) {
 }
 
 void func_80BBB354(EnZos* this, GlobalContext* globalCtx) {
-    s32 item;
+    s32 getItemId;
 
     if (Actor_HasParent(&this->actor, globalCtx)) {
         this->actor.parent = NULL;
@@ -242,11 +242,11 @@ void func_80BBB354(EnZos* this, GlobalContext* globalCtx) {
         func_800B8500(&this->actor, globalCtx, 1000.0f, 1000.0f, -1);
     } else {
         if (gSaveContext.save.weekEventReg[39] & 0x20) {
-            item = GI_RUPEE_PURPLE;
+            getItemId = GI_RUPEE_PURPLE;
         } else {
-            item = GI_HEART_PIECE;
+            getItemId = GI_HEART_PIECE;
         }
-        Actor_PickUp(&this->actor, globalCtx, item, 10000.0f, 50.0f);
+        Actor_PickUp(&this->actor, globalCtx, getItemId, 10000.0f, 50.0f);
     }
 }