From 7215995e94317a59926424906db656f600a37b81 Mon Sep 17 00:00:00 2001
From: Jcw87 <Jcw87@users.noreply.github.com>
Date: Mon, 18 Dec 2023 18:33:23 -0800
Subject: [PATCH] avoid name collisions

---
 src/d/d_flower.cpp | 2 +-
 src/d/d_grass.cpp  | 2 +-
 src/d/d_kankyo.cpp | 4 ++--
 src/d/d_kyeff.cpp  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/d/d_flower.cpp b/src/d/d_flower.cpp
index 1af6d530f..7aab25379 100644
--- a/src/d/d_flower.cpp
+++ b/src/d/d_flower.cpp
@@ -67,7 +67,7 @@ void dFlower_packet_c::calc() {
 }
 
 /* 800C0A88-800C0D38       .text checkGroundY__FR4cXyz */
-void checkGroundY(cXyz&) {
+static void checkGroundY(cXyz&) {
     /* Nonmatching */
 }
 
diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp
index ba8673e28..56782abdf 100644
--- a/src/d/d_grass.cpp
+++ b/src/d/d_grass.cpp
@@ -72,7 +72,7 @@ void dGrass_packet_c::calc() {
 }
 
 /* 80078008-800782B8       .text checkGroundY__FR4cXyz */
-void checkGroundY(cXyz&) {
+static void checkGroundY(cXyz&) {
     /* Nonmatching */
 }
 
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 2c0fa18b6..e9bbc8604 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -106,7 +106,7 @@ s16 u8_data_ratio_set(u8 param_0, u8 param_1, f32 param_2) {
 }
 
 /* 8018F894-8018F8E4       .text s16_data_ratio_set__Fssf */
-s16 s16_data_ratio_set(s16 param_0, s16 param_1, f32 param_2) {
+static s16 s16_data_ratio_set(s16 param_0, s16 param_1, f32 param_2) {
     return param_0 + (s16)(param_2 * (param_1 - param_0));
 }
 
@@ -147,7 +147,7 @@ f32 float_kankyo_color_ratio_set(f32 param_0, f32 param_1, f32 param_2, f32 para
 }
 
 /* 8018FAE0-8018FB14       .text get_parcent__Ffff */
-f32 get_parcent(f32 param_0, f32 param_1, f32 param_2) {
+static f32 get_parcent(f32 param_0, f32 param_1, f32 param_2) {
     f32 temp_f1;
     f32 temp_f2;
     f32 temp_f4 = param_0 - param_1;
diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp
index fe1c742be..0c86175be 100644
--- a/src/d/d_kyeff.cpp
+++ b/src/d/d_kyeff.cpp
@@ -26,7 +26,7 @@ BOOL dKyeff_Draw(dKyeff_c* i_this) {
 }
 
 /* 80198008-8019803C       .text get_parcent__Ffff */
-f32 get_parcent(f32 param_0, f32 param_1, f32 param_2) {
+static f32 get_parcent(f32 param_0, f32 param_1, f32 param_2) {
     f32 temp_f1;
     f32 temp_f2;
     f32 temp_f4 = param_0 - param_1;
@@ -41,7 +41,7 @@ f32 get_parcent(f32 param_0, f32 param_1, f32 param_2) {
 }
 
 /* 8019803C-8019808C       .text s16_data_ratio_set__Fssf */
-s16 s16_data_ratio_set(s16 param_0, s16 param_1, f32 param_2) {
+static s16 s16_data_ratio_set(s16 param_0, s16 param_1, f32 param_2) {
     return param_0 + (s16)(param_2 * (param_1 - param_0));
 }