more cleanup and move more ram stuff

This commit is contained in:
Seth Barberee
2024-05-27 08:37:58 -07:00
parent 55f516ec5e
commit b2a0fe8422
23 changed files with 61 additions and 98 deletions
+3 -4
View File
@@ -6,6 +6,7 @@
#include "constants/type.h"
#include "dungeon_ai.h"
#include "dungeon_leader.h"
#include "dungeon_map_access.h"
#include "dungeon_pokemon_attributes.h"
#include "dungeon_util.h"
#include "move_util.h"
@@ -22,8 +23,6 @@ extern void nullsub_93(Position *);
extern void sub_80522F4(Entity *, Entity *, u8 *);
extern void sub_806F370(Entity *pokemon, Entity *target, u32, u32, u8 *, u8 moveType, s32, u32, u32, u32);
extern void sub_80694C0(Entity *, s32, s32, u32);
extern void sub_804535C(Entity *, u32);
extern void sub_804AC20(Position *);
extern void sub_807EC28(bool8);
extern void sub_806A5B8(Entity *);
@@ -95,8 +94,8 @@ void sub_807E254(Entity *pokemon,Entity *target)
nullsub_93(&targetPos);
sub_80694C0(pokemon,targetPos.x,targetPos.y,1);
sub_80694C0(target,pokemonPos.x,pokemonPos.y,1);
sub_804535C(pokemon,0x0);
sub_804535C(target,0x0);
sub_804535C(pokemon,NULL);
sub_804535C(target,NULL);
if (EntityExists(pokemon)) {
if (pokemon->info->isTeamLeader) {