From daf5f744eaa9c732a884a8b905024054f08369f2 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 3 Nov 2019 21:58:21 -0500
Subject: [PATCH] ds: update sprites and first level of starbase

---
 demosplash/Makefile                           |   4 +
 demosplash/demosplash.s                       |  11 ++-
 demosplash/graphics/sprites/astronaut.inc     |  92 +++++++++---------
 demosplash/graphics/starbase/Makefile         |   2 +-
 demosplash/graphics/starbase/jail.png         | Bin 1665 -> 5158 bytes
 .../ootw_running-20190309-163912.piskel       |   1 +
 demosplash/graphics/starbase/starbase.inc     |  34 ++++++-
 demosplash/starbase.s                         |   2 +-
 demosplash/starbase_action.s                  |  23 ++---
 9 files changed, 103 insertions(+), 66 deletions(-)
 create mode 100644 demosplash/graphics/starbase/ootw_running-20190309-163912.piskel

diff --git a/demosplash/Makefile b/demosplash/Makefile
index c8e917e8..425e9024 100644
--- a/demosplash/Makefile
+++ b/demosplash/Makefile
@@ -53,7 +53,11 @@ demosplash.o:	demosplash.s \
 	pt3_lib_init.s pt3_lib_core.s pt3_lib_mockingboard.s \
 	pt3_lib_play_frame.s pt3_lib_write_frame.s \
 	interrupt_handler.s \
+	starbase.s \
+	starbase_action.s \
 	missing.s k_40_48d.inc create_update_type1.s \
+	graphics/starbase/starbase.inc \
+	graphics/sprites/alien.inc graphics/sprites/astronaut.inc \
 	escape.s create_update_type2.s offsets_table2.s \
 	book.s book_40_48d.inc \
 	credits.s credits_bg.inc offsets_table.s \
diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s
index 7fcd2860..613cf116 100644
--- a/demosplash/demosplash.s
+++ b/demosplash/demosplash.s
@@ -127,13 +127,16 @@ frame_decode_loop:
 	; starbase scene
 	;===========================
 
-;	jsr	starbase
+	jsr	starbase
 
 	;===========================
 	; escape scene
 	;===========================
 
-	jsr	escape
+	nop
+	nop
+	nop
+;	jsr	escape
 
 	;===========================
 	; book scene
@@ -170,7 +173,6 @@ wait_until_keypressed:
 
 ; Apple II intro
 .include "appleII_intro.s"
-.include "appleII_40_96.inc"
 
 .align $100
 .include "vapor_lock.s"
@@ -197,7 +199,7 @@ wait_until_keypressed:
 .include "starbase.s"
 
 ; escape
-.include "escape.s"
+;.include "escape.s"
 
 ; book
 .include "book.s"
@@ -217,6 +219,7 @@ wait_until_keypressed:
 .include "create_update_type2.s"
 
 ; Pictures (no need to align)
+.include "appleII_40_96.inc"
 .include "earth.inc"
 .include "book_40_48d.inc"
 .include "credits_bg.inc"
diff --git a/demosplash/graphics/sprites/astronaut.inc b/demosplash/graphics/sprites/astronaut.inc
index 66be47b5..153d3d39 100644
--- a/demosplash/graphics/sprites/astronaut.inc
+++ b/demosplash/graphics/sprites/astronaut.inc
@@ -12,8 +12,8 @@
 astro_stand:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -44,8 +44,8 @@ astro_walk_progression:
 astro_walk_left1:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ab,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -55,8 +55,8 @@ astro_walk_left1:
 astro_walk_left2:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -66,8 +66,8 @@ astro_walk_left2:
 astro_walk_left3:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -77,8 +77,8 @@ astro_walk_left3:
 astro_walk_left4:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -88,8 +88,8 @@ astro_walk_left4:
 astro_walk_left5:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$bb,$22,$aa,$aa
 	.byte $fa,$aa,$22,$aa,$aa
@@ -99,8 +99,8 @@ astro_walk_left5:
 astro_walk_left6:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$6a,$22,$aa,$aa
@@ -110,8 +110,8 @@ astro_walk_left6:
 astro_walk_left7:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$2b,$aa,$aa
 	.byte $aa,$6a,$22,$aa,$aa
@@ -121,8 +121,8 @@ astro_walk_left7:
 astro_walk_left8:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$6a,$22,$aa,$aa
