From 9f8fdadc4fadb737338211e578bf75978a4adf1a Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 24 Nov 2017 14:09:00 -0500 Subject: [PATCH] tfv: consolidate zero page definitions --- tfv/tfv_worldmap.s | 13 ------------- tfv/tfv_zp.inc | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tfv/tfv_worldmap.s b/tfv/tfv_worldmap.s index cbf1d7f7..300d7e96 100644 --- a/tfv/tfv_worldmap.s +++ b/tfv/tfv_worldmap.s @@ -1,16 +1,3 @@ -ODD EQU $7B -DIRECTION EQU $7C -REFRESH EQU $7D -ON_BIRD EQU $7E -MOVED EQU $7F -STEPS EQU $80 -TFV_X EQU $81 -TFV_Y EQU $82 -NEWX EQU $83 -NEWY EQU $84 -MAP_X EQU $85 -GROUND_COLOR EQU $86 - ; In Town ; Puzzle Room diff --git a/tfv/tfv_zp.inc b/tfv/tfv_zp.inc index af8bd0de..592b1f78 100644 --- a/tfv/tfv_zp.inc +++ b/tfv/tfv_zp.inc @@ -17,7 +17,7 @@ MASK EQU $2E COLOR EQU $30 INVFLG EQU $32 -;; Flying Routine +;; Flying Routine Only TURNING EQU $60 SCREEN_X EQU $61 @@ -49,9 +49,23 @@ DRAW_SPLASH EQU $7A SPEED EQU $7B SPLASH_COUNT EQU $7C OVER_WATER EQU $7D - SHIPY EQU $E4 +;; World Map Only + +ODD EQU $7B +DIRECTION EQU $7C +REFRESH EQU $7D +ON_BIRD EQU $7E +MOVED EQU $7F +STEPS EQU $80 +TFV_X EQU $81 +TFV_Y EQU $82 +NEWX EQU $83 +NEWY EQU $84 +MAP_X EQU $85 +GROUND_COLOR EQU $86 +