From 489106198973e1377d0ac823b4decaa395ca7c9e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 22 Jun 2017 22:08:27 -0400 Subject: File modes --- include/gba/defines.h | 0 include/global.h | 0 include/player_pc.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/gba/defines.h mode change 100755 => 100644 include/global.h mode change 100755 => 100644 include/player_pc.h (limited to 'include') diff --git a/include/gba/defines.h b/include/gba/defines.h old mode 100755 new mode 100644 diff --git a/include/global.h b/include/global.h old mode 100755 new mode 100644 diff --git a/include/player_pc.h b/include/player_pc.h old mode 100755 new mode 100644 -- cgit v1.2.3 From 9e14c471e6176d3b9eded4815f917b4a2e06d5cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 22 Jun 2017 22:27:51 -0400 Subject: Start decompiling field_tasks.s --- include/field_special_scene.h | 2 +- include/rom4.h | 2 +- include/secret_base.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') 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/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 -- cgit v1.2.3 From d5db71923c6fb611760e3a21f4f44c7c56142159 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 23 Jun 2017 08:44:18 -0400 Subject: up through sub_80695E0 --- include/field_tasks.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') 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); -- cgit v1.2.3 From 9cc199f064aa2f5a8e188dfe805a511c2c92c4fa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Jun 2017 21:48:30 -0400 Subject: stupid sub_8069D34 --- include/vars.h | 9 +++++++++ 1 file changed, 9 insertions(+) mode change 100644 => 100755 include/vars.h (limited to 'include') diff --git a/include/vars.h b/include/vars.h old mode 100644 new mode 100755 index cb5bb3296..eb527ec09 --- 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 -- cgit v1.2.3 From 57a6a5e6564aec89ab45f2d4c3b911f59f7db210 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Jun 2017 22:26:02 -0400 Subject: PerStepCallback_8069F64 --- include/field_effect_helpers.h | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 include/field_effect_helpers.h (limited to 'include') diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h old mode 100644 new mode 100755 index 56838fc3a..895d861e2 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -9,5 +9,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 -- cgit v1.2.3 From 41cc0382a43161c0c66ddaf73742ecec8dcbdcc6 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 27 Jun 2017 09:43:57 -0400 Subject: Finish decompiling field_tasks.s --- include/field_camera.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') 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); -- cgit v1.2.3