Fix includes to work with asm files

This commit is contained in:
PikalaxALT 2019-01-03 20:36:23 -05:00
parent 155e506920
commit 8acdc1034d
6 changed files with 231 additions and 232 deletions

View File

@ -151,7 +151,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@
$(PREPROC) $< charmap.txt | $(CPP) -I include -nostdinc -undef - | $(AS) $(ASFLAGS) -o $@
$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $<

View File

@ -1,3 +1,6 @@
#include "constants/region_map.h"
#include "constants/trainer_classes.h"
.section .rodata
.align 2

View File

@ -0,0 +1,115 @@
#ifndef GUARD_CONSTANTS_REGION_MAP_H
#define GUARD_CONSTANTS_REGION_MAP_H
#define MAPSEC_PALLET_TOWN 0x0
#define MAPSEC_VIRIDIAN_CITY 0x1
#define MAPSEC_PEWTER_CITY 0x2
#define MAPSEC_CERULEAN_CITY 0x3
#define MAPSEC_LAVENDER_TOWN 0x4
#define MAPSEC_VERMILION_CITY 0x5
#define MAPSEC_CELADON_CITY 0x6
#define MAPSEC_FUCHSIA_CITY 0x7
#define MAPSEC_CINNABAR_ISLAND 0x8
#define MAPSEC_INDIGO_PLATEAU 0x9
#define MAPSEC_SAFFRON_CITY 0xA
#define MAPSEC_ROUTE_4 0xB
#define MAPSEC_ROUTE_10 0xC
#define MAPSEC_ROUTE_1 0xD
#define MAPSEC_ROUTE_2 0xE
#define MAPSEC_ROUTE_3 0xF
#define MAPSEC_ROUTE_4_2 0x10
#define MAPSEC_ROUTE_5 0x11
#define MAPSEC_ROUTE_6 0x12
#define MAPSEC_ROUTE_7 0x13
#define MAPSEC_ROUTE_8 0x14
#define MAPSEC_ROUTE_9 0x15
#define MAPSEC_ROUTE_10_2 0x16
#define MAPSEC_ROUTE_11 0x17
#define MAPSEC_ROUTE_12 0x18
#define MAPSEC_ROUTE_13 0x19
#define MAPSEC_ROUTE_14 0x1A
#define MAPSEC_ROUTE_15 0x1B
#define MAPSEC_ROUTE_16 0x1C
#define MAPSEC_ROUTE_17 0x1D
#define MAPSEC_ROUTE_18 0x1E
#define MAPSEC_ROUTE_19 0x1F
#define MAPSEC_ROUTE_20 0x20
#define MAPSEC_ROUTE_21 0x21
#define MAPSEC_ROUTE_22 0x22
#define MAPSEC_ROUTE_23 0x23
#define MAPSEC_ROUTE_24 0x24
#define MAPSEC_ROUTE_25 0x25
#define MAPSEC_VIRIDIAN_FOREST 0x26
#define MAPSEC_MT_MOON 0x27
#define MAPSEC_S_S_ANNE 0x28
#define MAPSEC_UNDERGROUND_PATH 0x29
#define MAPSEC_UNDERGROUND_PATH_2 0x2A
#define MAPSEC_DIGLETTS_CAVE 0x2B
#define MAPSEC_KANTO_VICTORY_ROAD 0x2C
#define MAPSEC_ROCKET_HIDEOUT 0x2D
#define MAPSEC_SILPH_CO 0x2E
#define MAPSEC_POKEMON_MANSION 0x2F
#define MAPSEC_KANTO_SAFARI_ZONE 0x30
#define MAPSEC_POKEMON_LEAGUE 0x31
#define MAPSEC_ROCK_TUNNEL 0x32
#define MAPSEC_SEAFOAM_ISLANDS 0x33
#define MAPSEC_POKEMON_TOWER 0x34
#define MAPSEC_CERULEAN_CAVE 0x35
#define MAPSEC_POWER_PLANT 0x36
#define MAPSEC_ONE_ISLAND 0x37
#define MAPSEC_TWO_ISLAND 0x38
#define MAPSEC_THREE_ISLAND 0x39
#define MAPSEC_FOUR_ISLAND 0x3A
#define MAPSEC_FIVE_ISLAND 0x3B
#define MAPSEC_SEVEN_ISLAND 0x3C
#define MAPSEC_SIX_ISLAND 0x3D
#define MAPSEC_KINDLE_ROAD 0x3E
#define MAPSEC_TREASURE_BEACH 0x3F
#define MAPSEC_CAPE_BRINK 0x40
#define MAPSEC_BOND_BRIDGE 0x41
#define MAPSEC_THREE_ISLE_PORT 0x42
#define MAPSEC_SEVII_ISLE_6 0x43
#define MAPSEC_SEVII_ISLE_7 0x44
#define MAPSEC_SEVII_ISLE_8 0x45
#define MAPSEC_SEVII_ISLE_9 0x46
#define MAPSEC_RESORT_GORGEOUS 0x47
#define MAPSEC_WATER_LABYRINTH 0x48
#define MAPSEC_FIVE_ISLE_MEADOW 0x49
#define MAPSEC_MEMORIAL_PILLAR 0x4A
#define MAPSEC_OUTCAST_ISLAND 0x4B
#define MAPSEC_GREEN_PATH 0x4C
#define MAPSEC_WATER_PATH 0x4D
#define MAPSEC_RUIN_VALLEY 0x4E
#define MAPSEC_TRAINER_TOWER 0x4F
#define MAPSEC_CANYON_ENTRANCE 0x50
#define MAPSEC_SEVAULT_CANYON 0x51
#define MAPSEC_TANOBY_RUINS 0x52
#define MAPSEC_SEVII_ISLE_22 0x53
#define MAPSEC_SEVII_ISLE_23 0x54
#define MAPSEC_SEVII_ISLE_24 0x55
#define MAPSEC_NAVEL_ROCK 0x56
#define MAPSEC_MT_EMBER 0x57
#define MAPSEC_BERRY_FOREST 0x58
#define MAPSEC_ICEFALL_CAVE 0x59
#define MAPSEC_ROCKET_WAREHOUSE 0x5A
#define MAPSEC_TRAINER_TOWER_2 0x5B
#define MAPSEC_DOTTED_HOLE 0x5C
#define MAPSEC_LOST_CAVE 0x5D
#define MAPSEC_PATTERN_BUSH 0x5E
#define MAPSEC_ALTERING_CAVE 0x5F
#define MAPSEC_TANOBY_CHAMBERS 0x60
#define MAPSEC_THREE_ISLE_PATH 0x61
#define MAPSEC_TANOBY_KEY 0x62
#define MAPSEC_BIRTH_ISLAND 0x63
#define MAPSEC_MONEAN_CHAMBER 0x64
#define MAPSEC_LIPTOO_CHAMBER 0x65
#define MAPSEC_WEEPTH_CHAMBER 0x66
#define MAPSEC_DILFORD_CHAMBER 0x67
#define MAPSEC_SCUFIB_CHAMBER 0x68
#define MAPSEC_RIXY_CHAMBER 0x69
#define MAPSEC_VIAPOIS_CHAMBER 0x6A
#define MAPSEC_EMBER_SPA 0x6B
#define MAPSEC_CELADON_DEPT 0x6C
#define MAPSEC_NONE 0x6D
#endif //GUARD_CONSTANTS_REGION_MAP_H