@@ -132,8 +132,8 @@ astro_walk_left8:
 astro_walk_left9:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -143,8 +143,8 @@ astro_walk_left9:
 astro_walk_left10:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -286,8 +286,8 @@ astro_run_left9:
 kick1:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $bb,$ab,$22,$ba,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -303,8 +303,8 @@ kick1:
 shooting1:
 	.byte 5,8
 	.byte $AA,$AA,$8A,$8A,$AA
-	.byte $AA,$AA,$bb,$88,$AA
-	.byte $0A,$0A,$AA,$2B,$AA
+	.byte $AA,$AA,$bb,$88,$8A
+	.byte $0A,$0A,$AA,$2B,$88
 	.byte $AA,$A0,$AB,$B2,$AA
 	.byte $AA,$AA,$AA,$22,$AA
 	.byte $AA,$AA,$AA,$22,$AA
@@ -347,8 +347,8 @@ crouch1:
 	.byte 3,8
 	.byte $aa,$aa,$aa
 	.byte $8a,$8a,$aa
-	.byte $bb,$88,$aa
-	.byte $aa,$2b,$aa
+	.byte $bb,$88,$8a
+	.byte $aa,$2b,$88
 	.byte $aa,$bb,$aa
 	.byte $aa,$bb,$aa
 	.byte $22,$22,$aa
@@ -359,8 +359,8 @@ crouch2:
 	.byte $AA,$aa,$aa,$aa,$AA
 	.byte $AA,$aa,$aa,$aa,$AA
 	.byte $AA,$8a,$8a,$aa,$AA
-	.byte $AA,$bb,$88,$aa,$AA
-	.byte $AA,$aa,$2b,$2a,$AA
+	.byte $AA,$bb,$88,$8a,$AA
+	.byte $AA,$aa,$2b,$28,$AA
 	.byte $AA,$aa,$bb,$22,$AA
 	.byte $AA,$ba,$2b,$aa,$AA
 	.byte $AA,$52,$f2,$f2,$AA
@@ -477,8 +477,8 @@ astro_jump_progression:
 jump1:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -488,7 +488,7 @@ jump1:
 jump2:
 	.byte 5,8
 	.byte $8a,$8a,$aa,$aa,$aa
-	.byte $bb,$88,$aa,$aa,$aa
+	.byte $bb,$88,$8a,$8a,$aa
 	.byte $aa,$2b,$22,$aa,$aa
 	.byte $aa,$22,$bb,$aa,$aa
 	.byte $aa,$a2,$bb,$aa,$aa
@@ -499,7 +499,7 @@ jump2:
 jump3:
 	.byte 5,8
 	.byte $8a,$8a,$aa,$aa,$aa
-	.byte $bb,$88,$aa,$aa,$aa
+	.byte $bb,$88,$8a,$8a,$aa
 	.byte $aa,$2b,$22,$aa,$aa
 	.byte $aa,$22,$bb,$aa,$aa
 	.byte $aa,$a2,$bb,$aa,$aa
@@ -510,7 +510,7 @@ jump3:
 jump4:
 	.byte 5,8
 	.byte $8a,$8a,$aa,$aa,$aa
-	.byte $bb,$88,$aa,$aa,$aa
+	.byte $bb,$88,$8a,$8a,$aa
 	.byte $aa,$2b,$22,$aa,$aa
 	.byte $aa,$22,$bb,$aa,$aa
 	.byte $aa,$a2,$bb,$aa,$aa
@@ -521,7 +521,7 @@ jump4:
 jump5:
 	.byte 5,8
 	.byte $b8,$88,$aa,$aa,$aa
-	.byte $ab,$b8,$aa,$aa,$aa
+	.byte $ab,$b8,$8a,$8a,$aa
 	.byte $ba,$b2,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -532,8 +532,8 @@ jump5:
 jump6:
 	.byte 5,8
 	.byte $aa,$b8,$88,$aa,$aa
-	.byte $aa,$ab,$b8,$aa,$aa
-	.byte $ab,$ba,$b2,$aa,$aa
+	.byte $aa,$ab,$b8,$8a,$aa
+	.byte $ab,$ba,$b2,$aa,$a8
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$66,$22,$2a,$fa
@@ -543,8 +543,8 @@ jump6:
 jump7:
 	.byte 5,8
 	.byte $aa,$b8,$88,$aa,$aa
-	.byte $aa,$ab,$b8,$aa,$aa
-	.byte $aa,$aa,$b2,$aa,$aa
+	.byte $aa,$ab,$b8,$8a,$aa
+	.byte $aa,$aa,$b2,$a8,$aa
 	.byte $ab,$ab,$22,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$66,$22,$2a,$fa
