summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--battle/anim_objects.asm2
-rw-r--r--battle/core.asm2
-rw-r--r--engine/map_setup.asm2
-rw-r--r--engine/pokedex.asm6
-rw-r--r--engine/specials.asm2
-rw-r--r--home/copy.asm56
-rw-r--r--home/map.asm4
-rw-r--r--home/window.asm2
-rw-r--r--items/item_effects.asm4
-rw-r--r--main.asm126
-rw-r--r--maps/PokeCenter2F.asm10
-rw-r--r--misc/mobile_22.asm12
-rw-r--r--misc/mobile_40.asm2
-rw-r--r--misc/mobile_42.asm6
-rw-r--r--misc/mobile_5f.asm4
15 files changed, 124 insertions, 116 deletions
diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
index f4aea5163..943b550b3 100644
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -4949,7 +4949,7 @@ endr
ld l, a
pop de
push bc
- call Functione73
+ call DecompressRequest2bpp
pop bc
ret
; ce85e (33:685e)
diff --git a/battle/core.asm b/battle/core.asm
index 752343df8..e7bd66203 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -9366,7 +9366,7 @@ Function3fb6c: ; 3fb6c
hlcoord 1, 5
lb bc, 3, 7
call ClearBox
- call Functione51
+ call LoadStandardFont
call Function3ed9f
call Function3fbd6
xor a
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index 7d0a9affb..957747406 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -343,7 +343,7 @@ Function154f7: ; 154f7
jr c, .ok
ret
.ok
- call Special_ReplaceKrisSprite
+ call ReplaceKrisSprite
ret
Function1550c: ; 1550c (5:550c)
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index dd58e940d..005129f5f 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -838,7 +838,7 @@ Function405df: ; 405df (10:45df)
ld hl, PokedexLZ
ld de, VTiles2 tile $31
lb bc, BANK(PokedexLZ), $3a
- call Functione73
+ call DecompressRequest2bpp
.asm_4060f
ret
@@ -2487,7 +2487,7 @@ Function414b7: ; 414b7
xor a
call ByteFill
call Function414fb
- call Functione5f
+ call LoadFontsExtra
ld hl, VTiles2 tile $60
ld bc, $0200
call Function41504
@@ -2511,7 +2511,7 @@ Function414b7: ; 414b7
ret
Function414fb: ; 414fb
- call Functione51
+ call LoadStandardFont
ld hl, VTiles1
ld bc, $0800
diff --git a/engine/specials.asm b/engine/specials.asm
index 0dc12a542..931a59078 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -76,7 +76,7 @@ SpecialsPointers:: ; c029
add_special UpdateTimePals
add_special ClearTileMap
add_special UpdateSprites
- add_special Special_ReplaceKrisSprite
+ add_special ReplaceKrisSprite
add_special Special_GameCornerPrizeMonCheckDex
add_special SpecialSeenMon
add_special WaitSFX
diff --git a/home/copy.asm b/home/copy.asm
index 30934df8f..e479ddeaf 100644
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -8,9 +8,9 @@ Get2bpp_2:: ; dc9
ld a, [hROMBank]
push af
- ld a, BANK(Function104284)
+ ld a, BANK(_Get2bpp)
rst Bankswitch
- call Function104284
+ call _Get2bpp
pop af
rst Bankswitch
@@ -24,9 +24,9 @@ Get1bpp_2:: ; ddc
ld a, [hROMBank]
push af
- ld a, BANK(Function1042b2)
+ ld a, BANK(_Get1bpp)
rst Bankswitch
- call Function1042b2
+ call _Get1bpp
pop af
rst Bankswitch
@@ -47,7 +47,7 @@ FarCopyBytesDouble_DoubleBankSwitch:: ; def
ret
; dfd
-Functiondfd:: ; dfd
+OldDMATransfer:: ; dfd
dec c
ld a, [hBGMapMode]
push af
@@ -59,42 +59,47 @@ Functiondfd:: ; dfd
rst Bankswitch
.loop
+; load the source and target MSB and LSB
ld a, d
- ld [rHDMA1], a
+ ld [rHDMA1], a ; source MSB
ld a, e
and $f0
- ld [rHDMA2], a
+ ld [rHDMA2], a ; source LSB
ld a, h
and $1f
- ld [rHDMA3], a
+ ld [rHDMA3], a ; target MSB
ld a, l
and $f0
- ld [rHDMA4], a
+ ld [rHDMA4], a ; target LSB
+; stop when c < 8
ld a, c
cp $8
jr c, .done
+; decrease c by 8
sub $8
ld c, a
+; DMA transfer state
ld a, $f
ld [hDMATransfer], a
call DelayFrame
+; add $100 to hl and de
ld a, l
- add 0
+ add $100 % $100
ld l, a
ld a, h
- adc 1
+ adc $100 / $100
ld h, a
ld a, e
- add 0
+ add $100 % $100
ld e, a
ld a, d
- adc 1
+ adc $100 / $100
ld d, a
jr .loop
.done
ld a, c
- and $7f
+ and $7f ; pretty silly, considering at most bits 0-2 would be set
ld [hDMATransfer], a
call DelayFrame
pop af
@@ -107,15 +112,15 @@ Functiondfd:: ; dfd
-Special_ReplaceKrisSprite:: ; e4a
- callba Function14135
+ReplaceKrisSprite:: ; e4a
+ callba _ReplaceKrisSprite
ret
; e51
-Functione51:: ; e51
- callba Functionfb449
+LoadStandardFont:: ; e51
+ callba _LoadStandardFont
ret
; e58
@@ -126,27 +131,30 @@ LoadFontsBattleExtra:: ; e58
-Functione5f:: ; e5f
- callba Functionfb48a
- callba Functionfb4b0
+LoadFontsExtra:: ; e5f
+ callba _LoadFontsExtra1
+ callba _LoadFontsExtra2
ret
; e6c
-Functione6c:: ; e6c
- callba Functionfb4b0
+LoadFontsExtra2:: ; e6c
+ callba _LoadFontsExtra2
ret
; e73
-Functione73:: ; e73
+DecompressRequest2bpp:: ; e73
push de
ld a, BANK(sScratch)
call GetSRAMBank
push bc
+
ld de, sScratch
ld a, b
call FarDecompress
+
pop bc
pop hl
+
ld de, sScratch
call Request2bpp
call CloseSRAM
diff --git a/home/map.asm b/home/map.asm
index d2a5b1771..16b2456ab 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -2022,8 +2022,8 @@ Function2bae:: ; 2bae
call DisableLCD
call ClearSprites
callba Function14168
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
ld a, [hROMBank]
push af
ld a, [MapGroup]
diff --git a/home/window.asm b/home/window.asm
index 1198cfbe1..886799bea 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -42,7 +42,7 @@ Function2de2:: ; 2de2
call Function2e31
ld a, $90
ld [hWY], a
- call Special_ReplaceKrisSprite
+ call ReplaceKrisSprite
callba ReturnFromMapSetupScript
callba Function106594
ret
diff --git a/items/item_effects.asm b/items/item_effects.asm
index 480ed895f..c1d891326 100644
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -607,7 +607,7 @@ endr
call FadeToWhite
- call Functione51
+ call LoadStandardFont
pop hl
ld de, StringBuffer1
@@ -687,7 +687,7 @@ endr
call PrintText
call FadeToWhite
- call Functione51
+ call LoadStandardFont
jr .asm_ebe2
.asm_ebd1
diff --git a/main.asm b/main.asm
index d4a39a489..f1b391494 100644
--- a/main.asm
+++ b/main.asm
@@ -109,8 +109,8 @@ Function5b44: ; 5b44
xor a
ld [$ffde], a
call ClearTileMap
- call Functione5f
- call Functione51
+ call LoadFontsExtra
+ call LoadStandardFont
call ResetTextRelatedRAM
ret
; 5b54
@@ -582,7 +582,7 @@ Function5e9f: ; 5e9f
call Function5ebf
call Function5f1c
call Function5f40
- call Functione5f
+ call LoadFontsExtra
call UpdateSprites
ret
; 5eaf
@@ -591,7 +591,7 @@ Function5eaf: ; 5eaf
call Function5ebf
call Function5f1c
call Function5f48
- call Functione5f
+ call LoadFontsExtra
call UpdateSprites
ret
; 5ebf
@@ -856,7 +856,7 @@ NamePlayer: ; 0x6074
call FadeToWhite
call ClearTileMap
- call Functione5f
+ call LoadFontsExtra
call WaitBGMap
xor a
@@ -948,7 +948,7 @@ ShrinkPlayer: ; 610f
call DelayFrames
call Intro_PlacePlayerSprite
- call Functione5f
+ call LoadFontsExtra
ld c, 50
call DelayFrames
@@ -1431,7 +1431,7 @@ Data63ca: ; 63ca
Copyright: ; 63e2
call ClearTileMap
- call Functione5f
+ call LoadFontsExtra
ld de, CopyrightGFX
ld hl, VTiles2 tile $60
lb bc, BANK(CopyrightGFX), $1d
@@ -1553,11 +1553,11 @@ Function64bf:: ; 64bf
; 64cd
Function64cd: ; 64cd
- call Functione5f
+ call LoadFontsExtra
ld a, $90
ld [hWY], a
call Function2e31
- call Functione51
+ call LoadStandardFont
ret
; 64db
@@ -4783,7 +4783,7 @@ CutDownTreeOrGrass: ; c810
call Function2914
call UpdateSprites
call DelayFrame
- call Functione51
+ call LoadStandardFont
ret
; c840
@@ -5020,7 +5020,7 @@ UsedSurfScript: ; c986
copybytetovar Buffer2
writevarcode VAR_MOVEMENT
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
special PlayMapMusic
; step into the water
special Special_SurfStartStep ; (slow_step_x, step_end)
@@ -5258,7 +5258,7 @@ FlyFunction: ; ca3b
Functioncacb: ; cacb
callba Function561d
call DelayFrame
- call Special_ReplaceKrisSprite
+ call ReplaceKrisSprite
callba Function106594
ret
; cade
@@ -6359,7 +6359,7 @@ PutTheRodAway: ; d095
ld a, $1
ld [PlayerAction], a
call UpdateSprites
- call Special_ReplaceKrisSprite
+ call ReplaceKrisSprite
ret
; d0a4
@@ -6478,14 +6478,14 @@ Script_GetOnBike: ; 0xd13e
writetext UnknownText_0xd17c
closetext
loadmovesprites
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
end
; 0xd14e
Script_GetOnBike_Register: ; 0xd14e
writecode VAR_MOVEMENT, $1
loadmovesprites
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
end
; 0xd156
@@ -6502,7 +6502,7 @@ Script_GetOffBike: ; 0xd158
UnknownScript_0xd163:
loadmovesprites
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
special PlayMapMusic
end
; 0xd16b
@@ -11322,8 +11322,8 @@ Function11c11: ; 11c11 (4:5c11)
Function11c51: ; 11c51
call ClearSprites
callab Function8cf53
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
ld de, GFX_11e65
ld hl, VTiles1 tile $6b
@@ -12525,7 +12525,7 @@ endr
push af
ld a, 1
ld [hOAMUpdate], a
- call Functione5f
+ call LoadFontsExtra
pop af
ld [hOAMUpdate], a
.ReturnEnd
@@ -16188,7 +16188,7 @@ GetEmote2bpp: ; 1412a
ret
; 14135
-Function14135:: ; 14135
+_ReplaceKrisSprite:: ; 14135
call GetPlayerSprite
ld a, [UsedSprites]
ld [hUsedSpriteIndex], a
@@ -22316,7 +22316,7 @@ PokepicYesOrNo:: ; 24528
call Function2173
call Function321c
call UpdateSprites
- call Functione51
+ call LoadStandardFont
ret
; 24547
@@ -26660,7 +26660,7 @@ LinkCommunications: ; 28000
call DelayFrames
call ClearScreen
call UpdateSprites
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
callba Function16d69a
call Function3200
@@ -28897,7 +28897,7 @@ Function29082: ; 29082
ret
.asm_2909b
- call Functione51
+ call LoadStandardFont
scf
ret
; 290a0
@@ -32264,7 +32264,7 @@ INCBIN "gfx/battle/balls.2bpp"
_ShowLinkBattleParticipants: ; 2c1b2
call WhiteBGMap
- call Functione5f
+ call LoadFontsExtra
hlcoord 2, 3
ld b, 9
ld c, 14
@@ -34330,8 +34330,8 @@ Function41a7f: ; 41a7f
callba Function1de247
call Function41af7
call DisableLCD
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
call Function414b7
call Function4147b
ld a, [wd265]
@@ -36226,7 +36226,7 @@ Function4802f: ; 4802f (12:402f)
ld [wd003], a
.asm_4805a
call Function486bf
- call Functione5f
+ call LoadFontsExtra
ld de, GFX_488c3
ld hl, VTiles2 tile $10
lb bc, BANK(GFX_488c3), 1
@@ -38087,7 +38087,7 @@ Function48e14: ; 48e14 (12:4e14)
call DelayFrames
call WhiteBGMap
call Function48000
- call Functione5f
+ call LoadFontsExtra
hlcoord 0, 0
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, $0
@@ -39576,8 +39576,8 @@ Function49ed0: ; 49ed0
xor a
ld [$ffde], a
call ClearTileMap
- call Functione5f
- call Functione51
+ call LoadFontsExtra
+ call LoadStandardFont
call ResetTextRelatedRAM
ret
; 49ee0
@@ -39829,7 +39829,7 @@ Function4a100: ; 4a100 (12:6100)
asm_4a111: ; 4a111 (12:6111)
pop bc
- call Functione5f
+ call LoadFontsExtra
jp Function49f0a
Function4a118: ; 4a118 (12:6118)
@@ -40029,7 +40029,7 @@ Function4a28a: ; 4a28a (12:628a)
callba Function11765d
call WhiteBGMap
call Call_ExitMenu
- call Functione5f
+ call LoadFontsExtra
scf
ret
.asm_4a2f0
@@ -40459,7 +40459,7 @@ Function4a6ab: ; 4a6ab (12:66ab)
call GetSGBLayout
callba Function11c1ab
pop bc
- call Functione5f
+ call LoadFontsExtra
jp Function4a4c4
Function4a6c5: ; 4a6c5 (12:66c5)
@@ -42267,8 +42267,8 @@ _ResetClock: ; 4d3b1
callba Function8000
ld b, $8
call GetSGBLayout
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
ld de, MUSIC_MAIN_MENU
call PlayMusic
ld hl, .text_askreset
@@ -42543,8 +42543,8 @@ Function4d54c: ; 4d54c
callba Function8000
ld b, $8
call GetSGBLayout
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
ld de, MUSIC_MAIN_MENU
call PlayMusic
ld hl, UnknownText_0x4d580
@@ -44975,7 +44975,7 @@ Function4e881: ; 4e881
call ClearTileMap
call ClearSprites
call DisableLCD
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
ld hl, VBGMap0
ld bc, VBGMap1 - VBGMap0
@@ -45008,7 +45008,7 @@ Function4e8c2: ; 4e8c2
call ClearTileMap
call ClearSprites
call DisableLCD
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
ld hl, VBGMap0
ld bc, VBGMap1 - VBGMap0
@@ -49349,7 +49349,7 @@ WaterToLandSprite: ; 803f9
push bc
ld a, PLAYER_NORMAL
ld [PlayerState], a
- call Special_ReplaceKrisSprite ; UpdateSprites
+ call ReplaceKrisSprite ; UpdateSprites
pop bc
ret
; 80404
@@ -49776,7 +49776,7 @@ Function8197c: ; 8197c
ld de, VTiles0
ld bc, $10
call CopyBytes
- call Functione51
+ call LoadStandardFont
ld hl, VTiles1
lb bc, 8, 0
.asm_8199d
@@ -53681,7 +53681,7 @@ ShakeHeadbuttTree: ; 8c80a
ld hl, VTiles1
lb bc, BANK(Font), $c
call Get1bpp
- call Special_ReplaceKrisSprite
+ call ReplaceKrisSprite
ret
; 8c893
@@ -57994,7 +57994,7 @@ InitClock: ; 90672 (24:4672)
call GetSGBLayout
xor a
ld [hBGMapMode], a ; $ff00+$d4
- call Functione51
+ call LoadStandardFont
ld de, GFX_908fb
ld hl, VTiles2 tile $00
lb bc, BANK(GFX_908fb), 1
@@ -58424,7 +58424,7 @@ Special_SetDayOfWeek: ; 90913
ld a, [DefaultFlypoint]
ld [StringBuffer2], a
call Function663
- call Functione51
+ call LoadStandardFont
pop af
ld [hInMenu], a
ret
@@ -61336,7 +61336,7 @@ Function91ff2: ; 91ff2
ld hl, TownMapGFX
ld de, VTiles2
lb bc, BANK(TownMapGFX), $30
- call Functione73
+ call DecompressRequest2bpp
ret
; 91fff
@@ -64511,7 +64511,7 @@ ReadAnyMail: ; b9237
call ClearSprites
call ClearTileMap
call DisableLCD
- call Functione5f
+ call LoadFontsExtra
pop de
push de
ld a, BANK(s0_a600)
@@ -64544,7 +64544,7 @@ ReadAnyMail: ; b9237
call Functionb929a
call WhiteBGMap
call DisableLCD
- call Functione51
+ call LoadStandardFont
jp EnableLCD
; b929a
@@ -65981,8 +65981,8 @@ _CardFlip: ; e00ee (38:40ee)
call PlayMusic
call DelayFrame
call DisableLCD
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
ld hl, LZ_e0d16
ld de, VTiles2 tile $00
call Decompress
@@ -71441,7 +71441,7 @@ Functione33e8: ; e33e8 (38:73e8)
ld bc, $310
xor a
call ByteFill
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
ld hl, PCMailGFX
ld de, VTiles2 tile $5c
@@ -71723,7 +71723,7 @@ Functione36f9: ; e36f9 (38:76f9)
ld de, DefaultFlypoint
callba Function116c1
call ClearTileMap
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
ld a, [MenuSelection]
dec a
@@ -72314,7 +72314,7 @@ Functione4512: ; e4512
hlcoord 16, 15 ;where on the screen the number is drawn
add "1"
ld [hl], a
- call Functione5f
+ call LoadFontsExtra
and a
ret
; e4520
@@ -74988,6 +74988,7 @@ Footprints: ; f9434
INCBIN "gfx/misc/footprints.1bpp"
; fb434
+; This and the following two functions are unreferenced.
Unknown_fb434:
db 0
@@ -75003,9 +75004,10 @@ Functionfb43f: ; fb43f
and a
jp nz, Get2bpp_2
jp Get2bpp
+; End unreferenced block
; fb449
-Functionfb449:: ; fb449
+_LoadStandardFont:: ; fb449
ld de, Font
ld hl, VTiles1
lb bc, BANK(Font), $80
@@ -75032,9 +75034,7 @@ Functionfb449:: ; fb449
ret
; fb48a
-
-
-Functionfb48a:: ; fb48a
+_LoadFontsExtra1:: ; fb48a
ld de, GFX_f9214
ld hl, VTiles2 tile $60
lb bc, BANK(GFX_f9214), 1
@@ -75050,7 +75050,7 @@ Functionfb48a:: ; fb48a
jr LoadFrame
; fb4b0
-Functionfb4b0:: ; fb4b0
+_LoadFontsExtra2:: ; fb4b0
ld de, GFX_f9424
ld hl, VTiles2 tile $61
ld b, BANK(GFX_f9424)
@@ -75521,8 +75521,8 @@ Functionfb877: ; fb877
Functionfb8c8: ; fb8c8
call ClearTileMap
- call Functione5f
- call Functione51
+ call LoadFontsExtra
+ call LoadStandardFont
callba Function40ab2
call Function3200
callba Function3da97
@@ -77307,7 +77307,7 @@ Function104265: ; 104265 (41:4265)
ret
-Function104284:: ; 104284
+_Get2bpp:: ; 104284
; 2bpp when [rLCDC] & $80
; switch to WRAM bank 6
ld a, [rSVBK]
@@ -77350,7 +77350,7 @@ endr
ret
; 1042b2
-Function1042b2:: ; 1042b2
+_Get1bpp:: ; 1042b2
; 1bpp when [rLCDC] & $80
.loop
ld a, c
@@ -77785,7 +77785,7 @@ LoadGraphics: ; 1047cf
xor a
ld [hTileAnimFrame], a ; $ff00+$df
callba Function14168
- call Functione5f
+ call LoadFontsExtra
callba Function106594
ret
@@ -81626,7 +81626,7 @@ Function1ddf26: ; 1ddf26 (77:5f26)
ld hl, LZ_1ddf33
ld de, VTiles2 tile $31
lb bc, BANK(LZ_1ddf33), $3a
- call Functione73
+ call DecompressRequest2bpp
ret
; 1ddf33 (77:5f33)
diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm
index 93fc07a2f..9c3a858a9 100644
--- a/maps/PokeCenter2F.asm
+++ b/maps/PokeCenter2F.asm
@@ -435,7 +435,7 @@ PokeCenter2F_CheckGender:
special Functionc225
applymovement PLAYER, MovementData_0x192d1c
setflag ENGINE_KRIS_IN_CABLE_CLUB
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
loadfont
writetext Text_LikeTheLook
closetext
@@ -461,7 +461,7 @@ Script_CleanUpFemaleFlagAfterTrade:
writebyte $90
special Functionc225
applymovement PLAYER, MovementData_0x192d1c
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
applymovement PLAYER, MovementData_0x192d2a
applymovement $2, MovementData_0x192cfe
end
@@ -483,7 +483,7 @@ Script_CleanUpFemaleFlagAfterBattle:
writebyte $90
special Functionc225
applymovement PLAYER, MovementData_0x192d1c
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
applymovement PLAYER, MovementData_0x192d2a
applymovement $3, MovementData_0x192cfe
end
@@ -544,7 +544,7 @@ TimeCapsuleScript_CheckPlayerGender:
applymovement PLAYER, MovementData_0x192d22
faceperson PLAYER, $4
setflag ENGINE_KRIS_IN_CABLE_CLUB
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
loadfont
writetext Text_LikeTheLook
closetext
@@ -571,7 +571,7 @@ Script_LeftTimeCapsule:
writebyte $90
special Functionc225
applymovement PLAYER, MovementData_0x192d1c
- special Special_ReplaceKrisSprite
+ special ReplaceKrisSprite
applymovement PLAYER, MovementData_0x192cfc
applymovement $4, MovementData_0x192d01
.Done:
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index f529b5bc7..0f0e1852e 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -499,8 +499,8 @@ Function8939a: ; 8939a
Function893b3: ; 893b3 (22:53b3)
call DisableLCD
call ClearSprites
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
call Function893ef
call Function8942b
call Function89455
@@ -510,8 +510,8 @@ Function893b3: ; 893b3 (22:53b3)
Function893cc: ; 893cc
call DisableLCD
call ClearSprites
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
call Function893ef
call Function89464
call EnableLCD
@@ -4307,7 +4307,7 @@ Function8ac7c: ; 8ac7c
.asm_8ace4
call CloseSRAM
- call Functione51
+ call LoadStandardFont
ld a, [wd02f]
ld c, a
and a
@@ -4319,7 +4319,7 @@ Function8ac7c: ; 8ac7c
ld a, $2
call Function89259
jp c, Function8ac7c
- call Functione51
+ call LoadStandardFont
pop de
ld c, $0
scf
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index a777be7b9..5afe9e3a9 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -411,7 +411,7 @@ Function1002dc: ; 1002dc
callba RunMapSetupScript
xor a
ld [hMapEntryMethod], a
- call Functione51
+ call LoadStandardFont
ret
; 1002ed
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index c57a4008a..613c21bc3 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -131,7 +131,7 @@ Function1080b7: ; 1080b7
call DisableLCD
call Function1081ad
call Function1081ca
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
ld a, $1
ld [rVBK], a
@@ -194,7 +194,7 @@ Function108157: ; 108157
call DisableLCD
call Function1081ad
call Function1081ca
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
call EnableLCD
xor a
@@ -326,7 +326,7 @@ Function10824b: ; 10824b
ld [hWX], a
ld a, $90
ld [hWY], a
- call Functione51
+ call LoadStandardFont
call LoadFontsBattleExtra
callba Function106462
callba Function106464
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 5ef47e8ff..a58c6eb0d 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -10,8 +10,8 @@ Function17c000: ; 17c000
xor a
call ByteFill
- call Functione51
- call Functione5f
+ call LoadStandardFont
+ call LoadFontsExtra
ld hl, HaveWantMap
decoord 0, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 06:30:52 +0000