Epsilon_02/pokeemerald-modern
1
0
Fork 0
mirror of https://github.com/resetes12/pokeemerald synced 2025-10-05 16:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Followers 143500a && f6efe48: capitalization in follower splash message & ignore trainerRange on OW templates when trainerType nonzero

Browse Source
This commit is contained in:
resetes12
2025-08-18 13:04:19 +02:00
parent 8da70747b3
commit ed20a19c0d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/event_object_movement.c
View File

@@ -1808,7 +1808,7 @@ static u16 PackGraphicsId(const struct ObjectEventTemplate *template) {
if (template->script && template->script[0] == 0x7d) {
form = T1_READ_16(&template->script[2]);
form = (form >> 10) & 0x1F;
} else if (template->trainerRange_berryTreeId) {
} else if (template->trainerRange_berryTreeId && !template->trainerType) {
form = template->trainerRange_berryTreeId & 0x1F;
}
graphicsId |= form << OBJ_EVENT_GFX_SPECIES_BITS;

2
src/follower_helper.c
View File

@@ -36,7 +36,7 @@ static const u8 sCondMsg16[] = _("{STR_VAR_1} doesn't want to get off\nthe boat
static const u8* const sBoatTexts[] = {sCondMsg14, sCondMsg15, sCondMsg16, NULL};
static const u8 sCondMsg17[] = _("{STR_VAR_1} is listening to the\nsound of the machines.");
static const u8* const sMachineTexts[] = {sCondMsg13, sCondMsg17, NULL};
static const u8 sCondMsg18[] = _("Waah! your POKéMON suddenly splashed\nwater!");
static const u8 sCondMsg18[] = _("Waah! Your POKéMON suddenly splashed\nwater!");
static const u8 sCondMsg19[] = _("Your POKéMON is blowing sand in the\nair!");
static const u8 sCondMsg20[] = _("{STR_VAR_1} is playing around,\nplucking bits of grass.");
static const u8 sCondMsg21[] = _("Your POKéMON is happily looking at\nyour footprints!");

1
tools/mapjson/json11.cpp
View File

@@ -20,6 +20,7 @@
#include "json11.h"
#include <cassert>
#include <cmath>
#include <cstdint>
#include <cstdlib>
#include <cstdio>
#include <limits>