diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:12:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 14:12:14 -0600 |
| commit | b827bd9a5a44e17fa9fced591465fc64a619a134 (patch) | |
| tree | 473525953b1ac35be06b26cd2e6926fb7b0278cb /src/field/field_special_scene.c | |
| parent | 30c77aa4ca5502b07a9ccdf2012a7da265e8bffa (diff) | |
| parent | 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 (diff) | |
Merge pull request #500 from huderlem/vars
Use constants for vars
Diffstat (limited to 'src/field/field_special_scene.c')
| -rw-r--r-- | src/field/field_special_scene.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c index 0b7fe336e..67b652a57 100644 --- a/src/field/field_special_scene.c +++ b/src/field/field_special_scene.c @@ -291,7 +291,7 @@ bool8 sub_80C7754(void) void Task_HandlePorthole(u8 taskId) { s16 *data = gTasks[taskId].data; - u16 *var = GetVarPointer(VAR_PORTHOLE); + u16 *var = GetVarPointer(VAR_PORTHOLE_STATE); struct WarpData *location = &gSaveBlock1.location; switch (data[0]) @@ -337,8 +337,8 @@ void Task_HandlePorthole(u8 taskId) } break; case EXIT_PORTHOLE: // exit porthole. - FlagClear(0x4001); - FlagClear(0x4000); + FlagClear(FLAG_SPECIAL_FLAG_1); + FlagClear(FLAG_SPECIAL_FLAG_0); copy_saved_warp2_bank_and_enter_x_to_warp1(0); sp13E_warp_to_last_warp(); DestroyTask(taskId); @@ -352,7 +352,7 @@ void sub_80C78A0(void) gSprites[spriteId].coordOffsetEnabled = FALSE; - if (VarGet(0x40B4) == 2) + if (VarGet(VAR_PORTHOLE_STATE) == 2) { StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4)); } @@ -374,8 +374,8 @@ void sub_80C791C(void) void sub_80C7958(void) { FlagSet(FLAG_SYS_CRUISE_MODE); - FlagSet(0x4001); - FlagSet(0x4000); + FlagSet(FLAG_SPECIAL_FLAG_1); + FlagSet(FLAG_SPECIAL_FLAG_0); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); sub_80C7754(); sub_8080F9C(); |