move orb effects 4 5

include/move_orb_effects_4.h

@@ -0,0 +1,22 @@
+#ifndef GUARD_MOVE_ORB_EFFECTS_4_H
+#define GUARD_MOVE_ORB_EFFECTS_4_H
+
+#include "structs/dungeon_entity.h"
+
+void CounterStatusTarget(Entity * pokemon, Entity * target, u8 newStatus);
+void SafeguardStatusTarget(Entity * pokemon, Entity * target);
+void MistStatusTarget(Entity * pokemon, Entity * target);
+void WishStatusTarget(Entity * pokemon, Entity * target);
+void MagicCoatStatusTarget(Entity * pokemon, Entity * target);
+void LightScreenStatusTarget(Entity * pokemon, Entity * target);
+void ReflectStatusTarget(Entity * pokemon, Entity * target);
+void ProtectStatusTarget(Entity * pokemon, Entity * target);
+void MirrorCoatStatusTarget(Entity * pokemon, Entity * target);
+void EndureStatusTarget(Entity * pokemon, Entity * target);
+void MirrorMoveStatusTarget(Entity * pokemon, Entity * target);
+void Conversion2StatusTarget(Entity * pokemon, Entity * target);
+void VitalThrowStatusTarget(Entity * pokemon, Entity * target);
+void sub_8079E34(Entity * pokemon, Entity * target, bool8 param_3);
+
+#endif
+

include/move_orb_effects_5.h

@@ -1,25 +1,8 @@
-#ifndef GUARD_CODE_8077274_1_H
-#define GUARD_CODE_8077274_1_H
+#ifndef GUARD_MOVE_ORB_EFFECTS_5_H
+#define GUARD_MOVE_ORB_EFFECTS_5_H
 
 #include "structs/dungeon_entity.h"
 
-// TODO: Remove this file
-
-
-
-void CounterStatusTarget(Entity * pokemon, Entity * target, u8 newStatus);
-void SafeguardStatusTarget(Entity * pokemon, Entity * target);
-void MistStatusTarget(Entity * pokemon, Entity * target);
-void WishStatusTarget(Entity * pokemon, Entity * target);
-void MagicCoatStatusTarget(Entity * pokemon, Entity * target);
-void LightScreenStatusTarget(Entity * pokemon, Entity * target);
-void ReflectStatusTarget(Entity * pokemon, Entity * target);
-void ProtectStatusTarget(Entity * pokemon, Entity * target);
-void MirrorCoatStatusTarget(Entity * pokemon, Entity * target);
-void EndureStatusTarget(Entity * pokemon, Entity * target);
-void MirrorMoveStatusTarget(Entity * pokemon, Entity * target);
-void Conversion2StatusTarget(Entity * pokemon, Entity * target);
-void VitalThrowStatusTarget(Entity * pokemon, Entity * target);
 void sub_8079F20(Entity * pokemon, Entity * target, u8 param_3, u8 param_4);
 void sub_807A0CC(Entity * pokemon, Entity * target);
 void EndSleepClassStatus(Entity * pokemon, Entity * target, bool8 param_3, bool8 param_4);
@@ -36,6 +19,6 @@ void SendMuzzledEndMessage(Entity * pokemon, Entity * target);
 bool8 TrySendImmobilizeSleepEndMsg(Entity *pokemon, Entity *target);
 void WakeUpPokemon(Entity * pokemon);
 void SendThawedMessage(Entity *pokemon, Entity *target);
-void sub_8079E34(Entity * pokemon, Entity * target, bool8 param_3);
 
-#endif // !GUARD_CODE_8077274_1_H
+#endif
+

src/blow_away.c

@@ -9,7 +9,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"
@@ -32,9 +31,10 @@
 #include "dungeon_kecleon_shop.h"
 #include "dungeon_engine.h"
 #include "warp_target.h"
+#include "move_orb_effects_5.h"
+#include "expose_trap.h"
 
 extern void sub_804EB30();
-extern bool8 ExposeTrap(s32 x, s32 y);
 extern void sub_80421AC(Entity * pokemon, Entity * target);
 extern void sub_807BB78(Entity *pokemon);
 

src/code_8066D04.c

@@ -10,7 +10,6 @@
 #include "dungeon_action.h"
 #include "code_8066D04.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_jobs.h"
 #include "run_dungeon.h"
 #include "dungeon_items.h"
@@ -45,6 +44,7 @@
 #include "dungeon_leveling.h"
 #include "dungeon_monster_house.h"
 #include "warp_target.h"
+#include "move_orb_effects_5.h"
 
 extern void sub_8042208(Entity *pokemon, u8 r1);
 

src/code_806FDF4.c

