diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bike.h | 4 | ||||
| -rw-r--r-- | include/field_camera.h | 7 | ||||
| -rw-r--r-- | include/field_map_obj.h | 2 | ||||
| -rw-r--r-- | include/fieldmap.h | 2 | ||||
| -rw-r--r-- | include/overworld.h | 6 | ||||
| -rw-r--r-- | include/rotating_gate.h | 8 |
6 files changed, 24 insertions, 5 deletions
diff --git a/include/bike.h b/include/bike.h index e625ad438..46b668169 100644 --- a/include/bike.h +++ b/include/bike.h @@ -63,6 +63,10 @@ enum ACRO_TRANS_WHEELIE_LOWERING_MOVING, }; +// Exported RAM declarations +extern bool8 gUnusedBikeCameraAheadPanback; + +// Exported ROM declarations void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys); void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys); bool8 RS_IsRunningDisallowed(u8 tile); diff --git a/include/field_camera.h b/include/field_camera.h index 6ff8ce006..fcc19ce9a 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -6,22 +6,19 @@ struct CameraObject { void (*callback)(struct CameraObject *); - u32 unk4; + u32 spriteId; s32 unk8; s32 unkC; s32 x; s32 y; }; -extern struct CameraObject gUnknown_03005DD0; - // Exported RAM declarations - +extern struct CameraObject gUnknown_03005DD0; extern u16 gUnknown_03005DEC; extern u16 gUnknown_03005DE8; // Exported ROM declarations - void DrawWholeMapView(void); void CurrentMapDrawMetatileAt(int x, int y); void sub_8089C08(s16 *a0, s16 *a1); diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 8b7e296dd..8f34d4b93 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -91,6 +91,8 @@ void sub_808F23C(const struct MapObject *mapObject, u8 movementType); void sub_808F208(const struct MapObject *mapObject); void npc_coords_shift_still(struct MapObject *pObject); void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +u8 AddCameraObject(u8 linkedSpriteId); +void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y); // Exported data declarations diff --git a/include/fieldmap.h b/include/fieldmap.h index 23654f536..3128e95ce 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -16,5 +16,7 @@ s32 GetMapBorderIdAt(s16, s16); bool32 CanCameraMoveInDirection(u8); u16 GetBehaviorByMetatileId(u16 metatileId); void sav1_camera_get_focus_coords(u16 *x, u16 *y); +u8 MapGridGetMetatileLayerTypeAt(s32 x, s32 y); +u8 CameraMove(s32 deltaX, s32 deltaY); #endif //GUARD_FIELDMAP_H diff --git a/include/overworld.h b/include/overworld.h index 7f0a1795f..cd0f4e60f 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -15,9 +15,15 @@ struct LinkPlayerMapObject u8 mode; }; +// Exported RAM declarations extern struct WarpData gUnknown_020322DC; extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; +extern u16 *gBGTilemapBuffers1; +extern u16 *gBGTilemapBuffers2; +extern u16 *gBGTilemapBuffers3; + +// Exported ROM declarations extern const struct UCoords32 gUnknown_08339D64[]; void DoWhiteOut(void); diff --git a/include/rotating_gate.h b/include/rotating_gate.h new file mode 100644 index 000000000..50a838953 --- /dev/null +++ b/include/rotating_gate.h @@ -0,0 +1,8 @@ +#ifndef GUARD_ROTATING_GATE_H +#define GUARD_ROTATING_GATE_H + +void RotatingGatePuzzleCameraUpdate(s16, s16); +void RotatingGate_InitPuzzleAndGraphics(); +u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); + +#endif // GUARD_ROTATING_GATE_H |