ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup formatting

Browse Source
This commit is contained in:
Marcus Huderle 2018-12-29 11:12:50 -06:00
parent 6e7bdb3ca4
commit d0d870e193
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/field_effects.h
View File

@ -67,6 +67,6 @@
#define FLDEFF_USE_TELEPORT 63 #define FLDEFF_USE_TELEPORT 63
#define FLDEFF_64 64 #define FLDEFF_64 64
#define FLDEFF_65 65 #define FLDEFF_65 65
#define FLDEFF_MOVE_DEOXYS_ROCK 66 #define FLDEFF_MOVE_DEOXYS_ROCK 66
#endif #endif

8
include/constants/flags.h
View File

@ -1355,10 +1355,10 @@
#define FLAG_SYS_PYRAMID_GOLD (SYSTEM_FLAGS + 0x71) #define FLAG_SYS_PYRAMID_GOLD (SYSTEM_FLAGS + 0x71)
#define FLAG_SYS_FRONTIER_PASS (SYSTEM_FLAGS + 0x72) #define FLAG_SYS_FRONTIER_PASS (SYSTEM_FLAGS + 0x72)
#define FLAG_0x8D3 (SYSTEM_FLAGS + 0x73) #define FLAG_0x8D3 (SYSTEM_FLAGS + 0x73)
#define FLAG_DEOXYS_ROCK_COMPLETE (SYSTEM_FLAGS + 0x74) #define FLAG_DEOXYS_ROCK_COMPLETE (SYSTEM_FLAGS + 0x74)
#define FLAG_0x8D5 (SYSTEM_FLAGS + 0x75) #define FLAG_0x8D5 (SYSTEM_FLAGS + 0x75)
#define FLAG_0x8D6 (SYSTEM_FLAGS + 0x76) #define FLAG_0x8D6 (SYSTEM_FLAGS + 0x76)
#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (SYSTEM_FLAGS + 0x77) #define FLAG_SYS_STORAGE_UNKNOWN_FLAG (SYSTEM_FLAGS + 0x77)

8
include/constants/vars.h
View File

@ -68,8 +68,8 @@
#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 #define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032
#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 #define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033
#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034
#define VAR_DEOXYS_ROCK_LEVEL 0x4035 #define VAR_DEOXYS_ROCK_LEVEL 0x4035
#define VAR_STORAGE_UNKNOWN 0x4036 #define VAR_STORAGE_UNKNOWN 0x4036
#define VAR_0x4037 0x4037 #define VAR_0x4037 0x4037
#define VAR_0x4038 0x4038 #define VAR_0x4038 0x4038
@ -81,8 +81,8 @@
#define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_0x403F 0x403F #define VAR_0x403F 0x403F
#define VAR_DAYS 0x4040 #define VAR_DAYS 0x4040
#define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044 #define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045 #define VAR_POKELOT_PRIZE 0x4045

7
src/field_player_avatar.c
View File

@ -723,7 +723,7 @@ static bool8 sub_808B1BC(s16 x, s16 y, u8 direction)
{ {
if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
&& MapGridGetZCoordAt(x, y) == 3 && MapGridGetZCoordAt(x, y) == 3
&& GetEventObjectIdByXYZ(x, y, 3) == 16) && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT)
{ {
sub_808C750(direction); sub_808C750(direction);
return TRUE; return TRUE;
@ -792,11 +792,8 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
MoveCoords(direction, &playerX, &playerY); MoveCoords(direction, &playerX, &playerY);
mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR));
if (mewObjectId == EVENT_OBJECTS_COUNT)
if (mewObjectId == 16)
{
return FALSE; return FALSE;
}
object = &gEventObjects[mewObjectId]; object = &gEventObjects[mewObjectId];
mewPrevX = object->previousCoords.x; mewPrevX = object->previousCoords.x;