Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-25 03:30:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanups (#2318)

Browse Source 
* Cleanup commas in .macro

* Cleanup src/item_use.c post #2313

* Cleanup src/fieldmap.c post #2314

* s/int/s32/g in fieldmap.h/fieldmap.c

* Cleanup src/battle_pyramid.c post #2310

* Cleanup src/battle_anim_effects_2.c post #2266
This commit is contained in:
Martin Griffin
2026-06-17 15:36:35 +01:00
committed by GitHub
parent 9424eaf622 030b1781cd
commit 5a9f566bbd
7 changed files with 108 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@@ -301,7 +301,7 @@
@
@ implicit is set when a waitstate is generated as part of another command (e.g. special)
@ if an implicit waitstate is immediately followed by another waitstate, a warning is raised
.macro waitstate, implicit=0
.macro waitstate implicit=0
.if _last_implicit_waitstate == .
.warning "explicit waitstate follows implicit waitstate, ignoring"
.else

2
data/script_cmd_table.inc
View File

@@ -1,6 +1,6 @@
.ifndef SCRIPT_CMD_TABLE_ENTRY_MACRO
.set SCRIPT_CMD_TABLE_ENTRY_MACRO, 1
.macro script_cmd_table_entry constant:req value:req
.macro script_cmd_table_entry constant:req, value:req
.if ALLOCATE_SCRIPT_CMD_TABLE
.4byte \value
.else

22
include/fieldmap.h
View File

@@ -23,19 +23,19 @@
extern struct BackupMapLayout gBackupMapLayout;
int MapGridGetMetatileIdAt(int x, int y);
int MapGridGetMetatileBehaviorAt(int x, int y);
void MapGridSetMetatileIdAt(int x, int y, u16 metatile);
void MapGridSetMetatileEntryAt(int x, int y, u16 metatile);
s32 MapGridGetMetatileIdAt(s32 x, s32 y);
s32 MapGridGetMetatileBehaviorAt(s32 x, s32 y);
void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatile);
void MapGridSetMetatileEntryAt(s32 x, s32 y, u16 metatile);
void GetCameraCoords(u16 *x, u16 *y);
u8 MapGridGetCollisionAt(int x, int y);
int GetMapBorderIdAt(int x, int y);
bool32 CanCameraMoveInDirection(int direction);
u8 MapGridGetCollisionAt(s32 x, s32 y);
s32 GetMapBorderIdAt(s32 x, s32 y);
bool32 CanCameraMoveInDirection(s32 direction);
u16 GetMetatileAttributesById(u16 metatile);
void GetCameraFocusCoords(u16 *x, u16 *y);
u8 MapGridGetMetatileLayerTypeAt(int x, int y);
u8 MapGridGetElevationAt(int x, int y);
bool8 CameraMove(int x, int y);
u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y);
u8 MapGridGetElevationAt(s32 x, s32 y);
bool8 CameraMove(s32 x, s32 y);
void SaveMapView(void);
void SetCameraFocusCoords(u16 x, u16 y);
void InitMap(void);
@@ -50,7 +50,7 @@ void CopyPrimaryTilesetToVram(struct MapLayout const *mapLayout);
void CopySecondaryTilesetToVram(struct MapLayout const *mapLayout);
const struct MapHeader *const GetMapHeaderFromConnection(const struct MapConnection *connection);
const struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y);
void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable);
void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 impassable);
// field_region_map.c
void FieldInitRegionMap(MainCallback callback);

12
src/battle_anim_effects_2.c
View File

@@ -3474,9 +3474,13 @@ static void AnimOrbitScatter_Step(struct Sprite *sprite)
{
sprite->x2 += sprite->data[0];
sprite->y2 += sprite->data[1];
if (sprite->x + sprite->x2 > (DISPLAY_WIDTH + 16) || sprite->x + sprite->x2 < -16 ||
sprite->y + sprite->y2 > DISPLAY_HEIGHT || sprite->y + sprite->y2 < -16)
if (sprite->x + sprite->x2 > (DISPLAY_WIDTH + 16)
|| sprite->x + sprite->x2 < -16
|| sprite->y + sprite->y2 > DISPLAY_HEIGHT
|| sprite->y + sprite->y2 < -16)
{
DestroyAnimSprite(sprite);
}
}
static void AnimSpitUpOrb_Step(struct Sprite *sprite)
@@ -3736,9 +3740,9 @@ static void AnimPerishSongMusicNote(struct Sprite *sprite)
sprite->data[1] = sprite->data[0] / 2;
index = ((sprite->data[0] * 3) + sprite->data[3]) & 0xff;
index = ((sprite->data[0] * 3) + sprite->data[3]) & 0xFF;
sprite->data[6] += 10;
sprite->data[6] &= 0xff;
sprite->data[6] &= 0xFF;
sprite->x2 = Cos(index, 100);

