diff options
| author | Melody <melody@pallet.town> | 2018-12-03 00:31:15 -0500 | 
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-03 00:31:15 -0500 | 
| commit | 52fa5137c95a3bbdf3bf29d594e66948bf7382ae (patch) | |
| tree | 4731f07160d38ef1a92134496bdeb17877006ce0 /include | |
| parent | eeb6446da4384246e6b5c47b04554d82a4cd752f (diff) | |
tweak alignment
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/trainers.h | 166 | 
1 files changed, 83 insertions, 83 deletions
| diff --git a/include/constants/trainers.h b/include/constants/trainers.h index d7832754e..d1ab51e4e 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -17,7 +17,7 @@  #define TRAINER_PIC_HIKER                  0  #define TRAINER_PIC_AQUA_GRUNT_M           1  #define TRAINER_PIC_POKEMON_BREEDER_F      2 -#define TRAINER_PIC_COOLTRAINER_M         3 +#define TRAINER_PIC_COOLTRAINER_M          3  #define TRAINER_PIC_BIRD_KEEPER            4  #define TRAINER_PIC_COLLECTOR              5  #define TRAINER_PIC_AQUA_GRUNT_F           6 @@ -34,7 +34,7 @@  #define TRAINER_PIC_INTERVIEWER           17  #define TRAINER_PIC_TUBER_F               18  #define TRAINER_PIC_TUBER_M               19 -#define TRAINER_PIC_COOLTRAINER_F        20 +#define TRAINER_PIC_COOLTRAINER_F         20  #define TRAINER_PIC_LADY                  21  #define TRAINER_PIC_BEAUTY                22  #define TRAINER_PIC_RICH_BOY              23 @@ -105,8 +105,8 @@  #define TRAINER_PIC_PYRAMID_KING_BRANDON  88  #define TRAINER_PIC_RED                   89  #define TRAINER_PIC_LEAF                  90 -#define TRAINER_PIC_RS_BRENDAN 91 -#define TRAINER_PIC_RS_MAY     92 +#define TRAINER_PIC_RS_BRENDAN            91 +#define TRAINER_PIC_RS_MAY                92  #define TRAINER_BACK_PIC_BRENDAN                0  #define TRAINER_BACK_PIC_MAY                    1 @@ -117,95 +117,95 @@  #define TRAINER_BACK_PIC_WALLY                  6  #define TRAINER_BACK_PIC_STEVEN                 7 -#define FACILITY_CLASS_HIKER           0x0 -#define FACILITY_CLASS_AQUA_GRUNT_M     0x1 -#define FACILITY_CLASS_POKEMON_BREEDER_F  0x2 -#define FACILITY_CLASS_COOLTRAINER_M   0x3 -#define FACILITY_CLASS_BIRD_KEEPER     0x4 -#define FACILITY_CLASS_COLLECTOR       0x5 -#define FACILITY_CLASS_AQUA_GRUNT_F     0x6 -#define FACILITY_CLASS_SWIMMER_M       0x7 -#define FACILITY_CLASS_MAGMA_GRUNT_M    0x8 -#define FACILITY_CLASS_EXPERT_M        0x9 -#define FACILITY_CLASS_BLACK_BELT      0xa -#define FACILITY_CLASS_AQUA_LEADER_ARCHIE     0xb -#define FACILITY_CLASS_HEX_MANIAC      0xc -#define FACILITY_CLASS_AROMA_LADY      0xd -#define FACILITY_CLASS_RUIN_MANIAC     0xe -#define FACILITY_CLASS_INTERVIEWER     0xf -#define FACILITY_CLASS_TUBER_F         0x10 -#define FACILITY_CLASS_TUBER_M         0x11 -#define FACILITY_CLASS_COOLTRAINER_F   0x12 -#define FACILITY_CLASS_LADY            0x13 -#define FACILITY_CLASS_BEAUTY          0x14 -#define FACILITY_CLASS_RICH_BOY        0x15 -#define FACILITY_CLASS_EXPERT_F        0x16 -#define FACILITY_CLASS_POKEMANIAC      0x17 -#define FACILITY_CLASS_MAGMA_GRUNT_F    0x18 -#define FACILITY_CLASS_GUITARIST       0x19 -#define FACILITY_CLASS_KINDLER         0x1a -#define FACILITY_CLASS_CAMPER          0x1b -#define FACILITY_CLASS_PICNICKER       0x1c -#define FACILITY_CLASS_BUG_MANIAC      0x1d -#define FACILITY_CLASS_PSYCHIC_M       0x1e -#define FACILITY_CLASS_PSYCHIC_F       0x1f -#define FACILITY_CLASS_GENTLEMAN       0x20 +#define FACILITY_CLASS_HIKER                0x0 +#define FACILITY_CLASS_AQUA_GRUNT_M         0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F    0x2 +#define FACILITY_CLASS_COOLTRAINER_M        0x3 +#define FACILITY_CLASS_BIRD_KEEPER          0x4 +#define FACILITY_CLASS_COLLECTOR            0x5 +#define FACILITY_CLASS_AQUA_GRUNT_F         0x6 +#define FACILITY_CLASS_SWIMMER_M            0x7 +#define FACILITY_CLASS_MAGMA_GRUNT_M        0x8 +#define FACILITY_CLASS_EXPERT_M             0x9 +#define FACILITY_CLASS_BLACK_BELT           0xa +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE   0xb +#define FACILITY_CLASS_HEX_MANIAC           0xc +#define FACILITY_CLASS_AROMA_LADY           0xd +#define FACILITY_CLASS_RUIN_MANIAC          0xe +#define FACILITY_CLASS_INTERVIEWER          0xf +#define FACILITY_CLASS_TUBER_F              0x10 +#define FACILITY_CLASS_TUBER_M              0x11 +#define FACILITY_CLASS_COOLTRAINER_F        0x12 +#define FACILITY_CLASS_LADY                 0x13 +#define FACILITY_CLASS_BEAUTY               0x14 +#define FACILITY_CLASS_RICH_BOY             0x15 +#define FACILITY_CLASS_EXPERT_F             0x16 +#define FACILITY_CLASS_POKEMANIAC           0x17 +#define FACILITY_CLASS_MAGMA_GRUNT_F        0x18 +#define FACILITY_CLASS_GUITARIST            0x19 +#define FACILITY_CLASS_KINDLER              0x1a +#define FACILITY_CLASS_CAMPER               0x1b +#define FACILITY_CLASS_PICNICKER            0x1c +#define FACILITY_CLASS_BUG_MANIAC           0x1d +#define FACILITY_CLASS_PSYCHIC_M            0x1e +#define FACILITY_CLASS_PSYCHIC_F            0x1f +#define FACILITY_CLASS_GENTLEMAN            0x20  #define FACILITY_CLASS_ELITE_FOUR_SIDNEY    0x21  #define FACILITY_CLASS_ELITE_FOUR_PHOEBE    0x22 -#define FACILITY_CLASS_LEADER_ROXANNE        0x23 +#define FACILITY_CLASS_LEADER_ROXANNE       0x23  #define FACILITY_CLASS_LEADER_BRAWLY        0x24 -#define FACILITY_CLASS_LEADER_TATE_AND_LIZA        0x25 -#define FACILITY_CLASS_SCHOOL_KID_M    0x26 -#define FACILITY_CLASS_SCHOOL_KID_F    0x27 -#define FACILITY_CLASS_SR_AND_JR       0x28 -#define FACILITY_CLASS_POKEFAN_M       0x29 -#define FACILITY_CLASS_POKEFAN_F       0x2a -#define FACILITY_CLASS_YOUNGSTER       0x2b -#define FACILITY_CLASS_CHAMPION_WALLACE        0x2c -#define FACILITY_CLASS_FISHERMAN       0x2d -#define FACILITY_CLASS_CYCLING_TRIATHLETE_M    0x2e -#define FACILITY_CLASS_CYCLING_TRIATHLETE_F    0x2f -#define FACILITY_CLASS_RUNNING_TRIATHLETE_M    0x30 -#define FACILITY_CLASS_RUNNING_TRIATHLETE_F    0x31 -#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M    0x32 -#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F    0x33 -#define FACILITY_CLASS_DRAGON_TAMER    0x34 -#define FACILITY_CLASS_NINJA_BOY       0x35 -#define FACILITY_CLASS_BATTLE_GIRL     0x36 -#define FACILITY_CLASS_PARASOL_LADY    0x37 -#define FACILITY_CLASS_SWIMMER_F       0x38 -#define FACILITY_CLASS_TWINS           0x39 -#define FACILITY_CLASS_SAILOR          0x3a -#define FACILITY_CLASS_PKMN_TRAINER_WALLY  0x3b -#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN  0x3c +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 +#define FACILITY_CLASS_SCHOOL_KID_M         0x26 +#define FACILITY_CLASS_SCHOOL_KID_F         0x27 +#define FACILITY_CLASS_SR_AND_JR            0x28 +#define FACILITY_CLASS_POKEFAN_M            0x29 +#define FACILITY_CLASS_POKEFAN_F            0x2a +#define FACILITY_CLASS_YOUNGSTER            0x2b +#define FACILITY_CLASS_CHAMPION_WALLACE     0x2c +#define FACILITY_CLASS_FISHERMAN            0x2d +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 +#define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 +#define FACILITY_CLASS_DRAGON_TAMER         0x34 +#define FACILITY_CLASS_NINJA_BOY            0x35 +#define FACILITY_CLASS_BATTLE_GIRL          0x36 +#define FACILITY_CLASS_PARASOL_LADY         0x37 +#define FACILITY_CLASS_SWIMMER_F            0x38 +#define FACILITY_CLASS_TWINS                0x39 +#define FACILITY_CLASS_SAILOR               0x3a +#define FACILITY_CLASS_PKMN_TRAINER_WALLY   0x3b +#define FACILITY_CLASS_PKMN_TRAINER_BRENDAN 0x3c  #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_2  0x3d  #define FACILITY_CLASS_PKMN_TRAINER_BRENDAN_3  0x3e -#define FACILITY_CLASS_PKMN_TRAINER_MAY  0x3f -#define FACILITY_CLASS_PKMN_TRAINER_MAY_2  0x40 -#define FACILITY_CLASS_PKMN_TRAINER_MAY_3  0x41 -#define FACILITY_CLASS_PKMN_BREEDER_M  0x42 -#define FACILITY_CLASS_BUG_CATCHER     0x43 -#define FACILITY_CLASS_PKMN_RANGER_M   0x44 -#define FACILITY_CLASS_PKMN_RANGER_F   0x45 -#define FACILITY_CLASS_MAGMA_LEADER_MAXIE    0x46 -#define FACILITY_CLASS_LASS            0x47 -#define FACILITY_CLASS_YOUNG_COUPLE    0x48 -#define FACILITY_CLASS_OLD_COUPLE      0x49 -#define FACILITY_CLASS_SIS_AND_BRO     0x4a -#define FACILITY_CLASS_STEVEN  0x4b -#define FACILITY_CLASS_SALON_MAIDEN_ANABEL    0x4c -#define FACILITY_CLASS_DOME_ACE_TUCKER        0x4d -#define FACILITY_CLASS_RED  0x4e -#define FACILITY_CLASS_LEAF 0x4f -#define FACILITY_CLASS_RS_BRENDAN 0x50 -#define FACILITY_CLASS_RS_MAY 0x51 +#define FACILITY_CLASS_PKMN_TRAINER_MAY     0x3f +#define FACILITY_CLASS_PKMN_TRAINER_MAY_2   0x40 +#define FACILITY_CLASS_PKMN_TRAINER_MAY_3   0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M       0x42 +#define FACILITY_CLASS_BUG_CATCHER          0x43 +#define FACILITY_CLASS_PKMN_RANGER_M        0x44 +#define FACILITY_CLASS_PKMN_RANGER_F        0x45 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE   0x46 +#define FACILITY_CLASS_LASS                 0x47 +#define FACILITY_CLASS_YOUNG_COUPLE         0x48 +#define FACILITY_CLASS_OLD_COUPLE           0x49 +#define FACILITY_CLASS_SIS_AND_BRO          0x4a +#define FACILITY_CLASS_STEVEN               0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL  0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER      0x4d +#define FACILITY_CLASS_RED                  0x4e +#define FACILITY_CLASS_LEAF                 0x4f +#define FACILITY_CLASS_RS_BRENDAN           0x50 +#define FACILITY_CLASS_RS_MAY               0x51  #define TRAINER_CLASS_PKMN_TRAINER_1 0x0  #define TRAINER_CLASS_PKMN_TRAINER_2 0x1  #define TRAINER_CLASS_HIKER          0x2  #define TRAINER_CLASS_TEAM_AQUA      0x3  #define TRAINER_CLASS_PKMN_BREEDER   0x4 -#define TRAINER_CLASS_COOLTRAINER  0x5 +#define TRAINER_CLASS_COOLTRAINER    0x5  #define TRAINER_CLASS_BIRD_KEEPER    0x6  #define TRAINER_CLASS_COLLECTOR      0x7  #define TRAINER_CLASS_SWIMMER_M      0x8 @@ -218,7 +218,7 @@  #define TRAINER_CLASS_AROMA_LADY     0xf  #define TRAINER_CLASS_RUIN_MANIAC    0x10  #define TRAINER_CLASS_INTERVIEWER    0x11 -#define TRAINER_CLASS_TUBER_F       0x12 +#define TRAINER_CLASS_TUBER_F        0x12  #define TRAINER_CLASS_TUBER_M        0x13  #define TRAINER_CLASS_LADY           0x14  #define TRAINER_CLASS_BEAUTY         0x15 | 
