summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/gbc_only.asm2
-rwxr-xr-xmisc/mobile_41.asm12
-rwxr-xr-xmisc/mobile_5c.asm8
3 files changed, 12 insertions, 10 deletions
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index cae976a1c..f4b3eba8b 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
+INCBIN "gfx/misc/gbc_only.2bpp.lz"
; 4f0bc
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 6a38e67c2..169107978 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1116,16 +1116,18 @@ INCBIN "gfx/unknown/106514.2bpp"
LoadOverworldFont:: ; 106594
- ld de, .bgfont
+ ld de, .font
ld hl, VTiles1
- lb bc, BANK(.bgfont), $80
+ lb bc, BANK(.font), $80
call Get2bpp
- ld de, .bgfont + $80 tiles
+ ld de, .space
ld hl, VTiles2 tile $7f
- lb bc, BANK(.bgfont), 1
+ lb bc, BANK(.space), 1
call Get2bpp
ret
; 1065ad
-.bgfont
+.font
INCBIN "gfx/unknown/1065ad.2bpp"
+.space
+INCBIN "gfx/unknown/106dad.2bpp"
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index ef9db89a8..d181de745 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -206,7 +206,7 @@ Function170c06: ; 170c06
; 170c8b
Function170c8b: ; 170c8b
- ld hl, LastPlayerCounterMove
+ ld hl, LastEnemyCounterMove
ld b, $5
.asm_170c90
ld a, [hl]
@@ -858,7 +858,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call ByteFill
call DisableLCD
- ld hl, GFX_172f1f
+ ld hl, GameBoyN64GFX
ld de, VTiles2 tile $00
ld bc, $610
call CopyBytes
@@ -929,8 +929,8 @@ Palette_172edf:
RGB 0, 0, 0
RGB 0, 0, 0
-GFX_172f1f:
-INCBIN "gfx/unknown/172f1f.2bpp"
+GameBoyN64GFX:
+INCBIN "gfx/trade/game_boy_n64.2bpp"
Tilemap_1733af:
IF DEF(CRYSTAL11)