Merge branch 'master' into battle_tower
This commit is contained in:
+1
-15
@@ -25,6 +25,7 @@
|
||||
#include "international_string_util.h"
|
||||
#include "trainer_pokemon_sprites.h"
|
||||
#include "scanline_effect.h"
|
||||
#include "graphics.h"
|
||||
#include "constants/species.h"
|
||||
#include "constants/moves.h"
|
||||
#include "constants/trainers.h"
|
||||
@@ -85,21 +86,6 @@ extern const struct FacilityMon gBattleFrontierMons[];
|
||||
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
|
||||
extern const struct SpriteTemplate gUnknown_0860CFA8;
|
||||
|
||||
// gfx
|
||||
extern const u8 gUnknown_08D83D50[];
|
||||
extern const u8 gUnknown_08D84970[];
|
||||
extern const u8 gUnknown_08D84F00[];
|
||||
extern const u8 gUnknown_08D85444[];
|
||||
extern const u8 gUnknown_08D85358[];
|
||||
extern const u8 gUnknown_08D85600[];
|
||||
extern const u8 gUnknown_08D854C8[];
|
||||
extern const u8 gUnknown_08D82F10[];
|
||||
extern const u8 gUnknown_08D834FC[];
|
||||
extern const u8 gUnknown_08D83B2C[];
|
||||
extern const u8 gUnknown_08D83C3C[];
|
||||
extern const u8 gUnknown_08D83900[];
|
||||
extern const u8 gBattleFrontierGfx_DomeOptions[];
|
||||
|
||||
// text
|
||||
extern const u8 gTrainerClassNames[][0xD];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user