Reduce number of separate script files to optimize diskspace.

Makefile

@@ -32,8 +32,6 @@ hessian.d64: hessian.seq loader.prg main.pak options.bin emptysave.bin savelist.
 	script00.pak script01.pak script02.pak script03.pak script04.pak script05.pak script06.pak script07.pak \
 	script08.pak script09.pak script10.pak script11.pak script12.pak script13.pak script14.pak script15.pak \
 	script16.pak script17.pak script18.pak script19.pak script20.pak script21.pak script22.pak script23.pak \
-	script24.pak script25.pak script26.pak script27.pak script28.pak script29.pak script30.pak script31.pak \
-	script32.pak \
 	charset00.pak charset01.pak charset02.pak charset03.pak charset04.pak charset05.pak charset06.pak charset07.pak \
 	charset08.pak charset09.pak charset10.pak charset11.pak charset12.pak charset13.pak charset14.pak \
 	level00.pak level01.pak level02.pak level03.pak level04.pak level05.pak level06.pak level07.pak level08.pak \
@@ -301,42 +299,6 @@ script23.pak: script23.s memory.s mainsym.s
 	dasm script23.s -oscript23.bin -f3
 	pack2 script23.bin script23.pak
 
-script24.pak: script24.s memory.s mainsym.s
-	dasm script24.s -oscript24.bin -f3
-	pack2 script24.bin script24.pak
-
-script25.pak: script25.s memory.s mainsym.s
-	dasm script25.s -oscript25.bin -f3
-	pack2 script25.bin script25.pak
-
-script26.pak: script26.s memory.s mainsym.s
-	dasm script26.s -oscript26.bin -f3
-	pack2 script26.bin script26.pak
-
-script27.pak: script27.s memory.s mainsym.s
-	dasm script27.s -oscript27.bin -f3
-	pack2 script27.bin script27.pak
-
-script28.pak: script28.s memory.s mainsym.s
-	dasm script28.s -oscript28.bin -f3
-	pack2 script28.bin script28.pak
-
-script29.pak: script29.s memory.s mainsym.s
-	dasm script29.s -oscript29.bin -f3
-	pack2 script29.bin script29.pak
-
-script30.pak: script30.s memory.s mainsym.s
-	dasm script30.s -oscript30.bin -f3
-	pack2 script30.bin script30.pak
-
-script31.pak: script31.s memory.s mainsym.s
-	dasm script31.s -oscript31.bin -f3
-	pack2 script31.bin script31.pak
-
-script32.pak: script32.s memory.s mainsym.s
-	dasm script32.s -oscript32.bin -f3
-	pack2 script32.bin script32.pak
-
 loadermusic.bin: music/hessianmusic.d64
 	d642prg music/hessianmusic.d64 loader.bin loadermusic.bin -h
 

hessian.seq

@@ -97,15 +97,6 @@ script20.pak 58
 script21.pak 59
 script22.pak 5A
 script23.pak 5B
-script24.pak 5C
-script25.pak 5D
-script26.pak 5E
-script27.pak 5F
-script28.pak 60
-script29.pak 61
-script30.pak 62
-script31.pak 63
-script32.pak 64
 music02.pak 23
 music03.pak 24
 main.pak 01

level.s

@@ -1321,9 +1321,18 @@ CP_NotLowerLabs:lda #$00
                 lda limitD
                 sbc #6
                 sta temp2
-                ldx #3
+                lda #$40
+                clc
+                adc actXL+ACTI_PLAYER
+                php
+                rol
+                rol
+                rol
+                and #$03
+                tax
+                plp
                 lda actXH+ACTI_PLAYER
-                sbc #5
+                sbc #4
                 bcc CP_OverLeft
                 cmp limitL
                 bcs CP_NotOverLeft

script.s

@@ -1,92 +1,143 @@
 EP_TITLE        = $0000
 
 EP_SCIENTIST1   = $0100
+EP_SCIENTIST2   = $0101
+EP_GARAGECOMPUTER = $0102
 
-EP_SCIENTIST2   = $0200
-EP_GARAGECOMPUTER = $0201
+EP_THEATRECOMPUTER = $0200
+EP_LOBBYCOMPUTER = $0201
+EP_OFFICECOMPUTER1 = $0202
+EP_OFFICECOMPUTER2 = $0203
+EP_OFFICECOMPUTER3 = $0204
+EP_OFFICECOMPUTER4 = $0205
 
 EP_RADIOUPPERLABSENTRANCE = $0300
