Conflicts: include/battle.h include/battle_controllers.h include/battle_script_commands.h include/contest.h include/list_menu.h src/battle_controllers.c src/battle_gfx_sfx_util.c src/battle_main.c src/battle_message.c src/battle_tower.c src/berry_crush.c src/contest.c src/ereader_helpers.c src/evolution_scene.c src/hall_of_fame.c src/mauville_old_man.c src/mystery_gift_menu.c src/pokedex.c src/pokenav_conditions_search_results.c src/pokenav_menu_handler_gfx.c src/pokenav_ribbons_list.c src/rom_header_gf.c src/union_room.c src/union_room_battle.c src/union_room_player_avatar.c
14 lines
407 B
C
14 lines
407 B
C
#ifndef GUARD_tilesets_H
|
|
#define GUARD_tilesets_H
|
|
|
|
extern const u32 gTilesetTiles_General[];
|
|
extern const u16 gTilesetPalettes_General[][16];
|
|
|
|
extern const struct Tileset *const gTilesetPointer_SecretBase;
|
|
extern const struct Tileset *const gTilesetPointer_SecretBaseRedCave;
|
|
|
|
extern const struct Tileset gTileset_Building;
|
|
extern const struct Tileset gTileset_BrendansMaysHouse;
|
|
|
|
#endif //GUARD_tilesets_H
|