diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/flags.h | 513 | ||||
| -rw-r--r-- | include/constants/map_objects.h | 2 |
2 files changed, 259 insertions, 256 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 3cf229ffb..4578c4ac3 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -3,261 +3,264 @@ // TODO: Get correct names and numbers -#define FLAG_0x001 0x1 -#define FLAG_0x002 0x2 -#define FLAG_0x003 0x3 -#define FLAG_0x004 0x4 -#define FLAG_0x005 0x5 -#define FLAG_0x006 0x6 -#define FLAG_0x007 0x7 -#define FLAG_0x008 0x8 -#define FLAG_0x009 0x9 -#define FLAG_0x00A 0xA -#define FLAG_0x00B 0xB -#define FLAG_0x00C 0xC -#define FLAG_0x00D 0xD -#define FLAG_0x00E 0xE -#define FLAG_0x00F 0xF -#define FLAG_0x010 0x10 -#define FLAG_0x011 0x11 -#define FLAG_0x012 0x12 -#define FLAG_0x013 0x13 -#define FLAG_0x014 0x14 -#define FLAG_0x015 0x15 -#define FLAG_0x016 0x16 -#define FLAG_0x017 0x17 -#define FLAG_0x018 0x18 -#define FLAG_0x019 0x19 -#define FLAG_0x01A 0x1A -#define FLAG_0x01B 0x1B -#define FLAG_0x01C 0x1C -#define FLAG_0x01D 0x1D -#define FLAG_0x01E 0x1E -#define FLAG_0x01F 0x1F -#define FLAG_0x020 0x20 -#define FLAG_0x021 0x21 -#define FLAG_0x022 0x22 -#define FLAG_0x023 0x23 -#define FLAG_0x024 0x24 -#define FLAG_0x025 0x25 -#define FLAG_0x026 0x26 -#define FLAG_0x027 0x27 -#define FLAG_0x028 0x28 -#define FLAG_0x029 0x29 -#define FLAG_0x02A 0x2A -#define FLAG_0x02B 0x2B -#define FLAG_0x02C 0x2C -#define FLAG_0x02D 0x2D -#define FLAG_0x02E 0x2E -#define FLAG_0x02F 0x2F -#define FLAG_0x030 0x30 -#define FLAG_0x031 0x31 -#define FLAG_0x032 0x32 -#define FLAG_0x033 0x33 -#define FLAG_0x034 0x34 -#define FLAG_0x035 0x35 -#define FLAG_0x036 0x36 -#define FLAG_0x037 0x37 -#define FLAG_0x038 0x38 -#define FLAG_0x039 0x39 -#define FLAG_0x03A 0x3A -#define FLAG_0x03B 0x3B -#define FLAG_0x03C 0x3C -#define FLAG_0x03D 0x3D -#define FLAG_0x03E 0x3E -#define FLAG_0x03F 0x3F -#define FLAG_0x040 0x40 -#define FLAG_0x041 0x41 -#define FLAG_0x042 0x42 -#define FLAG_0x043 0x43 -#define FLAG_0x044 0x44 -#define FLAG_0x045 0x45 -#define FLAG_0x046 0x46 -#define FLAG_0x047 0x47 -#define FLAG_0x048 0x48 -#define FLAG_0x049 0x49 -#define FLAG_0x04A 0x4A -#define FLAG_0x04B 0x4B -#define FLAG_0x04C 0x4C -#define FLAG_0x04D 0x4D -#define FLAG_0x04E 0x4E -#define FLAG_0x04F 0x4F -#define FLAG_0x050 0x50 -#define FLAG_0x051 0x51 -#define FLAG_0x052 0x52 -#define FLAG_0x053 0x53 -#define FLAG_0x054 0x54 -#define FLAG_0x055 0x55 -#define FLAG_0x056 0x56 -#define FLAG_0x057 0x57 -#define FLAG_0x058 0x58 -#define FLAG_0x059 0x59 -#define FLAG_0x05A 0x5A -#define FLAG_0x05B 0x5B -#define FLAG_0x05C 0x5C -#define FLAG_0x05D 0x5D -#define FLAG_0x05E 0x5E -#define FLAG_0x05F 0x5F -#define FLAG_0x060 0x60 -#define FLAG_0x061 0x61 -#define FLAG_0x062 0x62 -#define FLAG_0x063 0x63 -#define FLAG_0x064 0x64 -#define FLAG_0x065 0x65 -#define FLAG_0x066 0x66 -#define FLAG_0x067 0x67 -#define FLAG_0x068 0x68 -#define FLAG_0x069 0x69 -#define FLAG_0x06A 0x6A -#define FLAG_0x06B 0x6B -#define FLAG_0x06C 0x6C -#define FLAG_0x06D 0x6D -#define FLAG_0x06E 0x6E -#define FLAG_0x06F 0x6F -#define FLAG_0x070 0x70 -#define FLAG_0x071 0x71 -#define FLAG_0x072 0x72 -#define FLAG_0x073 0x73 -#define FLAG_0x074 0x74 -#define FLAG_0x075 0x75 -#define FLAG_0x076 0x76 -#define FLAG_0x077 0x77 -#define FLAG_0x078 0x78 -#define FLAG_0x079 0x79 -#define FLAG_0x07A 0x7A -#define FLAG_0x07B 0x7B -#define FLAG_0x07C 0x7C -#define FLAG_0x07D 0x7D -#define FLAG_0x07E 0x7E -#define FLAG_0x07F 0x7F -#define FLAG_0x080 0x80 -#define FLAG_0x081 0x81 -#define FLAG_0x082 0x82 -#define FLAG_0x083 0x83 -#define FLAG_0x084 0x84 -#define FLAG_0x085 0x85 -#define FLAG_0x086 0x86 -#define FLAG_0x087 0x87 -#define FLAG_0x088 0x88 -#define FLAG_0x089 0x89 -#define FLAG_0x08A 0x8A -#define FLAG_0x08B 0x8B -#define FLAG_0x08C 0x8C -#define FLAG_0x08D 0x8D -#define FLAG_0x08E 0x8E -#define FLAG_0x08F 0x8F -#define FLAG_0x090 0x90 -#define FLAG_0x091 0x91 -#define FLAG_0x092 0x92 -#define FLAG_0x093 0x93 -#define FLAG_0x094 0x94 -#define FLAG_0x095 0x95 -#define FLAG_0x096 0x96 -#define FLAG_0x097 0x97 -#define FLAG_0x098 0x98 -#define FLAG_0x099 0x99 -#define FLAG_0x09A 0x9A -#define FLAG_0x09B 0x9B -#define FLAG_0x09C 0x9C -#define FLAG_0x09D 0x9D -#define FLAG_0x09E 0x9E -#define FLAG_0x09F 0x9F -#define FLAG_0x0A0 0xA0 -#define FLAG_0x0A1 0xA1 -#define FLAG_0x0A2 0xA2 -#define FLAG_0x0A3 0xA3 -#define FLAG_0x0A4 0xA4 -#define FLAG_0x0A5 0xA5 -#define FLAG_0x0A6 0xA6 -#define FLAG_0x0A7 0xA7 -#define FLAG_0x0A8 0xA8 -#define FLAG_0x0A9 0xA9 -#define FLAG_0x0AA 0xAA -#define FLAG_0x0AB 0xAB -#define FLAG_0x0AC 0xAC -#define FLAG_0x0AD 0xAD -#define FLAG_0x0AE 0xAE -#define FLAG_0x0AF 0xAF -#define FLAG_0x0B0 0xB0 -#define FLAG_0x0B1 0xB1 -#define FLAG_0x0B2 0xB2 -#define FLAG_0x0B3 0xB3 -#define FLAG_0x0B4 0xB4 -#define FLAG_0x0B5 0xB5 -#define FLAG_0x0B6 0xB6 -#define FLAG_0x0B7 0xB7 -#define FLAG_0x0B8 0xB8 -#define FLAG_0x0B9 0xB9 -#define FLAG_0x0BA 0xBA -#define FLAG_0x0BB 0xBB -#define FLAG_0x0BC 0xBC -#define FLAG_0x0BD 0xBD -#define FLAG_0x0BE 0xBE -#define FLAG_0x0BF 0xBF -#define FLAG_0x0C0 0xC0 -#define FLAG_0x0C1 0xC1 -#define FLAG_0x0C2 0xC2 -#define FLAG_0x0C3 0xC3 -#define FLAG_0x0C4 0xC4 -#define FLAG_0x0C5 0xC5 -#define FLAG_0x0C6 0xC6 -#define FLAG_0x0C7 0xC7 -#define FLAG_0x0C8 0xC8 -#define FLAG_0x0C9 0xC9 -#define FLAG_0x0CA 0xCA -#define FLAG_0x0CB 0xCB -#define FLAG_0x0CC 0xCC -#define FLAG_0x0CD 0xCD -#define FLAG_0x0CE 0xCE -#define FLAG_0x0CF 0xCF -#define FLAG_0x0D0 0xD0 -#define FLAG_0x0D1 0xD1 -#define FLAG_0x0D2 0xD2 -#define FLAG_0x0D3 0xD3 -#define FLAG_0x0D4 0xD4 -#define FLAG_0x0D5 0xD5 -#define FLAG_0x0D6 0xD6 -#define FLAG_0x0D7 0xD7 -#define FLAG_0x0D8 0xD8 -#define FLAG_0x0D9 0xD9 -#define FLAG_0x0DA 0xDA -#define FLAG_0x0DB 0xDB -#define FLAG_0x0DC 0xDC -#define FLAG_0x0DD 0xDD -#define FLAG_0x0DE 0xDE -#define FLAG_0x0DF 0xDF -#define FLAG_0x0E0 0xE0 -#define FLAG_0x0E1 0xE1 -#define FLAG_0x0E2 0xE2 -#define FLAG_0x0E3 0xE3 -#define FLAG_0x0E4 0xE4 -#define FLAG_0x0E5 0xE5 -#define FLAG_0x0E6 0xE6 -#define FLAG_0x0E7 0xE7 -#define FLAG_0x0E8 0xE8 -#define FLAG_0x0E9 0xE9 -#define FLAG_0x0EA 0xEA -#define FLAG_0x0EB 0xEB -#define FLAG_0x0EC 0xEC -#define FLAG_0x0ED 0xED -#define FLAG_0x0EE 0xEE -#define FLAG_0x0EF 0xEF -#define FLAG_0x0F0 0xF0 -#define FLAG_0x0F1 0xF1 -#define FLAG_0x0F2 0xF2 -#define FLAG_0x0F3 0xF3 -#define FLAG_0x0F4 0xF4 -#define FLAG_0x0F5 0xF5 -#define FLAG_0x0F6 0xF6 -#define FLAG_0x0F7 0xF7 -#define FLAG_0x0F8 0xF8 -#define FLAG_0x0F9 0xF9 -#define FLAG_0x0FA 0xFA -#define FLAG_0x0FB 0xFB -#define FLAG_0x0FC 0xFC -#define FLAG_0x0FD 0xFD -#define FLAG_0x0FE 0xFE -#define FLAG_0x0FF 0xFF +#define FLAG_TEMP_1 0x001 +#define FLAG_TEMP_2 0x002 +#define FLAG_TEMP_3 0x003 +#define FLAG_TEMP_4 0x004 +#define FLAG_TEMP_5 0x005 +#define FLAG_TEMP_6 0x006 +#define FLAG_TEMP_7 0x007 +#define FLAG_TEMP_8 0x008 +#define FLAG_TEMP_9 0x009 +#define FLAG_TEMP_A 0x00A +#define FLAG_TEMP_B 0x00B +#define FLAG_TEMP_C 0x00C +#define FLAG_TEMP_D 0x00D +#define FLAG_TEMP_E 0x00E +#define FLAG_TEMP_F 0x00F +#define FLAG_TEMP_10 0x010 +#define FLAG_TEMP_11 0x011 +#define FLAG_TEMP_12 0x012 +#define FLAG_TEMP_13 0x013 +#define FLAG_TEMP_14 0x014 +#define FLAG_TEMP_15 0x015 +#define FLAG_TEMP_16 0x016 +#define FLAG_TEMP_17 0x017 +#define FLAG_TEMP_18 0x018 +#define FLAG_TEMP_19 0x019 +#define FLAG_TEMP_1A 0x01A +#define FLAG_TEMP_1B 0x01B +#define FLAG_TEMP_1C 0x01C +#define FLAG_TEMP_1D 0x01D +#define FLAG_TEMP_1E 0x01E +#define FLAG_TEMP_1F 0x01F + +#define FLAG_0x020 0x020 +#define FLAG_0x021 0x021 +#define FLAG_0x022 0x022 +#define FLAG_0x023 0x023 +#define FLAG_0x024 0x024 +#define FLAG_0x025 0x025 +#define FLAG_0x026 0x026 +#define FLAG_0x027 0x027 + +// Hide/show flags +#define FLAG_HIDE_BULBASAUR_BALL 0x028 +#define FLAG_HIDE_SQUIRTLE_BALL 0x029 +#define FLAG_HIDE_CHARMANDER_BALL 0x02A +#define FLAG_HIDE_OAK_IN_HIS_LAB 0x02B +#define FLAG_HIDE_OAK_IN_PALLET_TOWN 0x02C +#define FLAG_HIDE_RIVAL_IN_LAB 0x02D +#define FLAG_HIDE_PEWTER_CITY_GYM_ESCORT 0x02E +#define FLAG_HIDE_DOME_FOSSIL 0x02F +#define FLAG_HIDE_HELIX_FOSSIL 0x030 +#define FLAG_HIDE_NUGGET_BRIDGE_ROCKET 0x031 +#define FLAG_HIDE_BILL_CLEFAIRY 0x032 +#define FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE 0x033 +#define FLAG_HIDE_TOWER_FUJI 0x034 +#define FLAG_HIDE_POKEHOUSE_FUJI 0x035 +#define FLAG_HIDE_LIFT_KEY 0x036 +#define FLAG_HIDE_SILPH_SCOPE 0x037 +#define FLAG_HIDE_HIDEOUT_GIOVANNI 0x038 +#define FLAG_HIDE_TOWN_MAP 0x039 +#define FLAG_HIDE_POKEDEX 0x03A +#define FLAG_HIDE_CERULEAN_ROCKET 0x03B +#define FLAG_HIDE_CERULEAN_RIVAL 0x03C +#define FLAG_HIDE_SS_ANNE_RIVAL 0x03D +#define FLAG_HIDE_SAFFRON_ROCKETS 0x03E +#define FLAG_HIDE_SAFFRON_CIVILIANS 0x03F +#define FLAG_HIDE_SEAFOAM_1F_BOULDER_1 0x040 +#define FLAG_HIDE_SEAFOAM_1F_BOULDER_2 0x041 +#define FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 0x042 +#define FLAG_HIDE_SEAFOAM_B1F_BOULDER_2 0x043 +#define FLAG_HIDE_SEAFOAM_B2F_BOULDER_1 0x044 +#define FLAG_HIDE_SEAFOAM_B2F_BOULDER_2 0x045 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 0x046 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 0x047 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 0x048 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 0x049 +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 0x04A +#define FLAG_HIDE_SEAFOAM_B3F_BOULDER_6 0x04B +#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 0x04C +#define FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 0x04D +#define FLAG_HIDE_SILPH_RIVAL 0x04E +#define FLAG_HIDE_ROUTE_22_RIVAL 0x04F +#define FLAG_HIDE_PEWTER_MUSEUM_ESCORT 0x050 +#define FLAG_HIDE_TOWER_RIVAL 0x051 +#define FLAG_HIDE_MOLTRES 0x052 +#define FLAG_HIDE_SILPH_ROCKETS 0x053 +#define FLAG_HIDE_ROUTE_12_SNORLAX 0x054 +#define FLAG_HIDE_VIRIDIAN_GIOVANNI 0x055 +#define FLAG_HIDE_OLD_AMBER 0x056 +#define FLAG_HIDE_EEVEE_BALL 0x057 +#define FLAG_HIDE_VICTORY_ROAD_2F_BOULDER 0x058 +#define FLAG_HIDE_VICTORY_ROAD_3F_BOULDER 0x059 +#define FLAG_HIDE_OAK_IN_CHAMP_ROOM 0x05A +#define FLAG_HIDE_GAME_CORNER_ROCKET 0x05B +#define FLAG_HIDE_CERULEAN_CAVE_GUARD 0x05C +#define FLAG_HIDE_ZAPDOS 0x05D +#define FLAG_HIDE_TOWER_ROCKET_1 0x05E +#define FLAG_HIDE_CELADON_ROCKETS 0x05F +#define FLAG_HIDE_DOJO_HITMONLEE_BALL 0x060 +#define FLAG_HIDE_DOJO_HITMONCHAN_BALL 0x061 +#define FLAG_HIDE_CINNABAR_BILL 0x062 +#define FLAG_HIDE_UNION_ROOM_1 0x063 +#define FLAG_HIDE_UNION_ROOM_2 0x064 +#define FLAG_HIDE_UNION_ROOM_3 0x065 +#define FLAG_HIDE_UNION_ROOM_4 0x066 +#define FLAG_HIDE_UNION_ROOM_5 0x067 +#define FLAG_HIDE_UNION_ROOM_6 0x068 +#define FLAG_HIDE_UNION_ROOM_7 0x069 +#define FLAG_HIDE_UNION_ROOM_8 0x06A +#define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B +#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C +#define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D +#define FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN 0x06E +#define FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY 0x06F +#define FLAG_HIDE_MG_DELIVERYMEN 0x070 +#define FLAG_HIDE_ONE_ISLAND_BILL 0x071 +#define FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL 0x072 +#define FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO 0x073 +#define FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER 0x074 +#define FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE 0x075 +#define FLAG_HIDE_LOSTELLE_IN_HER_HOME 0x076 +#define FLAG_0x077 0x077 +#define FLAG_0x078 0x078 +#define FLAG_HIDE_THREE_ISLAND_BIKERS 0x079 +#define FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST 0x07A +#define FLAG_HIDE_TWO_ISLAND_WOMAN 0x07B +#define FLAG_HIDE_TWO_ISLAND_BEAUTY 0x07C +#define FLAG_HIDE_TWO_ISLAND_SUPER_NERD 0x07D +#define FLAG_HIDE_THREE_ISLAND_ANTIBIKERS 0x07E +#define FLAG_0x07F 0x07F +#define FLAG_0x080 0x080 +#define FLAG_0x081 0x081 +#define FLAG_0x082 0x082 +#define FLAG_HIDE_TOWER_ROCKET_2 0x083 +#define FLAG_HIDE_TOWER_ROCKET_3 0x084 +#define FLAG_0x085 0x085 +#define FLAG_0x086 0x086 +#define FLAG_0x087 0x087 +#define FLAG_0x088 0x088 +#define FLAG_0x089 0x089 +#define FLAG_0x08A 0x08A +#define FLAG_0x08B 0x08B +#define FLAG_0x08C 0x08C +#define FLAG_0x08D 0x08D +#define FLAG_0x08E 0x08E +#define FLAG_0x08F 0x08F +#define FLAG_0x090 0x090 +#define FLAG_0x091 0x091 +#define FLAG_0x092 0x092 +#define FLAG_0x093 0x093 +#define FLAG_0x094 0x094 +#define FLAG_0x095 0x095 +#define FLAG_0x096 0x096 +#define FLAG_0x097 0x097 +#define FLAG_0x098 0x098 +#define FLAG_0x099 0x099 +#define FLAG_0x09A 0x09A +#define FLAG_0x09B 0x09B +#define FLAG_0x09C 0x09C +#define FLAG_0x09D 0x09D +#define FLAG_0x09E 0x09E +#define FLAG_0x09F 0x09F +#define FLAG_0x0A0 0x0A0 +#define FLAG_0x0A1 0x0A1 +#define FLAG_0x0A2 0x0A2 +#define FLAG_0x0A3 0x0A3 +#define FLAG_0x0A4 0x0A4 +#define FLAG_0x0A5 0x0A5 +#define FLAG_0x0A6 0x0A6 +#define FLAG_0x0A7 0x0A7 +#define FLAG_0x0A8 0x0A8 +#define FLAG_0x0A9 0x0A9 +#define FLAG_0x0AA 0x0AA +#define FLAG_0x0AB 0x0AB +#define FLAG_0x0AC 0x0AC +#define FLAG_0x0AD 0x0AD +#define FLAG_0x0AE 0x0AE +#define FLAG_0x0AF 0x0AF +#define FLAG_0x0B0 0x0B0 +#define FLAG_0x0B1 0x0B1 +#define FLAG_0x0B2 0x0B2 +#define FLAG_0x0B3 0x0B3 +#define FLAG_0x0B4 0x0B4 +#define FLAG_0x0B5 0x0B5 +#define FLAG_0x0B6 0x0B6 +#define FLAG_0x0B7 0x0B7 +#define FLAG_0x0B8 0x0B8 +#define FLAG_0x0B9 0x0B9 +#define FLAG_0x0BA 0x0BA +#define FLAG_0x0BB 0x0BB +#define FLAG_0x0BC 0x0BC +#define FLAG_0x0BD 0x0BD +#define FLAG_0x0BE 0x0BE +#define FLAG_0x0BF 0x0BF +#define FLAG_0x0C0 0x0C0 +#define FLAG_0x0C1 0x0C1 +#define FLAG_0x0C2 0x0C2 +#define FLAG_0x0C3 0x0C3 +#define FLAG_0x0C4 0x0C4 +#define FLAG_0x0C5 0x0C5 +#define FLAG_0x0C6 0x0C6 +#define FLAG_0x0C7 0x0C7 +#define FLAG_0x0C8 0x0C8 +#define FLAG_0x0C9 0x0C9 +#define FLAG_0x0CA 0x0CA +#define FLAG_0x0CB 0x0CB +#define FLAG_0x0CC 0x0CC +#define FLAG_0x0CD 0x0CD +#define FLAG_0x0CE 0x0CE +#define FLAG_0x0CF 0x0CF +#define FLAG_0x0D0 0x0D0 +#define FLAG_0x0D1 0x0D1 +#define FLAG_0x0D2 0x0D2 +#define FLAG_0x0D3 0x0D3 +#define FLAG_0x0D4 0x0D4 +#define FLAG_0x0D5 0x0D5 +#define FLAG_0x0D6 0x0D6 +#define FLAG_0x0D7 0x0D7 +#define FLAG_0x0D8 0x0D8 +#define FLAG_0x0D9 0x0D9 +#define FLAG_0x0DA 0x0DA +#define FLAG_0x0DB 0x0DB +#define FLAG_0x0DC 0x0DC +#define FLAG_0x0DD 0x0DD +#define FLAG_0x0DE 0x0DE +#define FLAG_0x0DF 0x0DF +#define FLAG_0x0E0 0x0E0 +#define FLAG_0x0E1 0x0E1 +#define FLAG_0x0E2 0x0E2 +#define FLAG_0x0E3 0x0E3 +#define FLAG_0x0E4 0x0E4 +#define FLAG_0x0E5 0x0E5 +#define FLAG_0x0E6 0x0E6 +#define FLAG_0x0E7 0x0E7 +#define FLAG_0x0E8 0x0E8 +#define FLAG_0x0E9 0x0E9 +#define FLAG_0x0EA 0x0EA +#define FLAG_0x0EB 0x0EB +#define FLAG_0x0EC 0x0EC +#define FLAG_0x0ED 0x0ED +#define FLAG_0x0EE 0x0EE +#define FLAG_0x0EF 0x0EF +#define FLAG_0x0F0 0x0F0 +#define FLAG_0x0F1 0x0F1 +#define FLAG_0x0F2 0x0F2 +#define FLAG_0x0F3 0x0F3 +#define FLAG_0x0F4 0x0F4 +#define FLAG_0x0F5 0x0F5 +#define FLAG_0x0F6 0x0F6 +#define FLAG_0x0F7 0x0F7 +#define FLAG_0x0F8 0x0F8 +#define FLAG_0x0F9 0x0F9 +#define FLAG_0x0FA 0x0FA +#define FLAG_0x0FB 0x0FB +#define FLAG_0x0FC 0x0FC +#define FLAG_0x0FD 0x0FD +#define FLAG_0x0FE 0x0FE +#define FLAG_0x0FF 0x0FF #define FLAG_0x100 0x100 #define FLAG_0x101 0x101 #define FLAG_0x102 0x102 diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h index b6154da17..39c8871e1 100644 --- a/include/constants/map_objects.h +++ b/include/constants/map_objects.h @@ -79,7 +79,7 @@ #define MAP_OBJ_GFX_AGATHA 75 #define MAP_OBJ_GFX_DAISY 76 #define MAP_OBJ_GFX_LORELEI 77 -#define MAP_OBJ_GFX_OLD_MAN_3 78 +#define MAP_OBJ_GFX_MR_FUJI 78 #define MAP_OBJ_GFX_BRUNO 79 #define MAP_OBJ_GFX_BROCK 80 #define MAP_OBJ_GFX_MISTY 81 |