-EP_RADIOSECURITYCENTER = $0301
+EP_OFFICECOMPUTER5 = $0301
+EP_ITCOMPUTER = $0302
+EP_SCREENSAVEREFFECT = $0303
 
 EP_CONFIGUREUPGRADE = $0400
 EP_INSTALLUPGRADE = $0401
 EP_INSTALLEFFECT = $0402
 
-EP_ENTERCODE    = $0500
-EP_ENTERCODELOOP = $0501
-
-EP_ELEVATOR     = $0600
-EP_ELEVATORLOOP = $0601
-EP_RADIOUPPERLABSELEVATOR = $0602
-EP_RADIOSECURITYPASS = $0603
-EP_ESCORTSCIENTISTSREFRESH = $0604
-EP_ESCORTSCIENTISTSZONE = $0605
-EP_HACKERFOLLOW = $0606
-EP_HACKERFOLLOWZONE = $0607
-
-EP_USEHEALTHRECHARGER = $0700
-EP_USEBATTERYRECHARGER = $0701
-EP_RECHARGEREFFECT = $0702
-EP_COMBATROBOTSABOTEUR = $0703
-EP_DESTROYCOMBATROBOTSABOTEUR = $0704
-
-EP_RECYCLINGSTATION = $0800
-EP_CONSTRUCTSPEECH = $0801
+EP_RADIOSECURITYCENTER = $0500
+EP_SECURITYCOMPUTER1 = $0501
+EP_SECURITYCOMPUTER2 = $0502
+EP_SECURITYCOMPUTER3 = $0503
+EP_SECURITYCOMPUTER4 = $0504
+EP_SECURITYCOMPUTER5 = $0505
+EP_SECURITYCOMPUTER6 = $0506
+
+EP_RECYCLINGSTATION = $0600
+EP_CONSTRUCTSPEECH = $0601
+EP_ENTERCODE    = $0602
+EP_ENTERCODELOOP = $0603
+EP_USEHEALTHRECHARGER = $0604
+EP_USEBATTERYRECHARGER = $0605
+EP_RECHARGEREFFECT = $0606
+
+EP_LABCOMPUTER1 = $0700
+EP_LABCOMPUTER2 = $0701
+EP_LABCOMPUTER3 = $0702
+EP_LABCOMPUTER4 = $0703
+EP_LABCOMPUTER5 = $0704
+EP_LABCOMPUTER6 = $0705
+EP_LABCOMPUTER7 = $0706
+EP_LABCOMPUTER8 = $0707
+EP_LABCOMPUTER9 = $0708
+
+EP_ELEVATOR     = $0800
+EP_ELEVATORLOOP = $0801
+EP_RADIOUPPERLABSELEVATOR = $0802
+EP_RADIOSECURITYPASS = $0803
+EP_ESCORTSCIENTISTSREFRESH = $0804
+EP_ESCORTSCIENTISTSZONE = $0805
+EP_HACKERFOLLOW = $0806
+EP_HACKERFOLLOWZONE = $0807
 
 EP_MOVEROTORDRONE = $0900
 EP_DESTROYROTORDRONE = $0901
 EP_HACKER       = $0902
 EP_HACKER2      = $0903
-
-EP_INSTALLAMPLIFIER = $0a00
-EP_RUNLASER     = $0a01
-EP_SWITCHGENERATOR = $0a02
-EP_SWITCHLASER = $0a03
-EP_MOVEGENERATOR = $0a04
+EP_HACKER3      = $0904
+EP_HACKER4      = $0905
+EP_HACKERAMBUSH = $0906
+EP_GIVELAPTOP = $0907
+
+EP_LOWERLABSCOMPUTER1 = $0a00
+EP_LOWERLABSCOMPUTER2 = $0a01
+EP_LOWERLABSCOMPUTER3 = $0a02
+EP_LOWERLABSCOMPUTER4 = $0a03
+EP_LOWERLABSCOMPUTER5 = $0a04
+EP_LOWERLABSCOMPUTER6 = $0a05
+EP_LOWERLABSCOMPUTER7 = $0a06
+EP_LOWERLABSCOMPUTER8 = $0a07
+EP_LOWERLABSCOMPUTER9 = $0a08
 
 EP_RADIOCAVES   = $0b00
 EP_MOVEBAT      = $0b01
 EP_MOVESPIDER   = $0b02
 EP_MOVELARGESPIDER = $0b03
 EP_OPENWALL     = $0b04
 EP_MOVEACID     = $0b05