@@ -9,7 +9,6 @@
 #include "music_util.h"
 #include "dungeon_message.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "code_8097670.h"
 #include "dungeon_info.h"
 #include "dungeon_items.h"
@@ -29,6 +28,7 @@
 #include "dungeon_cutscene.h"
 #include "string_format.h"
 #include "dungeon_mon_spawn.h"
+#include "move_orb_effects_5.h"
 
 void nullsub_96(Entity *pokemon,Entity *target);
 u8 sub_8097900(s16);

src/code_8075708.c

@@ -36,7 +36,6 @@
 #include "constants/weather.h"
 #include "number_util.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "math.h"
 #include "dungeon_config.h"
 #include "dungeon_engine.h"

src/drought_orb.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/dungeon_8067A80.c

@@ -9,7 +9,6 @@
 #include "dungeon_action.h"
 #include "code_8066D04.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "run_dungeon.h"
 #include "dungeon_items.h"
 #include "dungeon_range.h"

src/dungeon_8071B48.c

@@ -5,7 +5,6 @@
 #include "dungeon_range.h"
 #include "dungeon_message.h"
 #include "code_8041AD0.h"
-#include "code_8077274_1.h"
 #include "constants/dungeon.h"
 #include "dungeon_map_access.h"
 #include "dungeon_random.h"

src/dungeon_action_execution.c

@@ -8,7 +8,6 @@
 #include "code_804267C.h"
 #include "code_8066D04.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "constants/dungeon_action.h"
 #include "constants/dungeon.h"
 #include "constants/iq_skill.h"

src/dungeon_ai.c

@@ -3,7 +3,6 @@
 #include "dungeon_ai.h"
 #include "dungeon_tilemap.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/direction.h"
@@ -30,6 +29,7 @@
 #include "dungeon_misc.h"
 #include "dungeon_cutscene.h"
 #include "dungeon_strings.h"
