From d5b71bd0f531986d2a6a63f0a90d8e1233e01a7f Mon Sep 17 00:00:00 2001
From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Date: Thu, 16 Dec 2021 23:47:18 +0000
Subject: Tutorial (#362)

* ObjTree OK, data imported

* EnMs OK, data imported

* And the spec

* OK

* Some minor edits

* A lot of preliminary stuff

* Mostly complete beginning

* First draft of other functions doc

* Whoops, forgot the GlobalContext pad

* Draw functions (minus colour), create Data

* Data

* gitignore, some progress on documenting

* Review comments, continue documenting

* spec

* Finish off documentation

* undefined_syms

* Add a couple of todos

* One more

* At least add tools for object decomp

* Start conversion table stuff

* Document ObjTree

* Document EnMs

* Add more tables to conversions

* Maide's review

* Review

* Review

* Typos and incomplete thoughts

* Update vscode.md

* Correct function/variable names

* Review suggestions

* Format

* Missed one

* Rename functions and format

* Fix ObjTree

* Update actorfixer.py, fix some variable names

* Some review

* Review suggestions

* More review

* Hopefully fix all the thisx references

* Missed one
---
 src/code/code_8012EC80.c   | 14 +++++++-------
 src/code/z_face_reaction.c |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/code')

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index 3bd5aac92..34ad973f6 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -45,7 +45,7 @@ void* gItemIcons[] = {
     0x08007000, // ITEM_BOMBCHU
     0x08008000, // ITEM_STICK
     0x08009000, // ITEM_NUT
-    0x0800A000, // ITEM_BEAN
+    0x0800A000, // ITEM_MAGIC_BEANS
     0x0800B000, // ITEM_SLINGSHOT
     0x0800C000, // ITEM_POWDER_KEG
     0x0800D000, // ITEM_PICTO_BOX
@@ -82,7 +82,7 @@ void* gItemIcons[] = {
     0x0802C000, // ITEM_DEED_OCEAN
     0x0802D000, // ITEM_ROOM_KEY
     0x0802E000, // ITEM_LETTER_MAMA
-    0x0802F000, // ITEM_LETTER_KAFEI
+    0x0802F000, // ITEM_LETTER_TO_KAFEI
     0x08030000, // ITEM_PENDANT_MEMORIES
     0x08031000, // ITEM_TINGLE_MAP
     0x08032000, // ITEM_MASK_DEKU
@@ -90,7 +90,7 @@ void* gItemIcons[] = {
     0x08034000, // ITEM_MASK_ZORA
     0x08035000, // ITEM_MASK_FIERCE_DEITY
     0x08036000, // ITEM_MASK_TRUTH
-    0x08037000, // ITEM_MASK_KAFEI
+    0x08037000, // ITEM_MASK_KAFEIS_MASK
     0x08038000, // ITEM_MASK_ALL_NIGHT
     0x08039000, // ITEM_MASK_BUNNY
     0x0803A000, // ITEM_MASK_KEATON
@@ -180,7 +180,7 @@ u8 gItemSlots[] = {
     SLOT_BOMBCHU,            // ITEM_BOMBCHU
     SLOT_STICK,              // ITEM_STICK
     SLOT_NUT,                // ITEM_NUT
-    SLOT_BEAN,               // ITEM_BEAN
+    SLOT_MAGIC_BEANS,        // ITEM_MAGIC_BEANS
     SLOT_TRADE_KEY_MAMA,     // ITEM_SLINGSHOT
     SLOT_POWDER_KEG,         // ITEM_POWDER_KEG
     SLOT_PICTO_BOX,          // ITEM_PICTO_BOX
@@ -217,7 +217,7 @@ u8 gItemSlots[] = {
     SLOT_TRADE_DEED,         // ITEM_DEED_OCEAN
     SLOT_TRADE_KEY_MAMA,     // ITEM_ROOM_KEY
     SLOT_TRADE_KEY_MAMA,     // ITEM_LETTER_MAMA
-    SLOT_TRADE_COUPLE,       // ITEM_LETTER_KAFEI
+    SLOT_TRADE_COUPLE,       // ITEM_LETTER_TO_KAFEI
     SLOT_TRADE_COUPLE,       // ITEM_PENDANT_MEMORIES
     SLOT_TRADE_COUPLE,       // ITEM_TINGLE_MAP
     SLOT_MASK_DEKU,          // ITEM_MASK_DEKU
@@ -225,7 +225,7 @@ u8 gItemSlots[] = {
     SLOT_MASK_ZORA,          // ITEM_MASK_ZORA
     SLOT_MASK_FIERCE_DEITY,  // ITEM_MASK_FIERCE_DEITY
     SLOT_MASK_TRUTH,         // ITEM_MASK_TRUTH
-    SLOT_MASK_KAFEI,         // ITEM_MASK_KAFEI
+    SLOT_MASK_KAFEIS_MASK,   // ITEM_MASK_KAFEIS_MASK
     SLOT_MASK_ALL_NIGHT,     // ITEM_MASK_ALL_NIGHT
     SLOT_MASK_BUNNY,         // ITEM_MASK_BUNNY
     SLOT_MASK_KEATON,        // ITEM_MASK_KEATON
@@ -260,7 +260,7 @@ s16 gItemPrices[] = {
     0,   // ITEM_BOMBCHU
     0,   // ITEM_STICK
     0,   // ITEM_NUT
-    0,   // ITEM_BEAN
+    0,   // ITEM_MAGIC_BEANS
     0,   // ITEM_SLINGSHOT
     0,   // ITEM_POWDER_KEG
     0,   // ITEM_PICTO_BOX
diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c
index a6a6da5b3..d54561fdd 100644
--- a/src/code/z_face_reaction.c
+++ b/src/code/z_face_reaction.c
@@ -3,7 +3,7 @@
 /**
  * Indices of the columns of this array:
  * - index 0x00: PLAYER_MASK_TRUTH
- * - index 0x01: PLAYER_MASK_KAFEI
+ * - index 0x01: PLAYER_MASK_KAFEIS_MASK
  * - index 0x02: PLAYER_MASK_ALL_NIGHT
  * - index 0x03: PLAYER_MASK_BUNNY
  * - index 0x04: PLAYER_MASK_KEATON
-- 
cgit v1.2.3