-EP_RADIOLOWERLABS = $0b06
+EP_INSTALLAMPLIFIER = $0b06
+EP_RUNLASER     = $0b07
+EP_SWITCHGENERATOR = $0b08
+EP_SWITCHLASER = $0b09
+EP_MOVEGENERATOR = $0b0a
 
 EP_SUBNETROUTER = $0c00
 EP_SERVERROOMCOMPUTER = $0c01
 EP_MOVESCIENTISTS = $0c02
 EP_RADIOCONSTRUCT = $0c03
-
-EP_HACKER3      = $0d00
-EP_HACKER4      = $0d01
-
-EP_ESCORTSCIENTISTSSTART = $0e00
-
-EP_ESCORTSCIENTISTSFINISH = $0f00
-EP_RADIOFINDFILTER = $0f01
-
-EP_HACKERAMBUSH = $1000
-EP_GIVELAPTOP = $1001
-EP_THRONECHIEF = $1002
-EP_BEGINAMBUSH  = $1003
-EP_RADIOCONSTRUCT2 = $1004
-
-EP_BEGINSURGERY = $1100
-EP_BEGINSURGERY2 = $1101
-
-EP_AFTERSURGERY = $1200
-EP_AFTERSURGERYRUN = $1201
-EP_AFTERSURGERYZONE = $1202
-EP_AFTERSURGERYNOAIR = $1203
-EP_AFTERSURGERYFOLLOW = $1204
-EP_AFTERSURGERYNOAIRDIE = $1205
-EP_AFTERSURGERYNOAIRRADIO = $1206
+EP_RADIOLOWERLABS = $0c04
+EP_COMBATROBOTSABOTEUR = $0c05
+EP_DESTROYCOMBATROBOTSABOTEUR = $0c06
+
+EP_ESCORTSCIENTISTSSTART = $0d00
+EP_ESCORTSCIENTISTSFINISH = $0d01
+EP_RADIOFINDFILTER = $0d02
+
+EP_MOVEJORMUNGANDR = $0e00
+
+EP_BEGINSURGERY = $0f00
+EP_BEGINSURGERY2 = $0f01
+EP_AFTERSURGERY = $0f02
+EP_AFTERSURGERYRUN = $0f03
+EP_AFTERSURGERYZONE = $0f04
+EP_AFTERSURGERYNOAIR = $0f05
+EP_AFTERSURGERYFOLLOW = $0f06
+EP_AFTERSURGERYNOAIRDIE = $0f07
+EP_AFTERSURGERYNOAIRRADIO = $0f08
+
+EP_THRONECHIEF = $1000
+EP_BEGINAMBUSH  = $1001
+EP_RADIOCONSTRUCT2 = $1002
+
+EP_LOWERSECURITYCOMPUTER1 = $1100
+EP_LOWERSECURITYCOMPUTER2 = $1101
+EP_LOWERSECURITYCOMPUTER3 = $1102
+EP_LOWERSECURITYCOMPUTER4 = $1103
+EP_LOWERSECURITYCOMPUTER5 = $1104
+
+EP_TUNNELMACHINE = $1200
+EP_TUNNELMACHINEITEMS = $1201
+EP_TUNNELMACHINERUN = $1202
+EP_RADIOJORMUNGANDR = $1203
+EP_RADIOJORMUNGANDRRUN = $1204
+EP_DESTROYPLAN = $1205
+EP_MOVELARGETANK = $1206
+EP_MOVEFIREBALL = $1207
+EP_RADIOHACKERWARNING = $1208
 
 EP_REACHOLDTUNNELS = $1300
 EP_HACKERFOLLOWFINISH = 1301
 EP_ENTERLAB = $1302
 EP_HACKERENTERLAB = $1303
