diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 82e985f85..a70367470 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -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) diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index d65d65723..eccefe1a9 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -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[] = {" "}; diff --git a/src/mon_markings.c b/src/mon_markings.c index 222c93016..89b573e66 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -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 = {