Misc labeling

bank_000.asm

@@ -824,7 +824,7 @@ Call_000_6ec:
     ld a, $02
     ld [$d062], a
     ld [$d063], a
-    call Call_000_1268
+    call ApplyPlayerRightSpeed
     xor a
     ld [$d062], a
     call Call_000_110b
@@ -845,7 +845,7 @@ Call_000_6ec:
     ld a, $02
     ld [$d062], a
     ld [$d063], a
-    call Call_000_1272
+    call ApplyPlayerLeftSpeed
     xor a
     ld [$d062], a
     jp Call_000_1062
@@ -1378,7 +1378,7 @@ jr_000_0abc:
     jr c, .jr_000_0b08
     ld a, [$d061]
     ld [$d060], a
-    call Call_000_127d
+    call ApplyPlayerUpSpeed
     ld a, [wPlayerScreenYCoord]
     cp $08
     jp nz, Jump_000_0bba
@@ -1393,7 +1393,7 @@ jr_000_0abc:
     jp Jump_000_0bba
 
 .jr_000_0b08:
-    call Call_000_127d
+    call ApplyPlayerUpSpeed
     ldh a, [$90]
     bit 4, a
     jp nz, Jump_000_0bba
@@ -1427,7 +1427,7 @@ jr_000_0abc:
     ld [$d061], a
     ld a, b
     ld [$d060], a
-    call Call_000_127d
+    call ApplyPlayerUpSpeed
     ld a, [wPlayerScreenYCoord]
     cp $10
     jp nz, Jump_000_0baf
@@ -1955,7 +1955,7 @@ Jump_000_0caf:
     ld a, c
     sub b
     jr c, .jr_000_0f5a
-    call Call_000_1288
+    call ApplyPlayerDownSpeed
     ld a, [$d040]
     cp $08
     jp nz, .jump_000_1021
@@ -1971,7 +1971,7 @@ Jump_000_0caf:
     ld a, [$d060]
     sub b
     ld [$d060], a
-    call nz, Call_000_1288
+    call nz, ApplyPlayerDownSpeed
     ld a, [wStageScrollTileY]
     ld b, a
     ld a, [$d040]
@@ -2013,7 +2013,7 @@ Jump_000_0caf:
     ld a, b
     dec a
     ld [$d060], a
-    call Call_000_1288
+    call ApplyPlayerDownSpeed
     ld a, [$d040]
     sub $07
     ld [wStageScrollTileY], a
@@ -2137,7 +2137,7 @@ Call_000_1062:
     ld [$d063], a
     ld a, b
     ld [$d062], a
-    call Call_000_1268
+    call ApplyPlayerRightSpeed
     ld a, [$d042]
     inc a
     ld [wStageScrollTileX], a
@@ -2245,7 +2245,7 @@ Call_000_110b:
     ld [$d063], a
     ld b, a
     ld [$d062], a
-    call Call_000_1272
+    call ApplyPlayerLeftSpeed
     ld a, $01
     ld [wStageScrollTileX], a
     jp .jump_000_11be
@@ -2406,7 +2406,7 @@ Call_000_1248:
     ret
 
 
-Call_000_1268:
+ApplyPlayerRightSpeed:
     ld hl, wPlayerScreenXCoord
     ld a, [$d062]
     ld b, a
@@ -2415,7 +2415,7 @@ Call_000_1268:
     ret
 
 
-Call_000_1272:
+ApplyPlayerLeftSpeed:
     ld hl, wPlayerScreenXCoord
     ld a, [$d062]
     ld b, a
@@ -2425,7 +2425,7 @@ Call_000_1272:
     ret
 
 
-Call_000_127d:
+ApplyPlayerUpSpeed:
     ld hl, wPlayerScreenYCoord
     ld a, [$d060]
     ld b, a
@@ -2435,7 +2435,7 @@ Call_000_127d:
     ret
 
 
-Call_000_1288:
+ApplyPlayerDownSpeed:
     ld hl, wPlayerScreenYCoord
     ld a, [$d060]
     ld b, a

bank_001.asm

@@ -155,7 +155,7 @@ Call_001_4000:
     ld a, c
     sub b
     jr c, .jr_001_4133
-    call Call_000_1268
+    call ApplyPlayerRightSpeed
     ld a, [wPlayerScreenXCoord]
     xor a
     ld [$d063], a
