diff --git a/courses/dks_jungle_parkway/course_data.inc.c b/courses/dks_jungle_parkway/course_data.inc.c
index 1a35040329..6fc51118a6 100644
--- a/courses/dks_jungle_parkway/course_data.inc.c
+++ b/courses/dks_jungle_parkway/course_data.inc.c
@@ -4178,6 +4178,9 @@ TrackWaypoint d_course_dks_jungle_parkway_unknown_waypoints[] = {
     {3, 0, 251, 0},
     {3, 0, 45, 0},
     {-32768, 0, 0, 0},
+};
+
+TrackWaypoint d_course_dks_jungle_parkway_unknown_waypoints2[] = {
     {1237, 0, -1373, 0},
     {1206, 0, -1365, 0},
     {877, 0, -1272, 0},
diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c
index 05f5271022..4fe3b73bbb 100644
--- a/src/code_80005FD0.c
+++ b/src/code_80005FD0.c
@@ -4955,7 +4955,7 @@ void func_800120C8(void) {
 
 void func_80012190(void) {
     TrackWaypoint *tree;
-    s32 i = 0;
+    s32 i;
 
     tree = (TrackWaypoint *) VIRTUAL_TO_PHYSICAL2(gSegmentTable[SEGMENT_NUMBER2(d_frappe_snowland_tree)] + (SEGMENT_OFFSET(d_frappe_snowland_tree)));
 
diff --git a/src/code_80091750.c b/src/code_80091750.c
index bbf29a5b2d..d2385cb969 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -12604,15 +12604,15 @@ void func_800AB9B0(struct_8018D9E0_entry *arg0) {
 }
 
 void func_800ABAE8(struct_8018D9E0_entry *arg0) {
-    s32 phi_v1;
+    s32 index;
 
     if (arg0->type == 0x8C) {
-        phi_v1 = 4;
+        index = 4;
     } else {
-        phi_v1 = arg0->type - 0x78;
+        index = arg0->type - 0x78;
     }
-    arg0->column = D_800E7430[phi_v1].column;
-    arg0->row = D_800E7430[phi_v1].row;
+    arg0->column = D_800E7430[index].column;
+    arg0->row = D_800E7430[index].row;
 }
 
 void func_800ABB24(struct_8018D9E0_entry *arg0) {