matched all easy functions

include/field_camera.h

@@ -26,5 +26,6 @@ extern u16 gUnknown_03005DE8;
 
 void DrawWholeMapView(void);
 void CurrentMapDrawMetatileAt(int x, int y);
+void sub_805A658(s16 *x, s16 *y);
 
 #endif //GUARD_FIELD_CAMERA_H

include/field_effect.h

@@ -84,5 +84,6 @@ void CreateTeleportFieldEffectTask(void);
 void FieldEffectActiveListRemove(u8 id);
 void sub_8085620(void);
 void FieldEffectStop(struct Sprite *sprite, u8 id);
+u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
 
 #endif //GUARD_FIELD_EFFECTS_H

include/trainer_pokemon_sprites.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_DOME_CARDS_H
+#ifndef GUARD_TRAINER_POKEMON_SPRITES_H
-#define GUARD_BATTLE_DOME_CARDS_H
+#define GUARD_TRAINER_POKEMON_SPRITES_H
 
 #include "global.h"
 
@@ -13,5 +13,6 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS
 u8 sub_818D97C(u8 a0, u8 a1);
 u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 FreeAndDestroyTrainerPicSprite(u16);
+u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
 
-#endif //GUARD_BATTLE_DOME_CARDS_H
+#endif // GUARD_TRAINER_POKEMON_SPRITES_H

ld_script.txt

@@ -192,7 +192,6 @@ SECTIONS {
         src/coins.o(.text);
         src/fldeff_strength.o(.text);
         src/battle_transition.o(.text);
-        asm/battle_transition.o(.text);
         asm/battle_controller_link_partner.o(.text);
         asm/battle_message.o(.text);
         src/math_util.o(.text);