summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/battle/1c.asm4
-rwxr-xr-xengine/battle/animations.asm6
-rwxr-xr-xengine/battle/core.asm18
-rwxr-xr-xengine/cable_club.asm2
-rwxr-xr-xengine/clear_save.asm4
-rwxr-xr-xengine/evos_moves.asm2
-rwxr-xr-xengine/intro.asm4
-rwxr-xr-xengine/items/items.asm10
-rwxr-xr-xengine/menu/naming_screen.asm2
-rwxr-xr-xengine/menu/start_sub_menus.asm4
-rwxr-xr-xengine/overworld/cut.asm2
-rwxr-xr-xengine/palettes.asm2
-rwxr-xr-xengine/titlescreen.asm4
-rwxr-xr-xengine/town_map.asm4
-rwxr-xr-xengine/trade.asm8
15 files changed, 38 insertions, 38 deletions
diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm
index 1f07807a..dff1f993 100755
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -24,7 +24,7 @@ Func_708ca: ; 708ca (1c:48ca)
sla a
ld [rOBP1], a ; $ff49
jr nz, .asm_708f6
- call CleanLCD_OAM
+ call ClearSprites
call Func_7092a
ld b, $e4
.asm_7090d
@@ -42,7 +42,7 @@ Func_708ca: ; 708ca (1c:48ca)
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call Delay3
- jp CleanLCD_OAM
+ jp ClearSprites
Func_7092a: ; 7092a (1c:492a)
ld de, $9000
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 8f4cbcd5..55fa02d7 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -616,7 +616,7 @@ AnimationCleanOAM: ; 78ec8 (1e:4ec8)
push bc
push af
call DelayFrame
- call CleanLCD_OAM
+ call ClearSprites
pop af
pop bc
pop de
@@ -2616,7 +2616,7 @@ AnimationPetalsFalling: ; 79c8a (1e:5c8a)
ld a, $14
ld [W_SUBANIMTRANSFORM], a
call Func_79c97
- jp CleanLCD_OAM
+ jp ClearSprites
Func_79c97: ; 79c97 (1e:5c97)
ld c, a
@@ -2773,7 +2773,7 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77)
ld de, $0208
call Func_79de9
call AnimationShowMonPic
- call CleanLCD_OAM
+ call ClearSprites
ld a, $90
ld [$ffb0], a
ld hl, $9c00
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index a19919f4..94a2c518 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -183,7 +183,7 @@ Func_3c04c: ; 3c04c (f:404c)
call Delay3
ld b, $1
call GoPAL_SET
- call ResetLCD_OAM
+ call HideSprites
ld hl, PrintBeginningBattleText
ld b, BANK(PrintBeginningBattleText)
jp Bankswitch
@@ -1146,7 +1146,7 @@ Func_3c7d8: ; 3c7d8 (f:47d8)
.asm_3c7fa
xor a
ld [$cd6a], a
- call CleanLCD_OAM
+ call ClearSprites
ld a, [wWhichPokemon] ; $cf92
ld [wPlayerMonNumber], a ; $cc2f
ld c, a
@@ -1449,7 +1449,7 @@ Func_3c92a: ; 3c92a (f:492a)
call Func_3ee5b
call LoadScreenTilesFromBuffer1
.next4
- call CleanLCD_OAM
+ call ClearSprites
ld hl,wTileMap
ld bc,$040B
call ClearScreenArea
@@ -2271,7 +2271,7 @@ asm_3d05f: ; 3d05f (f:505f)
ld [$d152], a
call UseItem
call Func_3ee5b
- call CleanLCD_OAM
+ call ClearSprites
xor a
ld [wCurrentMenuItem], a ; $cc26
ld a, [W_BATTLETYPE] ; $d05a
@@ -2335,7 +2335,7 @@ Func_3d0e0: ; 3d0e0 (f:50e0)
asm_3d0ed: ; 3d0ed (f:50ed)
jp nc, Func_3d119
asm_3d0f0: ; 3d0f0 (f:50f0)
- call CleanLCD_OAM
+ call ClearSprites
call GBPalWhiteOut
call Func_3ee5b
call LoadScreenTilesFromBuffer2
@@ -2383,7 +2383,7 @@ Func_3d119: ; 3d119 (f:5119)
xor a
ld [$cc49], a
ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
- call CleanLCD_OAM
+ call ClearSprites
ld a, $36
call Predef ; indirect jump to StatusScreen (12953 (4:6953))
ld a, $37
@@ -2423,7 +2423,7 @@ Func_3d119: ; 3d119 (f:5119)
ld a, $1
ld [$cd6a], a
call GBPalWhiteOut
- call CleanLCD_OAM
+ call ClearSprites
call Func_3ee5b
call LoadScreenTilesFromBuffer1
call GoPAL_SET_CF1C
@@ -6219,7 +6219,7 @@ Func_3ec32: ; 3ec32 (f:6c32)
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $ff
ld [$cfcb], a
- call CleanLCD_OAM
+ call ClearSprites
call ClearScreen
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -6787,7 +6787,7 @@ Func_3efeb: ; 3efeb (f:6feb)
ld hl, Coord
ld bc, $40a
call ClearScreenArea
- call CleanLCD_OAM
+ call ClearSprites
ld a, [W_ISINBATTLE] ; $d057
dec a
call z, Func_3cdec
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index bcba5592..975ce678 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -887,7 +887,7 @@ Func_5a5f: ; 5a5f (1:5a5f)
ret nz
ld a, $4d
call Predef ; indirect jump to Func_5aaf (5aaf (1:5aaf))
- jp InitGame
+ jp Init
.asm_5a75
call Func_5317
ld hl, Club_GFX
diff --git a/engine/clear_save.asm b/engine/clear_save.asm
index dbb3d3a6..f68bc43d 100755
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -15,9 +15,9 @@ Func_1c98a: ; 1c98a (7:498a)
call DisplayTextBoxID
ld a, [wCurrentMenuItem] ; $cc26
and a
- jp z, InitGame
+ jp z, Init
callba Func_73b6a
- jp InitGame
+ jp Init
ClearSaveDataText: ; 1c9c1 (7:49c1)
TX_FAR _ClearSaveDataText
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
index eb59ce39..9757e4f1 100755
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -123,7 +123,7 @@ Func_3ad71: ; 3ad71 (e:6d71)
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $ff
ld [$cfcb], a
- call CleanLCD_OAM
+ call ClearSprites
callab Func_7bde9
jp c, Func_3af2e
ld hl, EvolvedText
diff --git a/engine/intro.asm b/engine/intro.asm
index 89c344db..2a3d72a1 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -9,7 +9,7 @@ PlayIntro: ; 41682 (10:5682)
xor a
ld [$ffae], a
ld [H_AUTOBGTRANSFERENABLED], a
- call CleanLCD_OAM
+ call ClearSprites
call DelayFrame
ret
@@ -329,7 +329,7 @@ PlayShootingStar: ; 4188a (10:588a)
ld [$c0ee], a
call PlaySound
call Func_417f8
- call CleanLCD_OAM
+ call ClearSprites
jp Delay3
Func_418e9: ; 418e9 (10:58e9)
diff --git a/engine/items/items.asm b/engine/items/items.asm
index e7f9cbe6..e9faef42 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -419,7 +419,7 @@ ItemUseBall: ; d687 (3:5687)
jr nz,.checkParty
ld hl,ItemUseBallText06
call PrintText
- call CleanLCD_OAM
+ call ClearSprites
ld a,[$cfe5] ;caught mon_ID
ld [$d11e],a
ld a,$3d
@@ -430,11 +430,11 @@ ItemUseBall: ; d687 (3:5687)
jr z,.sendToBox
xor a
ld [$cc49],a
- call CleanLCD_OAM
+ call ClearSprites
call AddPokemonToParty ;add mon to Party
jr .End
.sendToBox ;$5907
- call CleanLCD_OAM
+ call ClearSprites
call Func_e7a4
ld hl,ItemUseBallText07
ld a,[$d7f1]
@@ -448,7 +448,7 @@ ItemUseBall: ; d687 (3:5687)
ld hl,ItemUseBallText05
.printText0 ;$5922
call PrintText
- call CleanLCD_OAM
+ call ClearSprites
.End ;$5928
ld a,[W_BATTLETYPE]
and a
@@ -2148,7 +2148,7 @@ ItemUseTMHM: ; e479 (3:6479)
pop af
pop af
call GBPalWhiteOutWithDelay3
- call CleanLCD_OAM
+ call ClearSprites
call GoPAL_SET_CF1C
jp LoadScreenTilesFromBuffer1 ; restore saved screen
.checkIfAbleToLearnMove
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 1c4b1740..36aba5eb 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -163,7 +163,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
call CopyData
call GBPalWhiteOutWithDelay3
call ClearScreen
- call CleanLCD_OAM
+ call ClearSprites
call GoPAL_SET_CF1C
call GBPalNormal
xor a
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 60893d81..d4b64fef 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -95,7 +95,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
call GoBackToPartyMenu
jp .checkIfPokemonChosen
.choseStats
- call CleanLCD_OAM
+ call ClearSprites
xor a
ld [$cc49],a
ld a,$36
@@ -710,7 +710,7 @@ TrainerInfo_DrawVerticalLine: ; 135d8 (4:75d8)
StartMenu_SaveReset: ; 135e3 (4:75e3)
ld a,[$d72e]
bit 6,a ; is the player using the link feature?
- jp nz,InitGame
+ jp nz,Init
ld a,$3f
call Predef ; save the game
call LoadScreenTilesFromBuffer2 ; restore saved screen
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index 6c888e7f..5712c904 100755
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -35,7 +35,7 @@ asm_ef82: ; ef82 (3:6f82)
ld hl, $d730
set 6, [hl]
call GBPalWhiteOutWithDelay3
- call CleanLCD_OAM
+ call ClearSprites
call Func_3dbe
ld a, $90
ld [$ffb0], a
diff --git a/engine/palettes.asm b/engine/palettes.asm
index ab8e7076..6c1a9b1d 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -409,7 +409,7 @@ LoadSGBBorderAndPalettes: ; 7202b (1c:602b)
ld de, PalPacket_724d8
ld hl, SuperPalettes
call Func_7210b
- call ZeroVram
+ call ClearVram
ld hl, PalPacket_72538
jp SendSGBPacket
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 113a55a8..50294de5 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -226,7 +226,7 @@ ENDC
call PlayCry
call WaitForSoundToFinish
call GBPalWhiteOutWithDelay3
- call CleanLCD_OAM
+ call ClearSprites
xor a
ld [$ffb0], a
inc a
@@ -306,7 +306,7 @@ Func_44dd: ; 44dd (1:44dd)
ld bc, $230
ld a, BANK(PlayerCharacterTitleGraphics)
call FarCopyData2
- call CleanLCD_OAM
+ call ClearSprites
xor a
ld [wWhichTrade], a ; $cd3d
ld hl, wOAMBuffer
diff --git a/engine/town_map.asm b/engine/town_map.asm
index db12c18f..6fbdeb2a 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -138,7 +138,7 @@ MonsNestText: ; 70f89 (1c:4f89)
db "'s NEST@"
LoadTownMap_Fly: ; 70f90 (1c:4f90)
- call CleanLCD_OAM
+ call ClearSprites
call LoadTownMap
call LoadPlayerSpriteGraphics
call LoadFontTilePatterns
@@ -343,7 +343,7 @@ Func_711ab: ; 711ab (1c:51ab)
ld [$d09b], a
call GBPalWhiteOut
call ClearScreen
- call CleanLCD_OAM
+ call ClearSprites
call LoadPlayerSpriteGraphics
call LoadFontTilePatterns
call UpdateSprites
diff --git a/engine/trade.asm b/engine/trade.asm
index fa579cc7..f91eac8d 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -117,7 +117,7 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
ld bc, $800
ld a, $7f
call FillMemory
- call CleanLCD_OAM
+ call ClearSprites
ld a, $ff
ld [$cfcb], a
ld hl, $d730
@@ -281,7 +281,7 @@ Func_412d2: ; 412d2 (10:52d2)
call PlaySound
jr .asm_412e7
.asm_41318
- call CleanLCD_OAM
+ call ClearSprites
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call ClearScreen
@@ -355,7 +355,7 @@ Func_41376: ; 41376 (10:5376)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call Func_41525
- jp CleanLCD_OAM
+ jp ClearSprites
Func_413c6: ; 413c6 (10:53c6)
call Func_41411
@@ -386,7 +386,7 @@ Func_413c6: ; 413c6 (10:53c6)
call Func_414c5
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- jp CleanLCD_OAM
+ jp ClearSprites
Func_41411: ; 41411 (10:5411)
ld a, $1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 03:44:24 +0000