summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-03-01 16:37:41 -0800
committerMarcus Huderle <huderlem@gmail.com>2015-03-01 16:37:41 -0800
commit513cf38fa305d369cf5b792acbaf171a0543bcaf (patch)
treef64ee441c69176173821bd41f8cb9cd408bea0d3
parent40d2ebd35024ccdbc73ec06ffdc90def7ce94bd3 (diff)
Dump initial High Scores data. Label high scores wram locations.
-rwxr-xr-xdata/initial_high_scores.asm21
-rwxr-xr-xmacros.asm11
-rwxr-xr-xmain.asm6
-rwxr-xr-xwram.asm78
4 files changed, 108 insertions, 8 deletions
diff --git a/data/initial_high_scores.asm b/data/initial_high_scores.asm
new file mode 100755
index 0000000..000896c
--- /dev/null
+++ b/data/initial_high_scores.asm
@@ -0,0 +1,21 @@
+InitialRedHighScores: ; 0xd42e
+; TODO: Use text instead of raw bytes for the names.
+ bigBCD6 50000000
+ db $4e, $49, $4e ; "NIN"
+ db $00, $00, $00, $00
+
+ bigBCD6 40000000
+ db $43, $52, $45 ; "CRE"
+ db $00, $00, $00, $00
+
+ bigBCD6 30000000
+ db $47, $41, $4d ; "GAM"
+ db $00, $00, $00, $00
+
+ bigBCD6 20000000
+ db $48, $41, $4c ; "HAL"
+ db $00, $00, $00, $00
+
+ bigBCD6 10000000
+ db $4a, $55, $50 ; "JUP"
+ db $00, $00, $00, $00
diff --git a/macros.asm b/macros.asm
index 0cf0516..0b301bc 100755
--- a/macros.asm
+++ b/macros.asm
@@ -25,6 +25,17 @@ bigdw: MACRO ; big-endian word
dx 2, \1
ENDM
+bigBCD6: MACRO
+; There is probably a better name for this macro.
+; It write a BCD in big-endian form.
+ dn ((\1) / 10) % 10, (\1) % 10
+ dn ((\1) / 1000) % 10, ((\1) / 100) % 10
+ dn ((\1) / 100000) % 10, ((\1) / 10000) % 10
+ dn ((\1) / 10000000) % 10, ((\1) / 1000000) % 10
+ dn ((\1) / 1000000000) % 10, ((\1) / 100000000) % 10
+ dn ((\1) / 100000000000) % 10, ((\1) / 10000000000) % 10
+ ENDM
+
;\1 = X
;\2 = Y
;\3 = Reference Background Map (e.g. vBGMap0 or vBGMap1)
diff --git a/main.asm b/main.asm
index 2a58132..3648d1e 100755
--- a/main.asm
+++ b/main.asm
@@ -3984,7 +3984,11 @@ SongBanks: ; 0xc77e
db MUSIC_NAME_ENTRY,BANK(Music_NameEntry)
; 0xc7ac
-INCBIN "baserom.gbc",$c7ac,$d71c - $c7ac
+INCBIN "baserom.gbc",$c7ac,$d42e - $c7ac
+
+INCLUDE "data/initial_high_scores.asm"
+
+INCBIN "baserom.gbc",$d46f,$d71c - $d46f
PointerTable_d71c: ; 0xd71c
dw DataArray_d720
diff --git a/wram.asm b/wram.asm
index 0836af6..f219e2a 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2,20 +2,84 @@
SECTION "WRAM Bank 0", WRAM0
wc000::
- ds $500
+ ds $500
wcBottomMessageText::
- ds $b00
+ ds $b00
SECTION "WRAM Bank 1", WRAMX, BANK[1]
wOAMBuffer:: ; d000
- ; buffer for OAM data. Copied to OAM by DMA
- ds 4 * 40
+ ; buffer for OAM data. Copied to OAM by DMA
+ ds 4 * 40
- ds $87a
+ ds $87a
wSoundTestCurrentBackgroundMusic:: ; d91a
- ds 1
+ ds 1
wSoundTextCurrentSoundEffect:: ; 0xd91b
- ds 1
+ ds 1
+
+ ds 225
+
+wRedHighScores:: ; 0xd9fd
+wRedHighScore1Points:: ; 0xd9fd
+ ds 6
+wRedHighScore1Name:: ; 0xda03
+ ds 3
+ ds 4
+
+wRedHighScore2Points:: ; 0xda0a
+ ds 6
+wRedHighScore2Name:: ; 0xda10
+ ds 3
+ ds 4
+
+wRedHighScore3Points:: ; 0xda17
+ ds 6
+wRedHighScore3Name:: ; 0xda1d
+ ds 3
+ ds 4
+
+wRedHighScore4Points:: ; 0xda24
+ ds 6
+wRedHighScore4Name:: ; 0xda2a
+ ds 3
+ ds 4
+
+wRedHighScore5Points:: ; 0xda31
+ ds 6
+wRedHighScore5Name:: ; 0xda37
+ ds 3
+ ds 4
+
+wBlueHighScores:: ; 0xda3e
+wBlueHighScore1Points:: ; 0xda3e
+ ds 6
+wBlueHighScore1Name:: ; 0xda44
+ ds 3
+ ds 4
+
+wBlueHighScore2Points:: ; 0xda4b
+ ds 6
+wBlueHighScore2Name:: ; 0xda52
+ ds 3
+ ds 4
+
+wBlueHighScore3Points:: ; 0xda58
+ ds 6
+wBlueHighScore3Name:: ; 0xda5e
+ ds 3
+ ds 4
+
+wBlueHighScore4Points:: ; 0xda65
+ ds 6
+wBlueHighScore4Name:: ; 0xda6b
+ ds 3
+ ds 4
+
+wBlueHighScore5Points:: ; 0xda72
+ ds 6
+wBlueHighScore5Name:: ; 0xda78
+ ds 3
+ ds 4