diff --git a/include/overlay005/ov5_021DDBE8.h b/include/overlay005/encounter_effect.h similarity index 97% rename from include/overlay005/ov5_021DDBE8.h rename to include/overlay005/encounter_effect.h index b4fb71cb3e..329fd023d5 100644 --- a/include/overlay005/ov5_021DDBE8.h +++ b/include/overlay005/encounter_effect.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_OV5_021DDBE8_H -#define POKEPLATINUM_OV5_021DDBE8_H +#ifndef POKEPLATINUM_ENCOUNTER_EFFECT_H +#define POKEPLATINUM_ENCOUNTER_EFFECT_H #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" @@ -90,4 +90,4 @@ BOOL ov5_021DF1CC(void); BOOL ov5_021DF208(void); void ov5_021DF224(void); -#endif // POKEPLATINUM_OV5_021DDBE8_H +#endif // POKEPLATINUM_ENCOUNTER_EFFECT_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index df3507e8bc..af6169fed0 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -484,7 +484,7 @@ Overlay overlay5 Object main.nef.p/src_overlay005_ov5_021DD42C.c.o Object main.nef.p/src_overlay005_ov5_021DD6FC.c.o Object main.nef.p/src_overlay005_ov5_021DDAE4.c.o - Object main.nef.p/src_overlay005_ov5_021DDBE8.c.o + Object main.nef.p/src_overlay005_encounter_effect.c.o Object main.nef.p/src_overlay005_ov5_021DF440.c.o Object main.nef.p/src_overlay005_ov5_021DFB54.c.o Object main.nef.p/src_overlay005_ov5_021E1154.c.o diff --git a/src/enc_effects.c b/src/enc_effects.c index 668fb4a11f..5295f76146 100644 --- a/src/enc_effects.c +++ b/src/enc_effects.c @@ -15,7 +15,7 @@ #include "enc_effects.h" #include "unk_02054884.h" #include "pokemon.h" -#include "overlay005/ov5_021DDBE8.h" +#include "overlay005/encounter_effect.h" // This needs to be moved to a constants file somewhere #define ZONE_ID_PAL_PARK 251 diff --git a/src/meson.build b/src/meson.build index 1163d0578f..a2776ad85d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -378,7 +378,7 @@ pokeplatinum_c = files( 'overlay005/ov5_021DD42C.c', 'overlay005/ov5_021DD6FC.c', 'overlay005/ov5_021DDAE4.c', - 'overlay005/ov5_021DDBE8.c', + 'overlay005/encounter_effect.c', 'overlay005/ov5_021DF440.c', 'overlay005/ov5_021DFB54.c', 'overlay005/ov5_021E1154.c', diff --git a/src/overlay005/ov5_021DDBE8.c b/src/overlay005/encounter_effect.c similarity index 99% rename from src/overlay005/ov5_021DDBE8.c rename to src/overlay005/encounter_effect.c index 4ea7e813f0..da223ad810 100644 --- a/src/overlay005/ov5_021DDBE8.c +++ b/src/overlay005/encounter_effect.c @@ -56,7 +56,7 @@ #include "unk_02054884.h" #include "pokemon.h" #include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021DDBE8.h" +#include "overlay005/encounter_effect.h" #include "overlay005/ov5_021E2338.h" #include "overlay005/ov5_021EF3A8.h" diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c index 279fb6b1ce..f53387e236 100644 --- a/src/overlay005/ov5_021E2338.c +++ b/src/overlay005/ov5_021E2338.c @@ -46,7 +46,7 @@ #include "unk_0202419C.h" #include "unk_02025E08.h" #include "trainer_info.h" -#include "overlay005/ov5_021DDBE8.h" +#include "overlay005/encounter_effect.h" #include "overlay005/ov5_021E22B0.h" #include "overlay005/ov5_021E2338.h" #include "overlay005/ov5_021EF3A8.h" diff --git a/src/unk_0205578C.c b/src/unk_0205578C.c index 563eaefc57..c7cbf3e102 100644 --- a/src/unk_0205578C.c +++ b/src/unk_0205578C.c @@ -7,7 +7,7 @@ #include "unk_020041CC.h" #include "heap.h" #include "unk_020508D4.h" -#include "overlay005/ov5_021DDBE8.h" +#include "overlay005/encounter_effect.h" typedef struct { int unk_00;