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

Added Route 114 south

Browse Source
This commit is contained in:
Suppai_Neko committed 2023-04-20 07:44:34 -07:00
1 parent ce2baad217
commit d6066d9fe0
8 files changed
+203 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/layouts/Route117South/map.bin
+1 -1
View File
@@ -1 +1 @@
И0Ё0Ё0Ё0Ё0Ё0Ё0К00000Ц0Ц0Ц0Ц0Ц0000000 1"100000000000000000И0Ё0Ё0Ё0Ё0Ё0Ё0Т0Б0Б0Б0В0Ц0Ц0Ц0Ц0Ц0000001!1"100000000000000000И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К0Ц0Ц0Ц00Ц000000 1!1*100000000000000000И0-0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К0Ц0Ц0Ц00000000 1"10000000000000000000Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К00Ц0Ц00000000 1"1000000000000000000Ц0Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К00Ц0Ц00000000 1"1000000000000000000Ц0Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К000Ц0Ц0Ц000000 1"1000000000000000000Ц0Ц0И0Ё0Ё0Ё0Ё0Ё0Ё0Ё0Ё0К000Ц0Ц0Ц000000 1"1000000000000000000Ц00000И0Ё0Ё0Ё0Ё0Ё0К00000000001!1!1100000000000000000Ц0 0 0 00И0Ё0Ё0Ё0Ё0Ё0К0000000001!1!1!1!111111111100000000Ц0 0 0 0 0И0Ё0Ё0Ё0Ё0Ё0К000000000 1!1)1)1)1)1)1)1)1)1)1)1!1!111100000Ц0 0 0 0 0И0Ё0Ё0Ё0Ё0Ё0К000000001!1"10000000000(1)1)1!1!111000Ц0 0 0 0 0И0Ё0Ё0Ё0Ё0Ё0К00000001!1!1*10000000000000(1)1!1!1100Ц000 0 0И0Ё0Ё0Ё0Ё0Ё0К0000011!1!1*10000000000000000(1!1!110Ц0Ц0Ц00000000000011!1!1)1*1000000000000000000(1)1*10Ц0Ц0Ц0Ц00000111111!1!1)1*1000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц00(1)1)1)1)1)1)1*100000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц0Ц00000000000000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц0Ц00000000000000000000000000000000000Ц0Ц0Ц0Ц0Ц0Ц0Ц0Ц00000000000000000000000000000000000
Έ΅΅΅΅΅΅ΊΖΖΖΖΖΖΖΖΖΖΖΖ00 1"1ΗΗΗΗΗΗΗΗΗΈ΅΅΅΅΅΅Β±±±²ΖΖΖΖΖΖΖΖΖΖΖΖ2 1"100ΗΗΗ000ΗΈ΅΅΅΅΅΅΅΅΅΅ΊΖΖΖΖ00 1"1 2000000000Έ-΅΅΅΅΅΅΅΅΅ΊΖΖΖ000Ξ1Ο100000 1"1000000€‘‘‘Η0000ΖΈ΅΅΅΅΅΅΅΅ΊΖΖ0000ΦΧ00001!1"1Ξ1Ο10000�000000ΖΖΈ΅΅΅΅΅΅΅΅Ί0ΖΖ0000δε0001!1!1*1ΦΧ0000�Ξ1Ο100ΗΗΗΖΖΈ΅΅΅΅΅΅΅΅Ί0ΖΖΖ0000000 1!1*10ήί0022�ΦΧ00ΖΖΈ΅΅΅΅΅΅΅΅Ί00ΖΖΖ2000000 1"100ΤΥ0022�δε0ƒ2„2„2„2Ζ000Έ΅΅΅΅΅Ί 000000000 1"100δε0000�000‹���Ζ 0 0 00Έ΅΅΅΅΅Ί 0 00000001111!1!111111111²000 ¤΅£Ζ 0 0 0 0Έ΅΅΅΅΅Ί 0 0 002200 1!1)1)1)1)1)1)1)1)1)1)1!1!1111¨¬©«Ζ 0 0 0 0Έ΅΅΅΅΅Ί 0 0 002201!1"10000000000(1)1)1!1!111120Ζ 0 0 0 0Έ΅΅΅΅΅Ί 0 000001!1!1*1000220000000Ί(1)1)1)1*100Ζ00 0 0Έ΅΅΅΅΅Ί 000011!1!1*100Ξ1Ο1000000220�000000ΗΖΖΖ0000000000011!1!1)1*1200ΦΧ000000220�222222ΗΖΖΖΖ0000111111!1!1)1*100000δε000200000�222222ΗΖΖΖΖΖΖΖ0(1)1)1)1)1)1)1*1000000000000000000�‘‘‘‘‘‘ΗΖΖΖΖΖΖΖΖ0000 20000000000000ΖΗΖΗΖΗΖΗ0000000ΗΖΖΖΖΖΖΖΖΖΗΖΗ000ΖΗΖΗ00ΖΗΖΗΖΗΖΗΖΗΖΗΖΗ00ΖΗΖΗΖΖΖΖΖΖΖΖΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗΖΗ
data/maps/Route117South/map.json
+78 -1
View File
@@ -20,7 +20,84 @@
}
],
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"x": 8,
"y": 14,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 33,
"y": 8,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route117South_EventScript_Martina",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 33,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "4",
"script": "Route117South_EventScript_Marika",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_AZURILL",
"x": 39,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_ABRA",
"x": 17,
"y": 11,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F",
"x": 22,
"y": 10,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT",
"movement_range_x": 9,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NORMAL",
"trainer_sight_or_berry_tree_id": "3",
"script": "Route117South_EventScript_Philis",
"flag": "0"
}
],
"warp_events": [
data/maps/Route117South/scripts.inc
+47
View File
@@ -1,2 +1,49 @@
Route117South_MapScripts::
.byte 0
Route117South_Text_PhilisIntro:
.string "Running electrifies my muscles!$"
Route117South_Text_PhilisDefeat:
.string "I really need to work on my cardio more.$"
Route117South_Text_PhilisPostBattle:
.string "Gotta keep charging for the next battle.$"
Route117South_EventScript_Philis::
trainerbattle_single TRAINER_PHILIS, Route117South_Text_PhilisIntro, Route117South_Text_PhilisDefeat
msgbox Route117South_Text_PhilisPostBattle, MSGBOX_AUTOCLOSE
end
Route117South_Text_MarikaIntro:
.string "Me and my girlfriend always battle\n"
.string "together.$"
Route117South_Text_MarikaDefeat:
.string "We lost?!?.$"
Route117South_Text_MarikaPostBattle:
.string "Battling together really tests our bond.$"
Route117South_EventScript_Marika::
trainerbattle_single TRAINER_MARIKA, Route117South_Text_MarikaIntro, Route117South_Text_MarikaDefeat
msgbox Route117South_Text_MarikaPostBattle, MSGBOX_AUTOCLOSE
end
Route117South_Text_MartinaIntro:
.string "Me and my girlfriend always battle\n"
.string "together.$"
Route117South_Text_MartinaDefeat:
.string "We lost?!?.$"
Route117South_Text_MartinaPostBattle:
.string "Battling together really tests our bond.$"
Route117South_EventScript_Martina::
trainerbattle_single TRAINER_MARTINA, Route117South_Text_MartinaIntro, Route117South_Text_MartinaDefeat
msgbox Route117South_Text_MartinaPostBattle, MSGBOX_AUTOCLOSE
end
include/constants/layouts.h
+1
View File
@@ -465,5 +465,6 @@
#define LAYOUT_ROUTE116EXT 458
#define LAYOUT_ROUTE101WEST 459
#define LAYOUT_ROUTE117NORTH 460
#define LAYOUT_ROUTE117SOUTH 461
#endif // GUARD_CONSTANTS_LAYOUTS_H
include/constants/opponents.h
+3
View File
@@ -866,6 +866,9 @@
#define TRAINER_KATE 872
#define TRAINER_KATE_2 873
#define TRAINER_COLEMAN_2 874
#define TRAINER_MARTINA 875
#define TRAINER_PHILIS 876
#define TRAINER_MARIKA 877
// 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
src/data/map_group_count.h
+1 -1
View File
@@ -1 +1 @@
static const u8 MAP_GROUP_COUNT[] = {68, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
static const u8 MAP_GROUP_COUNT[] = {69, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 19, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 114, 61, 89, 2, 1, 13, 1, 1, 3, 1, 0};
src/data/trainer_parties.h
+39
View File
@@ -147,6 +147,45 @@ static const struct TrainerMonItemCustomMoves sParty_coleman[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_philis[] = {
{
.iv = 0,
.lvl = 18,
.species = SPECIES_PIKACHU,
},
{
.iv = 50,
.lvl = 19,
.species = SPECIES_RAICHU,
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_marika[] = {
{
.iv = 255,
.lvl = 21,
.species = SPECIES_PLUSLE,
},
{
.iv = 255,
.lvl = 23,
.species = SPECIES_MINUN,
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_martina[] = {
{
.iv = 255,
.lvl = 21,
.species = SPECIES_PICHU,
},
{
.iv = 255,
.lvl = 23,
.species = SPECIES_ELEKID,
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Sawyer1[] = {
{
.iv = 0,
src/data/trainers.h
+33
View File
@@ -10377,4 +10377,37 @@ const struct Trainer gTrainers[] = {
.aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_TRY_TO_FAINT | AI_FLAG_CHECK_VIABILITY,
.party = ITEM_CUSTOM_MOVES(sParty_coleman2),
},
[TRAINER_MARTINA] =
{
.trainerClass = TRAINER_CLASS_BEAUTY,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_BEAUTY,
.trainerName = _("MARTINA"),
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_DEFAULT_MOVES(sParty_martina),
},
[TRAINER_PHILIS] =
{
.trainerClass = TRAINER_CLASS_TRIATHLETE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
.trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
.trainerName = _("PHILIS"),
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_DEFAULT_MOVES(sParty_philis),
},
[TRAINER_MARIKA] =
{
.trainerClass = TRAINER_CLASS_BATTLE_GIRL,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
.trainerPic = TRAINER_PIC_BATTLE_GIRL,
.trainerName = _("MARIKA"),
.items = {},
.doubleBattle = FALSE,
.aiFlags = 0,
.party = NO_ITEM_DEFAULT_MOVES(sParty_marika),
},
};