dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pret/pokefirered into union_room

Browse Source
This commit is contained in:
PikalaxALT
2020-01-22 12:38:19 -05:00
parent 0495cce904 e97d3532d4
commit 2d4be89ee5
175 changed files with 2750 additions and 2724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle.h
-1
View File
@@ -45,7 +45,6 @@
#define B_ACTION_NONE 0xFF
#define MAX_TRAINER_ITEMS 4
#define MAX_MON_MOVES 4
// array entries for battle communication
#define MULTIUSE_STATE 0x0
include/constants/daycare.h
+27
View File
@@ -0,0 +1,27 @@
#ifndef GUARD_DAYCARE_CONSTANTS_H
#define GUARD_DAYCARE_CONSTANTS_H
// Parent compatability scores
#define PARENTS_INCOMPATIBLE 0
#define PARENTS_LOW_COMPATIBILITY 20
#define PARENTS_MED_COMPATABILITY 50
#define PARENTS_MAX_COMPATABILITY 70
// Daycare state
#define DAYCARE_NO_MONS 0
#define DAYCARE_EGG_WAITING 1
#define DAYCARE_ONE_MON 2
#define DAYCARE_TWO_MONS 3
#define INHERITED_IV_COUNT 3
#define EGG_HATCH_LEVEL 5
#define EGG_GENDER_MALE 0x8000 // used to create a male egg from a female-only parent species (e.g. Nidoran)
#define DAYCARE_LEVEL_MENU_EXIT 5
#define DAYCARE_EXITED_LEVEL_MENU 2 // would be redundant with above if GF had used the same value
// Array buffers
#define EGG_MOVES_ARRAY_COUNT 10
#define EGG_LVL_UP_MOVES_ARRAY_COUNT 50
#endif //GUARD_DAYCARE_CONSTANTS_H
include/constants/flags.h
+9 -9
View File
@@ -104,14 +104,14 @@
#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_UNION_ROOM_PLAYER_1 0x063
#define FLAG_HIDE_UNION_ROOM_PLAYER_2 0x064
#define FLAG_HIDE_UNION_ROOM_PLAYER_3 0x065
#define FLAG_HIDE_UNION_ROOM_PLAYER_4 0x066
#define FLAG_HIDE_UNION_ROOM_PLAYER_5 0x067
#define FLAG_HIDE_UNION_ROOM_PLAYER_6 0x068
#define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x069
#define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x06A
#define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B
#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C
#define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D
@@ -450,7 +450,7 @@
#define FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL 0x1B6
#define FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE 0x1B7
#define FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL 0x1B8
#define FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY 0x1B9
#define FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY 0x1B9
#define FLAG_HIDE_TWO_ISLAND_REVIVE 0x1BA
#define FLAG_HIDE_THREE_ISLAND_ZINC 0x1BB
#define FLAG_0x1BC 0x1BC
include/constants/global.h
+3
View File
@@ -36,6 +36,7 @@
#define MALE 0
#define FEMALE 1
#define GENDER_COUNT 2
#define OPTIONS_BUTTON_MODE_HELP 0
#define OPTIONS_BUTTON_MODE_LR 1
@@ -59,6 +60,8 @@
#define NUM_BAG_POCKETS 5
#define MAX_MON_MOVES 4
#define PARTY_SIZE 6
#define MULTI_PARTY_SIZE (PARTY_SIZE / 2)
include/constants/layouts.h
+5 -5
View File
@@ -180,10 +180,10 @@
#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F 195
#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F 196
#define LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF 197
#define LAYOUT_SAFARI_ZONE_BUILDING 198
#define LAYOUT_SAFARI_ZONE_REST_HOUSE 198
#define LAYOUT_SAFARI_ZONE_SECRET_HOUSE 199
#define LAYOUT_FUCHSIA_CITY_ZOO_BUILDING 200
#define LAYOUT_FUCHSIA_CITY_BUILDING1 201
#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE 200
#define LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE 201
#define LAYOUT_FUCHSIA_CITY_HOUSE2 202
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE 203
#define LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE 204
@@ -260,8 +260,8 @@
#define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275
#define LAYOUT_VIRIDIAN_CITY_HOUSE1 276
#define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277
#define LAYOUT_UNUSED_LAYOUT_833B6EC 278
#define LAYOUT_UNUSED_LAYOUT_833BE30 279
#define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278
#define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279
#define LAYOUT_MT_EMBER_EXTERIOR 280
#define LAYOUT_MT_EMBER_SUMMIT 281
#define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282
include/constants/map_groups.h
+6 -6
View File
@@ -76,10 +76,10 @@
#define MAP_SAFARI_ZONE_EAST (64 | (1 << 8))
#define MAP_SAFARI_ZONE_NORTH (65 | (1 << 8))
#define MAP_SAFARI_ZONE_WEST (66 | (1 << 8))
#define MAP_SAFARI_ZONE_BUILDING1 (67 | (1 << 8))
#define MAP_SAFARI_ZONE_BUILDING2 (68 | (1 << 8))
#define MAP_SAFARI_ZONE_BUILDING3 (69 | (1 << 8))
#define MAP_SAFARI_ZONE_BUILDING4 (70 | (1 << 8))
#define MAP_SAFARI_ZONE_CENTER_REST_HOUSE (67 | (1 << 8))
#define MAP_SAFARI_ZONE_EAST_REST_HOUSE (68 | (1 << 8))
#define MAP_SAFARI_ZONE_NORTH_REST_HOUSE (69 | (1 << 8))
#define MAP_SAFARI_ZONE_WEST_REST_HOUSE (70 | (1 << 8))
#define MAP_SAFARI_ZONE_SECRET_HOUSE (71 | (1 << 8))
#define MAP_CERULEAN_CAVE_1F (72 | (1 << 8))
#define MAP_CERULEAN_CAVE_2F (73 | (1 << 8))
@@ -342,12 +342,12 @@
// Map Group 11
#define MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE (0 | (11 << 8))
#define MAP_FUCHSIA_CITY_MART (1 | (11 << 8))
#define MAP_FUCHSIA_CITY_ZOO_BUILDING (2 | (11 << 8))
#define MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE (2 | (11 << 8))
#define MAP_FUCHSIA_CITY_GYM (3 | (11 << 8))
#define MAP_FUCHSIA_CITY_HOUSE1 (4 | (11 << 8))
#define MAP_FUCHSIA_CITY_POKEMON_CENTER_1F (5 | (11 << 8))
#define MAP_FUCHSIA_CITY_POKEMON_CENTER_2F (6 | (11 << 8))
#define MAP_FUCHSIA_CITY_BUILDING1 (7 | (11 << 8))
#define MAP_FUCHSIA_CITY_WARDENS_HOUSE (7 | (11 << 8))
#define MAP_FUCHSIA_CITY_HOUSE2 (8 | (11 << 8))
#define MAP_FUCHSIA_CITY_HOUSE3 (9 | (11 << 8))
include/constants/menu.h
+31
View File
@@ -78,4 +78,35 @@
#define LISTMENU_BERRY_POWDER 5
#define LISTMENU_TRAINER_TOWER_FLOORS 6
// Std String Ids
#define STDSTRING_COOL 0
#define STDSTRING_BEAUTY 1
#define STDSTRING_CUTE 2
#define STDSTRING_SMART 3
#define STDSTRING_TOUGH 4
#define STDSTRING_COOL2 5
#define STDSTRING_BEAUTY2 6
#define STDSTRING_CUTE2 7
#define STDSTRING_SMART2 8
#define STDSTRING_TOUGH2 9
#define STDSTRING_ITEMS 10
#define STDSTRING_KEY_ITEMS 11
#define STDSTRING_POKEBALLS 12
#define STDSTRING_TMHMS 13
#define STDSTRING_BERRIES 14
#define STDSTRING_BOULDER_BADGE 15
#define STDSTRING_CASCADE_BADGE 16
#define STDSTRING_THUNDER_BADGE 17
#define STDSTRING_RAINBOW_BADGE 18
#define STDSTRING_SOUL_BADGE 19
#define STDSTRING_MARSH_BADGE 20
#define STDSTRING_VOLCANO_BADGE 21
#define STDSTRING_EARTH_BADGE 22
#define STDSTRING_COINS 23
#define STDSTRING_ITEMS_POCKET 24
#define STDSTRING_KEY_ITEMS_POCKET 25
#define STDSTRING_POKEBALLS_POCKET 26
#define STDSTRING_TM_CASE 27
#define STDSTRING_BERRY_POUCH 28
#endif //GUARD_CONSTANTS_MENU_H
include/constants/metatile_labels.h
+6
View File
@@ -1,6 +1,9 @@
#ifndef GUARD_METATILE_LABELS_H
#define GUARD_METATILE_LABELS_H
// General
#define METATILE_General_CalmWater 0x12B
// Pokemon Mansion
#define METATILE_PokemonMansion_Floor 0x284
#define METATILE_PokemonMansion_Floor_ShadeFull 0x285
@@ -34,4 +37,7 @@
#define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E
#define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F
// gTileset_82D504C. Below metatile probably needs generic name
#define METATILE_MtEmber_CaveEntrance 0x346
#endif // GUARD_METATILE_LABELS_H
include/constants/pokemon.h
+2
View File
@@ -131,6 +131,8 @@
#define EGG_GROUP_DRAGON 14
#define EGG_GROUP_UNDISCOVERED 15
#define EGG_GROUPS_PER_MON 2
// Pokemon natures
#define NATURE_HARDY 0
#define NATURE_LONELY 1
include/constants/region_map.h
+3 -1
View File
@@ -206,6 +206,8 @@
#define MAPSEC_SPECIAL_AREA 0xC4
#define MAPSEC_NONE 0xC5
#define MAPSEC_IN_GAME_TRADE 0xFE
#define METLOC_SPECIAL_EGG 0xFD
#define METLOC_IN_GAME_TRADE 0xFE
#define METLOC_FATEFUL_ENCOUNTER 0xFF
#endif //GUARD_CONSTANTS_REGION_MAP_H
include/daycare.h
-2
View File
@@ -3,8 +3,6 @@
#include "global.h"
#define EGG_HATCH_LEVEL 5
u8 *GetMonNick(struct Pokemon *mon, u8 *dest);
u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest);
u8 CountPokemonInDaycare(struct DayCare *daycare);
include/event_scripts.h
+5 -5
View File
@@ -1148,10 +1148,10 @@ extern const u8 EventScript_FldEffStrength[];
extern const u8 EventScript_FailSweetScent[];
extern const u8 EventScript_FldEffRockSmash[];
extern const u8 EventScript_SafariTimesUp[];
extern const u8 EventScript_SafariRetire[];
extern const u8 EventScript_SafariWarpOut[];
extern const u8 EventScript_SafariOutOfBalls[];
extern const u8 SafariZone_EventScript_TimesUp[];
extern const u8 SafariZone_EventScript_RetirePrompt[];
extern const u8 SafariZone_EventScript_OutOfBallsMidBattle[];
extern const u8 SafariZone_EventScript_OutOfBalls[];
extern const u8 EventScript_ItemfinderDigUpUnderfootItem[];
@@ -1162,7 +1162,7 @@ extern const u8 EventScript_TryDoNormalTrainerBattle[];
extern const u8 EventScript_TryDoDoubleRematchBattle[];
extern const u8 EventScript_TryDoRematchBattle[];
extern const u8 gUnknown_81A4EB4[];
extern const u8 EventScript_1C555B[];
extern const u8 Test_EventScript_Sign[];
// new_game
extern const u8 EventScript_ResetAllMapFlags[];