From 62b2d12afe84b9cde124e7fba25a40d43601c2fd Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Mon, 17 Oct 2022 17:19:48 -0700
Subject: [PATCH] address review

---
 include/constants/colors.h | 1 +
 include/dungeon_entity.h   | 2 +-
 src/code_809747C.c         | 5 +++++
 src/makuhita_dojo_1.c      | 2 +-
 src/status_checker.c       | 2 --
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/constants/colors.h b/include/constants/colors.h
index 26d3ca687..437da924a 100644
--- a/include/constants/colors.h
+++ b/include/constants/colors.h
@@ -8,5 +8,6 @@
 #define COLOR_GREEN 4
 #define COLOR_CYAN 5
 #define COLOR_YELLOW 6
+#define COLOR_WHITE_2 7
 
 #endif //GUARD_CONSTANTS_COLORS_H
diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h
index 700f7768c..55b442227 100644
--- a/include/dungeon_entity.h
+++ b/include/dungeon_entity.h
@@ -216,7 +216,7 @@ struct DungeonEntityData
     /* 0x170 */ struct Position posPixel;
     u32 unk174;
     u8 fill178[0x17A - 0x178];
-    u16 mimicMoveIDs[5]; // All moves that Mimic has copied (not sure on size...)
+    /* 0x17A */ u16 mimicMoveIDs[MAX_MON_MOVES]; // All moves that Mimic has copied (not sure on size...)
     // Previous value of targetPosition for movement, 1 and 2 moves ago.
     /* 0x184 */ struct Position previousTargetMovePosition1;
     /* 0x188 */ struct Position32 previousTargetMovePosition2;
diff --git a/src/code_809747C.c b/src/code_809747C.c
index d0334909b..3fbeecd76 100644
--- a/src/code_809747C.c
+++ b/src/code_809747C.c
@@ -76,7 +76,12 @@ void nullsub_208(void)
 bool8 sub_8097504(s16 mazeIndex)
 {
     s32 mazeIndex_s32;
+
+#ifndef NONMATCHING
     register s32 mazeIndex_s32_1 asm("r1");
+#else
+    s32 mazeIndex_s32_1;    
+#endif
     s32 uVar3;
 
     mazeIndex_s32 = mazeIndex;
diff --git a/src/makuhita_dojo_1.c b/src/makuhita_dojo_1.c
index 822b25a39..5cc3008ca 100644
--- a/src/makuhita_dojo_1.c
+++ b/src/makuhita_dojo_1.c
@@ -65,7 +65,7 @@ void DrawDojoCourseList(void)
       sVar3 = sub_80A2668(iVar6);
 
       y = sub_8013800(&gUnknown_203B31C->unk30, index);
-      color = 7; // COLOR_WHITE again?
+      color = COLOR_WHITE_2; // COLOR_WHITE again?
       if (IsMazeCompleted(sVar3)) {
         xxx_call_draw_string(8,y,gUnknown_80E0824,gUnknown_203B31C->unk64,0); // Draw Star symbol
         color = COLOR_GREEN;
diff --git a/src/status_checker.c b/src/status_checker.c
index a8dc77dcd..cb396c146 100644
--- a/src/status_checker.c
+++ b/src/status_checker.c
@@ -769,8 +769,6 @@ bool8 sub_805B968(struct DungeonEntity * pokemon, struct DungeonEntity * target,
     return flag;
 }
 
-
-// NOTE: Either Excavate or Rock Smash (90% sure it's Rock Smash)
 bool8 RockSmashMoveAction(struct DungeonEntity * pokemon, struct DungeonEntity * target, struct PokemonMove *move, s32 param_4)
 {
     bool8 uVar3;