summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/color.asm10
-rwxr-xr-xengine/events/whiteout.asm2
-rw-r--r--engine/learn.asm4
-rwxr-xr-xengine/main_menu.asm18
-rw-r--r--engine/movie/gamefreak_presents.asm12
-rw-r--r--engine/namingscreen.asm12
-rwxr-xr-xengine/overworld/map_objects.asm4
-rwxr-xr-xengine/overworld/movement.asm8
-rwxr-xr-xengine/overworld/player_object.asm12
-rwxr-xr-xengine/pack.asm2
-rw-r--r--engine/sine.asm2
-rwxr-xr-xengine/specials.asm2
-rwxr-xr-xengine/sprites.asm2
-rwxr-xr-xengine/title.asm10
14 files changed, 50 insertions, 50 deletions
diff --git a/engine/color.asm b/engine/color.asm
index 2d959df5..05c13b2b 100755
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -227,7 +227,7 @@ Function91b4:
ld a, [wc606]
ld c, a
ld a, [wc607]
- ld hl, wAttrMap
+ ld hl, wAttrmap
ld de, $14
.asm_91cc
and a
@@ -299,7 +299,7 @@ ApplyHPBarPals:
.asm_9236
ld e, c
inc e
- hlcoord 11, 1, wAttrMap
+ hlcoord 11, 1, wAttrmap
ld bc, 2 * SCREEN_WIDTH
ld a, [wCurPartyMon]
.asm_9241
@@ -543,7 +543,7 @@ Function9b01: ; 9b01 (2:5b01)
ret
Function9b1d: ; 9b1d (2:5b1d)
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a
call ByteFill
@@ -573,7 +573,7 @@ Function9b35: ; 9b35 (2:5b35)
ret
.asm_9b52
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld de, $9800
ld b, $12
ld a, $1
@@ -609,7 +609,7 @@ Function9b75: ; 9b75 (2:5b75)
ld a, [de]
inc a
ld e, a
- hlcoord 11, 2, wAttrMap
+ hlcoord 11, 2, wAttrmap
ld bc, $28
ld a, [wcca9]
.asm_9b8d
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 075274a4..01d7b388 100755
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -31,7 +31,7 @@ Script_Whiteout:
OverworldBGMap:
call ClearPalettes
- call FillScreenWithTextboxPal
+ call ClearScreen
call WaitBGMap2
call HideSprites
call RotateThreePalettesLeft
diff --git a/engine/learn.asm b/engine/learn.asm
index 8f599208..f61b0c6c 100644
--- a/engine/learn.asm
+++ b/engine/learn.asm
@@ -1,5 +1,5 @@
LearnMove:
- call LoadTileMapToTempTileMap
+ call LoadTilemapToTempTilemap
ld a, [wCurPartyMon]
ld hl, wPartyMon1Nickname
call GetNick
@@ -147,7 +147,7 @@ LearnMove:
ld [wcede], a
call StaticMenuJoypad
push af
- call Call_LoadTempTileMapToTileMap
+ call SafeLoadTempTilemapToTilemap
pop af
pop hl
bit 1, a
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 7b01ff59..6f460a5c 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -22,7 +22,7 @@ MainMenu_:
call Function5b0a
call CloseWindow
jr c, .asm_5a94
- call ClearTileMap
+ call ClearTilemap
ld a, [wMenuSelection]
ld hl, .Jumptable
rst JumpTable
@@ -230,7 +230,7 @@ Function5bb8: ; 5bb8 (1:5bb8)
Function5bf7: ; 5bf7 (1:5bf7)
xor a
ldh [hMapAnims], a
- call ClearTileMap
+ call ClearTilemap
call LoadFontsExtra
call Functiond9e
call ClearWindowData
@@ -504,7 +504,7 @@ MainMenu_Continue:
ld [wMusicFadeID + 1], a
call ClearBGPalettes
call CloseWindow
- call ClearTileMap
+ call ClearTilemap
ld c, 20
call DelayFrames
farcall JumpRoamMons
@@ -724,7 +724,7 @@ OakSpeech: ; 5fa5 (1:5fa5)
farcall InitClock ; What time is it?
call RotateFourPalettesLeft
- call ClearTileMap
+ call ClearTilemap
ld de, MUSIC_ROUTE_30
call PlayMusic
@@ -747,7 +747,7 @@ OakSpeech: ; 5fa5 (1:5fa5)
call PrintText
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
ld a, MARILL
ld [wCurSpecies], a
@@ -772,7 +772,7 @@ OakSpeech: ; 5fa5 (1:5fa5)
call PrintText
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
xor a
ld [wCurPartySpecies], a
@@ -789,7 +789,7 @@ OakSpeech: ; 5fa5 (1:5fa5)
call PrintText
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
xor a
ld [wCurPartySpecies], a
@@ -862,7 +862,7 @@ NamePlayer: ; 6085 (1:6085)
ld de, wPlayerName
farcall NamingScreen
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
call LoadFontsExtra
call WaitBGMap
xor a
@@ -968,7 +968,7 @@ ShrinkPlayer: ; 6123 (1:6123)
call DelayFrames
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
ret
MovePlayerPicRight: ; 617e (1:617e)
diff --git a/engine/movie/gamefreak_presents.asm b/engine/movie/gamefreak_presents.asm
index a52413c4..7e9519f4 100644
--- a/engine/movie/gamefreak_presents.asm
+++ b/engine/movie/gamefreak_presents.asm
@@ -3,7 +3,7 @@ Copyright_GFPresents: ; e49a8 (39:49a8)
; Return carry if user cancels animation by pressing a button.
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a
@@ -34,7 +34,7 @@ Copyright_GFPresents: ; e49a8 (39:49a8)
ld c, 100
call DelayFrames
- call ClearTileMap
+ call ClearTilemap
call GFPresents_Init
.loop
@@ -124,7 +124,7 @@ GFPresents_PlayFrame: ; e4a37 (39:4a37)
.finish
callfar ClearAnimatedObjectBuffer
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
ld c, 16
@@ -175,7 +175,7 @@ GFPresents_Star: ; e4a96 (39:4a96)
depixel 10, 11, 4, 0
ld a, $16
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
; TODO set some flag in the struct?
ld hl, $c
@@ -199,7 +199,7 @@ GFPresents_PlaceLogo: ; e4ab2 (39:4ab2)
depixel 10, 11, 4, 0
ld a, $15
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
call GFPresents_NextScene
@@ -315,7 +315,7 @@ GFPresents_Sparkle: ; e4b33 (39:4b33)
push af
depixel 11, 11
ld a, $17
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
pop af
; take the bottom 4 bits of a as an index into
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 3a68626d..f907c463 100644
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -158,7 +158,7 @@ Function11bda:
ld [hl], a
lb de, $24, $20
ld a, $1c
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ld hl, $1
add hl, bc
ld [hl], $0
@@ -190,7 +190,7 @@ Function11c11: ; 11c11 (4:5c11)
ld [hl], a
lb de, $24, $20
ld a, $1c
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ret
Function11c3a: ; 11c3a (4:5c3a)
@@ -351,7 +351,7 @@ Function11d3a:
ld d, $40
.asm_11d44
ld a, $14
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ld a, c
ld [wc5d5], a
ld a, b
@@ -926,12 +926,12 @@ Function12267: ; 12267 (4:6267)
ld a, BANK(MailIcon)
call FarCopyBytes
xor a
- ld hl, wTileMapEnd
+ ld hl, wTilemapEnd
ld [hli], a
ld [hl], a
lb de, $18, $10
ld a, $0
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ld hl, $2
add hl, bc
ld [hl], $0
@@ -1055,7 +1055,7 @@ Function123d5: ; 123d5 (4:63d5)
Function123e8:
lb de, $48, $10
ld a, $1b
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ld a, c
ld [wc5d5], a
ld a, b
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 6c344d31..887fb753 100755
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -673,7 +673,7 @@ Function55a1
jr z, .asm_55b8
call Function55bc
.asm_55b8
- call UpdateSprites_
+ call _UpdateSprites
ret
Function55bc: ; 55bc (1:55bc)
@@ -1154,7 +1154,7 @@ Function5879: ; 5879 (1:5879)
.data db 6,7,8,9
-UpdateSprites_:: ; 5896 (1:5896)
+_UpdateSprites:: ; 5896 (1:5896)
ld a, [wVramState]
bit 0, a
ret z
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 5a299571..d98b47ee 100755
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -1,6 +1,6 @@
GetMovementByte:
- ld hl, wMovementDataPointerBank
- call GetMovementByte_
+ ld hl, wMovementDataBank
+ call _GetMovementByte
ret
Function4fbd:
@@ -9,7 +9,7 @@ Function4fbd:
ld e, [hl]
inc [hl]
ld d, $0
- ld hl, wMovementPerson
+ ld hl, wMovementObject
ld a, [hli]
ld h, [hl]
ld l, a
@@ -36,7 +36,7 @@ Function4fdf: ; 4fdf (1:4fdf)
jp Function4fe9
GetMovementPerson
- ld a, [wMovementPerson]
+ ld a, [wMovementObject]
ret
Function4fe9: ; 4fe9 (1:4fe9)
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 06b38e94..0865dbf8 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -4,11 +4,11 @@ BlankScreen:
ldh [hBGMapMode], a
call ClearBGPalettes
call ClearSprites
- ld hl, wTileMap
+ ld hl, wTilemap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, " "
call ByteFill
- ld hl, wAttrMap
+ ld hl, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, $7
call ByteFill
@@ -122,7 +122,7 @@ SpawnPlayer2:
.PlayerObjectTemplate:
object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_12, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
-CopyObjectStruct_:: ; 86d7 (2:46d7)
+CopyObjectStruct:: ; 86d7 (2:46d7)
call CheckObjectMask
and a
ret nz
@@ -242,7 +242,7 @@ InitializeVariableSprites:
cp $b
jr nc, .asm_87ab
push bc
- call CopyObjectStruct_
+ call CopyObjectStruct
pop bc
jp c, Function87b9
.asm_87ab
@@ -315,7 +315,7 @@ asm_87da
jr nc, .asm_8814
push de
push bc
- call CopyObjectStruct_
+ call CopyObjectStruct
pop bc
pop de
.asm_8814
@@ -370,7 +370,7 @@ asm_882e
jr nc, .asm_8868
push de
push bc
- call CopyObjectStruct_
+ call CopyObjectStruct
pop bc
pop de
.asm_8868
diff --git a/engine/pack.asm b/engine/pack.asm
index 23a17c36..620976a9 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1308,7 +1308,7 @@ Function10cef: ; 10cef (4:4cef)
Function10d70: ; 10d70 (4:4d70)
call ClearBGPalettes
- call ClearTileMap
+ call ClearTilemap
call ClearSprites
call DisableLCD
ld hl, PackMenuGFX
diff --git a/engine/sine.asm b/engine/sine.asm
index 9a730219..e22d785a 100644
--- a/engine/sine.asm
+++ b/engine/sine.asm
@@ -1,4 +1,4 @@
-Sine_e:: ; 8ac9 (2:4ac9)
+_Sine:: ; 8ac9 (2:4ac9)
ld a, e
and $3f
cp $20
diff --git a/engine/specials.asm b/engine/specials.asm
index c12198bf..ad6c2085 100755
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -83,7 +83,7 @@ SpecialsPointers:
add_special ReloadSpritesNoPalettes, $02
add_special ClearBGPalettes
add_special UpdateTimePals
- add_special ClearTileMap
+ add_special ClearTilemap
add_special UpdateSprites
add_special ReplacePlayerSprite
add_special GameCornerPrizeMonCheckDex
diff --git a/engine/sprites.asm b/engine/sprites.asm
index eb9b2fd5..b9267d66 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -101,7 +101,7 @@ DoNextFrameForFirst16Sprites: ; 8d1c9
.cancel
ret ; 23:51f6
-InitAnimatedObjectStruct_:: ; 8d1f7
+_InitSpriteAnimStruct:: ; 8d1f7
push de ; 23:51f7
push af ; 23:51f8
ld hl, $c51c ; 23:51f9
diff --git a/engine/title.asm b/engine/title.asm
index 16737cc4..94863c56 100755
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -12,7 +12,7 @@ StartTitleScreen:
call ClearBGPalettes
ld hl, rLCDC
res 2, [hl]
- call ClearTileMap
+ call ClearTilemap
xor a
ldh [hLCDCPointer], a
ld b, $8
@@ -46,7 +46,7 @@ InitTitleScreen: ; 6291 (1:6291)
ld [wTimeOfDayPal], a
ld de, MUSIC_NONE
call PlayMusic
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call ClearSprites
xor a
@@ -98,7 +98,7 @@ InitTitleScreen: ; 6291 (1:6291)
ld [hl], a
ld de, $6058
ld a, $2c ; HO-OH
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ld hl, wAnimatedObjectStruct1
ld de, wAnimatedObjectStruct10
ld bc, $a
@@ -409,7 +409,7 @@ IF DEF(SILVER)
ld de, $7c58
ENDC
ld a, $f
- call InitAnimatedObjectStruct
+ call InitSpriteAnimStruct
ret
IF DEF(GOLD)
@@ -423,7 +423,7 @@ IF DEF(GOLD)
ENDC
Copyright:
- call ClearTileMap
+ call ClearTilemap
call LoadFontsExtra
ld de, CopyrightGFX
ld hl, vTiles2 tile $60
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 15:25:02 +0000