diff --git a/data/enemies/jeannine.ani b/data/enemies/jeannine.ani
new file mode 100644
index 0000000..065fd45
--- /dev/null
+++ b/data/enemies/jeannine.ani
@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/jeannine.png b/data/enemies/jeannine.png
new file mode 100644
index 0000000..88d2ce5
Binary files /dev/null and b/data/enemies/jeannine.png differ
diff --git a/data/room/34.tmx b/data/room/34.tmx
index 341bbd4..0f6d506 100644
--- a/data/room/34.tmx
+++ b/data/room/34.tmx
@@ -3,22 +3,22 @@
-25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25
+114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,0,0,114,115,114,115,114,115
diff --git a/data/room/35.room b/data/room/35.room
index 0117398..b1afd1d 100644
--- a/data/room/35.room
+++ b/data/room/35.room
@@ -1,33 +1,122 @@
-name=no 35
+name=SILICON BOOBS
bgColor=black
-border=red
+border=bright_green
tileMapFile=35.tmx
tileSetFile=standard.png
roomUp=0
roomDown=0
roomLeft=36.room
roomRight=34.room
+itemColor1=green
+itemColor2=red
+autoSurface=left
[enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
-width=16
+tileSetFile=jeannine.png
+animation=jeannine.ani
+width=8
height=16
-x=2
-y=2
-vx=0
+x=6
+y=13
+vx=0.4
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=6
+y1=13
+x2=14
+y2=13
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=jeannine.png
+animation=jeannine.ani
+width=8
+height=16
+x=16
+y=13
+vx=0.4
+vy=0
+x1=16
+y1=13
+x2=28
+y2=13
+color=cyan
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=jeannine.png
+animation=jeannine.ani
+width=8
+height=16
+x=7
+y=9
+vx=0.4
+vy=0
+x1=7
+y1=9
+x2=15
+y2=9
+color=red
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=jeannine.png
+animation=jeannine.ani
+width=8
+height=16
+x=16
+y=9
+vx=0.4
+vy=0
+x1=16
+y1=9
+x2=27
+y2=9
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=jeannine.png
+animation=jeannine.ani
+width=8
+height=16
+x=5
+y=5
+vx=0.4
+vy=0
+x1=5
+y1=5
+x2=12
+y2=5
+color=green
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=jeannine.png
+animation=jeannine.ani
+width=8
+height=16
+x=16
+y=5
+vx=0.4
+vy=0
+x1=16
+y1=5
+x2=26
+y2=5
+color=yellow
+flip=true
[/enemy]
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=57
+x=2
+y=4
counter=1
[/item]
\ No newline at end of file
diff --git a/data/room/35.tmx b/data/room/35.tmx
index 94f127e..d8840e7 100644
--- a/data/room/35.tmx
+++ b/data/room/35.tmx
@@ -3,21 +3,21 @@
-115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+118,119,114,115,118,119,114,115,114,115,114,115,118,119,114,115,114,115,114,115,118,119,114,115,114,115,114,115,114,115,114,115,
+115,118,119,114,115,114,115,118,119,114,115,114,115,114,115,114,115,118,119,114,115,114,115,114,115,114,115,118,119,114,115,114,
+116,140,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,116,140,
+140,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,120,
+120,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,144,
+144,116,407,408,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+116,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+140,116,0,0,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,140,116,
+116,140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,140,
+140,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,431,144,116,
+116,144,431,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+0,0,0,0,0,0,431,432,431,432,431,432,431,432,431,432,431,432,431,432,431,432,431,432,431,432,431,432,431,432,140,116,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+114,115,114,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+115,114,115,114,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115,118,119,114,115
diff --git a/data/room/36.tmx b/data/room/36.tmx
index 6765118..c43c02c 100644
--- a/data/room/36.tmx
+++ b/data/room/36.tmx
@@ -5,19 +5,19 @@
118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,
119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,119,118,119,118,119,118,119,118,119,118,119,118,119,354,0,118,119,118,119,118,119,118,119,118,119,118,119,118,0,0,
-0,0,118,119,118,119,118,119,118,119,118,119,118,119,118,0,354,119,118,119,118,119,118,119,118,119,118,119,118,119,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,144,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,144,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,144,
+0,0,119,118,119,118,119,118,119,118,119,118,119,118,119,354,0,118,119,118,119,118,119,118,119,118,119,118,119,118,0,120,
+0,0,118,119,118,119,118,119,118,119,118,119,118,119,118,0,354,119,118,119,118,119,118,119,118,119,118,119,118,119,0,144,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,120,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,144,
118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119,118,119
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index fa6ac91..4b35202 100644
Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ
diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png
index 69a7c9b..3a6ecef 100644
Binary files a/data/tilesets/standard_zxarne.png and b/data/tilesets/standard_zxarne.png differ
diff --git a/source/director.cpp b/source/director.cpp
index a65eb6f..0b71888 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -371,6 +371,7 @@ void Director::loadResources(section_t section)
textureList.push_back("jailer.png");
textureList.push_back("jailer2.png");
textureList.push_back("jailer3.png");
+ textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
textureList.push_back("macaronni_ted.png");
textureList.push_back("matatunos.png");
@@ -429,6 +430,7 @@ void Director::loadResources(section_t section)
animationList.push_back("jailer.ani");
animationList.push_back("jailer2.ani");
animationList.push_back("jailer3.ani");
+ animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
animationList.push_back("macaronni_ted.ani");
animationList.push_back("matatunos.ani");
@@ -527,6 +529,7 @@ void Director::loadResources(section_t section)
textureList.push_back("jailer.png");
textureList.push_back("jailer2.png");
textureList.push_back("jailer3.png");
+ textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
textureList.push_back("macaronni_ted.png");
textureList.push_back("matatunos.png");
@@ -592,6 +595,7 @@ void Director::loadResources(section_t section)
animationList.push_back("jailer.ani");
animationList.push_back("jailer2.ani");
animationList.push_back("jailer3.ani");
+ animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
animationList.push_back("macaronni_ted.ani");
animationList.push_back("matatunos.ani");
@@ -1183,6 +1187,8 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/jailer2.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer3.ani", t_data);
asset->add(prefix + "/data/enemies/jailer3.png", t_bitmap);
+ asset->add(prefix + "/data/enemies/jeannine.ani", t_data);
+ asset->add(prefix + "/data/enemies/jeannine.png", t_bitmap);
asset->add(prefix + "/data/enemies/lamp.ani", t_data);
asset->add(prefix + "/data/enemies/lamp.png", t_bitmap);
asset->add(prefix + "/data/enemies/macaronni_ted.ani", t_data);
diff --git a/source/ending2.cpp b/source/ending2.cpp
index af97b2a..8cfa196 100644
--- a/source/ending2.cpp
+++ b/source/ending2.cpp
@@ -288,6 +288,7 @@ void Ending2::iniSpriteList()
spriteList.push_back("diskette");
spriteList.push_back("bird");
spriteList.push_back("chip");
+ spriteList.push_back("jeannine");
spriteList.push_back("spark");
spriteList.push_back("code");
spriteList.push_back("paco");