summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-08 00:31:14 -0800
committerYamaArashi <shadow962@live.com>2017-01-08 00:31:14 -0800
commitcee1e81cb0d8bf808f145004b5b46249d2dbdedd (patch)
treefc2eab2f197095971b03ea8ecabdf81642859c7d
parent11f95794b99b5560f53c400ee5f7f3f231e8e3ad (diff)
rename truck_scene.c to field_special_scene.c
-rw-r--r--data/field_special_scene.s (renamed from data/truck_scene.s)0
-rw-r--r--include/field_special_scene.h (renamed from include/truck_scene.h)6
-rw-r--r--ld_script.txt4
-rw-r--r--src/field_special_scene.c (renamed from src/truck_scene.c)4
-rw-r--r--src/rom4.c2
5 files changed, 7 insertions, 9 deletions
diff --git a/data/truck_scene.s b/data/field_special_scene.s
index 9d3958924..9d3958924 100644
--- a/data/truck_scene.s
+++ b/data/field_special_scene.s
diff --git a/include/truck_scene.h b/include/field_special_scene.h
index f55a4ced7..5841d6bce 100644
--- a/include/truck_scene.h
+++ b/include/field_special_scene.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_TRUCK_SCENE_H
-#define GUARD_TRUCK_SCENE_H
+#ifndef GUARD_FIELD_SPECIAL_SCENE_H
+#define GUARD_FIELD_SPECIAL_SCENE_H
s32 GetTruckCameraBobbingY(int a1);
s32 GetTruckBoxMovement(int a1);
@@ -10,4 +10,4 @@ void Task_HandleTruckSequence(u8 taskId);
void ExecuteTruckSequence(void);
void EndTruckSequence(void);
-#endif // GUARD_TRUCK_SCENE_H
+#endif // GUARD_FIELD_SPECIAL_SCENE_H
diff --git a/ld_script.txt b/ld_script.txt
index 89e607d83..b258669dc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -167,7 +167,7 @@ SECTIONS {
src/field_poison.o(.text);
src/pokemon_size_record.o(.text);
asm/fldeff_80C5CD4.o(.text);
- src/truck_scene.o(.text);
+ src/field_special_scene.o(.text);
asm/rotating_gate.o(.text);
src/safari_zone.o(.text);
asm/contest_link_80C857C.o(.text);
@@ -370,7 +370,7 @@ SECTIONS {
data/contest_link_80C2020.o(.rodata);
src/pokemon_size_record.o(.rodata);
data/fldeff_80C5CD4.o(.rodata);
- data/truck_scene.o(.rodata);
+ data/field_special_scene.o(.rodata);
data/rotating_gate.o(.rodata);
data/item_use.o(.rodata);
data/battle_anim_80CA710.o(.rodata);
diff --git a/src/truck_scene.c b/src/field_special_scene.c
index a5c64eaae..80a1727d8 100644
--- a/src/truck_scene.c
+++ b/src/field_special_scene.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "truck_scene.h"
+#include "field_special_scene.h"
#include "asm.h"
#include "palette.h"
#include "task.h"
@@ -11,8 +11,6 @@
#include "event_data.h"
#include "sprite.h"
-extern u8 gUnknown_0202E85D;
-
extern s8 gTruckCamera_HorizontalTable[];
extern u8 gUnknown_083D295F[];
diff --git a/src/rom4.c b/src/rom4.c
index 0cad9a39a..3f383b690 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -26,7 +26,7 @@
#include "start_menu.h"
#include "task.h"
#include "tileset_anim.h"
-#include "truck_scene.h"
+#include "field_special_scene.h"
#include "weather.h"
#include "wild_encounter.h"
#include "metatile_behavior.h"