address review

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

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;

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;

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;

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;