View File

@ -0,0 +1,112 @@
#ifndef GUARD_TRAINER_CLASSES_H
#define GUARD_TRAINER_CLASSES_H
#define CLASS_PKMN_TRAINER 0x00
#define CLASS_PKMN_TRAINER_2 0x01
#define CLASS_AQUA_LEADER 0x02
#define CLASS_TEAM_AQUA 0x03
#define CLASS_AROMA_LADY 0x04
#define CLASS_RUIN_MANIAC 0x05
#define CLASS_INTERVIEWER 0x06
#define CLASS_TUBER 0x07
#define CLASS_TUBER_2 0x08
#define CLASS_COOLTRAINER 0x09
#define CLASS_HEX_MANIAC 0x0A
#define CLASS_LADY 0x0B
#define CLASS_BEAUTY 0x0C
#define CLASS_RICH_BOY 0x0D
#define CLASS_POKEMANIAC 0x0E
#define CLASS_SWIMMER_MALE 0x0F
#define CLASS_BLACK_BELT 0x10
#define CLASS_GUITARIST 0x11
#define CLASS_KINDLER 0x12
#define CLASS_CAMPER 0x13
#define CLASS_BUG_MANIAC 0x14
#define CLASS_PSYCHIC 0x15
#define CLASS_GENTLEMAN 0x16
#define CLASS_ELITE_FOUR 0x17
#define CLASS_LEADER 0x18
#define CLASS_SCHOOL_KID 0x19
#define CLASS_SR_AND_JR 0x1A
#define CLASS_POKEFAN 0x1B
#define CLASS_EXPERT 0x1C
#define CLASS_YOUNGSTER 0x1D
#define CLASS_CHAMPION 0x1E
#define CLASS_FISHERMAN 0x1F
#define CLASS_TRIATHLETE 0x20
#define CLASS_DRAGON_TAMER 0x21
#define CLASS_BIRD_KEEPER 0x22
#define CLASS_NINJA_BOY 0x23
#define CLASS_BATTLE_GIRL 0x24
#define CLASS_PARASOL_LADY 0x25
#define CLASS_SWIMMER_FEMALE 0x26
#define CLASS_PICNICKER 0x27
#define CLASS_TWINS 0x28
#define CLASS_SAILOR 0x29
#define CLASS_BOARDER 0x2A
#define CLASS_COLLECTOR 0x2B
#define CLASS_PKMN_TRAINER_3 0x2C
#define CLASS_PKMN_BREEDER 0x2D
#define CLASS_PKMN_RANGER 0x2E
#define CLASS_MAGMA_LEADER 0x2F
#define CLASS_TEAM_MAGMA 0x30
#define CLASS_LASS 0x31
#define CLASS_BUG_CATCHER 0x32
#define CLASS_HIKER 0x33
#define CLASS_YOUNG_COUPLE 0x34
#define CLASS_OLD_COUPLE 0x35
#define CLASS_SIS_AND_BRO 0x36
#define CLASS_AQUA_ADMIN 0x37
#define CLASS_MAGMA_ADMIN 0x38
#define CLASS_YOUNGSTER_2 0x39
#define CLASS_BUG_CATCHER_2 0x3A
#define CLASS_LASS_2 0x3B
#define CLASS_SAILOR_2 0x3C
#define CLASS_CAMPER_2 0x3D
#define CLASS_PICNICKER_2 0x3E
#define CLASS_POKEMANIAC_2 0x3F
#define CLASS_SUPER_NERD 0x40
#define CLASS_HIKER_2 0x41
#define CLASS_BIKER 0x42
#define CLASS_BURGLAR 0x43
#define CLASS_ENGINEER 0x44
#define CLASS_FISHERMAN_2 0x45
#define CLASS_SWIMMER_MALE_2 0x46
#define CLASS_CUE_BALL 0x47
#define CLASS_GAMER 0x48
#define CLASS_BEAUTY_2 0x49
#define CLASS_SWIMMER_FEMALE_2 0x4A
#define CLASS_PSYCHIC_2 0x4B
#define CLASS_ROCKER 0x4C
#define CLASS_JUGGLER 0x4D
#define CLASS_TAMER 0x4E
#define CLASS_BIRD_KEEPER_2 0x4F
#define CLASS_BLACK_BELT_2 0x50
#define CLASS_RIVAL 0x51
#define CLASS_SCIENTIST 0x52
#define CLASS_BOSS 0x53
#define CLASS_LEADER_2 0x54
#define CLASS_TEAM_ROCKET 0x55
#define CLASS_COOLTRAINER_2 0x56
#define CLASS_ELITE_FOUR_2 0x57
#define CLASS_GENTLEMAN_2 0x58
#define CLASS_RIVAL_2 0x59
#define CLASS_CHAMPION_2 0x5A
#define CLASS_CHANNELER 0x5B
#define CLASS_TWINS_2 0x5C
#define CLASS_COOL_COUPLE 0x5D
#define CLASS_YOUNG_COUPLE_2 0x5E
#define CLASS_CRUSH_KIN 0x5F
#define CLASS_SIS_AND_BRO_2 0x60
#define CLASS_PKMN_PROF 0x61
#define CLASS_PLAYER 0x62
#define CLASS_CRUSH_GIRL 0x63
#define CLASS_TUBER_3 0x64
#define CLASS_PKMN_BREEDER_2 0x65
#define CLASS_PKMN_RANGER_2 0x66
#define CLASS_AROMA_LADY_2 0x67
#define CLASS_RUIN_MANIAC_2 0x68
#define CLASS_LADY_2 0x69
#define CLASS_PAINTER 0x6A
#endif // GUARD_TRAINER_CLASSES_H

