From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/field_camera.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index c55d8e2a3..ce343c1d8 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -1,9 +1,9 @@ #include "global.h" #include "field_camera.h" #include "asm.h" +#include "asm_fieldmap.h" #include "berry.h" #include "field_player_avatar.h" -#include "asm_fieldmap.h" #include "sprite.h" #include "text.h" -- cgit v1.2.3 From 801877553db80267a62c0c3c0b2805b6716d1ef9 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:38:44 +0100 Subject: Remove trailing whitespace --- src/field_camera.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index ce343c1d8..607d353d4 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -91,7 +91,7 @@ void sub_8057A58(void) *gBGVOffsetRegs[2] = gUnknown_03000590.unk1 + gUnknown_0300059A + 8; *gBGHOffsetRegs[3] = gUnknown_03000590.unk0 + gUnknown_03000598; *gBGVOffsetRegs[3] = gUnknown_03000590.unk1 + gUnknown_0300059A + 8; - + if(gUnknown_03000590.unk4) { DmaCopy16(3, gBGTilemapBuffers[1], (void *)(VRAM + 0xE800), 0x800); @@ -119,7 +119,7 @@ static void DrawWholeMapViewInternal(int x, int y, struct MapData *mapData) u8 j; u32 r6; u8 temp; - + for(i = 0; i < 32; i += 2) { temp = gUnknown_03000590.unk3 + i; @@ -139,7 +139,7 @@ static void DrawWholeMapViewInternal(int x, int y, struct MapData *mapData) static void RedrawMapSlicesForCameraUpdate(struct UnknownStruct *a, int x, int y) { struct MapData *mapData = gMapHeader.mapData; - + if(x > 0) RedrawMapSliceWest(a, mapData); if(x < 0) @@ -156,7 +156,7 @@ static void RedrawMapSliceNorth(struct UnknownStruct *a, struct MapData *mapData u8 i; u8 temp; u32 r7; - + temp = a->unk3 + 28; if(temp >= 32) temp -= 32; @@ -175,7 +175,7 @@ static void RedrawMapSliceSouth(struct UnknownStruct *a, struct MapData *mapData u8 i; u8 temp; u32 r7 = a->unk3 * 32; - + for(i = 0; i < 32; i += 2) { temp = a->unk2 + i; @@ -190,7 +190,7 @@ static void RedrawMapSliceEast(struct UnknownStruct *a, struct MapData *mapData) u8 i; u8 temp; u32 r6 = a->unk2; - + for(i = 0; i < 32; i += 2) { temp = a->unk3 + i; @@ -205,7 +205,7 @@ static void RedrawMapSliceWest(struct UnknownStruct *a, struct MapData *mapData) u8 i; u8 temp; u8 r5 = a->unk2 + 28; - + if(r5 >= 32) r5 -= 32; for(i = 0; i < 32; i += 2) @@ -220,7 +220,7 @@ static void RedrawMapSliceWest(struct UnknownStruct *a, struct MapData *mapData) void CurrentMapDrawMetatileAt(int a, int b) { int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, a, b); - + if(offset >= 0) { DrawMetatileAt(gMapHeader.mapData, offset, a, b); @@ -231,7 +231,7 @@ void CurrentMapDrawMetatileAt(int a, int b) void DrawDoorMetatileAt(int x, int y, u16 *arr) { int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, x, y); - + if(offset >= 0) { DrawMetatile(1, arr, offset); @@ -243,7 +243,7 @@ static void DrawMetatileAt(struct MapData *mapData, u16 b, int c, int d) { u16 metatileId = MapGridGetMetatileIdAt(c, d); u16 *metatiles; - + if(metatileId > 1024) metatileId = 0; if(metatileId < 512) @@ -265,12 +265,12 @@ static void DrawMetatile(s32 a, u16 *b, u16 c) gBGTilemapBuffers[3][c + 1] = b[1]; gBGTilemapBuffers[3][c + 0x20] = b[2]; gBGTilemapBuffers[3][c + 0x21] = b[3]; - + gBGTilemapBuffers[2][c] = 0; gBGTilemapBuffers[2][c + 1] = 0; gBGTilemapBuffers[2][c + 0x20] = 0; gBGTilemapBuffers[2][c + 0x21] = 0; - + gBGTilemapBuffers[1][c] = b[4]; gBGTilemapBuffers[1][c + 1] = b[5]; gBGTilemapBuffers[1][c + 0x20] = b[6]; @@ -281,12 +281,12 @@ static void DrawMetatile(s32 a, u16 *b, u16 c) gBGTilemapBuffers[3][c + 1] = b[1]; gBGTilemapBuffers[3][c + 0x20] = b[2]; gBGTilemapBuffers[3][c + 0x21] = b[3]; - + gBGTilemapBuffers[2][c] = b[4]; gBGTilemapBuffers[2][c + 1] = b[5]; gBGTilemapBuffers[2][c + 0x20] = b[6]; gBGTilemapBuffers[2][c + 0x21] = b[7]; - + gBGTilemapBuffers[1][c] = 0; gBGTilemapBuffers[1][c + 1] = 0; gBGTilemapBuffers[1][c + 0x20] = 0; @@ -297,12 +297,12 @@ static void DrawMetatile(s32 a, u16 *b, u16 c) gBGTilemapBuffers[3][c + 1] = 0x3014; gBGTilemapBuffers[3][c + 0x20] = 0x3014; gBGTilemapBuffers[3][c + 0x21] = 0x3014; - + gBGTilemapBuffers[2][c] = b[0]; gBGTilemapBuffers[2][c + 1] = b[1]; gBGTilemapBuffers[2][c + 0x20] = b[2]; gBGTilemapBuffers[2][c + 0x21] = b[3]; - + gBGTilemapBuffers[1][c] = b[4]; gBGTilemapBuffers[1][c + 1] = b[5]; gBGTilemapBuffers[1][c + 0x20] = b[6]; @@ -320,14 +320,14 @@ static s32 MapPosToBgTilemapOffset(struct UnknownStruct *a, s32 x, s32 y) x = x + a->unk2; if(x >= 32) x -= 32; - + y = (y - gSaveBlock1.pos.y) * 2; if(y >= 32 || y < 0) return -1; y = y + a->unk3; if(y >= 32) y -= 32; - + return y * 32 + x; } @@ -367,7 +367,7 @@ void CameraUpdate(void) int r1; int r7; int r8; - + if(gUnknown_03004880.callback != NULL) gUnknown_03004880.callback(&gUnknown_03004880); r7 = gUnknown_03004880.unk8; @@ -376,8 +376,8 @@ void CameraUpdate(void) deltaY = 0; r1 = gUnknown_03004880.unk10; r0 = gUnknown_03004880.unk14; - - + + if(r1 == 0 && r7 != 0) { if(r7 > 0) @@ -406,12 +406,12 @@ void CameraUpdate(void) else deltaX = -1; } - + gUnknown_03004880.unk10 += r7; - gUnknown_03004880.unk10 = gUnknown_03004880.unk10 - 16 * (gUnknown_03004880.unk10 / 16); + gUnknown_03004880.unk10 = gUnknown_03004880.unk10 - 16 * (gUnknown_03004880.unk10 / 16); gUnknown_03004880.unk14 += r8; gUnknown_03004880.unk14 = gUnknown_03004880.unk14 - 16 * (gUnknown_03004880.unk14 / 16); - + if(deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); @@ -421,7 +421,7 @@ void CameraUpdate(void) tilemap_move_something(&gUnknown_03000590, deltaX * 2, deltaY * 2); RedrawMapSlicesForCameraUpdate(&gUnknown_03000590, deltaX * 2, deltaY * 2); } - + coords8_add(&gUnknown_03000590, r7, r8); gUnknown_0300489C -= r7; gUnknown_03004898 -= r8; @@ -467,7 +467,7 @@ void UpdateCameraPanning(void) static void CameraPanningCB_PanAhead(void) { u8 var; - + if (gUnknown_0202E854 == 0) { InstallCameraPanAheadCallback(); @@ -484,7 +484,7 @@ static void CameraPanningCB_PanAhead(void) { gUnknown_0300059C = 0; } - + var = player_get_direction_upper_nybble(); if (var == 2) { -- cgit v1.2.3 From 46cf490edd4fd5971d3a3511516beb0910e33c32 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:54:35 +0100 Subject: Declare gBGTilemapBuffers in header --- src/field_camera.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index 607d353d4..72dcbd721 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -7,8 +7,6 @@ #include "sprite.h" #include "text.h" -extern u16 gBGTilemapBuffers[4][0x400]; - extern u8 gUnknown_0202E854; -- cgit v1.2.3 From bcaab977727ded65c9eeaef9dbef9e9441d26fb7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 21 Jan 2017 16:48:06 -0800 Subject: formatting --- src/field_camera.c | 80 +++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index 72dcbd721..442bc095b 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -90,7 +90,7 @@ void sub_8057A58(void) *gBGHOffsetRegs[3] = gUnknown_03000590.unk0 + gUnknown_03000598; *gBGVOffsetRegs[3] = gUnknown_03000590.unk1 + gUnknown_0300059A + 8; - if(gUnknown_03000590.unk4) + if (gUnknown_03000590.unk4) { DmaCopy16(3, gBGTilemapBuffers[1], (void *)(VRAM + 0xE800), 0x800); DmaCopy16(3, gBGTilemapBuffers[2], (void *)(VRAM + 0xE000), 0x800); @@ -118,16 +118,16 @@ static void DrawWholeMapViewInternal(int x, int y, struct MapData *mapData) u32 r6; u8 temp; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = gUnknown_03000590.unk3 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; r6 = temp * 32; - for(j = 0; j < 32; j += 2) + for (j = 0; j < 32; j += 2) { temp = gUnknown_03000590.unk2 + j; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, r6 + temp, x + j / 2, y + i / 2); } @@ -138,13 +138,13 @@ static void RedrawMapSlicesForCameraUpdate(struct UnknownStruct *a, int x, int y { struct MapData *mapData = gMapHeader.mapData; - if(x > 0) + if (x > 0) RedrawMapSliceWest(a, mapData); - if(x < 0) + if (x < 0) RedrawMapSliceEast(a, mapData); - if(y > 0) + if (y > 0) RedrawMapSliceNorth(a, mapData); - if(y < 0) + if (y < 0) RedrawMapSliceSouth(a, mapData); a->unk4 = TRUE; } @@ -156,13 +156,13 @@ static void RedrawMapSliceNorth(struct UnknownStruct *a, struct MapData *mapData u32 r7; temp = a->unk3 + 28; - if(temp >= 32) + if (temp >= 32) temp -= 32; r7 = temp * 32; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk2 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y + 14); } @@ -174,10 +174,10 @@ static void RedrawMapSliceSouth(struct UnknownStruct *a, struct MapData *mapData u8 temp; u32 r7 = a->unk3 * 32; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk2 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, r7 + temp, gSaveBlock1.pos.x + i / 2, gSaveBlock1.pos.y); } @@ -189,10 +189,10 @@ static void RedrawMapSliceEast(struct UnknownStruct *a, struct MapData *mapData) u8 temp; u32 r6 = a->unk2; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk3 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, temp * 32 + r6, gSaveBlock1.pos.x, gSaveBlock1.pos.y + i / 2); } @@ -204,12 +204,12 @@ static void RedrawMapSliceWest(struct UnknownStruct *a, struct MapData *mapData) u8 temp; u8 r5 = a->unk2 + 28; - if(r5 >= 32) + if (r5 >= 32) r5 -= 32; - for(i = 0; i < 32; i += 2) + for (i = 0; i < 32; i += 2) { temp = a->unk3 + i; - if(temp >= 32) + if (temp >= 32) temp -= 32; DrawMetatileAt(mapData, temp * 32 + r5, gSaveBlock1.pos.x + 14, gSaveBlock1.pos.y + i / 2); } @@ -219,7 +219,7 @@ void CurrentMapDrawMetatileAt(int a, int b) { int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, a, b); - if(offset >= 0) + if (offset >= 0) { DrawMetatileAt(gMapHeader.mapData, offset, a, b); gUnknown_03000590.unk4 = TRUE; @@ -230,7 +230,7 @@ void DrawDoorMetatileAt(int x, int y, u16 *arr) { int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, x, y); - if(offset >= 0) + if (offset >= 0) { DrawMetatile(1, arr, offset); gUnknown_03000590.unk4 = TRUE; @@ -242,9 +242,9 @@ static void DrawMetatileAt(struct MapData *mapData, u16 b, int c, int d) u16 metatileId = MapGridGetMetatileIdAt(c, d); u16 *metatiles; - if(metatileId > 1024) + if (metatileId > 1024) metatileId = 0; - if(metatileId < 512) + if (metatileId < 512) metatiles = mapData->primaryTileset->metatiles; else { @@ -256,7 +256,7 @@ static void DrawMetatileAt(struct MapData *mapData, u16 b, int c, int d) static void DrawMetatile(s32 a, u16 *b, u16 c) { - switch(a) + switch (a) { case 2: gBGTilemapBuffers[3][c] = b[0]; @@ -313,17 +313,17 @@ static s32 MapPosToBgTilemapOffset(struct UnknownStruct *a, s32 x, s32 y) { x -= gSaveBlock1.pos.x; x *= 2; - if(x >= 32 || x < 0) + if (x >= 32 || x < 0) return -1; x = x + a->unk2; - if(x >= 32) + if (x >= 32) x -= 32; y = (y - gSaveBlock1.pos.y) * 2; - if(y >= 32 || y < 0) + if (y >= 32 || y < 0) return -1; y = y + a->unk3; - if(y >= 32) + if (y >= 32) y -= 32; return y * 32 + x; @@ -331,7 +331,7 @@ static s32 MapPosToBgTilemapOffset(struct UnknownStruct *a, s32 x, s32 y) static void CameraUpdateCallback(struct CameraSomething *a) { - if(a->unk4 != 0) + if (a->unk4 != 0) { a->unk8 = gSprites[a->unk4].data2; a->unkC = gSprites[a->unk4].data3; @@ -350,7 +350,7 @@ void ResetCameraUpdateInfo(void) u32 InitCameraUpdateCallback(u8 a) { - if(gUnknown_03004880.unk4 != 0) + if (gUnknown_03004880.unk4 != 0) DestroySprite(&gSprites[gUnknown_03004880.unk4]); gUnknown_03004880.unk4 = AddCameraObject(a); gUnknown_03004880.callback = CameraUpdateCallback; @@ -366,7 +366,7 @@ void CameraUpdate(void) int r7; int r8; - if(gUnknown_03004880.callback != NULL) + if (gUnknown_03004880.callback != NULL) gUnknown_03004880.callback(&gUnknown_03004880); r7 = gUnknown_03004880.unk8; r8 = gUnknown_03004880.unkC; @@ -376,30 +376,30 @@ void CameraUpdate(void) r0 = gUnknown_03004880.unk14; - if(r1 == 0 && r7 != 0) + if (r1 == 0 && r7 != 0) { - if(r7 > 0) + if (r7 > 0) deltaX = 1; else deltaX = -1; } - if(r0 == 0 && r8 != 0) + if (r0 == 0 && r8 != 0) { - if(r8 > 0) + if (r8 > 0) deltaY = 1; else deltaY = -1; } - if(r1 != 0 && r1 == -r7) + if (r1 != 0 && r1 == -r7) { - if(r7 > 0) + if (r7 > 0) deltaX = 1; else deltaX = -1; } - if(r0 != 0 && r0 == -r8) + if (r0 != 0 && r0 == -r8) { - if(r8 > 0) + if (r8 > 0) deltaX = 1; else deltaX = -1; @@ -410,7 +410,7 @@ void CameraUpdate(void) gUnknown_03004880.unk14 += r8; gUnknown_03004880.unk14 = gUnknown_03004880.unk14 - 16 * (gUnknown_03004880.unk14 / 16); - if(deltaX != 0 || deltaY != 0) + if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); UpdateFieldObjectsForCameraUpdate(deltaX, deltaY); -- cgit v1.2.3 From 010eb456d63b0d644285f263f310d73bfb9646b2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sat, 20 May 2017 17:49:54 +0200 Subject: Decrease indentation level of switches --- src/field_camera.c | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index 442bc095b..182e180ab 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -258,54 +258,54 @@ static void DrawMetatile(s32 a, u16 *b, u16 c) { switch (a) { - case 2: - gBGTilemapBuffers[3][c] = b[0]; - gBGTilemapBuffers[3][c + 1] = b[1]; - gBGTilemapBuffers[3][c + 0x20] = b[2]; - gBGTilemapBuffers[3][c + 0x21] = b[3]; - - gBGTilemapBuffers[2][c] = 0; - gBGTilemapBuffers[2][c + 1] = 0; - gBGTilemapBuffers[2][c + 0x20] = 0; - gBGTilemapBuffers[2][c + 0x21] = 0; - - gBGTilemapBuffers[1][c] = b[4]; - gBGTilemapBuffers[1][c + 1] = b[5]; - gBGTilemapBuffers[1][c + 0x20] = b[6]; - gBGTilemapBuffers[1][c + 0x21] = b[7]; - break; - case 1: - gBGTilemapBuffers[3][c] = b[0]; - gBGTilemapBuffers[3][c + 1] = b[1]; - gBGTilemapBuffers[3][c + 0x20] = b[2]; - gBGTilemapBuffers[3][c + 0x21] = b[3]; - - gBGTilemapBuffers[2][c] = b[4]; - gBGTilemapBuffers[2][c + 1] = b[5]; - gBGTilemapBuffers[2][c + 0x20] = b[6]; - gBGTilemapBuffers[2][c + 0x21] = b[7]; - - gBGTilemapBuffers[1][c] = 0; - gBGTilemapBuffers[1][c + 1] = 0; - gBGTilemapBuffers[1][c + 0x20] = 0; - gBGTilemapBuffers[1][c + 0x21] = 0; - break; - case 0: - gBGTilemapBuffers[3][c] = 0x3014; - gBGTilemapBuffers[3][c + 1] = 0x3014; - gBGTilemapBuffers[3][c + 0x20] = 0x3014; - gBGTilemapBuffers[3][c + 0x21] = 0x3014; - - gBGTilemapBuffers[2][c] = b[0]; - gBGTilemapBuffers[2][c + 1] = b[1]; - gBGTilemapBuffers[2][c + 0x20] = b[2]; - gBGTilemapBuffers[2][c + 0x21] = b[3]; - - gBGTilemapBuffers[1][c] = b[4]; - gBGTilemapBuffers[1][c + 1] = b[5]; - gBGTilemapBuffers[1][c + 0x20] = b[6]; - gBGTilemapBuffers[1][c + 0x21] = b[7]; - break; + case 2: + gBGTilemapBuffers[3][c] = b[0]; + gBGTilemapBuffers[3][c + 1] = b[1]; + gBGTilemapBuffers[3][c + 0x20] = b[2]; + gBGTilemapBuffers[3][c + 0x21] = b[3]; + + gBGTilemapBuffers[2][c] = 0; + gBGTilemapBuffers[2][c + 1] = 0; + gBGTilemapBuffers[2][c + 0x20] = 0; + gBGTilemapBuffers[2][c + 0x21] = 0; + + gBGTilemapBuffers[1][c] = b[4]; + gBGTilemapBuffers[1][c + 1] = b[5]; + gBGTilemapBuffers[1][c + 0x20] = b[6]; + gBGTilemapBuffers[1][c + 0x21] = b[7]; + break; + case 1: + gBGTilemapBuffers[3][c] = b[0]; + gBGTilemapBuffers[3][c + 1] = b[1]; + gBGTilemapBuffers[3][c + 0x20] = b[2]; + gBGTilemapBuffers[3][c + 0x21] = b[3]; + + gBGTilemapBuffers[2][c] = b[4]; + gBGTilemapBuffers[2][c + 1] = b[5]; + gBGTilemapBuffers[2][c + 0x20] = b[6]; + gBGTilemapBuffers[2][c + 0x21] = b[7]; + + gBGTilemapBuffers[1][c] = 0; + gBGTilemapBuffers[1][c + 1] = 0; + gBGTilemapBuffers[1][c + 0x20] = 0; + gBGTilemapBuffers[1][c + 0x21] = 0; + break; + case 0: + gBGTilemapBuffers[3][c] = 0x3014; + gBGTilemapBuffers[3][c + 1] = 0x3014; + gBGTilemapBuffers[3][c + 0x20] = 0x3014; + gBGTilemapBuffers[3][c + 0x21] = 0x3014; + + gBGTilemapBuffers[2][c] = b[0]; + gBGTilemapBuffers[2][c + 1] = b[1]; + gBGTilemapBuffers[2][c + 0x20] = b[2]; + gBGTilemapBuffers[2][c + 0x21] = b[3]; + + gBGTilemapBuffers[1][c] = b[4]; + gBGTilemapBuffers[1][c + 1] = b[5]; + gBGTilemapBuffers[1][c + 0x20] = b[6]; + gBGTilemapBuffers[1][c + 0x21] = b[7]; + break; } } -- cgit v1.2.3 From dd7f59cde93529e3e63bd2df0d096d1718835873 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 23 May 2017 12:06:33 -0400 Subject: Some more functions related to FMO camera and special anims --- src/field_camera.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index 442bc095b..acb30e21e 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -25,16 +25,6 @@ extern s16 gUnknown_0300059A; extern u8 gUnknown_0300059C; extern void (*gUnknown_030005A0)(void); -struct CameraSomething -{ - void (*callback)(struct CameraSomething *); - u32 unk4; - s32 unk8; - s32 unkC; - s32 unk10; - s32 unk14; -}; - extern struct CameraSomething gUnknown_03004880; extern u16 gUnknown_03004898; extern u16 gUnknown_0300489C; -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/field_camera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index df5ccc301..163082282 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -1,7 +1,7 @@ +#include "rotating_gate.h" +#include "fieldmap.h" #include "global.h" #include "field_camera.h" -#include "asm.h" -#include "asm_fieldmap.h" #include "berry.h" #include "field_player_avatar.h" #include "sprite.h" -- cgit v1.2.3 From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:01:42 +0200 Subject: Sort includes --- src/field_camera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/field_camera.c') diff --git a/src/field_camera.c b/src/field_camera.c index 163082282..1aed1549b 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -1,9 +1,9 @@ -#include "rotating_gate.h" -#include "fieldmap.h" #include "global.h" #include "field_camera.h" #include "berry.h" #include "field_player_avatar.h" +#include "fieldmap.h" +#include "rotating_gate.h" #include "sprite.h" #include "text.h" -- cgit v1.2.3