diff --git a/gb/Makefile b/gb/Makefile
index 4082049..4eb32d9 100644
--- a/gb/Makefile
+++ b/gb/Makefile
@@ -48,8 +48,7 @@ test:
 
 NEEDED_GRAPHICS = \
 	$(GENBACKGROUNDS)/title.tilemap \
-	$(GENBACKGROUNDS)/text-font.2bpp \
-	$(GENBACKGROUNDS)/room.tilemap
+	$(GENBACKGROUNDS)/text-font.2bpp
 
 $(GENSPRITES)/%.2bpp: $(RESSPRITES)/%.png | $(GENSPRITES)
 	$(GFX) -c '#fff,#cfcfcf,#686868,#000;' --columns -o $@ $<
diff --git a/gb/src/main/main.asm b/gb/src/main/main.asm
index 06b0b36..7034043 100644
--- a/gb/src/main/main.asm
+++ b/gb/src/main/main.asm
@@ -73,7 +73,7 @@ NextGameState::
     ; Initiate the next state
     ld a, [wGameState]
     cp 2 ; 2 = Gameplay
-    ; call z, InitGameplay
+    call z, InitGameplayState
     cp 1 ; 1 = Generate Dungeon
     call z, InitDungeonGeneration
     ld a, [wGameState]
@@ -83,10 +83,7 @@ NextGameState::
     ; Update the next state
     ld a, [wGameState]
     cp 2 ; 2 = Gameplay
-    jp z, Test
+    jp z, UpdateGameplayState
     cp 1 ; 1 = Generate Dungeon
     jp z, UpdateDungeonGeneration
-    jp UpdateTitleScreenState
-
-Test::
-    jp Test
\ No newline at end of file
+    jp UpdateTitleScreenState
\ No newline at end of file
diff --git a/gb/src/main/states/gameplay/gameplay-state.asm b/gb/src/main/states/gameplay/gameplay-state.asm
new file mode 100644
index 0000000..e6eba0d
--- /dev/null
+++ b/gb/src/main/states/gameplay/gameplay-state.asm
@@ -0,0 +1,28 @@
+INCLUDE "hardware.inc/hardware.inc"
+
+SECTION "GameplayState", ROM0
+
+roomTileData: INCBIN "src/generated/backgrounds/room.2bpp"
+roomTileDataEnd:
+
+roomTileMap: INCBIN "src/generated/backgrounds/room.tilemap"
+roomTileMapEnd:
+
+InitGameplayState::
+    call DrawRoom
+    ld a, LCDCF_ON | LCDCF_BGON
+    ld [rLCDC], a
+    ret
+
+DrawRoom::
+    ld de, roomTileData
+    ld hl, $9340
+    ld bc, roomTileDataEnd - roomTileData
+    call CopyDEIntoMemoryAtHL
+    ld de, roomTileMap
+    ld hl, $9800
+    ld bc, roomTileMapEnd - roomTileMap
+    jp CopyDEintoMemoryAtHL_With520Offset
+
+UpdateGameplayState::
+    jp NextGameState
\ No newline at end of file
diff --git a/gb/src/resources/backgrounds/room.png b/gb/src/resources/backgrounds/room.png
deleted file mode 100644
index 0a66305c892829c2314d8ade72a91ce0621d1600..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 399
zcmeAS@N?(olHy`uVBq!ia0y~yU}OMcCT0c(21OZ%uM7+fJOMr-t_%zeAz>l&7tR0w
z|9|Yc^_>h1jCP(bjv*Cu-p(}iV>T3E_{^npsoCY<<BlE69P0dQoWhg2-)kTIvODf%
z)9Hg}PA+xdzRy!i{@kW66UntT7jASq1O>8wbYnRfcTgbakZO;oqbSQsM=zn`tqZsp
z?bu-V_&vuL=R3U#zn!nJe!S07w}JV1{!eM|3CC_PHg!4`UmuyYF6@l?47tSjO)^ep
zZ{kB7bDvM@+MCoDD*D4oB#`y8%;QH3_N{KZd@JS88u?WZG%NiQDzDx@pqin->cPG5
zg6md2IH-Q%{DUn!AG{ELA?w3EM|sc6CinRd_~$UnUTCyEv?ZacC9|=Z#cDw_pX>$4
zcD@%2oY_k*EM&HNae+~`<V6FYRfz+;ELi%^A=aatwRU{w?1`TD<mUaJ?o~%s4fIy6
pTJkZtcS6|t)YyyG3@G46m;cNyA8yQTv-%7Y_jL7hS?83{1OV>Ut9AeY