From 1bb13b8c708b1352bc4ca34d605384d5e85f3334 Mon Sep 17 00:00:00 2001
From: petrie911 <69443847+petrie911@users.noreply.github.com>
Date: Tue, 1 Dec 2020 20:29:51 -0600
Subject: En_Nwc (#475)

* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* chicks, man

* slight change

* formatted everything

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
---
 src/code/z_sram.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 1145bd9b3..f0a61bb5d 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -221,20 +221,23 @@ ItemEquips sDebugSaveEquips = {
     0x1122,                                                         // equipment
 };
 
-Inventory sDebugSaveInventory = {
-    { ITEM_STICK,     ITEM_NUT,           ITEM_BOMB,         ITEM_BOW,         ITEM_ARROW_FIRE,  ITEM_DINS_FIRE,
-      ITEM_SLINGSHOT, ITEM_OCARINA_FAIRY, ITEM_BOMBCHU,      ITEM_HOOKSHOT,    ITEM_ARROW_ICE,   ITEM_FARORES_WIND,
-      ITEM_BOOMERANG, ITEM_LENS,          ITEM_BEAN,         ITEM_HAMMER,      ITEM_ARROW_LIGHT, ITEM_NAYRUS_LOVE,
-      ITEM_BOTTLE,    ITEM_POTION_RED,    ITEM_POTION_GREEN, ITEM_POTION_BLUE, ITEM_POCKET_EGG,  ITEM_WEIRD_EGG }, // items
-    { 50, 50, 10, 30, 1, 1, 30, 1, 50, 1, 1, 1, 1, 1, 1, 1 },       // ammo
-    0x7777,                                                         // equipment
-    0x125249,                                                       // upgrades
-    0x1E3FFFF,                                                      // questItems
-    { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // dungeonItems
-    { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 },    // dungeonKeys
-    0,                                                              // defenseHearts
-    0,                                                              // gsTokens
-};
+Inventory
+    sDebugSaveInventory =
+        {
+            { ITEM_STICK,        ITEM_NUT,          ITEM_BOMB,          ITEM_BOW,      ITEM_ARROW_FIRE,
+              ITEM_DINS_FIRE,    ITEM_SLINGSHOT,    ITEM_OCARINA_FAIRY, ITEM_BOMBCHU,  ITEM_HOOKSHOT,
+              ITEM_ARROW_ICE,    ITEM_FARORES_WIND, ITEM_BOOMERANG,     ITEM_LENS,     ITEM_BEAN,
+              ITEM_HAMMER,       ITEM_ARROW_LIGHT,  ITEM_NAYRUS_LOVE,   ITEM_BOTTLE,   ITEM_POTION_RED,
+              ITEM_POTION_GREEN, ITEM_POTION_BLUE,  ITEM_POCKET_EGG,    ITEM_WEIRD_EGG }, // items
+            { 50, 50, 10, 30, 1, 1, 30, 1, 50, 1, 1, 1, 1, 1, 1, 1 },                     // ammo
+            0x7777,                                                                       // equipment
+            0x125249,                                                                     // upgrades
+            0x1E3FFFF,                                                                    // questItems
+            { 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },               // dungeonItems
+            { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 },                  // dungeonKeys
+            0,                                                                            // defenseHearts
+            0,                                                                            // gsTokens
+        };
 
 u16 sDebugSaveChecksum = 0;
 
-- 
cgit v1.2.3