-EP_SCIENTISTENTERLAB = $1306
+EP_SCIENTISTENTERLAB = $1304
+EP_HAZMAT = $1305
+EP_HAZMATLEAVE = $1306
+EP_DESTROYCOMMENT = $1307
 
 EP_LABNOTE4 = $1400
 EP_GIVELAPTOP2 = $1401
@@ -107,72 +158,13 @@ EP_INSTALLLAPTOPWORK = $1601
 EP_INSTALLLAPTOPFINISH = $1602
 EP_HACKERFINAL = $1603
 
-EP_TUNNELMACHINE = $1700
-EP_TUNNELMACHINEITEMS = $1701
-EP_TUNNELMACHINERUN = $1702
-EP_RADIOJORMUNGANDR = $1703
-EP_RADIOJORMUNGANDRRUN = $1704
-EP_DESTROYPLAN = $1705
-EP_MOVELARGETANK = $1706
-EP_MOVEFIREBALL = $1707
-
-EP_HAZMAT = $1800
-EP_HAZMATLEAVE = $1801
-EP_DESTROYCOMMENT = $1802
-EP_RADIOHACKERWARNING = $1803
-
-EP_MOVEJORMUNGANDR = $1900
-
-EP_MOVEEYESTAGE1 = $1a00
-EP_MOVEEYESTAGE2 = $1a01
-EP_DESTROYEYE = $1a02
-EP_CONSTRUCTENDING = $1a03
-
-EP_ENDING1 = $1b00
-EP_ENDING2 = $1b01
-EP_ENDING3 = $1b02
-
-EP_LOBBYCOMPUTER = $1c00
-EP_THEATRECOMPUTER = $1c01
-EP_OFFICECOMPUTER1 = $1c02
-EP_OFFICECOMPUTER2 = $1c03
-EP_OFFICECOMPUTER3 = $1c04
-EP_OFFICECOMPUTER4 = $1c05
-EP_OFFICECOMPUTER5 = $1c06
-
-EP_ITCOMPUTER = $1d00
-EP_SECURITYCOMPUTER1 = $1d01
-EP_SECURITYCOMPUTER2 = $1d02
-EP_SECURITYCOMPUTER3 = $1d03
-EP_SECURITYCOMPUTER4 = $1d04
-EP_SECURITYCOMPUTER5 = $1d05
-EP_SECURITYCOMPUTER6 = $1d06
-
-EP_LABCOMPUTER1 = $1e00
-EP_LABCOMPUTER2 = $1e01
-EP_LABCOMPUTER3 = $1e02
-EP_LABCOMPUTER4 = $1e03
-EP_LABCOMPUTER5 = $1e04
-EP_LABCOMPUTER6 = $1e05
-EP_LABCOMPUTER7 = $1e06
-EP_LABCOMPUTER8 = $1e07
-EP_LABCOMPUTER9 = $1e08
-
-EP_LOWERLABSCOMPUTER1 = $1f00
-EP_LOWERLABSCOMPUTER2 = $1f01
-EP_LOWERLABSCOMPUTER3 = $1f02
-EP_LOWERLABSCOMPUTER4 = $1f03
-EP_LOWERLABSCOMPUTER5 = $1f04
-EP_LOWERLABSCOMPUTER6 = $1f05
-EP_LOWERLABSCOMPUTER7 = $1f06
-EP_LOWERLABSCOMPUTER8 = $1f07
-EP_LOWERLABSCOMPUTER9 = $1f08
-
-EP_LOWERSECURITYCOMPUTER1 = $2000
-EP_LOWERSECURITYCOMPUTER2 = $2001
-EP_LOWERSECURITYCOMPUTER3 = $2002
-EP_LOWERSECURITYCOMPUTER4 = $2003
-EP_LOWERSECURITYCOMPUTER5 = $2004
+EP_MOVEEYESTAGE1 = $1700
+EP_MOVEEYESTAGE2 = $1701
+EP_DESTROYEYE = $1702
+EP_CONSTRUCTENDING = $1703
+EP_ENDING1 = $1704
+EP_ENDING2 = $1705
+EP_ENDING3 = $1706
 
 PLOT_ELEVATOR1  = $00                       ;Upper <-> lower lab
 PLOT_ELEVATOR2  = $01                       ;Jormungandr <-> Bio-Dome