View File

@ -7,119 +7,6 @@
// Exported type declarations
enum {
MAPSEC_PALLET_TOWN,
MAPSEC_VIRIDIAN_CITY,
MAPSEC_PEWTER_CITY,
MAPSEC_CERULEAN_CITY,
MAPSEC_LAVENDER_TOWN,
MAPSEC_VERMILION_CITY,
MAPSEC_CELADON_CITY,
MAPSEC_FUCHSIA_CITY,
MAPSEC_CINNABAR_ISLAND,
MAPSEC_INDIGO_PLATEAU,
MAPSEC_SAFFRON_CITY,
MAPSEC_ROUTE_4,
MAPSEC_ROUTE_10,
MAPSEC_ROUTE_1,
MAPSEC_ROUTE_2,
MAPSEC_ROUTE_3,
MAPSEC_ROUTE_4_2,
MAPSEC_ROUTE_5,
MAPSEC_ROUTE_6,
MAPSEC_ROUTE_7,
MAPSEC_ROUTE_8,
MAPSEC_ROUTE_9,
MAPSEC_ROUTE_10_2,
MAPSEC_ROUTE_11,
MAPSEC_ROUTE_12,
MAPSEC_ROUTE_13,
MAPSEC_ROUTE_14,
MAPSEC_ROUTE_15,
MAPSEC_ROUTE_16,
MAPSEC_ROUTE_17,
MAPSEC_ROUTE_18,
MAPSEC_ROUTE_19,
MAPSEC_ROUTE_20,
MAPSEC_ROUTE_21,
MAPSEC_ROUTE_22,
MAPSEC_ROUTE_23,
MAPSEC_ROUTE_24,
MAPSEC_ROUTE_25,
MAPSEC_VIRIDIAN_FOREST,
MAPSEC_MT_MOON,
MAPSEC_S_S_ANNE,
MAPSEC_UNDERGROUND_PATH,
MAPSEC_UNDERGROUND_PATH_2,
MAPSEC_DIGLETTS_CAVE,
MAPSEC_KANTO_VICTORY_ROAD,
MAPSEC_ROCKET_HIDEOUT,
MAPSEC_SILPH_CO,
MAPSEC_POKEMON_MANSION,
MAPSEC_KANTO_SAFARI_ZONE,
MAPSEC_POKEMON_LEAGUE,
MAPSEC_ROCK_TUNNEL,
MAPSEC_SEAFOAM_ISLANDS,
MAPSEC_POKEMON_TOWER,
MAPSEC_CERULEAN_CAVE,
MAPSEC_POWER_PLANT,
MAPSEC_ONE_ISLAND,
MAPSEC_TWO_ISLAND,
MAPSEC_THREE_ISLAND,
MAPSEC_FOUR_ISLAND,
MAPSEC_FIVE_ISLAND,
MAPSEC_SEVEN_ISLAND,
MAPSEC_SIX_ISLAND,
MAPSEC_KINDLE_ROAD,
MAPSEC_TREASURE_BEACH,
MAPSEC_CAPE_BRINK,
MAPSEC_BOND_BRIDGE,
MAPSEC_THREE_ISLE_PORT,
MAPSEC_SEVII_ISLE_6,
MAPSEC_SEVII_ISLE_7,
MAPSEC_SEVII_ISLE_8,
MAPSEC_SEVII_ISLE_9,
MAPSEC_RESORT_GORGEOUS,
MAPSEC_WATER_LABYRINTH,
MAPSEC_FIVE_ISLE_MEADOW,
MAPSEC_MEMORIAL_PILLAR,
MAPSEC_OUTCAST_ISLAND,
MAPSEC_GREEN_PATH,
MAPSEC_WATER_PATH,
MAPSEC_RUIN_VALLEY,
MAPSEC_TRAINER_TOWER,
MAPSEC_CANYON_ENTRANCE,
MAPSEC_SEVAULT_CANYON,
MAPSEC_TANOBY_RUINS,
MAPSEC_SEVII_ISLE_22,
MAPSEC_SEVII_ISLE_23,
MAPSEC_SEVII_ISLE_24,
MAPSEC_NAVEL_ROCK,
MAPSEC_MT_EMBER,
MAPSEC_BERRY_FOREST,
MAPSEC_ICEFALL_CAVE,
MAPSEC_ROCKET_WAREHOUSE,
MAPSEC_TRAINER_TOWER_2,
MAPSEC_DOTTED_HOLE,
MAPSEC_LOST_CAVE,
MAPSEC_PATTERN_BUSH,
MAPSEC_ALTERING_CAVE,
MAPSEC_TANOBY_CHAMBERS,
MAPSEC_THREE_ISLE_PATH,
MAPSEC_TANOBY_KEY,
MAPSEC_BIRTH_ISLAND,
MAPSEC_MONEAN_CHAMBER,
MAPSEC_LIPTOO_CHAMBER,
MAPSEC_WEEPTH_CHAMBER,
MAPSEC_DILFORD_CHAMBER,
MAPSEC_SCUFIB_CHAMBER,
MAPSEC_RIXY_CHAMBER,
MAPSEC_VIAPOIS_CHAMBER,
MAPSEC_EMBER_SPA,
MAPSEC_CELADON_DEPT,
MAPSEC_NONE
};
enum
{
INPUT_EVENT_NONE,

View File

@ -1,118 +0,0 @@
#ifndef GUARD_TRAINER_CLASSES_H
#define GUARD_TRAINER_CLASSES_H
#include "global.h"
enum
{
CLASS_PKMN_TRAINER0, // 0
CLASS_PKMN_TRAINER1, // 1
CLASS_AQUA_LEADER, // 2
CLASS_TEAM_AQUA, // 3
CLASS_AROMA_LADY, // 4
CLASS_RUIN_MANIAC, // 5
CLASS_INTERVIEWER, // 6
CLASS_TUBER_FEMALE, // 7
CLASS_TUBER_MALE, // 8
CLASS_COOLTRAINER_2, // 9
CLASS_HEX_MANIAC, // 0xA
CLASS_LADY, // 0xB
CLASS_BEAUTY, // 0xC
CLASS_RICH_BOY, // 0xD
CLASS_POKEMANIAC, // 0xE
CLASS_SWIMMER_MALE, // 0xF
CLASS_BLACK_BELT, // 0x10
CLASS_GUITARIST, // 0x11
CLASS_KINDLER, // 0x12
CLASS_CAMPER, // 0x13
CLASS_BUG_MANIAC, // 0x14
CLASS_PSYCHIC, // 0x15
CLASS_GENTLEMAN, // 0x16
CLASS_ELITE_FOUR, // 0x17
CLASS_LEADER, // 0x18
CLASS_SCHOOL_KID, // 0x19
CLASS_SCHOOL_SR_JR, // 0x1A
CLASS_POKE_FAN, // 0x1B
CLASS_EXPERT, // 0x1C
CLASS_YOUNGSTER, // 0x1D
CLASS_CHAMPION, // 0x1E
CLASS_FISHERMAN, // 0x1F
CLASS_TRIATHLETE, // 0x20
CLASS_DRAGON_TAMER, // 0x21
CLASS_BIRD_KEEPER, // 0x22
CLASS_NINJA_BOY, // 0x23
CLASS_BATTLE_GIRL, // 0x24
CLASS_PARASOL_LADY, // 0x25
CLASS_SWIMMER_FEMALE, // 0x26
CLASS_PICKNICKER, // 0x27
CLASS_TWINS, // 0x28
CLASS_SAILOR, // 0x29
CLASS_BOARDER, // 0x2A
CLASS_COLLECTOR, // 0x2B
CLASS_PKMN_TRAINER2, // 0x2C
CLASS_PKMN_BREEDER, // 0x2D
CLASS_PKMN_RANGER, // 0x2E
CLASS_MAGMA_LEADER, // 0x2F
CLASS_TEAM_MAGMA, // 0x30
CLASS_LASS, // 0x31
CLASS_BUG_CATCHER, // 0x32
CLASS_HIKER, // 0x33
CLASS_YOUNG_COUPLE, // 0x34
CLASS_OLD_COUPLE, // 0x35
CLASS_SIS_AND_BRO, // 0x36
CLASS_AQUA_ADMIN, // 0x37
CLASS_MAGMA_ADMIN, // 0x38
CLASS_YOUNGSTER, // 0x39
CLASS_BUG_CATCHER, // 0x3A
CLASS_LASS, // 0x3B
CLASS_SAILER, // 0x3C
CLASS_CAMPER, // 0x3D
CLASS_PICKNICKER, // 0x3E
CLASS_POKEMANIAC, // 0x3F
CLASS_SUPER_NERD, // 0x40
CLASS_HIKER, // 0x41
CLASS_BIKER, // 0x42
CLASS_BURGLAR, // 0x43
CLASS_ENGINEER, // 0x44
CLASS_FISHERMAN, // 0x45
CLASS_SWIMMER_MALE, // 0x46
CLASS_CUE_BALL, // 0x47
CLASS_GAMER, // 0x48
CLASS_BEAUTY, // 0x49
CLASS_SWIMMER_FEMALE, // 0x4A
CLASS_PSYCHIC, // 0x4B
CLASS_ROCKER, // 0x4C
CLASS_JUGGLER, // 0x4D
CLASS_TAMER, // 0x4E
CLASS_BIRD_KEEPER, // 0x4F
CLASS_BLACK_BELT, // 0X50
CLASS_PKMN_TRAINER_RIVAL, // 0X51
CLASS_SCIENTIST, // 0X52
CLASS_BOSS, // 0X53
CLASS_LEADER, // 0X54
CLASS_TEAM_ROCKET, // 0X55
CLASS_COOLTRAINER, // 0X56
CLASS_ELITE_FOUR, // 0X57
CLASS_GENTLEMAN, // 0X58
CLASS_PKMN_TRAINER_RIVAL, // 0X59
CLASS_CHAMPION, // 0X5A
CLASS_CHANNERLER, // 0X5B
CLASS_TWINS, // 0X5C
CLASS_COOL_COUPLE, // 0X5D
CLASS_YOUNG_COUPLE, // 0X5E
CLASS_CRUSH_KIN, // 0X5F
CLASS_SIS_AND_BRO, // 0X60
CLASS_PROFESSOR, // 0X61
CLASS_PLAYER, // 0X62
CLASS_CRUSH_GIRL, // 0X63
CLASS_TUBER2, // 0X64
CLASS_PKMN_BREEDER, // 0X65
CLASS_PKMN_RANGER, // 0X66
CLASS_AROMA_LADY, // 0X67
CLASS_RUIN_MANIAC, // 0X68
CLASS_LADY, // 0X69
CLASS_PAINTER, // 0X6A
};
#endif // GUARD_TRAINER_CLASSES_H