Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-30 12:59:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master'

Browse Source
This commit is contained in:
cawtds
2024-08-29 22:49:05 +02:00
parent a468febc86 539ed36160
commit 88969eece2
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/event_object_movement.c
View File

@@ -3280,15 +3280,12 @@ u8 CameraObjectGetFollowedObjectId(void)
void CameraObjectReset2(void)
{
struct Sprite *cameraObject = FindCameraObject();
#ifdef UBFIX
struct Sprite* cameraObject = FindCameraObject();
if (cameraObject == NULL)
return;
cameraObject->data[1] = 2;
#else
FindCameraObject()->data[1] = 2;
#endif
cameraObject->data[1] = 2;
}
u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)

2
src/link_rfu_2.c
View File

@@ -1831,7 +1831,7 @@ static void ReceiveRfuLinkPlayers(const struct SioInfo *sioInfo)
// Could be relocated to top of file, but would also require relocating assert strings
static const char sASCII_PokemonSioInfo[] = "PokemonSioInfo";
static const u8 sText_Akito[] = _("　あきと"); // Presumably "Akito Mori", one of Game Freak's programmers
ALIGNED(4) static const u8 sText_Akito[] = _("あきと"); // Presumably "Akito Mori", one of Game Freak's programmers
static const char sASCII_LinkLossDisconnect[] = "LINK LOSS DISCONNECT!";
static const char sASCII_LinkLossRecoveryNow[] = "LINK LOSS RECOVERY NOW";
ALIGNED(4) static const char sASCII_30Spaces[] = {" "};

2
src/mon_markings.c
View File

@@ -22,7 +22,7 @@ static struct Sprite *CreateMarkingComboSprite(u16, u16, const u16 *, u16);
static const u16 sMonMarkings_Pal[] = INCBIN_U16("graphics/misc/mon_markings.gbapal");
static const u16 sMonMarkings_Gfx[] = INCBIN_U16("graphics/misc/mon_markings.4bpp");
static const u8 sUnused[] = {0x09, 0x50, 0x13, 0x02, 0xFF};
static const u8 sJPText_Confirm[] = _("けってい");
static const struct OamData sOamData_MenuWindow =
{