From 5574442fdc28e5391be4a3113e0fcf630aadfb9c Mon Sep 17 00:00:00 2001
From: briaguya <briaguya@alice>
Date: Sat, 6 Aug 2022 04:30:03 -0400
Subject: [PATCH] fix ganon's boss key

---
 soh/include/z64item.h                               | 8 ++++----
 soh/include/z64player.h                             | 2 +-
 soh/src/overlays/actors/ovl_player_actor/z_player.c | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/soh/include/z64item.h b/soh/include/z64item.h
index 5b3844da1..ec2bf1457 100644
--- a/soh/include/z64item.h
+++ b/soh/include/z64item.h
@@ -430,6 +430,10 @@ typedef enum {
     /* 0x91 */ GI_REQUIEM_OF_SPIRIT,
     /* 0x92 */ GI_PRELUDE_OF_LIGHT,
 
+    GI_SINGLE_MAGIC,
+    GI_DOUBLE_MAGIC,
+    GI_DOUBLE_DEFENSE,
+
     /* 0x93 */ GI_GERUDO_FORTRESS_SMALL_KEY,
     /* 0x94 */ GI_FOREST_TEMPLE_SMALL_KEY,
     /* 0x95 */ GI_FIRE_TEMPLE_SMALL_KEY,
@@ -447,10 +451,6 @@ typedef enum {
     /* 0xA0 */ GI_SHADOW_TEMPLE_BOSS_KEY,
     /* 0xA1 */ GI_GANONS_CASTLE_BOSS_KEY,
 
-    GI_SINGLE_MAGIC,
-    GI_DOUBLE_MAGIC,
-    GI_DOUBLE_DEFENSE,
-
     GI_BOTTLE_WITH_RED_POTION,
     GI_BOTTLE_WITH_GREEN_POTION,
     GI_BOTTLE_WITH_BLUE_POTION,
diff --git a/soh/include/z64player.h b/soh/include/z64player.h
index 0425c8eae..08618e3d1 100644
--- a/soh/include/z64player.h
+++ b/soh/include/z64player.h
@@ -13,7 +13,7 @@ typedef struct {
     /* 0x04 */ u16 objectId;
 } GetItemEntry; // size = 0x06
 
-extern GetItemEntry sGetItemTable[160];
+extern GetItemEntry sGetItemTable[175];
 
 typedef enum {
     /* 0 */ PLAYER_SWORD_NONE,
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 68893ac00..c6a584dcb 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -641,6 +641,10 @@ GetItemEntry sGetItemTable[] = {
     GET_ITEM(ITEM_SONG_REQUIEM, OBJECT_GI_MELODY, GID_SONG_REQUIEM, 0x76, 0x80, CHEST_ANIM_LONG),
     GET_ITEM(ITEM_SONG_PRELUDE, OBJECT_GI_MELODY, GID_SONG_PRELUDE, 0x78, 0x80, CHEST_ANIM_LONG),
 
+    GET_ITEM(ITEM_SINGLE_MAGIC, OBJECT_GI_MAGICPOT, GID_MAGIC_SMALL, 0xE4, 0x80, CHEST_ANIM_LONG),
+    GET_ITEM(ITEM_DOUBLE_MAGIC, OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE, 0xE8, 0x80, CHEST_ANIM_LONG),
+    GET_ITEM(ITEM_DOUBLE_DEFENSE, OBJECT_GI_HEARTS, GID_HEART_CONTAINER, 0xE9, 0x80, CHEST_ANIM_LONG),
+
     GET_ITEM(ITEM_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT),    
     GET_ITEM(ITEM_FOREST_TEMPLE_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT),    
     GET_ITEM(ITEM_FIRE_TEMPLE_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, 0x60, 0x80, CHEST_ANIM_SHORT),    
@@ -658,10 +662,6 @@ GetItemEntry sGetItemTable[] = {
     GET_ITEM(ITEM_SHADOW_TEMPLE_BOSS_KEY, OBJECT_GI_BOSSKEY, GID_KEY_BOSS, 0xC7, 0x80, CHEST_ANIM_LONG),
     GET_ITEM(ITEM_GANONS_CASTLE_BOSS_KEY, OBJECT_GI_BOSSKEY, GID_KEY_BOSS, 0xC7, 0x80, CHEST_ANIM_LONG),
 
-    GET_ITEM(ITEM_SINGLE_MAGIC, OBJECT_GI_MAGICPOT, GID_MAGIC_SMALL, 0xE4, 0x80, CHEST_ANIM_LONG),
-    GET_ITEM(ITEM_DOUBLE_MAGIC, OBJECT_GI_MAGICPOT, GID_MAGIC_LARGE, 0xE8, 0x80, CHEST_ANIM_LONG),
-    GET_ITEM(ITEM_DOUBLE_DEFENSE, OBJECT_GI_HEARTS, GID_HEART_CONTAINER, 0xE9, 0x80, CHEST_ANIM_LONG),
-
     GET_ITEM(ITEM_BOTTLE_WITH_RED_POTION, OBJECT_GI_LIQUID, GID_POTION_RED, 0x43, 0x80, CHEST_ANIM_LONG),
     GET_ITEM(ITEM_BOTTLE_WITH_GREEN_POTION, OBJECT_GI_LIQUID, GID_POTION_GREEN, 0x44, 0x80, CHEST_ANIM_LONG),
     GET_ITEM(ITEM_BOTTLE_WITH_BLUE_POTION, OBJECT_GI_LIQUID, GID_POTION_BLUE, 0x45, 0x80, CHEST_ANIM_LONG),