From ca08ab907279c4b21ca377edce1d7e1bb2cb7284 Mon Sep 17 00:00:00 2001
From: alex <hi@imalex.xyz>
Date: Sat, 27 Mar 2021 17:48:33 +0000
Subject: [PATCH] avoid including ld_addrs everywhere (#234)

---
 include/common.h                                    | 1 -
 src/battle/item/coconut/coconut.c                   | 1 +
 src/battle/item/dusty_hammer/dusty_hammer.c         | 1 +
 src/battle/item/egg_missile/egg_missile.c           | 1 +
 src/battle/item/insecticide_herb/insecticide_herb.c | 1 +
 src/battle/item/mystery/mystery.c                   | 1 +
 src/battle/item/pebble/pebble.c                     | 1 +
 src/battle/item/sleepy_sheep/sleepy_sheep.c         | 1 +
 src/code_16F740.c                                   | 1 +
 src/code_1b40_len_20b0.c                            | 1 +
 src/code_2e230_len_2190.c                           | 1 +
 src/code_316f30.c                                   | 1 +
 src/code_ebd0_len_6a0.c                             | 1 +
 src/world/actions.c                                 | 1 +
 14 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/include/common.h b/include/common.h
index 8e785491ea..0e3f4293aa 100644
--- a/include/common.h
+++ b/include/common.h
@@ -10,6 +10,5 @@
 #include "enums.h"
 #include "si.h"
 #include "messages.h"
-#include "ld_addrs.h"
 
 #endif
diff --git a/src/battle/item/coconut/coconut.c b/src/battle/item/coconut/coconut.c
index a5c579ea98..5c75d0f823 100644
--- a/src/battle/item/coconut/coconut.c
+++ b/src/battle/item/coconut/coconut.c
@@ -1,4 +1,5 @@
 #include "coconut.h"
+#include "ld_addrs.h"
 #include "battle/item/coconut/coconut.png.h"
 
 /// 32x32 square.
diff --git a/src/battle/item/dusty_hammer/dusty_hammer.c b/src/battle/item/dusty_hammer/dusty_hammer.c
index ca4bde6e9f..3f80b63bb1 100644
--- a/src/battle/item/dusty_hammer/dusty_hammer.c
+++ b/src/battle/item/dusty_hammer/dusty_hammer.c
@@ -1,4 +1,5 @@
 #include "dusty_hammer.h"
+#include "ld_addrs.h"
 #include "battle/item/dusty_hammer/dusty_hammer.png.h"
 
 Vtx N(model)[] = {
diff --git a/src/battle/item/egg_missile/egg_missile.c b/src/battle/item/egg_missile/egg_missile.c
index 849a2f55ce..f4ed0ef04c 100644
--- a/src/battle/item/egg_missile/egg_missile.c
+++ b/src/battle/item/egg_missile/egg_missile.c
@@ -1,4 +1,5 @@
 #include "egg_missile.h"
+#include "ld_addrs.h"
 #include "battle/item/egg_missile/egg_missile1.png.h"
 #include "battle/item/egg_missile/egg_missile2.png.h"
 #include "battle/item/egg_missile/egg_missile3.png.h"
diff --git a/src/battle/item/insecticide_herb/insecticide_herb.c b/src/battle/item/insecticide_herb/insecticide_herb.c
index 68f74d0282..86947bed2e 100644
--- a/src/battle/item/insecticide_herb/insecticide_herb.c
+++ b/src/battle/item/insecticide_herb/insecticide_herb.c
@@ -1,4 +1,5 @@
 #include "insecticide_herb.h"
+#include "ld_addrs.h"
 #include "battle/item/insecticide_herb/insecticide_herb.png.h"
 
 Vtx N(model)[] = {
diff --git a/src/battle/item/mystery/mystery.c b/src/battle/item/mystery/mystery.c
index b96c43ca03..0a6de289d0 100644
--- a/src/battle/item/mystery/mystery.c
+++ b/src/battle/item/mystery/mystery.c
@@ -1,4 +1,5 @@
 #include "mystery.h"
+#include "ld_addrs.h"
 #include "battle/item/mystery/mystery.png.h"
 
 Vtx N(model)[] = {
diff --git a/src/battle/item/pebble/pebble.c b/src/battle/item/pebble/pebble.c
index f1de75f29a..d73c0dd52a 100644
--- a/src/battle/item/pebble/pebble.c
+++ b/src/battle/item/pebble/pebble.c
@@ -1,4 +1,5 @@
 #include "pebble.h"
+#include "ld_addrs.h"
 #include "battle/item/pebble/pebble.png.h"
 
 Vtx N(model)[] = {
diff --git a/src/battle/item/sleepy_sheep/sleepy_sheep.c b/src/battle/item/sleepy_sheep/sleepy_sheep.c
index e8cb9c7021..5fb45178f2 100644
--- a/src/battle/item/sleepy_sheep/sleepy_sheep.c
+++ b/src/battle/item/sleepy_sheep/sleepy_sheep.c
@@ -1,4 +1,5 @@
 #include "sleepy_sheep.h"
+#include "ld_addrs.h"
 #include "battle/item/sleepy_sheep/sleepy_sheep1.png.h"
 #include "battle/item/sleepy_sheep/sleepy_sheep2.png.h"
 #include "battle/item/sleepy_sheep/sleepy_sheep3.png.h"
diff --git a/src/code_16F740.c b/src/code_16F740.c
index 1b0d66767d..3f6d6b72c9 100644
--- a/src/code_16F740.c
+++ b/src/code_16F740.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "ld_addrs.h"
 
 extern s16 D_802809F6;
 extern s32 D_80280A30;
diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c
index 558e31c9e4..8bd45ab111 100644
--- a/src/code_1b40_len_20b0.c
+++ b/src/code_1b40_len_20b0.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "nu/nusys.h"
+#include "ld_addrs.h"
 
 s8 D_80074020 = 1;
 s8 D_80074021 = 5;
diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c
index fc9e7b7781..f2dc85c616 100644
--- a/src/code_2e230_len_2190.c
+++ b/src/code_2e230_len_2190.c
@@ -1,4 +1,5 @@
 #include "audio.h"
+#include "ld_addrs.h"
 
 void func_80052E30(u8 index) {
     UnkAl48* temp = &D_8009A5C0->unk_1320[index];
diff --git a/src/code_316f30.c b/src/code_316f30.c
index feb778fe2a..d881c837c5 100644
--- a/src/code_316f30.c
+++ b/src/code_316f30.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "ld_addrs.h"
 
 void func_80200000(void);
 void func_80200080(void);
diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c
index 7842719b37..3213553350 100644
--- a/src/code_ebd0_len_6a0.c
+++ b/src/code_ebd0_len_6a0.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "nu/nusys.h"
+#include "ld_addrs.h"
 
 void intro_logos_set_fade_alpha(s16 alpha);
 void intro_logos_set_fade_color(s16 color);
diff --git a/src/world/actions.c b/src/world/actions.c
index 9c754e7e37..ac09947ee8 100644
--- a/src/world/actions.c
+++ b/src/world/actions.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "ld_addrs.h"
 
 s32 func_802B6000_E24920();
 s32 func_802B6288_E23968();