From 4cf701c5871a17f0bc580019e8d294bc1c84ebf3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 5 Nov 2017 01:34:52 -0400 Subject: move ewram defines to ewram.h. --- src/field/field_tasks.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/field/field_tasks.c') diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index da6f162c2..767753da2 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -1,7 +1,3 @@ -// - -// - #include "global.h" #include "task.h" #include "main.h" -- cgit v1.2.3 From be716ef9f841589c67f152a90ce5c7c29f7211d8 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Nov 2017 20:24:39 -0500 Subject: change Sprite struct to use a data array instead of manual declares. --- src/field/field_tasks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/field/field_tasks.c') diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 767753da2..95b8b749b 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -197,7 +197,7 @@ const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8 void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag) { const struct MetatileOffset *offsetData = sub_80695E0(offsets, MapGridGetMetatileBehaviorAt(x, y)); - const struct MetatileOffset *offsetData2 = offsetData; + const struct MetatileOffset *offsetdata[2] = offsetData; if (offsetData != NULL) { MapGridSetMetatileIdAt(x + offsetData[0].x, y + offsetData[0].y, offsetData[0].tileId); @@ -205,10 +205,10 @@ void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 { CurrentMapDrawMetatileAt(x + offsetData[0].x, y + offsetData[0].y); } - MapGridSetMetatileIdAt(x + offsetData2[1].x, y + offsetData2[1].y, offsetData2[1].tileId); + MapGridSetMetatileIdAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y, offsetdata[2][1].tileId); if (flag) { - CurrentMapDrawMetatileAt(x + offsetData2[1].x, y + offsetData2[1].y); + CurrentMapDrawMetatileAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y); } } } -- cgit v1.2.3 From 79650185e2af1748a9728f6e9209d64f93cdb050 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Nov 2017 22:01:16 -0500 Subject: false positive --- src/field/field_tasks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/field/field_tasks.c') diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 95b8b749b..e938a57ef 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -197,7 +197,7 @@ const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8 void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag) { const struct MetatileOffset *offsetData = sub_80695E0(offsets, MapGridGetMetatileBehaviorAt(x, y)); - const struct MetatileOffset *offsetdata[2] = offsetData; + const struct MetatileOffset *offsetdata2 = offsetData; if (offsetData != NULL) { MapGridSetMetatileIdAt(x + offsetData[0].x, y + offsetData[0].y, offsetData[0].tileId); @@ -205,10 +205,10 @@ void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 { CurrentMapDrawMetatileAt(x + offsetData[0].x, y + offsetData[0].y); } - MapGridSetMetatileIdAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y, offsetdata[2][1].tileId); + MapGridSetMetatileIdAt(x + offsetdata2[1].x, y + offsetdata2[1].y, offsetdata2[1].tileId); if (flag) { - CurrentMapDrawMetatileAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y); + CurrentMapDrawMetatileAt(x + offsetdata2[1].x, y + offsetdata2[1].y); } } } -- cgit v1.2.3 From 5f242ae6cee377d219defa8290ef1c164b003f52 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 13:00:26 -0600 Subject: abilities, songs, species constants --- src/field/field_tasks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field/field_tasks.c') diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index e938a57ef..2da0f7303 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -16,7 +16,7 @@ #include "fieldmap.h" #include "field_player_avatar.h" #include "field_camera.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "field_tasks.h" -- cgit v1.2.3 From 026e017a16df44806b95435403a8e3b8dbe78084 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 15:10:56 -0600 Subject: flag, vars, items constants --- src/field/field_tasks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/field/field_tasks.c') diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 2da0f7303..108ba64ba 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -1,10 +1,10 @@ #include "global.h" #include "task.h" #include "main.h" -#include "vars.h" +#include "constants/vars.h" #include "bike.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "event_data.h" #include "overworld.h" #include "clock.h" -- cgit v1.2.3