From 7b6961e7bcc1ba3c8204ff02d084544acf6b59c4 Mon Sep 17 00:00:00 2001 From: 4am Date: Fri, 1 Oct 2021 16:29:59 -0400 Subject: [PATCH] shave some bytes --- bin/rename.py | 5 ++++- .../{MATTERHORN1 => MS1} | 0 .../{MATTERHORN2 => MS2} | 0 .../{MATTERHORN3 => MS3} | 0 .../{MATTERHORN4 => MS4} | 0 .../{MATTERHORN5 => MS5} | 0 .../{MATTERHORN6 => MS6} | 0 .../{MATTERHORN7 => MS7} | 0 .../{MATTERHORN8 => MS8} | 0 res/ACTION.HGR/{MATTERHORN1 => MS1} | Bin res/ACTION.HGR/{MATTERHORN2 => MS2} | Bin res/ACTION.HGR/{MATTERHORN3 => MS3} | Bin res/ACTION.HGR/{MATTERHORN4 => MS4} | Bin res/ACTION.HGR/{MATTERHORN5 => MS5} | Bin res/ACTION.HGR/{MATTERHORN6 => MS6} | Bin res/ACTION.HGR/{MATTERHORN7 => MS7} | Bin res/ACTION.HGR/{MATTERHORN8 => MS8} | Bin res/ACTION.HGR/_FileInformation.txt | 16 ++++++++-------- .../{MATTERHORN => MS} | Bin res/ARTWORK.SHR/{MATTERHORN => MS} | Bin res/ARTWORK.SHR/_FileInformation.txt | 2 +- res/ATTRACT/MATTERHORN | 16 ---------------- res/ATTRACT/MS | 16 ++++++++++++++++ res/ATTRACT/THE.SPACE.ARK | 7 +++++++ res/ATTRACT/_FileInformation.txt | 3 ++- res/GAMES.CONF | 2 +- res/SS/ACTIONMHS.CONF | 16 ++++++++-------- res/SS/SHR37.CONF | 2 +- res/TITLE.DHGR/{MATTERHORN => MS} | Bin res/TITLE.DHGR/_FileInformation.txt | 2 +- .../Matterhorn Screamer (4cade compatible).po | Bin 143360 -> 143360 bytes src/constants.a | 2 +- src/prelaunch/matterhorn.a | 2 +- 33 files changed, 51 insertions(+), 40 deletions(-) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN1 => MS1} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN2 => MS2} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN3 => MS3} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN4 => MS4} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN5 => MS5} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN6 => MS6} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN7 => MS7} (100%) rename res/ACTION.HGR.UNCOMPRESSED/{MATTERHORN8 => MS8} (100%) rename res/ACTION.HGR/{MATTERHORN1 => MS1} (100%) rename res/ACTION.HGR/{MATTERHORN2 => MS2} (100%) rename res/ACTION.HGR/{MATTERHORN3 => MS3} (100%) rename res/ACTION.HGR/{MATTERHORN4 => MS4} (100%) rename res/ACTION.HGR/{MATTERHORN5 => MS5} (100%) rename res/ACTION.HGR/{MATTERHORN6 => MS6} (100%) rename res/ACTION.HGR/{MATTERHORN7 => MS7} (100%) rename res/ACTION.HGR/{MATTERHORN8 => MS8} (100%) rename res/ARTWORK.SHR.UNCOMPRESSED/{MATTERHORN => MS} (100%) rename res/ARTWORK.SHR/{MATTERHORN => MS} (100%) delete mode 100644 res/ATTRACT/MATTERHORN create mode 100644 res/ATTRACT/MS create mode 100644 res/ATTRACT/THE.SPACE.ARK rename res/TITLE.DHGR/{MATTERHORN => MS} (100%) diff --git a/bin/rename.py b/bin/rename.py index 26cb552e9..45b1842b2 100755 --- a/bin/rename.py +++ b/bin/rename.py @@ -167,7 +167,10 @@ def driver_phase_2(): def driver_phase_3(): rename("CP", "CAPTAIN.POWER") +def driver_phase_4(): + rename("MATTERHORN", "MS") + if __name__ == '__main__': #rename("MR.DO", "MD") #driver() - driver_phase_3() + driver_phase_4() diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN1 b/res/ACTION.HGR.UNCOMPRESSED/MS1 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN1 rename to res/ACTION.HGR.UNCOMPRESSED/MS1 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN2 b/res/ACTION.HGR.UNCOMPRESSED/MS2 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN2 rename to res/ACTION.HGR.UNCOMPRESSED/MS2 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN3 b/res/ACTION.HGR.UNCOMPRESSED/MS3 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN3 rename to res/ACTION.HGR.UNCOMPRESSED/MS3 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN4 b/res/ACTION.HGR.UNCOMPRESSED/MS4 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN4 rename to res/ACTION.HGR.UNCOMPRESSED/MS4 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN5 b/res/ACTION.HGR.UNCOMPRESSED/MS5 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN5 rename to res/ACTION.HGR.UNCOMPRESSED/MS5 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN6 b/res/ACTION.HGR.UNCOMPRESSED/MS6 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN6 rename to res/ACTION.HGR.UNCOMPRESSED/MS6 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN7 b/res/ACTION.HGR.UNCOMPRESSED/MS7 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN7 rename to res/ACTION.HGR.UNCOMPRESSED/MS7 diff --git a/res/ACTION.HGR.UNCOMPRESSED/MATTERHORN8 b/res/ACTION.HGR.UNCOMPRESSED/MS8 similarity index 100% rename from res/ACTION.HGR.UNCOMPRESSED/MATTERHORN8 rename to res/ACTION.HGR.UNCOMPRESSED/MS8 diff --git a/res/ACTION.HGR/MATTERHORN1 b/res/ACTION.HGR/MS1 similarity index 100% rename from res/ACTION.HGR/MATTERHORN1 rename to res/ACTION.HGR/MS1 diff --git a/res/ACTION.HGR/MATTERHORN2 b/res/ACTION.HGR/MS2 similarity index 100% rename from res/ACTION.HGR/MATTERHORN2 rename to res/ACTION.HGR/MS2 diff --git a/res/ACTION.HGR/MATTERHORN3 b/res/ACTION.HGR/MS3 similarity index 100% rename from res/ACTION.HGR/MATTERHORN3 rename to res/ACTION.HGR/MS3 diff --git a/res/ACTION.HGR/MATTERHORN4 b/res/ACTION.HGR/MS4 similarity index 100% rename from res/ACTION.HGR/MATTERHORN4 rename to res/ACTION.HGR/MS4 diff --git a/res/ACTION.HGR/MATTERHORN5 b/res/ACTION.HGR/MS5 similarity index 100% rename from res/ACTION.HGR/MATTERHORN5 rename to res/ACTION.HGR/MS5 diff --git a/res/ACTION.HGR/MATTERHORN6 b/res/ACTION.HGR/MS6 similarity index 100% rename from res/ACTION.HGR/MATTERHORN6 rename to res/ACTION.HGR/MS6 diff --git a/res/ACTION.HGR/MATTERHORN7 b/res/ACTION.HGR/MS7 similarity index 100% rename from res/ACTION.HGR/MATTERHORN7 rename to res/ACTION.HGR/MS7 diff --git a/res/ACTION.HGR/MATTERHORN8 b/res/ACTION.HGR/MS8 similarity index 100% rename from res/ACTION.HGR/MATTERHORN8 rename to res/ACTION.HGR/MS8 diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt index 1b1de9278..c5090101e 100644 --- a/res/ACTION.HGR/_FileInformation.txt +++ b/res/ACTION.HGR/_FileInformation.txt @@ -421,14 +421,6 @@ MARBLE.MADNESS=Type(06),AuxType(3FF8),Access(C3) MARBLE.MADNESS2=Type(06),AuxType(3FF8),Access(C3) MARS.CARS=Type(06),AuxType(3FF8),Access(C3) MATING.ZONE=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN1=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN2=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN3=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN4=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN5=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN6=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN7=Type(06),AuxType(3FF8),Access(C3) -MATTERHORN8=Type(06),AuxType(3FF8),Access(C3) MAXWELL.MANOR=Type(06),AuxType(3FF8),Access(C3) MAXWELL.MANOR2=Type(06),AuxType(3FF8),Access(C3) MB1=Type(06),AuxType(3FF8),Access(C3) @@ -508,6 +500,14 @@ MR19=Type(06),AuxType(3FF8),Access(C3) MR20=Type(06),AuxType(3FF8),Access(C3) MR21=Type(06),AuxType(3FF8),Access(C3) MR22=Type(06),AuxType(3FF8),Access(C3) +MS1=Type(06),AuxType(3FF8),Access(C3) +MS2=Type(06),AuxType(3FF8),Access(C3) +MS3=Type(06),AuxType(3FF8),Access(C3) +MS4=Type(06),AuxType(3FF8),Access(C3) +MS5=Type(06),AuxType(3FF8),Access(C3) +MS6=Type(06),AuxType(3FF8),Access(C3) +MS7=Type(06),AuxType(3FF8),Access(C3) +MS8=Type(06),AuxType(3FF8),Access(C3) MT=Type(06),AuxType(3FF8),Access(C3) MT2=Type(06),AuxType(3FF8),Access(C3) MZ01=Type(06),AuxType(3FF8),Access(C3) diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/MATTERHORN b/res/ARTWORK.SHR.UNCOMPRESSED/MS similarity index 100% rename from res/ARTWORK.SHR.UNCOMPRESSED/MATTERHORN rename to res/ARTWORK.SHR.UNCOMPRESSED/MS diff --git a/res/ARTWORK.SHR/MATTERHORN b/res/ARTWORK.SHR/MS similarity index 100% rename from res/ARTWORK.SHR/MATTERHORN rename to res/ARTWORK.SHR/MS diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt index 9b170371d..f2767f357 100644 --- a/res/ARTWORK.SHR/_FileInformation.txt +++ b/res/ARTWORK.SHR/_FileInformation.txt @@ -132,7 +132,6 @@ MARAUDER=Type(06),AuxType(1FF8),Access(C3) MARBLE.MADNESS=Type(06),AuxType(1FF8),Access(C3) MARS.CARS=Type(06),AuxType(1FF8),Access(C3) MATING.ZONE=Type(06),AuxType(1FF8),Access(C3) -MATTERHORN=Type(06),AuxType(1FF8),Access(C3) MAXWELL.MANOR=Type(06),AuxType(1FF8),Access(C3) MB=Type(06),AuxType(1FF8),Access(C3) MC=Type(06),AuxType(1FF8),Access(C3) @@ -146,6 +145,7 @@ MONSTER.MASH=Type(06),AuxType(1FF8),Access(C3) MOUSKATTACK=Type(06),AuxType(1FF8),Access(C3) MP=Type(06),AuxType(1FF8),Access(C3) MR=Type(06),AuxType(1FF8),Access(C3) +MS=Type(06),AuxType(1FF8),Access(C3) MT=Type(06),AuxType(1FF8),Access(C3) N.O.R.A.D=Type(06),AuxType(1FF8),Access(C3) NEPTUNE=Type(06),AuxType(1FF8),Access(C3) diff --git a/res/ATTRACT/MATTERHORN b/res/ATTRACT/MATTERHORN deleted file mode 100644 index efc1182d2..000000000 --- a/res/ATTRACT/MATTERHORN +++ /dev/null @@ -1,16 +0,0 @@ -# -# Attract mode for MATTERHORN -# This file is automatically generated -# - -ARTWORK.SHR/MATTERHORN=C -ACTION.HGR/MATTERHORN1=A -ACTION.HGR/MATTERHORN2=A -ACTION.HGR/MATTERHORN3=A -ACTION.HGR/MATTERHORN4=A -ACTION.HGR/MATTERHORN5=A -ACTION.HGR/MATTERHORN6=A -ACTION.HGR/MATTERHORN7=A -ACTION.HGR/MATTERHORN8=A - -[eof] diff --git a/res/ATTRACT/MS b/res/ATTRACT/MS new file mode 100644 index 000000000..c28bd3813 --- /dev/null +++ b/res/ATTRACT/MS @@ -0,0 +1,16 @@ +# +# Attract mode for MS +# This file is automatically generated +# + +ARTWORK.SHR/MS=C +ACTION.HGR/MS1=A +ACTION.HGR/MS2=A +ACTION.HGR/MS3=A +ACTION.HGR/MS4=A +ACTION.HGR/MS5=A +ACTION.HGR/MS6=A +ACTION.HGR/MS7=A +ACTION.HGR/MS8=A + +[eof] diff --git a/res/ATTRACT/THE.SPACE.ARK b/res/ATTRACT/THE.SPACE.ARK new file mode 100644 index 000000000..5bcf2bc6f --- /dev/null +++ b/res/ATTRACT/THE.SPACE.ARK @@ -0,0 +1,7 @@ +# +# Attract mode for THE.SPACE.ARK +# This file is automatically generated +# + + +[eof] diff --git a/res/ATTRACT/_FileInformation.txt b/res/ATTRACT/_FileInformation.txt index 02a4ca2ee..eafe53911 100644 --- a/res/ATTRACT/_FileInformation.txt +++ b/res/ATTRACT/_FileInformation.txt @@ -206,7 +206,6 @@ MARAUDER=Type(04),AuxType(8000),Access(C3) MARBLE.MADNESS=Type(04),AuxType(8000),Access(C3) MARS.CARS=Type(04),AuxType(8000),Access(C3) MATING.ZONE=Type(04),AuxType(8000),Access(C3) -MATTERHORN=Type(04),AuxType(8000),Access(C3) MAXWELL.MANOR=Type(04),AuxType(8000),Access(C3) MAZEBLOX=Type(04),AuxType(8000),Access(C3) MB=Type(04),AuxType(8000),Access(C3) @@ -226,6 +225,7 @@ MOON.PATROL=Type(04),AuxType(8000),Access(C3) MOUSKATTACK=Type(04),AuxType(8000),Access(C3) MP=Type(04),AuxType(8000),Access(C3) MR=Type(04),AuxType(8000),Access(C3) +MS=Type(04),AuxType(8000),Access(C3) MT=Type(04),AuxType(8000),Access(C3) MZ=Type(04),AuxType(8000),Access(C3) N.O.R.A.D=Type(04),AuxType(8000),Access(C3) @@ -360,6 +360,7 @@ THE.GOONIES=Type(04),AuxType(8000),Access(C3) THE.HEIST=Type(04),AuxType(8000),Access(C3) THE.LAST.NINJA=Type(04),AuxType(8000),Access(C3) THE.SNAPPER=Type(04),AuxType(8000),Access(C3) +THE.SPACE.ARK=Type(04),AuxType(8000),Access(C3) THEXDER=Type(04),AuxType(8000),Access(C3) THIEF=Type(04),AuxType(8000),Access(C3) THRESHOLD=Type(04),AuxType(8000),Access(C3) diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 60595537f..3e76d42e5 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -202,7 +202,7 @@ 0001,MB=Mario Bros. 0001,MARS.CARS 1001,MATING.ZONE -0111,MATTERHORN=Matterhorn Screamer +0111,MS=Matterhorn Screamer 1000,MAXWELL.MANOR 1000,MAZEBLOX 0000,MEGABOTS diff --git a/res/SS/ACTIONMHS.CONF b/res/SS/ACTIONMHS.CONF index 2f0f0eca7..da0764931 100644 --- a/res/SS/ACTIONMHS.CONF +++ b/res/SS/ACTIONMHS.CONF @@ -2,13 +2,13 @@ # Matterhorn Screamer action slideshow # -MATTERHORN1=MATTERHORN -MATTERHORN2=MATTERHORN -MATTERHORN3=MATTERHORN -MATTERHORN4=MATTERHORN -MATTERHORN5=MATTERHORN -MATTERHORN6=MATTERHORN -MATTERHORN7=MATTERHORN -MATTERHORN8=MATTERHORN +MS1=MS +MS2=MS +MS3=MS +MS4=MS +MS5=MS +MS6=MS +MS7=MS +MS8=MS [eof] diff --git a/res/SS/SHR37.CONF b/res/SS/SHR37.CONF index 9c1511104..0b93a4e1b 100644 --- a/res/SS/SHR37.CONF +++ b/res/SS/SHR37.CONF @@ -3,7 +3,7 @@ # NM -MATTERHORN +MS PITSTOP.II BATMAN B2 diff --git a/res/TITLE.DHGR/MATTERHORN b/res/TITLE.DHGR/MS similarity index 100% rename from res/TITLE.DHGR/MATTERHORN rename to res/TITLE.DHGR/MS diff --git a/res/TITLE.DHGR/_FileInformation.txt b/res/TITLE.DHGR/_FileInformation.txt index 9b04aaa4c..cb7eb94aa 100644 --- a/res/TITLE.DHGR/_FileInformation.txt +++ b/res/TITLE.DHGR/_FileInformation.txt @@ -13,7 +13,7 @@ HEAVY.BARREL=Type(06),AuxType(4000),Access(C3) I2=Type(06),AuxType(4000),Access(C3) IE=Type(06),AuxType(4000),Access(C3) INDIANA.JONES=Type(06),AuxType(4000),Access(C3) -MATTERHORN=Type(06),AuxType(4000),Access(C3) +MS=Type(06),AuxType(4000),Access(C3) PIPE.DREAM=Type(06),AuxType(4000),Access(C3) PLATOON=Type(06),AuxType(4000),Access(C3) PP=Type(06),AuxType(4000),Access(C3) diff --git a/res/dsk/Matterhorn Screamer (4cade compatible).po b/res/dsk/Matterhorn Screamer (4cade compatible).po index f055f68aace4085303210b458560fc417dcd2802..9a7241aebcaa65aa44d60de662c4910189b3465d 100644 GIT binary patch delta 70 zcmZp8z|ru4V*?9|#3$e2kPz1(5C0%P1_*G}78GD;m@LDxnpw#=c=9P0Db9w+3<@Ag Trp=5@!i-I9ZETFo*qF2cqx=w= delta 70 zcmZp8z|ru4V*?9|#4lgRkPz1(5C0%P1_&tAkmhG#m@LDxnpw-&aq=k^DNcsR3<@Ag Trp=5@!i-I9ZETFo*qF2cj8+f8 diff --git a/src/constants.a b/src/constants.a index 2b1a84a3d..0f6754f50 100644 --- a/src/constants.a +++ b/src/constants.a @@ -6,7 +6,7 @@ ; YE OLDE GRAND UNIFIED MEMORY MAP ; ; LC RAM BANK 1 -; D000..E917 - persistent data structures (gGlobalPrefsStore, gGamesListStore) +; D000..E90F - persistent data structures (gGlobalPrefsStore, gGamesListStore) ; E92D..FFF1 - main program code ; FFF2..FFF9 - API functions and global constants available for main program ; code, prelaunchers, transition effects, &c. diff --git a/src/prelaunch/matterhorn.a b/src/prelaunch/matterhorn.a index a1dd2ee45..3d9fef5ae 100644 --- a/src/prelaunch/matterhorn.a +++ b/src/prelaunch/matterhorn.a @@ -2,7 +2,7 @@ ;(c) 2020 by Tom Greene !cpu 6502 -!to "build/PRELAUNCH/MATTERHORN",plain +!to "build/PRELAUNCH/MS",plain *=$106 !source "src/prelaunch/common.a"