@@ -554,8 +554,8 @@ jump7:
 jump8:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$b2,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$2a,$22,$aa,$aa
@@ -590,8 +590,8 @@ crouch_shooting:
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$8a,$8a,$aa
-	.byte $AA,$AA,$bb,$88,$aa
-	.byte $0A,$0A,$aa,$2b,$2a
+	.byte $AA,$AA,$bb,$88,$8a
+	.byte $0A,$0A,$aa,$2b,$28
 	.byte $AA,$A0,$ba,$bb,$22
 	.byte $AA,$AA,$2a,$2b,$aa
 	.byte $AA,$AA,$52,$f2,$f2
@@ -607,8 +607,8 @@ crouch_kicking:
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$8a,$8a,$aa
-	.byte $AA,$AA,$bb,$88,$aa
-	.byte $AA,$AA,$aa,$2b,$2a
+	.byte $AA,$AA,$bb,$88,$8a
+	.byte $AA,$AA,$aa,$2b,$28
 	.byte $AA,$AA,$aa,$bb,$22
 	.byte $AA,$AA,$2a,$bb,$a2
 	.byte $5A,$56,$A2,$f2,$f2
diff --git a/demosplash/graphics/starbase/Makefile b/demosplash/graphics/starbase/Makefile
index 02e4f0f9..3df29e28 100644
--- a/demosplash/graphics/starbase/Makefile
+++ b/demosplash/graphics/starbase/Makefile
@@ -9,7 +9,7 @@ all:	starbase.inc
 
 starbase.inc:	$(PNG2RLE) \
 	jail.png hallway.png window.png ship.png
-	$(PNG2RLE) asm jail.png jail_rle >> starbase.inc
+	$(PNG2RLE) asm jail.png jail_rle > starbase.inc
 	$(PNG2RLE) asm hallway.png hallway_rle >> starbase.inc
 	$(PNG2RLE) asm window.png window_rle >> starbase.inc
 	$(PNG2RLE) asm ship.png ship_rle >> starbase.inc
diff --git a/demosplash/graphics/starbase/jail.png b/demosplash/graphics/starbase/jail.png
index 4c66796ad3285ad24256c8f375f5432ba7ea2397..916c74abce6349193047dcff3a315f519de2fe1f 100644
GIT binary patch
delta 5044
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
KMNUMnLSTZ~2C}CB

