diff --git a/source/level/layertile.cpp b/source/level/layertile.cpp index 50acff25a..624c2d95a 100644 --- a/source/level/layertile.cpp +++ b/source/level/layertile.cpp @@ -16,8 +16,15 @@ const u32 YInc=16<<16; /*****************************************************************************/ static const int TILE2D_WIDTH=16; static const int TILE2D_HEIGHT=12; -static const int SCREEN_TILE2D_WIDTH=((512/TILE2D_WIDTH)+1); -static const int SCREEN_TILE2D_HEIGHT=((256/TILE2D_HEIGHT)+1); +#if defined(__TERRITORY_EUR__) +static const int SCREEN_TILE_ADJ_W =1; +static const int SCREEN_TILE_ADJ_H =2; // Extra line needed :o( +#else +static const int SCREEN_TILE_ADJ_W =1; +static const int SCREEN_TILE_ADJ_H =1; +#endif +static const int SCREEN_TILE2D_WIDTH=((512/TILE2D_WIDTH)+SCREEN_TILE_ADJ_W); +static const int SCREEN_TILE2D_HEIGHT=((256/TILE2D_HEIGHT)+SCREEN_TILE_ADJ_H); static const int PrimCount=SCREEN_TILE2D_WIDTH*SCREEN_TILE2D_HEIGHT; static const int PrimMemSize=PrimCount*sizeof(TSPRT); diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 330ed4ca9..b940cfe78 100644 --- a/source/level/layertile3d.cpp +++ b/source/level/layertile3d.cpp @@ -23,11 +23,17 @@ int ShowPolyz=0; #endif static const int BLOCK_SIZE =16; +#if defined(__TERRITORY_EUR__) +static const int SCREEN_TILE_ADJ_U =2; +static const int SCREEN_TILE_ADJ_D =2; // Extra line needed :o( +static const int SCREEN_TILE_ADJ_L =3; +static const int SCREEN_TILE_ADJ_R =3; +#else static const int SCREEN_TILE_ADJ_U =2; static const int SCREEN_TILE_ADJ_D =1; static const int SCREEN_TILE_ADJ_L =3; static const int SCREEN_TILE_ADJ_R =3; - +#endif static const int SCREEN_TILE3D_WIDTH =(INGAME_SCREENW/BLOCK_SIZE)+SCREEN_TILE_ADJ_L+SCREEN_TILE_ADJ_R; static const int SCREEN_TILE3D_HEIGHT =(INGAME_SCREENH/BLOCK_SIZE)+SCREEN_TILE_ADJ_U+SCREEN_TILE_ADJ_D; diff --git a/source/system/vid.cpp b/source/system/vid.cpp index ad1bbf251..d6e3af82b 100644 --- a/source/system/vid.cpp +++ b/source/system/vid.cpp @@ -316,8 +316,10 @@ u8 *screenData=LoadPakScreen(LOADINGSCREENS_BOOTSCREEN_GFX); SetDispMask(0); #if defined(__TERRITORY_USA__) || defined(__TERRITORY_JAP__) SetVideoMode( MODE_NTSC ); + ScreenYOfs=0; // Set screen ofs for NTSC #else SetVideoMode( MODE_PAL ); + ScreenYOfs=16; // Set screen ofs for PAL #endif VSync(0); @@ -376,6 +378,7 @@ int ScrH=VidGetScrH()*FrameFlipFlag; while(DrawSync(1)); } +#if defined(__VERSION_DEBUG__) if(ScreenClipBox==1) { @@ -409,7 +412,7 @@ if(ScreenClipBox==2) setRGB0(f4,50,50,50); AddPrimToList(f4,0); } - +#endif // How many frames since we last flipped the display? int fc=FrameCounter; s_vblsThisFrame=fc-s_lastFrameCounter; @@ -439,6 +442,8 @@ u8 *Screen=(u8*)MemAlloc(512*256*2,"Screen"); /*****************************************************************************/ /*** VRAM VIEWER *************************************************************/ /*****************************************************************************/ + +#if defined(__VERSION_DEBUG__) #define UseVRamViewer #ifdef UseVRamViewer @@ -475,4 +480,5 @@ int OldX=Scr->Disp.disp.x,OldY=Scr->Disp.disp.y; Scr->Disp.disp.y=OldY; } +#endif #endif \ No newline at end of file