ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move field_special_scene data to C

Browse Source
This commit is contained in:
Slawter666 2018-09-11 02:04:03 +01:00
parent bcea321494
commit b6ee8823f0
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/field_special_scene.s
View File

@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gTruckCamera_HorizontalTable:: @ 858E898
.byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
gUnknown_0858E8AB:: @ 858E8AB
.byte 0x18, 0xFE
gUnknown_0858E8AD:: @ 858E8AD
.byte 0x17, 0xFE

2
ld_script.txt
View File

@ -454,7 +454,7 @@ SECTIONS {
data/script_pokemon_util_80F87D8.o(.rodata); data/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata) src/pokemon_size_record.o(.rodata)
data/field_effect_misc.o(.rodata); data/field_effect_misc.o(.rodata);
data/field_special_scene.o(.rodata); src/field_special_scene.o(.rodata);
src/rotating_gate.o(.rodata); src/rotating_gate.o(.rodata);
data/item_use.o(.rodata); data/item_use.o(.rodata);
data/battle_anim_80FE840.o(.rodata); data/battle_anim_80FE840.o(.rodata);

24
src/field_special_scene.c
View File

@ -1,22 +1,21 @@
#include "global.h" #include "global.h"
#include "task.h" #include "event_data.h"
#include "sprite.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "constants/songs.h" #include "main.h"
#include "sound.h"
#include "palette.h" #include "palette.h"
#include "script.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 "constants/vars.h"
#include "event_data.h"
#include "main.h"
#define SECONDS(value) ((signed) (60.0 * value + 0.5)) #define SECONDS(value) ((signed) (60.0 * value + 0.5))
extern u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); // should be in field_specials.h 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 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 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 copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
extern void sp13E_warp_to_last_warp(void); extern void sp13E_warp_to_last_warp(void);
extern void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); 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 MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId);
extern void DrawWholeMapView(); extern void DrawWholeMapView();
extern s8 gTruckCamera_HorizontalTable[]; //. 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};
extern u8 gUnknown_0858E8AB[]; const u8 gUnknown_0858E8AB[] = {0x18, 0xFE};
extern u8 gUnknown_0858E8AD[]; const u8 gUnknown_0858E8AD[] = {0x17, 0xFE};
// .text
void Task_Truck3(u8); void Task_Truck3(u8);
s16 GetTruckCameraBobbingY(int a1) s16 GetTruckCameraBobbingY(int a1)