Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added leafs House and 2 new trainers

Browse Source
This commit is contained in:
Suppai_Neko committed 2023-04-04 18:30:33 -07:00
1 parent ac596bf32e
commit b30f237786
49 files changed
+655 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/constants/flags.h
+2 -2
View File
@@ -1222,8 +1222,8 @@
#define FLAG_ITEM_ROUTE_102ext_RARECANDY 0x494 // Unused Flag
#define FLAG_ITEM_TOWN_LITTLEROOT_POTION 0x495 // Unused Flag
#define FLAG_RECEIVED_FEEBASS 0x496 // Unused Flag
#define FLAG_UNUSED_0x497 0x497 // Unused Flag
#define FLAG_UNUSED_0x498 0x498 // Unused Flag
#define FLAG_ITEM_PETALBURGEXT2_WOODS_REVIVE 0x497 // Unused Flag
#define FLAG_LEAFS_ARRIVED 0x498 // Unused Flag
#define FLAG_UNUSED_0x499 0x499 // Unused Flag
#define FLAG_UNUSED_0x49A 0x49A // Unused Flag
#define FLAG_UNUSED_0x49B 0x49B // Unused Flag
include/constants/layouts.h
+3
View File
@@ -453,5 +453,8 @@
#define LAYOUT_PETALBURG_CITY_OLD_RESEARCH_BUILDING 446
#define LAYOUT_PETALBURG_WOODS_EXT 447
#define LAYOUT_ROUTE103EXT 448
#define LAYOUT_PETALBURG_WOODSEXT2 449
#define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE 450
#define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F 451
#endif // GUARD_CONSTANTS_LAYOUTS_H
include/constants/map_groups.h
+3
View File
@@ -184,6 +184,8 @@
#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8))
#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8))
#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8))
#define MAP_RUSTBORO_CITY_LEAFS_HOUSE (17 | (11 << 8))
#define MAP_RUSTBORO_CITY_LEAFS_HOUSE_2F (18 | (11 << 8))
// gMapGroup_IndoorFortree
#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8))
@@ -407,6 +409,7 @@
#define MAP_ALTERING_CAVE (106 | (24 << 8))
#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8))
#define MAP_PETALBURG_WOODS_EXT (108 | (24 << 8))
#define MAP_PETALBURG_WOODSEXT2 (109 | (24 << 8))
// gMapGroup_IndoorDynamic
#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8))
include/constants/opponents.h
+4 -2
View File
@@ -857,12 +857,14 @@
#define TRAINER_BRENDAN_PLACEHOLDER 853
#define TRAINER_MAY_PLACEHOLDER 854
#define TRAINER_BART 855
#define TRAINER_LEWIS 856
#define TRAINER_COLEMAN 867
// NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
// More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled
// MAX_TRAINERS_COUNT can be increased but will take up additional saveblock space
#define TRAINERS_COUNT 856
#define MAX_TRAINERS_COUNT 864
#define TRAINERS_COUNT 868
#define MAX_TRAINERS_COUNT 900//864
#endif // GUARD_CONSTANTS_OPPONENTS_H