From c7c6e5bd08f94a76d0acc2cbee79634594610dff Mon Sep 17 00:00:00 2001 From: Justin Scofield Date: Sat, 18 Jun 2022 22:59:35 -0400 Subject: [PATCH] move draw background into its own file --- Menu/menu.asm | 44 +++++++++---------------------------------- Menu/menu_draw_bg.asm | 31 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 Menu/menu_draw_bg.asm diff --git a/Menu/menu.asm b/Menu/menu.asm index 94faecd..cacbb73 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -185,7 +185,9 @@ Menu_InitItemScreen: STA.w $0200 RTS } -; ---------------------- + +; ----------------------------------------------------------------------------- + Menu_ItemScreen: { JSR Menu_CheckHScroll @@ -295,7 +297,7 @@ Menu_StatsScreen: RTS } -; ===================================== +; ----------------------------------------------------------------------------- Menu_CheckHScroll: { @@ -330,7 +332,7 @@ Menu_CheckHScroll: RTS } -; ===================================== +; ----------------------------------------------------------------------------- Menu_ScrollHorizontal: { @@ -414,7 +416,7 @@ Menu_CheckBottle: Menu_Exit: { - ;set $0303 by using $0202 to index table on exit + ; set $0303 by using $0202 to index table on exit JSR Menu_CheckBottle LDY.w $0202 : BEQ .no_item DEY @@ -514,35 +516,7 @@ Menu_UpdateHudItem: ; ============================================================================= -Menu_DrawBackground: -{ - REP #$30 - LDX.w #$FE ; $1700-17FF +incsrc "menu_draw_bg.asm" +incsrc "lw_map_names.asm" -.loop - LDA.w Menu_Tilemap, X - STA.w $1000, X - LDA.w Menu_Tilemap+$100, X - STA.w $1100, X - LDA.w Menu_Tilemap+$200, X - STA.w $1200, X - LDA.w Menu_Tilemap+$300, X - STA.w $1300, X - LDA.w Menu_Tilemap+$400, X - STA.w $1400, X - LDA.w Menu_Tilemap+$500, X - STA.w $1500, X - LDA.w Menu_Tilemap+$600, X - STA.w $1600, X - LDA.w Menu_Tilemap+$700, X - STA.w $1700, X - - DEX : DEX - BPL .loop - - RTS -} - -; ============================================================================= - -incsrc "lw_map_names.asm" \ No newline at end of file +; ============================================================================= \ No newline at end of file diff --git a/Menu/menu_draw_bg.asm b/Menu/menu_draw_bg.asm new file mode 100644 index 0000000..461f54c --- /dev/null +++ b/Menu/menu_draw_bg.asm @@ -0,0 +1,31 @@ +; ============================================================================= +; Tilemap Menu background + +Menu_DrawBackground: +{ + REP #$30 + LDX.w #$FE ; $1700-17FF + +.loop + LDA.w Menu_Tilemap, X + STA.w $1000, X + LDA.w Menu_Tilemap+$100, X + STA.w $1100, X + LDA.w Menu_Tilemap+$200, X + STA.w $1200, X + LDA.w Menu_Tilemap+$300, X + STA.w $1300, X + LDA.w Menu_Tilemap+$400, X + STA.w $1400, X + LDA.w Menu_Tilemap+$500, X + STA.w $1500, X + LDA.w Menu_Tilemap+$600, X + STA.w $1600, X + LDA.w Menu_Tilemap+$700, X + STA.w $1700, X + + DEX : DEX + BPL .loop + + RTS +} \ No newline at end of file