+#include "move_orb_effects_5.h"
 
 void RunMonsterAI(Entity *pokemon, u32 unused)
 {

src/dungeon_damage.c

@@ -27,7 +27,6 @@
 #include "dungeon_leveling.h"
 #include "weather.h"
 #include "game_options.h"
-#include "code_8077274_1.h"
 #include "code_806CD90.h"
 #include "constants/direction.h"
 #include "constants/dungeon.h"
@@ -47,6 +46,7 @@
 #include "dungeon_mon_spawn.h"
 #include "move_orb_actions_1.h"
 #include "move_orb_effects_2.h"
+#include "move_orb_effects_5.h"
 
 extern void sub_8041B18(Entity *pokemon);
 extern void sub_8041B90(Entity *pokemon);

src/dungeon_item_action.c

@@ -3,7 +3,6 @@
 #include "dungeon_item_action.h"
 #include "code_8041AD0.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/dungeon_action.h"
 #include "constants/dungeon.h"
@@ -40,6 +39,7 @@
 #include "warp_target.h"
 #include "move_orb_actions_1.h"
 #include "move_orb_effects_2.h"
+#include "move_orb_effects_5.h"
 
 extern void sub_804245C(Entity *, Item *);
 extern s32 sub_8042520(Entity *);

src/dungeon_leveling.c

@@ -6,7 +6,6 @@
 #include "dungeon_range.h"
 #include "dungeon_message.h"
 #include "code_8041AD0.h"
-#include "code_8077274_1.h"
 #include "constants/dungeon.h"
 #include "dungeon_map_access.h"
 #include "dungeon_misc.h"

src/dungeon_misc.c

@@ -29,7 +29,6 @@
 #include "constants/type.h"
 #include "constants/weather.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_util.h"
 #include "exclusive_pokemon.h"
 #include "dungeon_config.h"
@@ -53,6 +52,7 @@
 #include "dungeon_info.h"
 #include "dungeon_monster_house.h"
 #include "move_orb_effects_2.h"
+#include "move_orb_effects_5.h"
 
 static void EnsureCastformLoaded(void);
 static void EnsureDeoxysLoaded(void);

src/dungeon_mon_spawn.c

@@ -12,7 +12,6 @@
 #include "dungeon_vram.h"
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_config.h"
 #include "run_dungeon.h"
 #include "dungeon_range.h"

src/dungeon_monster_house.c

@@ -6,7 +6,6 @@
 #include "dungeon_message.h"
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/item.h"
@@ -29,6 +28,7 @@
 #include "dungeon_floor_spawns.h"
 #include "dungeon_misc.h"
 #include "dungeon_mon_spawn.h"
+#include "move_orb_effects_5.h"
 
 extern void sub_804178C(u32);
 

src/dungeon_move.c

@@ -13,7 +13,6 @@
 #include "dungeon_tilemap.h"
 #include "code_8041AD0.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "dungeon_logic.h"
 #include "dungeon_config.h"
@@ -28,6 +27,7 @@
 #include "dungeon_damage.h"
 #include "math.h"
 #include "move_orb_effects_1.h"
+#include "move_orb_effects_5.h"
 #include "move_orb_actions_1.h"
 #include "move_orb_actions_2.h"
 #include "move_orb_actions_3.h"

src/dungeon_move_util.c

@@ -13,7 +13,6 @@
 #include "dungeon_tilemap.h"
 #include "code_8041AD0.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "dungeon_logic.h"
 #include "dungeon_config.h"
@@ -35,6 +34,7 @@
 #include "move_orb_actions_4.h"
 #include "move_orb_effects_2.h"
 #include "move_orb_effects_3.h"
+#include "move_orb_effects_5.h"
 #include "weather.h"
 #include "targeting_flags.h"
 #include "pokemon_types.h"

src/dungeon_projectile_throw.c

@@ -9,11 +9,11 @@
 #include "dungeon_map_access.h"
 #include "dungeon_config.h"
 #include "dungeon_pos_data.h"
-#include "code_8077274_1.h"
 #include "dungeon_tilemap.h"
 #include "code_806CD90.h"
 #include "dungeon_message.h"
 #include "move_util.h"
+#include "move_orb_effects_5.h"
 #include "dungeon_strings.h"
 #include "dungeon_range.h"
 #include "dungeon_item_action.h"

src/dungeon_turn_effects.c

@@ -27,7 +27,6 @@
 #include "constants/weather.h"
 #include "number_util.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "dungeon_logic.h"
 #include "math.h"
 #include "dungeon_config.h"
@@ -40,6 +39,7 @@
 #include "move_orb_effects_2.h"
 #include "move_orb_effects_1.h"
 #include "warp_target.h"
+#include "move_orb_effects_5.h"
 
 extern void sub_805229C(void);
 extern void sub_80420B8(Entity *pokemon);

src/explosion.c

@@ -8,7 +8,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/expose_trap.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/hurl_orb.c

@@ -6,7 +6,6 @@
 #include "code_804267C.h"
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"
 #include "constants/monster.h"

src/move_orb_actions_1.c

@@ -6,7 +6,6 @@
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"
@@ -36,6 +35,8 @@
 #include "dungeon_damage.h"
 #include "move_util.h"
 #include "move_orb_effects_3.h"
+#include "move_orb_effects_4.h"
+#include "move_orb_effects_5.h"
 
 bool8 IronTailMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId)
 {

src/move_orb_actions_2.c

@@ -6,7 +6,6 @@
 #include "dungeon_vram.h"
 #include "dungeon_tilemap.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"
@@ -39,6 +38,7 @@
 #include "warp_target.h"
 #include "explosion.h"
 #include "move_orb_effects_3.h"
+#include "move_orb_effects_4.h"
 
 extern void nullsub_92(Entity *);
 

src/move_orb_actions_3.c

@@ -4,7 +4,6 @@
 #include "move_orb_actions_3.h"
 #include "dungeon_tilemap.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"
@@ -47,6 +46,8 @@
 #include "blow_away.h"
 #include "warp_target.h"
 #include "move_orb_effects_3.h"
+#include "move_orb_effects_4.h"
+#include "move_orb_effects_5.h"
 
 static void sub_805A7D4(Entity *, Entity *, Item *, DungeonPos *);
 

src/move_orb_actions_4.c

@@ -9,7 +9,6 @@
 #include "dungeon_message.h"
 #include "dungeon_move.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"
@@ -50,6 +49,7 @@
 #include "switcher_orb.h"
 #include "trawl_orb.h"
 #include "move_orb_effects_3.h"
+#include "move_orb_effects_4.h"
 
 bool8 ProtectMoveAction(Entity * pokemon,Entity * target,Move *move, s32 itemId)
 {

src/move_orb_actions_5.c

@@ -11,7 +11,6 @@
 #include "dungeon_strings.h"
 #include "dungeon_util.h"
 #include "dungeon_misc.h"
-#include "code_8077274_1.h"
 #include "code_806CD90.h"
 #include "dungeon_pos_data.h"
 #include "dungeon_floor_spawns.h"

src/move_orb_effects_1.c

@@ -3,7 +3,6 @@
 #include "move_orb_effects_1.h"
 #include "dungeon_message.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/direction.h"

src/move_orb_effects_2.c

@@ -3,7 +3,6 @@
 #include "move_orb_effects_2.h"
 #include "dungeon_vram.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/status.h"
@@ -29,6 +28,7 @@
 #include "dungeon_tilemap.h"
 #include "pokemon_3.h"
 #include "move_orb_actions_1.h"
+#include "move_orb_effects_5.h"
 #include "run_dungeon.h"
 
 extern void sub_8041D84(Entity *);

src/move_orb_effects_3.c

@@ -6,7 +6,6 @@
 #include "dungeon_message.h"
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/item.h"

src/move_orb_effects_4.c

@@ -1,11 +1,11 @@
 #include "global.h"
 #include "globaldata.h"
+#include "move_orb_effects_4.h"
 #include "dungeon_vram.h"
 #include "dungeon_map_access.h"
 #include "dungeon_message.h"
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/item.h"
@@ -25,14 +25,9 @@
 #include "dungeon_map_access.h"
 #include "dungeon_config.h"
 #include "dungeon_strings.h"
+#include "dungeon_misc.h"
 
-extern void UpdateMinimap();
 extern void EntityUpdateStatusSprites(Entity *);
-extern void sub_8042A74(Entity *r0);
-extern s32 GetMonsterApparentID(Entity *param_1, s16 param_2);
-extern void sub_806A898(Entity *, u32, u32);
-extern void HealTargetHP(Entity *pokemon, Entity *r1, s16, s16, u32);
-extern void sub_80420C8(Entity *r0);
 extern void nullsub_68(Entity *);
 extern void nullsub_67(Entity *);
 extern void nullsub_66(Entity *);
@@ -45,22 +40,8 @@ extern void nullsub_60(Entity *);
 extern void nullsub_59(Entity *);
 extern void nullsub_58(Entity *);
 extern void nullsub_57(Entity *);
-extern void sub_8041B34(Entity *);
-void sub_8041BD0(Entity *r0, u8 r1);
-void sub_8041EB4(Entity *);
-void sub_8041EA4(Entity *);
-extern void sub_8041E84(Entity *);
-extern void sub_8041E94(Entity *);
-extern void sub_8041E74(Entity *);
-extern void sub_8041E60(Entity *);
-extern void sub_8041E4C(Entity *);
-extern void sub_8041E3C(Entity *);
-extern void sub_8041E1C(Entity *);
-extern void nullsub_89(Entity *);
-extern void nullsub_88(Entity *);
-extern void nullsub_87(Entity *);
-extern void nullsub_86(Entity *);
-extern void sub_8041E0C(Entity *);
+extern void sub_8041B34(Entity *pokemon);
+extern void sub_80420C8(Entity *pokemon);
 
 void CounterStatusTarget(Entity * pokemon, Entity * target, u8 newStatus)
 {

src/move_orb_effects_5.c

@@ -1,11 +1,11 @@
 #include "global.h"
 #include "globaldata.h"
+#include "move_orb_effects_5.h"
 #include "dungeon_vram.h"
 #include "dungeon_map_access.h"
 #include "dungeon_message.h"
 #include "code_805D8C8.h"
 #include "code_806CD90.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "constants/ability.h"
 #include "constants/dungeon_exit.h"

src/one_room_orb.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/pounce_orb.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/status_checks.c

@@ -4,7 +4,6 @@
 #include "dungeon_util.h"
 #include "dungeon_move_util.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "constants/direction.h"
 #include "constants/dungeon_action.h"
 #include "constants/status.h"

src/switcher_orb.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/trap.c

@@ -4,7 +4,6 @@
 #include "dungeon_tilemap.h"
 #include "code_8041AD0.h"
 #include "dungeon_message.h"
-#include "code_8077274_1.h"
 #include "dungeon_random.h"
 #include "code_806CD90.h"
 #include "constants/dungeon_exit.h"
@@ -38,6 +37,7 @@
 #include "dungeon_mon_spawn.h"
 #include "move_orb_actions_1.h"
 #include "move_orb_effects_2.h"
+#include "move_orb_effects_4.h"
 
 void sub_80421EC(DungeonPos *, u32);
 void sub_804225C(Entity *, DungeonPos *, u8);

src/trawl_orb.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"

src/warp_target.c

@@ -7,7 +7,6 @@
 #include "dungeon_message.h"
 #include "code_806CD90.h"
 #include "structs/str_dungeon.h"
-#include "code_8077274_1.h"
 #include "dungeon_ai.h"
 #include "run_dungeon.h"
 #include "dungeon_generation.h"
@@ -28,6 +27,7 @@
 #include "dungeon_strings.h"
 #include "dungeon_kecleon_shop.h"
 #include "dungeon_range.h"
+#include "move_orb_effects_5.h"
 
 void sub_80421AC(Entity * pokemon, Entity * target);
 void sub_807BB78(Entity *pokemon);