atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style fixes

Browse source
This commit is contained in:
Eduardo Quezada 2024-05-21 18:57:09 -04:00
parent 05e58c70e6
commit 2fe18c22f9
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/maps/Route117/scripts.inc
View file

@ -28,13 +28,9 @@ Route117_OnTransition:
Route117_EventScript_ShowDaycareMon1:
@ set pokemon movement type based on compatibility
special SetDaycareCompatibilityString
@ 0:
call_if_eq VAR_RESULT, PARENTS_INCOMPATIBLE, Route117_EventScript_DaycareMonIncompatible
@ 20: do nothing if low compatibility
@ call_if_eq VAR_RESULT, PARENTS_LOW_COMPATIBILITY, Route117_EventScript_DaycareMonLowCompatibility
@ 50:
@ Don't do anything if PARENTS_LOW_COMPATIBILITY
call_if_eq VAR_RESULT, PARENTS_MED_COMPATIBILITY, Route117_EventScript_DaycareMonMedCompatibility
@ 70:
call_if_eq VAR_RESULT, PARENTS_MAX_COMPATIBILITY, Route117_EventScript_DaycareMonMaxCompatibility
clearflag FLAG_TEMP_2
Route117_EventScript_ShowDaycareMon0:

2
data/scripts/follower.inc
View file

@ -1,5 +1,5 @@
gText_FollowerLovesYou::
.string "{STR_VAR_1} is regarding you with\nadoration!$"
.string "{STR_VAR_1} is regarding you with\nadoration!$"
gText_FollowerLostInThought::
.string "{STR_VAR_1} seems lost in thought.$"

6
gflib/sprite.c
View file

@ -1736,13 +1736,15 @@ bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u
static const u8 sSpanPerImage[4][4] =
{
[ST_OAM_SQUARE] = {
[ST_OAM_SQUARE] =
{
[ST_OAM_SIZE_0] = 0, // SPRITE_SIZE_8x8
[ST_OAM_SIZE_1] = 2, // SPRITE_SIZE_16x16
[ST_OAM_SIZE_2] = 4, // SPRITE_SIZE_32x32
[ST_OAM_SIZE_3] = 6 // SPRITE_SIZE_64x64
},
[ST_OAM_H_RECTANGLE ... ST_OAM_V_RECTANGLE] = {
[ST_OAM_H_RECTANGLE ... ST_OAM_V_RECTANGLE] =
{
[ST_OAM_SIZE_0] = 1, // SPRITE_SIZE_16x8
[ST_OAM_SIZE_1] = 2, // SPRITE_SIZE_32x8
[ST_OAM_SIZE_2] = 3, // SPRITE_SIZE_32x16

4
include/event_object_movement.h
View file

@ -134,10 +134,10 @@ void SetSpritePosToOffsetMapCoords(s16 *x, s16 *y, s16 dx, s16 dy);
void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite);
void ObjectEventClearHeldMovement(struct ObjectEvent *);
void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *);
struct Pokemon * GetFirstLiveMon(void);
struct Pokemon *GetFirstLiveMon(void);
void UpdateFollowingPokemon(void);
void RemoveFollowingPokemon(void);
struct ObjectEvent * GetFollowerObject(void);
struct ObjectEvent *GetFollowerObject(void);
void TrySpawnObjectEvents(s16 cameraX, s16 cameraY);
u8 CreateObjectGraphicsSprite(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority);
u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);