summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-06-05 20:14:24 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-06-05 20:14:24 -0400
commite0a13580617b6ae932cff247d2d27727d8e00502 (patch)
treedd6d0cf1d0bdaaf2c259ff139f21cf030c2476d4
parent88c1048f86bf898cb5c42bb0fe77dce165aac7b3 (diff)
Font-loading functions
-rw-r--r--home/copy2.asm17
-rw-r--r--macros/farcall.asm12
-rw-r--r--shim.sym3
3 files changed, 29 insertions, 3 deletions
diff --git a/home/copy2.asm b/home/copy2.asm
index 5d3afe2..7cc4696 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -1,6 +1,21 @@
INCLUDE "constants.asm"
-SECTION "Video Copy functions", ROM0[$0D2A]
+SECTION "Video Copy functions", ROM0[$0D02]
+
+Function0d02::
+ jpab Function14000
+
+LoadFont:: ; 00:0d0a
+ jpab LoadFontGraphics
+
+LoadFontsBattleExtra::
+ jpab LoadPokemonMenuGraphics
+
+LoadFontExtra:: ; 00:0d1a
+ jpab LoadFontExtraGraphicsWithCursor
+
+LoadFontExtra2::
+ jpab LoadHexadecimalFontOrHUDGraphics
FarCopyData: ; d2a (0:d2a)
; Identical to FarCopyBytes except for tail call optimization
diff --git a/macros/farcall.asm b/macros/farcall.asm
index 50bb232..05bb7b1 100644
--- a/macros/farcall.asm
+++ b/macros/farcall.asm
@@ -20,3 +20,15 @@ homecall: MACRO
pop af
call Bankswitch
ENDM
+
+jpba: MACRO
+ ld a, BANK(\1)
+ ld hl, \1
+ jp FarCall_hl
+ENDM
+
+jpab: MACRO
+ ld hl, \1
+ ld a, BANK(\1)
+ jp FarCall_hl
+ENDM
diff --git a/shim.sym b/shim.sym
index d3a91f5..4eddee1 100644
--- a/shim.sym
+++ b/shim.sym
@@ -1,6 +1,4 @@
; ROM0
-00:0D0A LoadFont
-00:0D1A LoadFontExtra
00:0E18 ClearBox
00:0E2A ClearTileMap
00:0E3D DrawTextBox
@@ -97,6 +95,7 @@
04:640B Function_1240b
04:6C58 CheckRegisteredItem
+05:4000 Function14000
05:400a GetPlayerSprite
05:4036 AddMapSprites
05:404c CheckInteriorMap