diff options
Diffstat (limited to 'src/field_camera.c')
| -rw-r--r-- | src/field_camera.c | 54 |
1 files changed, 27 insertions, 27 deletions
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) { |