12
src/battle_pyramid.c
View File

@@ -1016,12 +1016,13 @@ static void HidePyramidItem(void)
{
// Rather than using event flags to hide the item object event,
// it moves them far off the map bounds.
events[i].x = SHRT_MAX;
events[i].y = SHRT_MAX;
events[i].x = INT16_MAX;
events[i].y = INT16_MAX;
break;
}
i++;
} while (events[i].localId != LOCALID_NONE);
}
while (events[i].localId != LOCALID_NONE);
}
static void SetPyramidFacilityTrainers(void)
@@ -1298,7 +1299,7 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx
return textIndex;
}
}
map += MAP_OFFSET_W + 32;
map += MAP_OFFSET_W + 32; // HINT: x == 32.
}
return textIndex;
@@ -1538,7 +1539,8 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio
gBackupMapLayout.width = mapLayout->width * PYRAMID_FLOOR_SQUARES_WIDE + MAP_OFFSET_W;
gBackupMapLayout.height = mapLayout->height * PYRAMID_FLOOR_SQUARES_HIGH + MAP_OFFSET_H;
map = gBackupMapLayout.map;
map += (gBackupMapLayout.width * (MAP_OFFSET + (i / PYRAMID_FLOOR_SQUARES_WIDE * mapLayout->height)) + MAP_OFFSET + (i % PYRAMID_FLOOR_SQUARES_WIDE * mapLayout->width));
map += gBackupMapLayout.width * (MAP_OFFSET + (i / PYRAMID_FLOOR_SQUARES_WIDE * mapLayout->height))
+ MAP_OFFSET + (i % PYRAMID_FLOOR_SQUARES_WIDE * mapLayout->width);
for (y = 0; y < mapLayout->height; y++)
{
for (x = 0; x < mapLayout->width; x++)

145
src/fieldmap.c
View File

@@ -44,9 +44,9 @@ static void FillEastConnection(struct MapHeader const *mapHeader, struct MapHead
static void InitBackupMapLayoutConnections(const struct MapHeader *mapHeader);
static void LoadSavedMapView(void);
static bool8 SkipCopyingMetatileFromSavedMap(u16 *mapBlock, u16 mapWidth, u8 yMode);
static const struct MapConnection *GetIncomingConnection(u8 direction, int x, int y);
static bool8 IsPosInIncomingConnectingMap(u8 direction, int x, int y, const struct MapConnection *connection);
static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax, int offset);
static const struct MapConnection *GetIncomingConnection(u8 direction, s32 x, s32 y);
static bool8 IsPosInIncomingConnectingMap(u8 direction, s32 x, s32 y, const struct MapConnection *connection);
static bool8 IsCoordInIncomingConnectingMap(s32 coord, s32 srcMax, s32 destMax, s32 offset);
#define GetBorderBlockAt(x, y) (gMapHeader.mapLayout->border[((x + 1) & 1) + (((y + 1) & 1) << 1)] | MAPGRID_IMPASSABLE)
@@ -107,7 +107,7 @@ static void InitMapLayoutData(const struct MapHeader *mapHeader)
static void InitBackupMapLayoutData(const u16 *map, u16 width, u16 height)
{
u16 *dest;
int y;
s32 y;
dest = gBackupMapLayout.map;
dest += gBackupMapLayout.width * MAP_OFFSET + MAP_OFFSET;
for (y = 0; y < height; y++)
@@ -120,7 +120,7 @@ static void InitBackupMapLayoutData(const u16 *map, u16 width, u16 height)
static void InitBackupMapLayoutConnections(const struct MapHeader *mapHeader)
{
int count, i, offset;
s32 count, i, offset;
const struct MapConnection *connection;
const struct MapHeader *cMap;
@@ -156,12 +156,12 @@ static void InitBackupMapLayoutConnections(const struct MapHeader *mapHeader)
}
}
static void FillConnection(int x, int y, const struct MapHeader *connectedMapHeader, int x2, int y2, int width, int height)
static void FillConnection(s32 x, s32 y, const struct MapHeader *connectedMapHeader, s32 x2, s32 y2, s32 width, s32 height)
{
int i;
s32 i;
const u16 *src;
u16 *dest;
int mapWidth;
s32 mapWidth;
mapWidth = connectedMapHeader->mapLayout->width;
src = &connectedMapHeader->mapLayout->map[mapWidth * y2 + x2];
@@ -177,10 +177,10 @@ static void FillConnection(int x, int y, const struct MapHeader *connectedMapHea
static void FillSouthConnection(const struct MapHeader *mapHeader, const struct MapHeader *connectedMapHeader, s32 offset)
{
int x, y;
int x2;
int width;
int cWidth;
s32 x, y;
s32 x2;
s32 width;
s32 cWidth;
if (!connectedMapHeader)
return;
@@ -212,10 +212,10 @@ static void FillSouthConnection(const struct MapHeader *mapHeader, const struct
static void FillNorthConnection(const struct MapHeader *mapHeader, const struct MapHeader *connectedMapHeader, s32 offset)
{
int x;
int x2, y2;
int width;
int cWidth, cHeight;
s32 x;
s32 x2, y2;
s32 width;
s32 cWidth, cHeight;
if (!connectedMapHeader)
return;
@@ -248,10 +248,10 @@ static void FillNorthConnection(const struct MapHeader *mapHeader, const struct
static void FillWestConnection(const struct MapHeader *mapHeader, const struct MapHeader *connectedMapHeader, s32 offset)
{
int y;
int x2, y2;
int height;
int cWidth, cHeight;
s32 y;
s32 x2, y2;
s32 height;
s32 cWidth, cHeight;
if (!connectedMapHeader)
return;
@@ -283,10 +283,10 @@ static void FillWestConnection(const struct MapHeader *mapHeader, const struct M
static void FillEastConnection(const struct MapHeader *mapHeader, const struct MapHeader *connectedMapHeader, s32 offset)
{
int x, y;
int y2;
int height;
int cHeight;
s32 x, y;
s32 y2;
s32 height;
s32 cHeight;
if (!connectedMapHeader)
return;
@@ -314,7 +314,7 @@ static void FillEastConnection(const struct MapHeader *mapHeader, const struct M
FillConnection(x, y, connectedMapHeader, /*x2*/ 0, y2, /*width*/ MAP_OFFSET + 1, height);
}
u8 MapGridGetElevationAt(int x, int y)
u8 MapGridGetElevationAt(s32 x, s32 y)
{
u16 block = GetMapGridBlockAt(x, y);
@@ -324,7 +324,7 @@ u8 MapGridGetElevationAt(int x, int y)
return UNPACK_ELEVATION(block);
}
u8 MapGridGetCollisionAt(int x, int y)
u8 MapGridGetCollisionAt(s32 x, s32 y)
{
u16 block = GetMapGridBlockAt(x, y);
@@ -334,9 +334,9 @@ u8 MapGridGetCollisionAt(int x, int y)
return UNPACK_COLLISION(block);
}
int MapGridGetMetatileIdAt(int x, int y)
s32 MapGridGetMetatileIdAt(s32 x, s32 y)
{
int block = GetMapGridBlockAt(x, y);
s32 block = GetMapGridBlockAt(x, y);
if (block == MAPGRID_UNDEFINED)
return UNPACK_METATILE(GetBorderBlockAt(x, y));
@@ -344,17 +344,17 @@ int MapGridGetMetatileIdAt(int x, int y)
return UNPACK_METATILE(block);
}
int MapGridGetMetatileBehaviorAt(int x, int y)
s32 MapGridGetMetatileBehaviorAt(s32 x, s32 y)
{
return UNPACK_BEHAVIOR(GetMetatileAttributesById(MapGridGetMetatileIdAt(x, y)));
}
u8 MapGridGetMetatileLayerTypeAt(int x, int y)
u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y)
{
return UNPACK_LAYER_TYPE(GetMetatileAttributesById(MapGridGetMetatileIdAt(x, y)));
}
void MapGridSetMetatileIdAt(int x, int y, u16 metatile)
void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatile)
{
if (AreCoordsWithinMapGridBounds(x, y))
{
@@ -364,7 +364,7 @@ void MapGridSetMetatileIdAt(int x, int y, u16 metatile)
}
}
void MapGridSetMetatileEntryAt(int x, int y, u16 metatile)
void MapGridSetMetatileEntryAt(s32 x, s32 y, u16 metatile)
{
if (AreCoordsWithinMapGridBounds(x, y))
{
@@ -390,10 +390,10 @@ u16 GetMetatileAttributesById(u16 metatile)
void SaveMapView(void)
{
int i, j;
int x, y;
s32 i, j;
s32 x, y;
u16 *mapView;
int width;
s32 width;
mapView = gSaveBlock1Ptr->mapView;
width = gBackupMapLayout.width;
x = gSaveBlock1Ptr->pos.x;
@@ -411,11 +411,9 @@ static bool32 SavedMapViewIsEmpty(void)
u32 marker = 0;
#ifndef UBFIX
// BUG: This loop extends past the bounds of the mapView array. Its size is only 0x100.
for (i = 0; i < sizeof(gSaveBlock1Ptr->mapView); i++)
marker |= gSaveBlock1Ptr->mapView[i];
#else
// UBFIX: Only iterate over 0x100
for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->mapView); i++)
marker |= gSaveBlock1Ptr->mapView[i];
#endif
@@ -435,10 +433,10 @@ static void ClearSavedMapView(void)
static void LoadSavedMapView(void)
{
u8 yMode;
int i, j;
int x, y;
s32 i, j;
s32 x, y;
u16 *mapView;
int width;
s32 width;
mapView = gSaveBlock1Ptr->mapView;
if (SavedMapViewIsEmpty())
return;
@@ -474,11 +472,11 @@ static void LoadSavedMapView(void)
static void MoveMapViewToBackup(u8 direction)
{
int width;
int x0, y0;
int x2, y2;
int x, y;
int i, j;
s32 width;
s32 x0, y0;
s32 x2, y2;
s32 x, y;
s32 i, j;
u16 *mapView = gSaveBlock1Ptr->mapView;
@@ -521,7 +519,7 @@ static void MoveMapViewToBackup(u8 direction)
ClearSavedMapView();
}
int GetMapBorderIdAt(int x, int y)
s32 GetMapBorderIdAt(s32 x, s32 y)
{
if (GetMapGridBlockAt(x, y) == MAPGRID_UNDEFINED)
return CONNECTION_INVALID;
@@ -560,14 +558,14 @@ int GetMapBorderIdAt(int x, int y)
}
}
int GetPostCameraMoveMapBorderId(int x, int y)
s32 GetPostCameraMoveMapBorderId(s32 x, s32 y)
{
return GetMapBorderIdAt(gSaveBlock1Ptr->pos.x + MAP_OFFSET + x, gSaveBlock1Ptr->pos.y + MAP_OFFSET + y);
}
bool32 CanCameraMoveInDirection(int direction)
bool32 CanCameraMoveInDirection(s32 direction)
{
int x, y;
s32 x, y;
x = gSaveBlock1Ptr->pos.x + MAP_OFFSET + gDirectionToVectors[direction].x;
y = gSaveBlock1Ptr->pos.y + MAP_OFFSET + gDirectionToVectors[direction].y;
@@ -577,7 +575,7 @@ bool32 CanCameraMoveInDirection(int direction)
return TRUE;
}
static void SetPositionFromConnection(const struct MapConnection *connection, int direction, int x, int y)
static void SetPositionFromConnection(const struct MapConnection *connection, s32 direction, s32 x, s32 y)
{
struct MapHeader const *mapHeader;
mapHeader = GetMapHeaderFromConnection(connection);
@@ -602,11 +600,11 @@ static void SetPositionFromConnection(const struct MapConnection *connection, in
}
}
bool8 CameraMove(int x, int y)
bool8 CameraMove(s32 x, s32 y)
{
int direction;
s32 direction;
const struct MapConnection *connection;
int old_x, old_y;
s32 old_x, old_y;
gCamera.active = FALSE;
direction = GetPostCameraMoveMapBorderId(x, y);
if (direction == CONNECTION_NONE || direction == CONNECTION_INVALID)
@@ -633,10 +631,10 @@ bool8 CameraMove(int x, int y)
return gCamera.active;
}
static const struct MapConnection *GetIncomingConnection(u8 direction, int x, int y)
static const struct MapConnection *GetIncomingConnection(u8 direction, s32 x, s32 y)
{
int count;
int i;
s32 count;
s32 i;
const struct MapConnection *connection;
const struct MapConnections *connections = gMapHeader.connections;
@@ -654,7 +652,7 @@ static const struct MapConnection *GetIncomingConnection(u8 direction, int x, in
return NULL;
}
static bool8 IsPosInIncomingConnectingMap(u8 direction, int x, int y, const struct MapConnection *connection)
static bool8 IsPosInIncomingConnectingMap(u8 direction, s32 x, s32 y, const struct MapConnection *connection)
{
struct MapHeader const *mapHeader;
mapHeader = GetMapHeaderFromConnection(connection);
@@ -670,9 +668,9 @@ static bool8 IsPosInIncomingConnectingMap(u8 direction, int x, int y, const stru
return FALSE;
}
static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax, int offset)
static bool8 IsCoordInIncomingConnectingMap(s32 coord, s32 srcMax, s32 destMax, s32 offset)
{
int min, max;
s32 min, max;
if (offset < 0)
min = 0;
@@ -690,7 +688,7 @@ static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax,
return FALSE;
}
static int IsCoordInConnectingMap(int coord, int max)
static s32 IsCoordInConnectingMap(s32 coord, s32 max)
{
if (coord >= 0 && coord < max)
return TRUE;
@@ -698,7 +696,7 @@ static int IsCoordInConnectingMap(int coord, int max)
return FALSE;
}
static int IsPosInConnectingMap(const struct MapConnection *connection, int x, int y)
static s32 IsPosInConnectingMap(const struct MapConnection *connection, s32 x, s32 y)
{
struct MapHeader const *mapHeader;
mapHeader = GetMapHeaderFromConnection(connection);
@@ -716,9 +714,9 @@ static int IsPosInConnectingMap(const struct MapConnection *connection, int x, i
const struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y)
{
int count;
s32 count;
const struct MapConnection *connection;
int i;
s32 i;
u8 direction;
if (!gMapHeader.connections)
{
@@ -730,18 +728,19 @@ const struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y)
for (i = 0; i < count; i++, connection++)
{
direction = connection->direction;
if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE) ||
(direction == CONNECTION_NORTH && y >= MAP_OFFSET) ||
(direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + MAP_OFFSET) ||
(direction == CONNECTION_WEST && x >= MAP_OFFSET) ||
(direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + MAP_OFFSET))
{
if (direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE)
continue;
}
else if (direction == CONNECTION_NORTH && y > MAP_OFFSET - 1)
continue;
else if (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + MAP_OFFSET)
continue;
else if (direction == CONNECTION_WEST && x > MAP_OFFSET - 1)
continue;
else if (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + MAP_OFFSET)
continue;
if (IsPosInConnectingMap(connection, x - MAP_OFFSET, y - MAP_OFFSET) == TRUE)
{
return connection;
}
}
return NULL;
}
@@ -770,7 +769,7 @@ void GetCameraCoords(u16 *x, u16 *y)
*y = gSaveBlock1Ptr->pos.y;
}
void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable)
void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 impassable)
{
if (AreCoordsWithinMapGridBounds(x, y))
{

17
src/item_use.c
View File

@@ -510,12 +510,9 @@ static void SetDistanceOfClosestHiddenItem(u8 taskId, s16 itemDistanceX, s16 ite
// New item is closer
tItemDistanceX = itemDistanceX;
tItemDistanceY = itemDistanceY;
return;
}
if (oldItemAbsX + oldItemAbsY == newItemAbsX + newItemAbsY &&
(oldItemAbsY > newItemAbsY ||
(oldItemAbsY == newItemAbsY && tItemDistanceY < itemDistanceY)))
else if (oldItemAbsX + oldItemAbsY == newItemAbsX + newItemAbsY
&& (oldItemAbsY > newItemAbsY || (oldItemAbsY == newItemAbsY && tItemDistanceY < itemDistanceY)))
{
// If items are equal distance, use whichever is closer on the Y axis or further south
tItemDistanceX = itemDistanceX;
@@ -549,22 +546,24 @@ static u8 GetDirectionToHiddenItem(s16 itemDistanceX, s16 itemDistanceY)
else
return DIR_NORTH;
}
if (absX < absY)
else if (absX < absY)
{
if (itemDistanceY < 0)
return DIR_SOUTH;
else
return DIR_WEST;
}
if (absX == absY)
else if (absX == absY)
{
if (itemDistanceY < 0)
return DIR_SOUTH;
else
return DIR_WEST;
}
return DIR_NONE; // Unreachable
else
{
return DIR_NONE; // Unreachable
}
}
static void PlayerFaceHiddenItem(u8 direction)