diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 05cc8b5..981f59a 100644 Binary files a/!TheEsc/!RunImage,ff8 and b/!TheEsc/!RunImage,ff8 differ diff --git a/!TheEsc/c/CTheEscape b/!TheEsc/c/CTheEscape index 705dcb0..1342eca 100644 --- a/!TheEsc/c/CTheEscape +++ b/!TheEsc/c/CTheEscape @@ -5,9 +5,10 @@ #include "Sound.h" #include "Graphics.h" -//#define SKIP_INTRO -//#define SKIP_MISSION1 -//#define SKIP_MISSION2 +#define SKIP_INTRO +#define SKIP_MISSION1 +#define SKIP_MISSION2 +#define M2_DEBUG_HITBOXES // SWI Registers _kernel_swi_regs inreg; diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index 82020c4..0c67a6a 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -310,7 +310,7 @@ void game2_tick_input() if(input_readkey(121)) { TilePlayer.location.X += 3 * (tick - lasttick); - if(TilePlayer.location.X > (950)) + if(TilePlayer.location.X > (930)) { TilePlayer.location.X = 100; TilePlayer.mapoffset.X += 10; @@ -416,6 +416,8 @@ int game2_tick() game2_tick_input(); draw_sprite("man",TilePlayer.location.X,TilePlayer.location.Y); + +#ifdef M2_DEBUG_HITBOXES draw_rectangle( (TilePlayer.location.X + TilePlayer.hitbox_bl.X), (TilePlayer.location.Y + TilePlayer.hitbox_bl.Y), @@ -428,6 +430,7 @@ int game2_tick() (TilePlayer.location.X + TilePlayer.drawbox_tr.X), (TilePlayer.location.Y + TilePlayer.drawbox_tr.Y) ); +#endif return 0; }else{ /* screen_flipbuffer();