diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-05 22:31:01 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 10:38:28 +0800 |
| commit | f9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch) | |
| tree | ee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/scrcmd.c | |
| parent | 405f1bb529809b8169364737087189df0fcca1d2 (diff) | |
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index 4217f7237..f486b93a6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -790,7 +790,7 @@ bool8 ScrCmd_warphole(struct ScriptContext *ctx) u16 y; PlayerGetDestCoords(&x, &y); - if (mapGroup == INVALID_U8 && mapNum == INVALID_U8) + if (mapGroup == 0xFF && mapNum == 0xFF) SetFixedHoleWarpAsDestination(x - 7, y - 7); else Overworld_SetWarpDestination(mapGroup, mapNum, -1, x - 7, y - 7); @@ -1491,7 +1491,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) if (width > 0x1C) width = 0x1C; - for (i = 0, height = 4; gStringVar4[i] != INVALID_U8;) + for (i = 0, height = 4; gStringVar4[i] != 0xFF;) { if (gStringVar4[i++] == 0xFE) height += 3; @@ -2238,8 +2238,8 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_808D074(GetPlayerFacingDirection()); - sub_80B0244(); + sub_808D074(GetPlayerFacingDirection()); + sub_80B0244(); ResetInitialPlayerAvatarState(); return TRUE; } @@ -2292,7 +2292,7 @@ bool8 ScrCmd_warpE0(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_80AF79C(); + sub_80AF79C(); ResetInitialPlayerAvatarState(); return TRUE; } |