@@ -170,7 +170,7 @@ Call_001_4000:
     ld [$d062], a
     ld a, b
     ld [$d063], a
-    call Call_000_1268
+    call ApplyPlayerRightSpeed
     scf
     ret
 .jr_001_4149:
@@ -343,14 +343,14 @@ Call_001_417c:
     jr c, .jr_001_429c
     ld a, [$d063]
     ld [$d062], a
-    call Call_000_1272
+    call ApplyPlayerLeftSpeed
     ld a, [wPlayerScreenXCoord]
     cp $08
     jr z, .jr_001_42a1
     and a
     ret
 .jr_001_429c:
-    call Call_000_1272
+    call ApplyPlayerLeftSpeed
     scf
     ret
 .jr_001_42a1:

bank_003.asm

@@ -3,7 +3,10 @@ SECTION "ROM Bank $003", ROMX[$4000], BANK[$3]
 TitlescreenTilemap:
     INCBIN "gfx/titlescreen.tilemap.lz"
 
-INCBIN "baserom.gb", $c1c7, $c6e0 - $c1c7
+FontFullTilesGfx:
+    INCBIN "gfx/font_full.2bpp.lz"
+
+INCBIN "baserom.gb", $c2c8, $c6e0 - $c2c8
 
 Metatiles_GreenGreens:
     INCBIN "data/stages/green_greens/metatiles.bin.lz"

bank_005.asm

@@ -2093,7 +2093,7 @@ InitRAM:
 Call_005_4b30:
 ; TODO: nop-ing this function results in title-screen music alterations.
     ld hl, $4b3a
-    ld de, $dc00
+    ld de, wdc00
     call HAL_Decompress
     ret
 
@@ -3153,13 +3153,11 @@ Call_005_5038:
     ld a, [de]
     and $e0
     cp $c0
-    jr nz, jr_005_5043
-
+    jr nz, .jr_005_5043
     inc de
     ld a, [de]
-    jr jr_005_505a
-
-jr_005_5043:
+    jr .jr_005_505a
+.jr_005_5043:
     ld h, $de
     ld a, $aa
     add b
@@ -3175,8 +3173,7 @@ jr_005_5043:
     adc $79
     ld h, a
     ld a, [hl]
-
-jr_005_505a:
+.jr_005_505a:
     ld c, a
     ld h, $de
     ld a, $52
@@ -4000,7 +3997,7 @@ Call_005_53cb:
 Call_005_53d3:
     push bc
     push de
-    ld d, $dc
+    ld d, wdc00 >> 8
     ld l, a
     ld h, d
     and e
@@ -4015,12 +4012,10 @@ Call_005_53d3:
     ld b, a
     ld a, l
     sub e
-    jr nc, jr_005_53e9
-
+    jr nc, .jr_005_53e9
     cpl
     inc a
-
-jr_005_53e9:
+.jr_005_53e9:
     ld l, a
     dec h
     ld a, c

bank_006.asm

@@ -454,7 +454,7 @@ Call_006_42e8:
     ld e, a
     ld h, d
     ld l, e
-    ld de, $9800
+    ld de, _VRAM + $1800
     call Decompress
     xor a
     call Call_000_21fb
@@ -1059,9 +1059,9 @@ jr_006_45b5:
     ld de, _VRAM + $e00
     ld c, Bank(FontGfx)
     call Decompress
-    ld hl, $5cdd
-    ld de, $8800
-    ld c, $03
+    ld hl, StageIntroScreensTilesGfx
+    ld de, _VRAM + $800
+    ld c, Bank(StageIntroScreensTilesGfx)
     call Decompress
     ld hl, $46b5
     ld de, $9800
@@ -1153,9 +1153,9 @@ Jump_006_486c:
     ld [$d053], a
     ld [$d055], a
     call StartTimer
-    ld hl, $41c7
-    ld de, $8e00
-    ld c, $03
+    ld hl, FontFullTilesGfx
+    ld de, _VRAM + $e00
+    ld c, Bank(FontFullTilesGfx)
     call Decompress
     ld hl, $4fcf
     ld de, $8000

wram.asm

@@ -96,3 +96,8 @@ wDestGfxAddress:: ; $d097
 
 wRAMFuncD099:: ; $d099
 	ds 7
+
+	ds $b60
+
+wdc00:: ; $dc00
+	ds $200