Prefer symbolic names in ips_segments

ejona86 · Apr 11, 2020 · 96a9f14 · 96a9f14
1 parent 9db0d2e
commit 96a9f14
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -16,6 +16,7 @@ build/handicap.ips: build/handicap.o build/ips.o
 # IPS base file. There is a corresponding .ips file
 build/handicap.nes: build/tetris.nes
 
+build/handicap.o: build/tetris.inc
 build/highscores.ips.cfg: build/highscores.o
 build/highscores.ips: build/highscores.o build/ips.o
 build/highscores.nes: build/tetris.nes

diff --git a/handicap.s b/handicap.s
@@ -6,7 +6,7 @@
 .include "ips.inc"
 
 .segment "TYPE_A_MENU_PATCH"
-        ips_segment     "TYPE_A_MENU_PATCH",$C95D,$0049
+        ips_segment     "TYPE_A_MENU_PATCH",height_menu_nametablepalette_patch,$0049
 
 ; height_menu_nametablepalette_patch:
         .byte   $3F,$0A,$01,$16

diff --git a/highscores.s b/highscores.s
@@ -2,10 +2,11 @@
 ; Custom high scores
 ;
 
+.include "build/tetris.inc"
 .include "ips.inc"
 
 .segment "DEFAULT_HIGH_SCORES"
-        ips_segment     "DEFAULT_HIGH_SCORES",$AD67
+        ips_segment     "DEFAULT_HIGH_SCORES",defaultHighScoresTable,$0051
 
 ; replace defaultHighScoresTable
         ; NAME

diff --git a/playerid.s b/playerid.s
@@ -14,7 +14,7 @@
         nop
 
 .segment "JMP_GAME_SHOW_PLAYERID_BG"
-        ips_segment     "JMP_GAME_SHOW_PLAYERID_BG",$8693
+        ips_segment     "JMP_GAME_SHOW_PLAYERID_BG",gameModeState_initGameBackground_finish
 
 ; in initGameBackground; replaces "jsr waitForVBlankAndEnableNmi"
         jsr     game_show_playerid_game_mod

diff --git a/screens.s b/screens.s
@@ -21,7 +21,7 @@
 
 
 .segment "CODE"
-        ips_segment     "CODE",$D6C9,$0637
+        ips_segment     "CODE",unreferenced_data1,$0637
 
 screenToDisplay := levelNumber
 backgroundRendered := levelNumber+1