diff --git a/asm/code_8042B34.s b/asm/code_8042B34.s deleted file mode 100644 index 2eb629c0e..000000000 --- a/asm/code_8042B34.s +++ /dev/null @@ -1,9 +0,0 @@ - #include "asm/constants/gba_constants.inc" - #include "asm/macros.inc" - - .syntax unified - - .text - - - .align 2, 0 diff --git a/include/pokemon.h b/include/pokemon.h index b5282086d..4f7e326a2 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -108,6 +108,11 @@ static inline bool8 PokemonFlag2(PokemonStruct1 *mon) return (((mon->unk0 >> 1) & 1)); } +static inline bool8 IsMonTeamLeader(PokemonStruct1 *pokemon) +{ + return pokemon->isTeamLeader != FALSE; +} + #include "constants/dungeon.h" static inline bool8 IsMonPartner(PokemonStruct1 *mon) diff --git a/ld_script.txt b/ld_script.txt index 1be5385d9..ccdbbd73e 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -215,7 +215,6 @@ SECTIONS { asm/code_8041AD0.o(.text); src/code_804267C.o(.text); src/code_8042B34.o(.text); - asm/code_8042B34.o(.text); src/dungeon_engine.o(.text); asm/code_8044210.o(.text); src/dungeon_action.o(.text);