diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 18:16:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 18:16:22 -0400 |
| commit | 792a2c6976a3adcf0e6a21c570189e6bcf0cdbcf (patch) | |
| tree | 8249799a47f602bacc9f50f20468043d2447534d /include | |
| parent | 3b3eb45b91c11b47504a80fcd853ec45abbbf445 (diff) | |
| parent | 08c23fb1c483ffcf7c17b8ac061ad4ff77318625 (diff) | |
Merge pull request #347 from PikalaxALT/field_tasks
Field tasks
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_camera.h | 2 | ||||
| -rwxr-xr-x | include/field_effect_helpers.h | 1 | ||||
| -rw-r--r-- | include/field_special_scene.h | 2 | ||||
| -rw-r--r-- | include/field_tasks.h | 6 | ||||
| -rw-r--r-- | include/rom4.h | 2 | ||||
| -rw-r--r-- | include/secret_base.h | 1 | ||||
| -rwxr-xr-x | include/vars.h | 9 |
7 files changed, 21 insertions, 2 deletions
diff --git a/include/field_camera.h b/include/field_camera.h index 9021b579e..4ce207541 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -11,6 +11,8 @@ struct CameraSomething s32 unk14; }; +extern struct Camera gUnknown_0202E844; + void move_tilemap_camera_to_upper_left_corner(void); void sub_8057A58(void); void sub_8057B14(u16 *a, u16 *b); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 32438a9ad..a1dd53a2b 100755 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -26,5 +26,6 @@ void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y); void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); +void ash(s16, s16, u16, u8); #endif // GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_special_scene.h b/include/field_special_scene.h index 5841d6bce..ef3f07120 100644 --- a/include/field_special_scene.h +++ b/include/field_special_scene.h @@ -8,6 +8,6 @@ void Task_Truck2(u8 taskId); void Task_Truck3(u8 taskId); void Task_HandleTruckSequence(u8 taskId); void ExecuteTruckSequence(void); -void EndTruckSequence(void); +void EndTruckSequence(u8); #endif // GUARD_FIELD_SPECIAL_SCENE_H diff --git a/include/field_tasks.h b/include/field_tasks.h index 53e704395..761d69ada 100644 --- a/include/field_tasks.h +++ b/include/field_tasks.h @@ -1,6 +1,12 @@ #ifndef GUARD_FIELD_TASKS_H #define GUARD_FIELD_TASKS_H +struct MetatileOffset { + s8 x; + s8 y; + u16 tileId; +}; + void SetUpFieldTasks(); void ActivatePerStepCallback(u8); void ResetFieldTasksArgs(void); diff --git a/include/rom4.h b/include/rom4.h index eac4d29a2..b7415bf0a 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -102,7 +102,7 @@ void sub_8053FB0(u16); // sub_8054034 // sub_8054044 // sub_8054050 -// sub_80540D0 +void sub_80540D0(s16 *, u16 *); void sub_8054164(void); u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); // get_map_light_level_from_warp diff --git a/include/secret_base.h b/include/secret_base.h index 3ca5ab182..3ea75ce27 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -10,6 +10,7 @@ u8 sub_80BC050(); void sub_80BC300(); const u8 sub_80BCCA4(u8); u8 *sub_80BCCE8(void); +void sub_80BCF1C(u8); void sub_80BD674(void *, u32, u8); #endif // GUARD_SECRET_BASE_H diff --git a/include/vars.h b/include/vars.h index f31ebde84..e08f344d4 100755 --- a/include/vars.h +++ b/include/vars.h @@ -1,7 +1,16 @@ #ifndef GUARD_VARS_H #define GUARD_VARS_H +#define VAR_0x4001 0x4001 +#define VAR_0x4002 0x4002 #define VAR_0x4003 0x4003 +#define VAR_0x4004 0x4004 +#define VAR_0x4005 0x4005 +#define VAR_0x4006 0x4006 +#define VAR_0x4007 0x4007 +#define VAR_0x4008 0x4008 +#define VAR_0x4009 0x4009 +#define VAR_0x400A 0x400A #define VAR_0x401F 0x401F #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 |