delta 1524
zcmV<Q1q=G7D1i--BYy>SdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmg^`C
z{AU%j1SAj=%Mq`0W(TwUDI6!=ozCq?x<9W;43=>rR05<h|ND1^e{gY;9I~jDT1v!~
zYp(2QSiD?*+$rYceq3_C!t)z>NY@t((SA4uR!;eZoY9|8d4E4~9CCRDROk7ky?x;)
z5ZgJxDZdVs=rTY&frFnwiO-Sq<+)v^6-zaJJ%xVuU+4S74ETqA%SmCcLYi^U992t2
z+c;*0-NvCPUo6M<oWb35xOQde#4}NfxZBn+LH$&dZyE0U{gx)Q`H=5f9GZeH4pGsr
zSG#_EeWZD~s(*e`{)W<9>yGML-!mN!gI>F&JBG@wekdn-k%!lm9=yF8xs<cTZ{>?_
zE_-7xT<KeD*jn>4JI@7EF6X4KQ#@Me*S58euL_FdFVVKKcd00bCDGwW15VaZI#ps&
zwkXper$zIqJ9Vg-d9tEr?wqIx2n}RZ?g!m@7h0?!cz+}V(H-uPAmy7bbPQXM;W`-x
z9%KRDK>#Cs@}m;I(rK-|py)6$sHY3RyxkF6Z03kUBy<BKv`(YSVc=`Izc#N449a0<
z!vsCHjR5+a(2H}WgXn~gg8H(6NyiBQ6F~!kGL*nTER=)_MP&|31Vb7Ka;VNJa|10T
z!UIZjPJgL@9IOJ2jc=5Wt}J{JV<Q9+l1fMlZm<MFR?Y(d(QNP`mn2z4il~@W@si43
zVWnu<JF08atfEC#O{;paWZA@ushL&t$~9rfm5TLPt=8&}K^@4BuN@uS8@JSQlUABG
zYqfdj&{NM{dg<D&*Y1Ny8d%4p3>`M=@JSP{G=KAyS*A{#b^3y<t+euzRhBMWH7vie
zcGCK;e1kPQS>uDL-BE9>L8^L%puL^Q<_wH+CJ?Th0ZM^+a~6$q=FQyZEY`gd3PVZR
z<P6%3fx$e9Wzmhh7v?0S@;kf*5W&B}T-elofw}j*Jz{P6anPlMp}h>ZQDegD8{OIP
z!+(MKNgcl0@w-5&tFB3<%?9^KvpSx~YPz5wCTP1h@#S;3`tnl8ZUvpF_sa$sE`~|Y
z*`9!cL;em_*v;R73YQuF94cIm^;4+uV)vgxh1V4R1S-7shUcNey<<HK72f;kb5P-t
zyFUXJ9<QA5Lxn#r!tX+bKd<NSL4}XDhJWusg^zcc_fW^S^`H)adhy-*FVGi&mg{GI
zoV?GPVrkVg7**-58^Yt!RQEZLfWktFJs~^7DNeKEBps8}vVw!Z>8RUlXqn@LU5bBN
zfJEZe)XV5P2K*|iuk2yT<vg1RI;7>&)_~j9G7#;+(U?ogNb+P%A5}P8pOPz$On>eq
z3o*l(2uw;C3#YQQKGGaKOOCDO)JODIBVvC>Y%=pej-g}W6iv<BLa=An5T_t`tq4#M
zzDOuY6s#j?GNF}hMtoRvq$vn$D9g@rzfy<KJL*7;^C?z%Bak?tXSF1KZ~=lNlF8W$
zOa{t!QVVW2NgcCtgOOJ%2;o*oE`L&ewAuF>wbcc2m^RQ_*VK%xXS9(Df}@F0sJ5Xl
z>K(%(dWC&_AnIGw6gh1x!_j?JN@>UUj895O)Rv2~XPX|8^kQQ`f(DWRyC#x|F-u*D
z=+b7?X@+7V-QYtAK;fIk<FRezvNG?M1NpM0ATNZP7hT{RpgtomX1EbyQ-4Bs1e$gp
zB@jnX+XLG`>^v>Dy>HFPj^J)vz0Z+F2c>O>F-_J&usjkrxfn>`t&E-Rs>D@=hYDcR
zyQ*+%uw%xp!_Kn5u135n65~ykowY-k!1kO??oAS&waL9n!m~EHH%WNbCif-@k8I-l
zt@Zj~t^J_>3v}J%kV#cA^a($>|4vZE#89S_!V+Ey3IhWj17ITeJd-ICC{a8~L_t(Y
z$L-cJ5dbg@fWR#EZ@DHI((5CD73RbY;X)w*;9K%C<gv;7l_xQ;Y##3X1@gVHbA*J1
aZwfD9oF!RBca*FE0000<MNUMnLSTYt3+_Dt

diff --git a/demosplash/graphics/starbase/ootw_running-20190309-163912.piskel b/demosplash/graphics/starbase/ootw_running-20190309-163912.piskel
new file mode 100644
index 00000000..ecd5f2f4
--- /dev/null
+++ b/demosplash/graphics/starbase/ootw_running-20190309-163912.piskel
@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"ootw_running","description":"","fps":5,"height":48,"width":80,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":9,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7],[8]],\"base64PNG\":\"data:image/png;base64,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\"}]}"],"hiddenFrames":[]}}
\ No newline at end of file
diff --git a/demosplash/graphics/starbase/starbase.inc b/demosplash/graphics/starbase/starbase.inc
index 295fc69d..ccfecd41 100644
--- a/demosplash/graphics/starbase/starbase.inc
+++ b/demosplash/graphics/starbase/starbase.inc
@@ -1,7 +1,35 @@
 jail_rle:	.byte $28 ; ysize=48
-	.byte $A0,$78,$55, $A0,$FF,$00, $A0,$69,$00, $AB,$50, $A0,$1D,$00, $AC,$55, $50
-	.byte $A0,$1B,$00, $AE,$55, $50, $A0,$19,$00, $A0,$10,$55, $50, $A0,$17,$00
-	.byte $A0,$12,$55, $A0,$16,$50, $A0,$FF,$55, $A0,$19,$55
+	.byte $A0,$12,$77, $57,$57, $A0,$14,$55, $AE,$77, $57,$57, $A0,$18,$55, $AA,$77
+	.byte $57,$57, $A7,$55, $00, $A0,$01,$A0, $50, $A0,$01,$A0, $A3,$55
+	.byte $00, $A0,$01,$A0, $50, $A0,$01,$A0, $A3,$55, $00, $A0,$01,$A0
+	.byte $50, $A0,$01,$A0, $A0,$16,$55, $00, $A0,$01,$AA, $55, $A0,$01,$AA
+	.byte $55, $76, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA
+	.byte $55, $76, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA
+	.byte $55, $76, $A5,$55, $95, $99, $AD,$55, $00
+	.byte $A0,$01,$AA, $55, $A0,$01,$AA, $55, $77, $55, $00
+	.byte $A0,$01,$AA, $55, $A0,$01,$AA, $55, $77, $55, $00
+	.byte $A0,$01,$AA, $55, $A0,$01,$AA, $55, $77, $A6,$55, $99
+	.byte $95, $AC,$55, $00, $A0,$01,$AA, $55, $A0,$01,$AA, $55
+	.byte $77, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA, $55
+	.byte $77, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA, $55
+	.byte $77, $A6,$55, $59, $AD,$55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $A0,$14,$55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $A0,$12,$55, $05,$05, $00, $0A
+	.byte $05, $0A, $05, $07, $05, $00, $0A
+	.byte $05, $0A, $05, $07, $05, $00, $0A
+	.byte $05, $0A, $05, $07, $05, $AF,$55, $45
+	.byte $A0,$18,$44, $AD,$55, $45, $AE,$44, $94, $44, $94
+	.byte $44,$44, $94, $A6,$44, $AB,$55, $45, $A0,$10,$44, $49
+	.byte $94, $99, $44,$44, $99,$99, $A5,$44, $AA,$05, $04
+	.byte $A0,$11,$44, $49, $44, $49, $44,$44, $49, $A6,$44
+	.byte $AB,$77, $70, $04, $A0,$1B,$44, $AD,$77, $70, $04
+	.byte $A0,$19,$44, $AF,$77, $70, $04, $A0,$17,$44, $A0,$11,$77, $70
+	.byte $04, $A0,$15,$44, $A0,$13,$77, $70, $04, $A0,$13,$44, $A0,$15,$77
+	.byte $70, $A0,$12,$04, $A0,$C8,$77
 	.byte $A1
 hallway_rle:	.byte $28 ; ysize=48
 	.byte $A3,$55, $A0,$11,$AA, $AD,$55, $A7,$AA, $55,$55, $A0,$01,$A5, $A0,$11,$AA
diff --git a/demosplash/starbase.s b/demosplash/starbase.s
index 905ef12e..095c7483 100644
--- a/demosplash/starbase.s
+++ b/demosplash/starbase.s
@@ -20,7 +20,7 @@ starbase_new_room:
 	lda	#0
 	sta	GAME_OVER
 
-	jsr	ootw_city
+	jsr	starbase_setup_room
 
 c4_check_done:
 	lda	GAME_OVER
diff --git a/demosplash/starbase_action.s b/demosplash/starbase_action.s
index 61885d14..2f3f8142 100644
--- a/demosplash/starbase_action.s
+++ b/demosplash/starbase_action.s
@@ -4,7 +4,8 @@
 	; starbase_init
 	;=======================
 	;=======================
-	; call once before entering city for first time
+	; call once before entering starbase for first time
+
 starbase_init:
 	lda	#0
 	sta	WHICH_ROOM
@@ -58,22 +59,22 @@ starbase_init:
 	lda	#1
 	sta	HAVE_GUN
 
-	lda	#19
+	lda	#0
 	sta	ASTRONAUT_X
-	lda	#230			; start offscreen
+	lda	#20			; start offscreen
 	sta	ASTRONAUT_Y
 
-	lda	#28
-	sta	fall_down_destination_smc+1
+;	lda	#28
+;	sta	fall_down_destination_smc+1
 
-	lda	#28
-	sta	fall_sideways_destination_smc+1
+;	lda	#28
+;	sta	fall_sideways_destination_smc+1
 
-	lda	#P_FALLING_DOWN		; fall into level
+	lda	#P_STANDING		; fall into level
 	sta	ASTRONAUT_STATE
 
-	lda	#$2c
-	sta	falling_stop_smc
+;	lda	#$2c
+;	sta	falling_stop_smc
 
 	rts
 
@@ -83,7 +84,7 @@ starbase_init:
 	; enter new room in jail
 	;===========================
 	;===========================
-ootw_city:
+starbase_setup_room:
 	;=================================
 	; setup vars