From b2aa6b750e1160332dd0f3821754096242380390 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Tue, 21 May 2024 23:13:56 -0400 Subject: [PATCH] riven_hgr: prep for maglev ride --- games/riven_hgr/common_defines.inc | 1 + games/riven_hgr/graphics_maglev/Makefile | 4 ++-- games/riven_hgr/graphics_maglev/inseat_e.png | Bin 0 -> 3569 bytes games/riven_hgr/level_maglev.s | 21 ++++++++++++++++ games/riven_hgr/leveldata_maglev.inc | 24 ++++++++++++++++++- 5 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 games/riven_hgr/graphics_maglev/inseat_e.png diff --git a/games/riven_hgr/common_defines.inc b/games/riven_hgr/common_defines.inc index 94940f7d..23fe1ca9 100644 --- a/games/riven_hgr/common_defines.inc +++ b/games/riven_hgr/common_defines.inc @@ -69,3 +69,4 @@ RIVEN_MAGSTEPS3 = 1 RIVEN_LOOKIN = 0 RIVEN_INSEAT = 1 +RIVEN_READY2GO = 2 diff --git a/games/riven_hgr/graphics_maglev/Makefile b/games/riven_hgr/graphics_maglev/Makefile index fa789336..cd010bde 100644 --- a/games/riven_hgr/graphics_maglev/Makefile +++ b/games/riven_hgr/graphics_maglev/Makefile @@ -6,15 +6,15 @@ PNG_TO_HGR = ../../../utils/hgr-utils/png2hgr all: maglev_graphics.inc maglev_graphics.inc: \ - inseat_s.hgr.zx02 inseat_w.hgr.zx02 \ + inseat_s.hgr.zx02 inseat_w.hgr.zx02 inseat_e.hgr.zx02 \ lookin_w.hgr.zx02 echo "inseat_s_zx02: .incbin \"inseat_s.hgr.zx02\"" > maglev_graphics.inc echo "inseat_w_zx02: .incbin \"inseat_w.hgr.zx02\"" >> maglev_graphics.inc + echo "inseat_e_zx02: .incbin \"inseat_e.hgr.zx02\"" >> maglev_graphics.inc echo "lookin_w_zx02: .incbin \"lookin_w.hgr.zx02\"" >> maglev_graphics.inc - #### %.hgr: %.png diff --git a/games/riven_hgr/graphics_maglev/inseat_e.png b/games/riven_hgr/graphics_maglev/inseat_e.png new file mode 100644 index 0000000000000000000000000000000000000000..2f385f0dc686eeae98fee02ee5f9c3d130433f6c GIT binary patch literal 3569 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