summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-09-11 02:04:03 +0100
committerSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-09-11 02:04:03 +0100
commitb6ee8823f021a7da98cf84d5fc8a6b8609d1630f (patch)
tree805d6da90d33914270e333adbfb9c2d1a46b5f7c /src
parentbcea321494f3cab1284325e73cca7f796961d963 (diff)
Move field_special_scene data to C
Diffstat (limited to 'src')
-rw-r--r--src/field_special_scene.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index c6cb0741d..1cabf63d6 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -1,22 +1,21 @@
#include "global.h"
-#include "task.h"
-#include "sprite.h"
+#include "event_data.h"
#include "event_object_movement.h"
-#include "constants/songs.h"
-#include "sound.h"
+#include "main.h"
#include "palette.h"
#include "script.h"
+#include "script_movement.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "constants/songs.h"
#include "constants/vars.h"
-#include "event_data.h"
-#include "main.h"
#define SECONDS(value) ((signed) (60.0 * value + 0.5))
extern u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); // should be in field_specials.h
extern void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-extern bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
extern bool32 CountSSTidalStep(u16);
-extern bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, u8 *);
extern void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
extern void sp13E_warp_to_last_warp(void);
extern void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
@@ -38,11 +37,12 @@ extern void pal_fill_black(void);
extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId);
extern void DrawWholeMapView();
-extern s8 gTruckCamera_HorizontalTable[];
-
-extern u8 gUnknown_0858E8AB[];
-extern u8 gUnknown_0858E8AD[];
+//. rodata
+static const s8 gTruckCamera_HorizontalTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0};
+const u8 gUnknown_0858E8AB[] = {0x18, 0xFE};
+const u8 gUnknown_0858E8AD[] = {0x17, 0xFE};
+// .text
void Task_Truck3(u8);
s16 GetTruckCameraBobbingY(int a1)