summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/anim_hp_bar.asm22
-rw-r--r--engine/billspctop.asm26
-rwxr-xr-xengine/color.asm136
-rwxr-xr-xengine/events/misc_scripts_2.asm2
-rwxr-xr-xengine/events/overworld.asm32
-rwxr-xr-xengine/events/std_collision.asm2
-rwxr-xr-xengine/events/whiteout.asm4
-rwxr-xr-xengine/health.asm27
-rwxr-xr-xengine/items.asm8
-rw-r--r--engine/learn.asm8
-rwxr-xr-xengine/main_menu.asm80
-rwxr-xr-xengine/math.asm162
-rwxr-xr-xengine/move_mon.asm112
-rwxr-xr-xengine/movement_pattern.asm16
-rw-r--r--engine/movie/gamefreak_presents.asm38
-rw-r--r--engine/namingscreen.asm64
-rwxr-xr-xengine/overworld/map_object_action.asm2
-rwxr-xr-xengine/overworld/map_objects.asm78
-rwxr-xr-xengine/overworld/movement.asm16
-rwxr-xr-xengine/overworld/npc_movement.asm22
-rwxr-xr-xengine/overworld/player_movement.asm14
-rwxr-xr-xengine/overworld/player_object.asm48
-rwxr-xr-xengine/overworld/player_step.asm8
-rwxr-xr-xengine/overworld/time.asm18
-rwxr-xr-xengine/pack.asm54
-rw-r--r--engine/sine.asm2
-rwxr-xr-xengine/specials.asm10
-rwxr-xr-xengine/sprites.asm2
-rwxr-xr-xengine/title.asm56
-rwxr-xr-xengine/variables.asm2
30 files changed, 540 insertions, 531 deletions
diff --git a/engine/anim_hp_bar.asm b/engine/anim_hp_bar.asm
index 29afa8ed..561cba42 100755
--- a/engine/anim_hp_bar.asm
+++ b/engine/anim_hp_bar.asm
@@ -277,7 +277,7 @@ Functiond78a: ; d78a (3:578a)
ret
Functiond7ba: ; d7ba (3:57ba)
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret z
ld hl, wCurHPAnimPal
@@ -290,7 +290,7 @@ Functiond7ba: ; d7ba (3:57ba)
ret
Functiond7cf: ; d7cf (3:57cf)
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr nz, .asm_d7db
call DelayFrame
@@ -318,15 +318,15 @@ Functiond7cf: ; d7cf (3:57cf)
cp $5
jr z, .asm_d805
ld a, $2
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, c
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
call DelayFrame
.asm_d805
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, c
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
call DelayFrame
pop af
cp $2
@@ -338,14 +338,14 @@ Functiond7cf: ; d7cf (3:57cf)
.asm_d819
inc c
ld a, $2
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, c
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
call DelayFrame
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, c
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
call DelayFrame
ret
@@ -358,7 +358,7 @@ Functiond7cf: ; d7cf (3:57cf)
.asm_d835
call DelayFrame
ld a, c
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
call DelayFrame
ret
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index 65403656..b0ec59a5 100644
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -10,7 +10,7 @@ BillsPC_CheckHavePokemon: ; e3e5 (3:63e5)
and a
ret nz
ld hl, Text_GottaHavePokemon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -20,8 +20,8 @@ Text_GottaHavePokemon:
BillsPC_LogIn: ; e3f7 (3:63f7)
xor a
- ld [hBGMapMode], a
- call LoadStandardMenuDataHeader
+ ldh [hBGMapMode], a
+ call LoadStandardMenuHeader
call Functione566
ld hl, wOptions
ld a, [hl]
@@ -44,14 +44,14 @@ BillsPC_LogOut: ; e41a (3:641a)
BillsPC_UsePC: ; e41e (3:641e)
ld hl, BillsPC_TopMenuDataHeader
- call LoadMenuDataHeader
+ call LoadMenuHeader
ld a, $1
.asm_e426
ld [wMenuCursorBuffer], a
call SetPalettes
xor a
ld [wWhichIndexSet], a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call DoNthMenu
jr c, .asm_e446
ld a, [wMenuCursorBuffer]
@@ -104,7 +104,7 @@ BillsPC_SeeYa:
ret
BillsPC_MovePKMNMenu:
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
farcall IsAnyPokemonHoldingMail ; 11:488c
jr nc, .asm_e4bb
ld hl, Text_PleaseRemoveMailBeforeMovePkmnWOMail
@@ -127,7 +127,7 @@ Text_PleaseRemoveMailBeforeMovePkmnWOMail:
db "@"
BillsPC_DepositMenu:
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
farcall DepositPokemon_ ; 38:6b9e
call ReturnToMapFromSubmenu
call Functione566
@@ -146,13 +146,13 @@ Functione4ed:
.asm_e4f9
ld hl, Text_YouDontHaveASinglePokemon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
.asm_e501
ld hl, Text_ItsYourLastPokemon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -193,7 +193,7 @@ CheckCurPartyMonFainted: ; e513 (3:6513)
ret
BillsPC_WithdrawMenu:
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
farcall WithdrawPokemon_ ; 38:6d71
call ReturnToMapFromSubmenu
call Functione566
@@ -210,7 +210,7 @@ Functione548:
.asm_e551
ld hl, Text_CantTakeAnyMorePokemon
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -226,7 +226,7 @@ BillsPC_ChangeBoxMenu:
Functione566: ; e566 (3:6566)
call DisableSpriteUpdates
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call ClearBGPalettes
call ClearSprites
hlcoord 0, 0
@@ -239,7 +239,7 @@ Functione566: ; e566 (3:6566)
hlcoord 0, 12
ld bc, IncGradGBPalTable_13
call Textbox
- call Function3456
+ call WaitBGMap2
call SetPalettes
ret
diff --git a/engine/color.asm b/engine/color.asm
index 25f7179b..05c13b2b 100755
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -130,7 +130,7 @@ Function9102:
call CopyBytes
call Function9b28
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
ret
.BGPal:
@@ -148,7 +148,7 @@ Function9102:
Function9136:
call CheckCGB
ret nz
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
ret z
ld hl, BlkPacket_9ee5
@@ -157,7 +157,7 @@ Function9136:
Function9144:
call CheckCGB
jr nz, .asm_9153
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
ret z
ld hl, PalPacket_a095
@@ -172,7 +172,7 @@ Function9144:
Function915e:
call CheckCGB
jr nz, .asm_916d
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
ret z
ld hl, PalPacket_a0a5
@@ -187,7 +187,7 @@ Function915e:
Function9178:
call CheckCGB
jr nz, .asm_91a9
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
ret z
ld a, c
@@ -217,7 +217,7 @@ Function9178:
ret
Function91b4:
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr nz, .asm_91bf
ld hl, wc602
@@ -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
@@ -243,7 +243,7 @@ Function91b4:
ld a, [wc605]
and $3
call Function9af1
- call LoadEDTile
+ call CopyTilemapAtOnce
ret
ApplyMonOrTrainerPals: ; 91e5 (2:51e5)
@@ -293,13 +293,13 @@ ApplyHPBarPals:
ld bc, $4
call CopyBytes
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
ret
.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
@@ -331,7 +331,7 @@ LoadStatsScreenPals:
ld [wTempBGPals + $11], a
call Function9b28
ld a, $1
- ld [hCGBPalUpdate], a
+ ldh [hCGBPalUpdate], a
ret
LoadMailPalettes:
@@ -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
@@ -557,27 +557,27 @@ Function9b28: ; 9b28 (2:5b28)
ret
Function9b35: ; 9b35 (2:5b35)
- ld a, [rLCDC]
+ ldh a, [rLCDC]
bit 7, a
jr z, .asm_9b52
- ld a, [hBGMapMode]
+ ldh a, [hBGMapMode]
push af
ld a, $2
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call DelayFrame
call DelayFrame
call DelayFrame
call DelayFrame
pop af
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
.asm_9b52
- hlcoord 0, 0, wAttrMap
+ hlcoord 0, 0, wAttrmap
ld de, $9800
ld b, $12
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
.asm_9b5e
ld c, $14
.asm_9b60
@@ -595,7 +595,7 @@ Function9b35: ; 9b35 (2:5b35)
dec b
jr nz, .asm_9b5e
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ret
Function9b75: ; 9b75 (2:5b75)
@@ -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
@@ -683,11 +683,11 @@ Function9be9:
ret z
ld hl, Palettes_9c09
ld a, $90
- ld [rOBPI], a
+ ldh [rOBPI], a
ld c, $30
.asm_9bf6
ld a, [hli]
- ld [rOBPD], a
+ ldh [rOBPD], a
dec c
jr nz, .asm_9bf6
ld hl, Palettes_9c09
@@ -731,7 +731,7 @@ Function9c39:
call CheckCGB
ret z
ld a, $90
- ld [rOBPI], a
+ ldh [rOBPI], a
ld a, $1c
call Function9ac7
call Function9c52
@@ -744,7 +744,7 @@ Function9c52: ; 9c52 (2:5c52)
ld c, $8
.asm_9c54
ld a, [hli]
- ld [rOBPD], a
+ ldh [rOBPD], a
dec c
jr nz, .asm_9c54
ret
@@ -791,9 +791,9 @@ Function9c87: ; 9c87 (2:5c87)
.asm_9c8c
push bc
xor a
- ld [rJOYP], a
+ ldh [rJOYP], a
ld a, $30
- ld [rJOYP], a
+ ldh [rJOYP], a
ld b, $10
.asm_9c96
ld e, $8
@@ -805,18 +805,18 @@ Function9c87: ; 9c87 (2:5c87)
jr nz, .asm_9ca2
ld a, $20
.asm_9ca2
- ld [rJOYP], a
+ ldh [rJOYP], a
ld a, $30
- ld [rJOYP], a
+ ldh [rJOYP], a
rr d
dec e
jr nz, .asm_9c9a
dec b
jr nz, .asm_9c96
ld a, $20
- ld [rJOYP], a
+ ldh [rJOYP], a
ld a, $30
- ld [rJOYP], a
+ ldh [rJOYP], a
call Function9ed9
pop bc
dec b
@@ -832,12 +832,12 @@ InitSGBBorder: ; 9cc0 (2:5cc0)
set 7, a
ld [wd8ba], a
xor a
- ld [rJOYP], a
- ld [hSGB], a
+ ldh [rJOYP], a
+ ldh [hSGB], a
call Function9da9
jr nc, .asm_9cf7
ld a, $1
- ld [hSGB], a
+ ldh [hSGB], a
call Function9d4a
call Function9e13
call Function9ed9
@@ -857,31 +857,31 @@ InitCGBPals:: ; 9cfd (2:5cfd)
call CheckCGB
ret z
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
ld hl, $8000
ld bc, $2000
xor a
call ByteFill
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ld a, $80
- ld [rBGPI], a
+ ldh [rBGPI], a
ld c, $20
.asm_9d19
ld a, $ff
- ld [rBGPD], a
+ ldh [rBGPD], a
ld a, $7f
- ld [rBGPD], a
+ ldh [rBGPD], a
dec c
jr nz, .asm_9d19
ld a, $80
- ld [rOBPI], a
+ ldh [rOBPI], a
ld c, $20
.asm_9d2a
ld a, $ff
- ld [rOBPD], a
+ ldh [rOBPD], a
ld a, $7f
- ld [rOBPD], a
+ ldh [rOBPD], a
dec c
jr nz, .asm_9d2a
ld hl, wTempBGPals
@@ -929,7 +929,7 @@ Function9d4a: ; 9d4a (2:5d4a)
Function9d70:
di
xor a
- ld [rJOYP], a
+ ldh [rJOYP], a
ld hl, PalPacket_a1c5
call Function9c87
call Function9d8b
@@ -964,38 +964,38 @@ Function9da9: ; 9da9 (2:5da9)
ld hl, PalPacket_a195
call Function9c87
call Function9ed9
- ld a, [rJOYP]
+ ldh a, [rJOYP]
and $3
cp $3
jr nz, .asm_9e05
ld a, $20
- ld [rJOYP], a
- ld a, [rJOYP]
- ld a, [rJOYP]
+ ldh [rJOYP], a
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
call Function9ed9
call Function9ed9
ld a, $30
- ld [rJOYP], a
+ ldh [rJOYP], a
call Function9ed9
call Function9ed9
ld a, $10
- ld [rJOYP], a
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
+ ldh [rJOYP], a
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
call Function9ed9
call Function9ed9
ld a, $30
- ld [rJOYP], a
- ld a, [rJOYP]
- ld a, [rJOYP]
- ld a, [rJOYP]
+ ldh [rJOYP], a
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
+ ldh a, [rJOYP]
call Function9ed9
call Function9ed9
- ld a, [rJOYP]
+ ldh a, [rJOYP]
and $3
cp $3
jr nz, .asm_9e05
@@ -1016,24 +1016,24 @@ Function9e0a: ; 9e0a (2:5e0a)
Function9e13: ; 9e13 (2:5e13)
call DisableLCD
ld a, $e4
- ld [rBGP], a
+ ldh [rBGP], a
ld hl, Palettes_a265
ld de, $8800
ld bc, $1000
call Function9eb1
call Function9ec3
ld a, $e3
- ld [rLCDC], a
+ ldh [rLCDC], a
ld hl, PalPacket_a175
call Function9c87
xor a
- ld [rBGP], a
+ ldh [rBGP], a
ret
Function9e37: ; 9e37 (2:5e37)
call DisableLCD
ld a, $e4
- ld [rBGP], a
+ ldh [rBGP], a
ld de, $8800
ld bc, $140
call Function9eb1
@@ -1057,17 +1057,17 @@ Function9e37: ; 9e37 (2:5e37)
call Function9eb1
call Function9ec3
ld a, $e3
- ld [rLCDC], a
+ ldh [rLCDC], a
ld hl, PalPacket_a1b5
call Function9c87
xor a
- ld [rBGP], a
+ ldh [rBGP], a
ret
Function9e83: ; 9e83 (2:5e83)
call DisableLCD
ld a, $e4
- ld [rBGP], a
+ ldh [rBGP], a
ld de, $8800
ld b, $80
.asm_9e8f
@@ -1081,11 +1081,11 @@ Function9e83: ; 9e83 (2:5e83)
jr nz, .asm_9e8f
call Function9ec3
ld a, $e3
- ld [rLCDC], a
+ ldh [rLCDC], a
ld hl, PalPacket_a1a5
call Function9c87
xor a
- ld [rBGP], a
+ ldh [rBGP], a
ret
Function9eb1: ; 9eb1 (2:5eb1)
diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm
index ac0f7e31..4a9e9484 100755
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -12,7 +12,7 @@ RepelWoreOffScript::
HiddenItemScript::
opentext
copybytetovar wcf2b
- itemtotext MEM_BUFFER_0, USE_SCRIPT_VAR
+ itemtotext STRING_BUFFER_3, USE_SCRIPT_VAR
writetext .PlayerFoundItemText
giveitem ITEM_FROM_MEM
iffalse .bag_full
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index c4967028..0787d094 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -25,7 +25,7 @@ FieldMoveGetPartyNick: ; c74b (3:474b)
ld [wMonType], a
ld a, [wCurPartyMon]
call GetNick
- call Function317b
+ call CopyName1
ld de, wStringBuffer2
ld hl, wStringBuffer3
call CopyName2
@@ -48,7 +48,7 @@ FieldMoveBadgeCheck: ; c776 (3:4776)
call FieldMoveEngineFlagCheck
ret nc
ld hl, .BadgeRequiredText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
scf
ret
@@ -99,7 +99,7 @@ FieldMovePartyCheck: ; c787 (3:4787)
FieldMoveFailed: ; c7be (3:47be)
ld hl, .CantUseHereText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ret
.CantUseHereText:
@@ -146,7 +146,7 @@ CutTreeOrGrass:
FailToCut:
ld hl, Text_NothingToCut
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -206,7 +206,7 @@ CutDownTreeOrGrass:
ld a, [wBuffer5]
ld [hl], a
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call OverworldTextModeSwitch
call UpdateSprites
call DelayFrame
@@ -397,13 +397,13 @@ StartSurfing:
CantSurf:
ld hl, CantSurfText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
AlreadySurfing:
ld hl, AlreadySurfingText
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -542,8 +542,8 @@ TryToFly:
.asm_ca83
xor a
- ld [hMapAnims], a
- call LoadStandardMenuDataHeader
+ ldh [hMapAnims], a
+ call LoadStandardMenuHeader
call ClearSprites
ld a, $24
ld hl, $5a61
@@ -783,7 +783,7 @@ FailToEscapeFromDungeon:
cp $2
jr nz, .asm_cc1c
ld hl, Text_CantUseDigEscapeRopeHere ; $4c29
- call MenuTextBox
+ call MenuTextbox
call WaitPressAorB_BlinkCursor
call CloseWindow
.asm_cc1c
@@ -882,7 +882,7 @@ DoTeleport:
FailTeleport:
ld hl, Text_CantUseTeleportHere
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -932,7 +932,7 @@ Functionccf1: ; ccf1 (3:4cf1)
jr asm_cd0c
ld hl, Text_AlreadyUsingStrength
- call MenuTextBoxBackup
+ call MenuTextboxBackup
ld a, $80
ret
@@ -1134,7 +1134,7 @@ DisappearWhirlpool: ; 4e20
ld a, [wBuffer5]
ld [hl], a
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call OverworldTextModeSwitch
ld a, [wBuffer6]
ld e, a
@@ -1285,12 +1285,12 @@ TryRockSmashFromMenu: ; cef7 (3:4ef7)
GetFacingObject: ; cf10 (3:4f10)
farcall CheckFacingObject
jr nc, .asm_cf2f
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
call GetObjectStruct
ld hl, $1
add hl, bc
ld a, [hl]
- ld [hLastTalked], a
+ ldh [hLastTalked], a
call GetMapObject
ld hl, $4
add hl, bc
@@ -1547,7 +1547,7 @@ PutTheRodAway: ; d096
call ClearBox
call WaitBGMap
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, $1
ld [wPlayerAction], a
call UpdateSprites
diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm
index 932f4db8..bb44687c 100755
--- a/engine/events/std_collision.asm
+++ b/engine/events/std_collision.asm
@@ -12,7 +12,7 @@ CheckFacingTileForStdScript::
ld a, [hli]
ld [wcf2b], a
ld a, [hli]
- ld [wTempTrainerHeader], a
+ ld [wTempTrainer], a
ld a, BANK(Script_JumpStdFromRAM)
ld hl, Script_JumpStdFromRAM
call CallScript
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 33098f13..01d7b388 100755
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -31,8 +31,8 @@ Script_Whiteout:
OverworldBGMap:
call ClearPalettes
- call FillScreenWithTextboxPal
- call Function3456
+ call ClearScreen
+ call WaitBGMap2
call HideSprites
call RotateThreePalettesLeft
ret
diff --git a/engine/health.asm b/engine/health.asm
index 506d5a9d..a94a3ec3 100755
--- a/engine/health.asm
+++ b/engine/health.asm
@@ -44,43 +44,46 @@ Functionc6bc: ; c6bc (3:46bc)
farcall Functionf900
ret
-ComputeHPBarPixels: ; c6de (3:46de)
+ComputeHPBarPixels:
+; e = bc * (6 * 8) / de
ld a, b
or c
jr z, .asm_c722
push hl
xor a
- ld [hPrintNum2], a
+ ldh [hMultiplicand + 0], a
ld a, b
- ld [hPrintNum3], a
+ ldh [hMultiplicand + 1], a
ld a, c
- ld [hPrintNum4], a
- ld a, $30
- ld [hPrintNum5], a
+ ldh [hMultiplicand + 2], a
+ ld a, 6 * 8
+ ldh [hMultiplier], a
call Multiply
+ ; We need de to be under 256 because hDivisor is only 1 byte.
ld a, d
and a
jr z, .asm_c711
+ ; divide de and hProduct by 4
srl d
rr e
srl d
rr e
- ld a, [hStringCmpString2]
+ ldh a, [hProduct + 2]
ld b, a
- ld a, [hPrintNum4]
+ ldh a, [hProduct + 3]
srl b
rr a
srl b
rr a
- ld [hPrintNum4], a
+ ldh [hDividend + 3], a
ld a, b
- ld [hPrintNum3], a
+ ldh [hDividend + 2], a
.asm_c711
ld a, e
- ld [hPrintNum5], a
+ ldh [hPrintNum5], a
ld b, $4
call Divide
- ld a, [hPrintNum4]
+ ldh a, [hPrintNum4]
ld e, a
pop hl
and a
diff --git a/engine/items.asm b/engine/items.asm
index 7d69c933..deafa60c 100755
--- a/engine/items.asm
+++ b/engine/items.asm
@@ -1,4 +1,4 @@
-ReceiveItem_:: ; d1e2 (3:51e2)
+_ReceiveItem:: ; d1e2 (3:51e2)
call CheckBagOrPC
jp nz, PutItemInPocketOrPC
push hl
@@ -38,7 +38,7 @@ ReceiveTMHM:
call GetTMHMNumber
jp PutItemInTMPocket
-TossItem_:: ; d21a (3:521a)
+_TossItem:: ; d21a (3:521a)
call CheckBagOrPC
jr nz, remove_item_from_bag_or_pc
push hl
@@ -79,7 +79,7 @@ RemoveNormalItem:
remove_item_from_bag_or_pc
jp RemoveItemAndQuantity
-CheckItem_:: ; d251 (3:5251)
+_CheckItem:: ; d251 (3:5251)
call CheckBagOrPC
jr nz, check_item_in_bag_or_pc
push hl
@@ -473,7 +473,7 @@ GetNumberedTM:
ld c, a
ret
-CheckTossableItem_:: ; d434 (3:5434)
+_CheckTossableItem:: ; d434 (3:5434)
ld a, $4
call GetItemAttr
bit 7, a
diff --git a/engine/learn.asm b/engine/learn.asm
index d285d326..f61b0c6c 100644
--- a/engine/learn.asm
+++ b/engine/learn.asm
@@ -1,5 +1,5 @@
LearnMove:
- call BackUpTilesToBuffer
+ call LoadTilemapToTempTilemap
ld a, [wCurPartyMon]
ld hl, wPartyMon1Nickname
call GetNick
@@ -127,7 +127,7 @@ LearnMove:
ld [wBuffer1], a
predef ListMoves
ld a, $4
- ld [wMenuData2End], a
+ ld [wMenuDataEnd], a
ld a, $6
ld [wced9], a
ld a, [wcfe3]
@@ -140,14 +140,14 @@ LearnMove:
ld a, $3
ld [wMenuJoypadFilter], a
ld a, $20
- ld [wcedc], a
+ ld [w2DMenuFlags1], a
xor a
ld [wcedd], a
ld a, $20
ld [wcede], a
call StaticMenuJoypad
push af
- call ReloadTilesFromBuffer
+ call SafeLoadTempTilemapToTilemap
pop af
pop hl
bit 1, a
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 0bd56b1a..6f460a5c 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -8,7 +8,7 @@ MainMenu_:
call PlayMusic
.asm_5a60
xor a
- ld [wc1d6], a
+ ld [wDisableTextAcceleration], a
call Function5bf7
ld b, $8
call GetSGBLayout
@@ -18,11 +18,11 @@ MainMenu_:
ld [wWhichIndexSet], a
call Function5b27
ld hl, .MenuDataHeader
- call LoadMenuDataHeader
+ call LoadMenuHeader
call Function5b0a
call CloseWindow
jr c, .asm_5a94
- call ClearTileMap
+ call ClearTilemap
ld a, [wMenuSelection]
ld hl, .Jumptable
rst JumpTable
@@ -92,7 +92,7 @@ Function5ae4: ; 5ae4 (1:5ae4)
ret
.asm_5af0
- ld a, [hCGB]
+ ldh a, [hCGB]
cp $1
ld a, $1
ret nz
@@ -132,7 +132,7 @@ Function5b27: ; 5b27 (1:5b27)
and a
ret z
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function5b45
ld hl, wOptions
ld a, [hl]
@@ -142,7 +142,7 @@ Function5b27: ; 5b27 (1:5b27)
pop af
ld [wOptions], a
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
Function5b45: ; 5b45 (1:5b45)
@@ -175,7 +175,7 @@ Function5b5b: ; 5b5b (1:5b5b)
decoord 1, 14
call Function5bb8
decoord 4, 16
- ld a, [hHours]
+ ldh a, [hHours]
ld c, a
farcall PrintHour
ld [hl], $9c
@@ -229,8 +229,8 @@ Function5bb8: ; 5bb8 (1:5bb8)
Function5bf7: ; 5bf7 (1:5bf7)
xor a
- ld [hMapAnims], a
- call ClearTileMap
+ ldh [hMapAnims], a
+ call ClearTilemap
call LoadFontsExtra
call Functiond9e
call ClearWindowData
@@ -248,7 +248,7 @@ MainMenu_Options:
MainMenu_NewGame:
xor a
- ld [wMonStatusFlags], a
+ ld [wDebugFlags], a
call Function5c3a
call Function5bf7
call OakSpeech
@@ -256,12 +256,12 @@ MainMenu_NewGame:
ld a, $0
ld [wceec], a
ld a, $f1
- ld [hMapEntryMethod], a
+ ldh [hMapEntryMethod], a
jp FinishContinueFunction
Function5c3a: ; 5c3a (1:5c3a)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function5c41
ret
@@ -276,16 +276,16 @@ Function5c41: ; 5c41 (1:5c41)
xor a
call ByteFill
- ld a, [rLY]
- ld [hSecondsBackup], a
+ ldh a, [rLY]
+ ldh [hSecondsBackup], a
call DelayFrame
- ld a, [hRandomSub]
+ ldh a, [hRandomSub]
ld [wPlayerID], a
- ld a, [rLY]
- ld [hSecondsBackup], a
+ ldh a, [rLY]
+ ldh [hSecondsBackup], a
call DelayFrame
- ld a, [hRandomAdd]
+ ldh a, [hRandomAdd]
ld [wPlayerID + 1], a
ld hl, wPartyCount
@@ -478,10 +478,10 @@ LoadOrRegenerateLuckyIDNumber: ; 5da7 (1:5da7)
MainMenu_Continue:
farcall TryLoadSaveFile
jr c, .asm_5e41
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call DisplaySaveInfoOnContinue
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld c, 20
call DelayFrames
call ConfirmContinue
@@ -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
@@ -514,7 +514,7 @@ MainMenu_Continue:
cp $1
jr z, .asm_5e42
ld a, $f2
- ld [hMapEntryMethod], a
+ ldh [hMapEntryMethod], a
jp FinishContinueFunction
.asm_5e41
@@ -533,7 +533,7 @@ PostCreditsSpawn: ; 5e52 (1:5e52)
xor a
ld [wd1db], a
ld a, $f1
- ld [hMapEntryMethod], a
+ ldh [hMapEntryMethod], a
ret
ConfirmContinue: ; 5e5b (1:5e5b)
@@ -613,13 +613,13 @@ DisplayContinueDataWithRTCError: ; 5ec7 (1:5ec7)
Continue_LoadMenuHeader: ; 5ed7 (1:5ed7)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld hl, .MenuDataHeader_Dex
CheckFlag ENGINE_POKEDEX
jr nz, .asm_5ee7
ld hl, .MenuDataHeader_NoDex
.asm_5ee7
- call OffsetMenuDataHeader_
+ call _OffsetMenuHeader
call MenuBox
call PlaceVerticalMenuItems
ret
@@ -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
@@ -905,7 +905,7 @@ ENDC
db 2, "NAME@"
SelectPresetName: ; 6108 (1:6108)
- call LoadMenuDataHeader
+ call LoadMenuHeader
call VerticalMenu
ld a, [wMenuCursorY]
dec a
@@ -920,7 +920,7 @@ StorePlayerName: ; 6119 (1:6119)
ret
ShrinkPlayer: ; 6123 (1:6123)
- ld a, [hROMBank]
+ ldh a, [hROMBank]
push af
ld a, 0 << 7 | 32 ; fade out
@@ -968,7 +968,7 @@ ShrinkPlayer: ; 6123 (1:6123)
call DelayFrames
call RotateThreePalettesRight
- call ClearTileMap
+ call ClearTilemap
ret
MovePlayerPicRight: ; 617e (1:617e)
@@ -986,11 +986,11 @@ MovePlayerPic
push hl
push de
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
lb bc, 7, 7
predef PlaceGraphic
xor a
- ld [hBGMapThird], a
+ ldh [hBGMapThird], a
call WaitBGMap
call DelayFrame
pop de
@@ -1023,17 +1023,17 @@ IntroFadePalettes:
Intro_WipeInFrontpic: ; 61c5 (1:61c5)
ld a, $77
- ld [hWX], a
+ ldh [hWX], a
call DelayFrame
ld a, $e4
call DmgToCgbBGPals
.asm_61d1
call DelayFrame
- ld a, [hWX]
+ ldh a, [hWX]
sub $8
cp $ff
ret z
- ld [hWX], a
+ ldh [hWX], a
jr .asm_61d1
Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0)
@@ -1042,7 +1042,7 @@ Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0)
ld hl, $58a0
rst FarCall
xor a
- ld [hGraphicStartTile], a
+ ldh [hGraphicStartTile], a
hlcoord 6, 4
lb bc, 7, 7
predef PlaceGraphic
@@ -1053,7 +1053,7 @@ ShrinkFrame: ; 61f7 (1:61f7)
ld c, $31
predef DecompressGet2bpp
xor a
- ld [hGraphicStartTile], a
+ ldh [hGraphicStartTile], a
hlcoord 6, 4
lb bc, 7, 7
predef PlaceGraphic
diff --git a/engine/math.asm b/engine/math.asm
index 7cc35eb4..cdac2d37 100755
--- a/engine/math.asm
+++ b/engine/math.asm
@@ -1,45 +1,45 @@
-Multiply_:: ; 67bd
+_Multiply:: ; 67bd
; hMultiplier is one byte.
ld a, 8
ld b, a
xor a
- ld [hProduct], a
- ld [hMathBuffer + 1], a
- ld [hMathBuffer + 2], a
- ld [hMathBuffer + 3], a
- ld [hMathBuffer + 4], a
+ ldh [hProduct], a
+ ldh [hMathBuffer + 1], a
+ ldh [hMathBuffer + 2], a
+ ldh [hMathBuffer + 3], a
+ ldh [hMathBuffer + 4], a
.loop
- ld a, [hMultiplier]
+ ldh a, [hMultiplier]
srl a
- ld [hMultiplier], a
+ ldh [hMultiplier], a
jr nc, .next
- ld a, [hMathBuffer + 4]
+ ldh a, [hMathBuffer + 4]
ld c, a
- ld a, [hMultiplicand + 2]
+ ldh a, [hMultiplicand + 2]
add c
- ld [hMathBuffer + 4], a
+ ldh [hMathBuffer + 4], a
- ld a, [hMathBuffer + 3]
+ ldh a, [hMathBuffer + 3]
ld c, a
- ld a, [hMultiplicand + 1]
+ ldh a, [hMultiplicand + 1]
adc c
- ld [hMathBuffer + 3], a
+ ldh [hMathBuffer + 3], a
- ld a, [hMathBuffer + 2]
+ ldh a, [hMathBuffer + 2]
ld c, a
- ld a, [hMultiplicand + 0]
+ ldh a, [hMultiplicand + 0]
adc c
- ld [hMathBuffer + 2], a
+ ldh [hMathBuffer + 2], a
- ld a, [hMathBuffer + 1]
+ ldh a, [hMathBuffer + 1]
ld c, a
- ld a, [hProduct]
+ ldh a, [hProduct]
adc c
- ld [hMathBuffer + 1], a
+ ldh [hMathBuffer + 1], a
.next
dec b
@@ -47,71 +47,71 @@ Multiply_:: ; 67bd
; hMultiplicand <<= 1
- ld a, [hMultiplicand + 2]
+ ldh a, [hMultiplicand + 2]
add a
- ld [hMultiplicand + 2], a
+ ldh [hMultiplicand + 2], a
- ld a, [hMultiplicand + 1]
+ ldh a, [hMultiplicand + 1]
rla
- ld [hMultiplicand + 1], a
+ ldh [hMultiplicand + 1], a
- ld a, [hMultiplicand + 0]
+ ldh a, [hMultiplicand + 0]
rla
- ld [hMultiplicand + 0], a
+ ldh [hMultiplicand + 0], a
- ld a, [hProduct]
+ ldh a, [hProduct]
rla
- ld [hProduct], a
+ ldh [hProduct], a
jr .loop
.done
- ld a, [hMathBuffer + 4]
- ld [hProduct + 3], a
+ ldh a, [hMathBuffer + 4]
+ ldh [hProduct + 3], a
- ld a, [hMathBuffer + 3]
- ld [hProduct + 2], a
+ ldh a, [hMathBuffer + 3]
+ ldh [hProduct + 2], a
- ld a, [hMathBuffer + 2]
- ld [hProduct + 1], a
+ ldh a, [hMathBuffer + 2]
+ ldh [hProduct + 1], a
- ld a, [hMathBuffer + 1]
- ld [hProduct + 0], a
+ ldh a, [hMathBuffer + 1]
+ ldh [hProduct + 0], a
ret
-Divide_:: ; 681d
+_Divide:: ; 681d
xor a
- ld [hMathBuffer + 0], a
- ld [hMathBuffer + 1], a
- ld [hMathBuffer + 2], a
- ld [hMathBuffer + 3], a
- ld [hMathBuffer + 4], a
+ ldh [hMathBuffer + 0], a
+ ldh [hMathBuffer + 1], a
+ ldh [hMathBuffer + 2], a
+ ldh [hMathBuffer + 3], a
+ ldh [hMathBuffer + 4], a
ld a, 9
ld e, a
.loop
- ld a, [hMathBuffer + 0]
+ ldh a, [hMathBuffer + 0]
ld c, a
- ld a, [hDividend + 1]
+ ldh a, [hDividend + 1]
sub c
ld d, a
- ld a, [hDivisor]
+ ldh a, [hDivisor]
ld c, a
- ld a, [hDividend + 0]
+ ldh a, [hDividend + 0]
sbc c
jr c, .next
- ld [hDividend + 0], a
+ ldh [hDividend + 0], a
ld a, d
- ld [hDividend + 1], a
+ ldh [hDividend + 1], a
- ld a, [hMathBuffer + 4]
+ ldh a, [hMathBuffer + 4]
inc a
- ld [hMathBuffer + 4], a
+ ldh [hMathBuffer + 4], a
jr .loop
@@ -120,39 +120,39 @@ Divide_:: ; 681d
cp 1
jr z, .done
- ld a, [hMathBuffer + 4]
+ ldh a, [hMathBuffer + 4]
add a
- ld [hMathBuffer + 4], a
+ ldh [hMathBuffer + 4], a
- ld a, [hMathBuffer + 3]
+ ldh a, [hMathBuffer + 3]
rla
- ld [hMathBuffer + 3], a
+ ldh [hMathBuffer + 3], a
- ld a, [hMathBuffer + 2]
+ ldh a, [hMathBuffer + 2]
rla
- ld [hMathBuffer + 2], a
+ ldh [hMathBuffer + 2], a
- ld a, [hMathBuffer + 1]
+ ldh a, [hMathBuffer + 1]
rla
- ld [hMathBuffer + 1], a
+ ldh [hMathBuffer + 1], a
dec e
jr nz, .next2
ld e, 8
- ld a, [hMathBuffer + 0]
- ld [hDivisor], a
+ ldh a, [hMathBuffer + 0]
+ ldh [hDivisor], a
xor a
- ld [hMathBuffer + 0], a
+ ldh [hMathBuffer + 0], a
- ld a, [hDividend + 1]
- ld [hDividend + 0], a
+ ldh a, [hDividend + 1]
+ ldh [hDividend + 0], a
- ld a, [hDividend + 2]
- ld [hDividend + 1], a
+ ldh a, [hDividend + 2]
+ ldh [hDividend + 1], a
- ld a, [hDividend + 3]
- ld [hDividend + 2], a
+ ldh a, [hDividend + 3]
+ ldh [hDividend + 2], a
.next2
ld a, e
@@ -161,30 +161,30 @@ Divide_:: ; 681d
dec b
.okay
- ld a, [hDivisor]
+ ldh a, [hDivisor]
srl a
- ld [hDivisor], a
+ ldh [hDivisor], a
- ld a, [hMathBuffer + 0]
+ ldh a, [hMathBuffer + 0]
rr a
- ld [hMathBuffer + 0], a
+ ldh [hMathBuffer + 0], a
jr .loop
.done
- ld a, [hDividend + 1]
- ld [hDivisor], a
+ ldh a, [hDividend + 1]
+ ldh [hDivisor], a
- ld a, [hMathBuffer + 4]
- ld [hDividend + 3], a
+ ldh a, [hMathBuffer + 4]
+ ldh [hDividend + 3], a
- ld a, [hMathBuffer + 3]
- ld [hDividend + 2], a
+ ldh a, [hMathBuffer + 3]
+ ldh [hDividend + 2], a
- ld a, [hMathBuffer + 2]
- ld [hDividend + 1], a
+ ldh a, [hMathBuffer + 2]
+ ldh [hDividend + 1], a
- ld a, [hMathBuffer + 1]
- ld [hDividend + 0], a
+ ldh a, [hMathBuffer + 1]
+ ldh [hDividend + 0], a
ret
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index bbfea25e..7410375f 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -11,7 +11,7 @@ TryAddMonToParty:: ; d892 (3:5892)
ret nc
ld [de], a
ld a, [de]
- ld [hMoveMon], a
+ ldh [hMoveMon], a
add e
ld e, a
jr nc, .asm_d8ad
@@ -28,7 +28,7 @@ TryAddMonToParty:: ; d892 (3:5892)
jr z, .asm_d8c2
ld hl, wOTPartyMonOT
.asm_d8c2
- ld a, [hMoveMon]
+ ldh a, [hMoveMon]
dec a
call SkipNames
ld d, h
@@ -43,7 +43,7 @@ TryAddMonToParty:: ; d892 (3:5892)
ld [wd151], a
call GetPokemonName
ld hl, wPartyMonNicknames
- ld a, [hMoveMon]
+ ldh a, [hMoveMon]
dec a
call SkipNames
ld d, h
@@ -58,7 +58,7 @@ TryAddMonToParty:: ; d892 (3:5892)
jr z, .asm_d903
ld hl, wOTPartyMon1
.asm_d903
- ld a, [hMoveMon]
+ ldh a, [hMoveMon]
dec a
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -117,28 +117,34 @@ GeneratePartyMonStats:
inc de
inc de
inc de
+
+ ; Initialize ID.
ld a, [wPlayerID]
ld [de], a
inc de
ld a, [wPlayerID + 1]
ld [de], a
inc de
+
+ ; Initialize Exp.
push de
ld a, [wCurPartyLevel]
ld d, a
- callfar CalcExpAtLevel ; 14:5550
+ callfar CalcExpAtLevel
pop de
- ld a, [hPrintNum2]
+ ldh a, [hProduct + 1]
ld [de], a
inc de
- ld a, [hStringCmpString2]
+ ldh a, [hProduct + 2]
ld [de], a
inc de
- ld a, [hPrintNum4]
+ ldh a, [hProduct + 3]
ld [de], a
inc de
+
+ ; Initialize stat experience.
xor a
- ld b, $a
+ ld b, MON_DVS - MON_STAT_EXP
.asm_d980
ld [de], a
inc de
@@ -215,10 +221,10 @@ GeneratePartyMonStats:
ld c, a
ld b, $0
call CalcMonStatC
- ld a, [hStringCmpString2]
+ ldh a, [hProduct + 2]
ld [de], a
inc de
- ld a, [hPrintNum4]
+ ldh a, [hProduct + 3]
ld [de], a
inc de
jr .asm_da2f
@@ -787,11 +793,11 @@ Functiondd6a: ; dd6a (3:5d6a)
pop bc
ld hl, $8
add hl, bc
- ld a, [hQuotient]
+ ldh a, [hQuotient]
ld [hli], a
- ld a, [hPrintNum3]
+ ldh a, [hPrintNum3]
ld [hli], a
- ld a, [hPrintNum4]
+ ldh a, [hPrintNum4]
ld [hl], a
and a
ret
@@ -886,13 +892,13 @@ SendMonIntoBox: ; de74 (3:5e74)
ld d, a
callfar CalcExpAtLevel
pop de
- ld a, [hQuotient]
+ ldh a, [hQuotient]
ld [de], a
inc de
- ld a, [hPrintNum3]
+ ldh a, [hPrintNum3]
ld [de], a
inc de
- ld a, [hPrintNum4]
+ ldh a, [hPrintNum4]
ld [de], a
inc de
xor a
@@ -1057,7 +1063,7 @@ GiveEgg: ; df92 (3:5f92)
ld hl, wPartyMon1Happiness
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
- ld a, [wMonStatusFlags]
+ ld a, [wDebugFlags]
bit 1, a
ld a, $1
jr nz, .asm_e028
@@ -1130,7 +1136,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
jr z, .asm_e096
ld bc, sBoxMonNicknames
.asm_e096
- call Function3231
+ call CopyDataUntil
ld hl, wPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
ld a, [wPokemonWithdrawDepositParameter]
@@ -1156,7 +1162,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
add hl, bc
ld bc, wPartyMonOT
.asm_e0c9
- call Function3231
+ call CopyDataUntil
ld hl, wPartyMonNicknames
ld a, [wPokemonWithdrawDepositParameter]
and a
@@ -1176,7 +1182,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
jr z, .asm_e0f3
ld bc, sBoxEnd
.asm_e0f3
- call Function3231
+ call CopyDataUntil
.asm_e0f6
ld a, [wPokemonWithdrawDepositParameter]
and a
@@ -1256,10 +1262,10 @@ CalcMonStats: ; e16d
.loop
inc c
call CalcMonStatC
- ld a, [hMultiplicand + 1]
+ ldh a, [hMultiplicand + 1]
ld [de], a
inc de
- ld a, [hMultiplicand + 2]
+ ldh a, [hMultiplicand + 2]
ld [de], a
inc de
ld a, c
@@ -1304,22 +1310,22 @@ CalcMonStatC: ; e181
add hl, bc
.sqrt_loop
xor a
- ld [hMultiplicand], a
- ld [hMultiplicand + 1], a
+ ldh [hMultiplicand], a
+ ldh [hMultiplicand + 1], a
inc b
ld a, b
cp $ff
jr z, .no_stat_exp
- ld [hMultiplicand + 2], a
- ld [hMultiplier], a
+ ldh [hMultiplicand + 2], a
+ ldh [hMultiplier], a
call Multiply
ld a, [hld]
ld d, a
- ld a, [hProduct + 3]
+ ldh a, [hProduct + 3]
sub d
ld a, [hli]
ld d, a
- ld a, [hProduct + 2]
+ ldh a, [hProduct + 2]
sbc d
jr c, .sqrt_loop
.no_stat_exp
@@ -1408,22 +1414,22 @@ CalcMonStatC: ; e181
inc d
.no_overflow_2
- ld [hMultiplicand + 2], a
+ ldh [hMultiplicand + 2], a
ld a, d
- ld [hMultiplicand + 1], a
+ ldh [hMultiplicand + 1], a
xor a
- ld [hMultiplicand + 0], a
+ ldh [hMultiplicand + 0], a
ld a, [wCurPartyLevel]
- ld [hMultiplier], a
+ ldh [hMultiplier], a
call Multiply
- ld a, [hProduct + 1]
- ld [hDividend + 0], a
- ld a, [hProduct + 2]
- ld [hDividend + 1], a
- ld a, [hProduct + 3]
- ld [hDividend + 2], a
+ ldh a, [hProduct + 1]
+ ldh [hDividend + 0], a
+ ldh a, [hProduct + 2]
+ ldh [hDividend + 1], a
+ ldh a, [hProduct + 3]
+ ldh [hDividend + 2], a
ld a, 100
- ld [hDivisor], a
+ ldh [hDivisor], a
ld a, 3
ld b, a
call Divide
@@ -1433,42 +1439,42 @@ CalcMonStatC: ; e181
jr nz, .not_hp
ld a, [wCurPartyLevel]
ld b, a
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
add b
- ld [hMultiplicand + 2], a
+ ldh [hMultiplicand + 2], a
jr nc, .no_overflow_3
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
inc a
- ld [hMultiplicand + 1], a
+ ldh [hMultiplicand + 1], a
.no_overflow_3
ld a, 10
.not_hp
ld b, a
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
add b
- ld [hMultiplicand + 2], a
+ ldh [hMultiplicand + 2], a
jr nc, .no_overflow_4
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
inc a
- ld [hMultiplicand + 1], a
+ ldh [hMultiplicand + 1], a
.no_overflow_4
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
cp (1000 / $100) + 1
jr nc, .max_stat
cp 1000 / $100
jr c, .stat_value_okay
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
cp 1000 % $100
jr c, .stat_value_okay
.max_stat
ld a, 999 / $100
- ld [hMultiplicand + 1], a
+ ldh [hMultiplicand + 1], a
ld a, 999 % $100
- ld [hMultiplicand + 2], a
+ ldh [hMultiplicand + 2], a
.stat_value_okay
pop bc
@@ -1630,7 +1636,7 @@ TextJump_WasSentToBillsPC:
InitNickname: ; e3b9 (3:63b9)
push de
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call DisableSpriteUpdates
pop de
push de
diff --git a/engine/movement_pattern.asm b/engine/movement_pattern.asm
index 0b7617ca..1909f480 100755
--- a/engine/movement_pattern.asm
+++ b/engine/movement_pattern.asm
@@ -137,26 +137,26 @@ Function47fa:
Function47fb: ; 47fb (1:47fb)
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
and $1
jp Function4ac9
Function4805: ; 4805 (1:4805)
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
and $1
or $2
jp Function4ac9
Function4811: ; 4811 (1:4811)
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
and $3
jp Function4ac9
Function481b: ; 481b (1:481b)
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
and $c
ld hl, $8
add hl, bc
@@ -170,7 +170,7 @@ Function482a: ; 482a (1:482a)
and $c
ld d, a
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
and $c
cp d
jr nz, .asm_483e
@@ -608,7 +608,7 @@ Function4ac9: ; 4ac9 (1:4ac9)
add hl, bc
ld [hl], $2
ld hl, wCenteredObject
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
cp [hl]
jr z, .asm_4ae9
ld hl, $9
@@ -627,13 +627,13 @@ Function4ac9: ; 4ac9 (1:4ac9)
call Function4603
Function4af6: ; 4af6 (1:4af6)
call Random
- ld a, [hRandom]
+ ldh a, [hRandom]
and $7f
jr asm_4b06
Function4aff: ; 4aff (1:4aff)
call Random
- ld a, [hRandomAdd]
+ ldh a, [hRandomAdd]
and $1f
asm_4b06
ld hl, $a
diff --git a/engine/movie/gamefreak_presents.asm b/engine/movie/gamefreak_presents.asm
index 6b15472f..7e9519f4 100644
--- a/engine/movie/gamefreak_presents.asm
+++ b/engine/movie/gamefreak_presents.asm
@@ -3,19 +3,19 @@ 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)
- ld [hBGMapAddress + 1], a
+ ldh [hBGMapAddress + 1], a
xor a ; LOW(vBGMap0)
- ld [hBGMapAddress], a
+ ldh [hBGMapAddress], a
- ld [hJoyDown], a
- ld [hSCX], a
- ld [hSCY], a
+ ldh [hJoyDown], a
+ ldh [hSCX], a
+ ldh [hSCY], a
ld a, SCREEN_HEIGHT_PX
- ld [hWY], a
+ ldh [hWY], a
call WaitBGMap
@@ -34,7 +34,7 @@ Copyright_GFPresents: ; e49a8 (39:49a8)
ld c, 100
call DelayFrames
- call ClearTileMap
+ call ClearTilemap
call GFPresents_Init
.loop
@@ -80,14 +80,14 @@ GFPresents_Init: ; e49f3 (39:49f3)
ld [wJumpTableIndex], a
ld [$ce64], a
ld [wIntroSceneTimer], a
- ld [hSCX], a
- ld [hSCY], a
+ ldh [hSCX], a
+ ldh [hSCY], a
ld a, 1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld a, SCREEN_HEIGHT_PX
- ld [hWY], a
+ ldh [hWY], a
lb de, %00100100, %11111000
call DmgToCgbObjPals
@@ -98,7 +98,7 @@ GFPresents_PlayFrame: ; e4a37 (39:4a37)
; Return carry when the sequence completes or is canceled.
call JoyTextDelay
- ld a, [hJoyLast]
+ ldh a, [hJoyLast]
and BUTTONS
jr nz, .pressed_button
@@ -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
@@ -279,7 +279,7 @@ GFPresents_UpdateLogoPal: ; e4b20 (39:4b20)
; OBP1 was initialized at end of GFPresents_Init
; once we reached the final state, leave it alone
- ld a, [rOBP1]
+ ldh a, [rOBP1]
cp %10010000
ret z
@@ -291,7 +291,7 @@ GFPresents_UpdateLogoPal: ; e4b20 (39:4b20)
; rotate OBP1 by one color slot (2 bits)
; DMG: logo is white, then light gray, then dark gray
; CGB: logo is white, then yellow
- ld a, [rOBP1]
+ ldh a, [rOBP1]
rrca
rrca
call DmgToCgbObjPal1
@@ -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 52cc06c7..f907c463 100644
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -15,23 +15,23 @@ NamingScreen: ; 11aad (4:5aad)
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
- ld a, [hMapAnims]
+ ldh a, [hMapAnims]
push af
xor a
- ld [hMapAnims], a
- ld a, [hInMenu]
+ ldh [hMapAnims], a
+ ldh a, [hInMenu]
push af
ld a, $1
- ld [hInMenu], a
+ ldh [hInMenu], a
call Function11ae4
call DelayFrame
.asm_11ad1
call Function11cd4
jr nc, .asm_11ad1
pop af
- ld [hInMenu], a
+ ldh [hInMenu], a
pop af
- ld [hMapAnims], a
+ ldh [hMapAnims], a
pop af
ld [wOptions], a
call ClearJoypad
@@ -45,7 +45,7 @@ Function11ae4: ; 11ae4 (4:5ae4)
call Function1201e
call Function11c67
ld a, $e3
- ld [rLCDC], a
+ ldh [rLCDC], a
call Function11b09
call WaitBGMap
call WaitTop
@@ -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)
@@ -300,14 +300,14 @@ Function11cd4: ; 11cd4 (4:5cd4)
callfar ClearAnimatedObjectBuffer
call ClearSprites
xor a
- ld [hSCX], a
- ld [hSCY], a
+ ldh [hSCX], a
+ ldh [hSCY], a
scf
ret
Function11cff: ; 11cff (4:5cff)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
hlcoord 1, 5
call Function11c5b
jr nz, .asm_11d0d
@@ -325,7 +325,7 @@ Function11cff: ; 11cff (4:5cff)
ld l, a
call PlaceString
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
Function11d27: ; 11d27 (4:5d27)
@@ -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
@@ -843,16 +843,16 @@ Function1201e: ; 1201e (4:601e)
ld [hli], a
ld [hl], $7e
xor a
- ld [hSCY], a
+ ldh [hSCY], a
ld [wGlobalAnimYOffset], a
- ld [hSCX], a
+ ldh [hSCX], a
ld [wGlobalAnimXOffset], a
ld [wce63], a
ld [wce64], a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld [wc5d2], a
ld a, $7
- ld [hWX], a
+ ldh [hWX], a
ret
NamingScreenGFX_Border: INCBIN "gfx/namingscreen/border.2bpp"
@@ -897,23 +897,23 @@ ComposeMailMessage:
ld [hl], e
inc hl
ld [hl], d
- ld a, [hMapAnims]
+ ldh a, [hMapAnims]
push af
xor a
- ld [hMapAnims], a
- ld a, [hInMenu]
+ ldh [hMapAnims], a
+ ldh a, [hInMenu]
push af
ld a, $1
- ld [hInMenu], a
+ ldh [hInMenu], a
call Function12267
call DelayFrame
.asm_1225b
call Function1238d
jr nc, .asm_1225b
pop af
- ld [hInMenu], a
+ ldh [hInMenu], a
pop af
- ld [hMapAnims], a
+ ldh [hMapAnims], a
ret
Function12267: ; 12267 (4:6267)
@@ -926,18 +926,18 @@ 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
call Function12351
ld a, $e3
- ld [rLCDC], a
+ ldh [rLCDC], a
call Function12341
ld b, $8
call GetSGBLayout
@@ -1015,14 +1015,14 @@ Function1238d: ; 1238d (4:638d)
callfar ClearAnimatedObjectBuffer
call ClearSprites
xor a
- ld [hSCX], a
- ld [hSCY], a
+ ldh [hSCX], a
+ ldh [hSCY], a
scf
ret
Function123b8: ; 123b8 (4:63b8)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
hlcoord 1, 1
lb bc, 4, 18
call ClearBox
@@ -1033,7 +1033,7 @@ Function123b8: ; 123b8 (4:63b8)
hlcoord 2, 2
call PlaceString
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ret
Function123d5: ; 123d5 (4:63d5)
@@ -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_object_action.asm b/engine/overworld/map_object_action.asm
index 40499b50..553243c4 100755
--- a/engine/overworld/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
@@ -9,7 +9,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- call jp_hl
+ call _hl_
ret
Pointers4460:
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 593a1d75..887fb753 100755
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -415,7 +415,7 @@ Function5429: ; 5429 (1:5429)
ld [hl], $2
call Function54c8
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_5450
ld hl, $9
@@ -435,7 +435,7 @@ Function5457: ; 5457 (1:5457)
ret z
ld a, [wObjectFollow_Leader]
ld d, a
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp d
ret nz
ld a, e
@@ -565,7 +565,7 @@ Function5504: ; 5504 (1:5504)
Function5518: ; 5518 (1:5518)
push bc
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld c, a
call Function5521
pop bc
@@ -622,7 +622,7 @@ Function5558: ; 5558 (1:5558)
ld [hli], a
ld a, [de]
ld [hli], a
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld [hli], a
push hl
ld hl, $10
@@ -646,7 +646,7 @@ Function557f:: ; 557f (1:557f)
ld bc, wPlayerStruct
xor a
.asm_5589
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
call DoesObjectHaveASprite
jr z, .asm_5593
call Function55ef
@@ -655,7 +655,7 @@ Function557f:: ; 557f (1:557f)
add hl, bc
ld b, h
ld c, l
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
inc a
cp $d
jr nz, .asm_5589
@@ -668,12 +668,12 @@ Function55a1
ld a, [wd180]
bit 7, a
jr z, .asm_55b8
- ld a, [hLastTalked]
+ ldh a, [hLastTalked]
and a
jr z, .asm_55b8
call Function55bc
.asm_55b8
- call UpdateSprites_
+ call _UpdateSprites
ret
Function55bc: ; 55bc (1:55bc)
@@ -697,13 +697,13 @@ Function55d8: ; 55d8 (1:55d8)
xor a
ld bc, wPlayerStruct
.asm_55dc
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
call Function5613
ld hl, $28
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
inc a
cp $d
jr nz, .asm_55dc
@@ -812,7 +812,7 @@ Function5660: ; 5660 (1:5660)
jr c, .asm_568f
sub $20
.asm_568f
- ld [hUsedSpriteIndex], a
+ ldh [hUsedSpriteIndex], a
ld a, [wce82]
ld e, a
ld hl, $1a
@@ -841,7 +841,7 @@ Function5660: ; 5660 (1:5660)
jr c, .asm_56bf
sub $20
.asm_56bf
- ld [hUsedSpriteTile], a
+ ldh [hUsedSpriteTile], a
ld hl, $6
add hl, bc
bit 7, [hl]
@@ -854,18 +854,18 @@ Function5660: ; 5660 (1:5660)
ld e, a
.asm_56d1
ld a, d
- ld [hFFC1], a
+ ldh [hFFC1], a
.asm_56d4
- ld a, [hFFC1]
+ ldh a, [hFFC1]
ld d, a
- ld a, [hUsedSpriteTile]
+ ldh a, [hUsedSpriteTile]
add e
dec a
cp $12
jr nc, .asm_56f6
ld b, a
.asm_56e0
- ld a, [hUsedSpriteIndex]
+ ldh a, [hUsedSpriteIndex]
add d
dec a
cp $14
@@ -908,7 +908,7 @@ Function5714: ; 5714 (1:5714)
ld bc, wPlayerSprite
xor a
.asm_5718
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
call DoesObjectHaveASprite
jr z, .asm_5722
call Function437c
@@ -917,7 +917,7 @@ Function5714: ; 5714 (1:5714)
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
inc a
cp $d
jr nz, .asm_5718
@@ -980,7 +980,7 @@ StartFollow::
Function578b: ; 578b (1:578b)
call CheckObjectVisibility
ret c
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
ld [wObjectFollow_Leader], a
ret
@@ -1006,7 +1006,7 @@ Function57a2: ; 57a2 (1:57a2)
ld hl, $9
add hl, bc
ld [hl], $0
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
ld [wObjectFollow_Follower], a
ret
@@ -1154,25 +1154,25 @@ 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
xor a
- ld [hUsedSpriteIndex], a
- ld a, [hOAMUpdate]
+ ldh [hUsedSpriteIndex], a
+ ldh a, [hOAMUpdate]
push af
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call Function58fe
call Function58b0
pop af
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
ret
Function58b0: ; 58b0 (1:58b0)
ld b, $a0
- ld a, [hUsedSpriteIndex]
+ ldh a, [hUsedSpriteIndex]
cp b
ret nc
ld l, a
@@ -1333,11 +1333,11 @@ Function597a: ; 597a (1:597a)
jr z, .asm_599d
or $80
.asm_599d
- ld [hFFC4], a
+ ldh [hFFC4], a
ld hl, $2
add hl, bc
ld a, [hl]
- ld [hFFC3], a
+ ldh [hFFC3], a
ld hl, $17
add hl, bc
ld a, [hl]
@@ -1348,7 +1348,7 @@ Function597a: ; 597a (1:597a)
ld e, a
ld a, [wce81]
add e
- ld [hFFC1], a
+ ldh [hFFC1], a
ld hl, $18
add hl, bc
ld a, [hl]
@@ -1359,7 +1359,7 @@ Function597a: ; 597a (1:597a)
ld e, a
ld a, [wce82]
add e
- ld [hFFC2], a
+ ldh [hFFC2], a
ld hl, $d
add hl, bc
ld a, [hl]
@@ -1375,28 +1375,28 @@ Function597a: ; 597a (1:597a)
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [hUsedSpriteIndex]
+ ldh a, [hUsedSpriteIndex]
ld c, a
ld b, $c3
ld a, [hli]
- ld [hUsedSpriteTile], a
+ ldh [hUsedSpriteTile], a
add c
cp $a0
jr nc, .asm_5a25
.asm_59f3
- ld a, [hFFC2]
+ ldh a, [hFFC2]
add [hl]
inc hl
ld [bc], a
inc c
- ld a, [hFFC1]
+ ldh a, [hFFC1]
add [hl]
inc hl
ld [bc], a
inc c
ld e, [hl]
inc hl
- ld a, [hFFC3]
+ ldh a, [hFFC3]
bit 2, e
jr z, .asm_5a08
xor a
@@ -1408,19 +1408,19 @@ Function597a: ; 597a (1:597a)
ld a, e
bit 1, a
jr z, .asm_5a14
- ld a, [hFFC4]
+ ldh a, [hFFC4]
or e
.asm_5a14
and $f0
or d
ld [bc], a
inc c
- ld a, [hUsedSpriteTile]
+ ldh a, [hUsedSpriteTile]
dec a
- ld [hUsedSpriteTile], a
+ ldh [hUsedSpriteTile], a
jr nz, .asm_59f3
ld a, c
- ld [hUsedSpriteIndex], a
+ ldh [hUsedSpriteIndex], a
.asm_5a23
xor a
ret
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 74e44cd3..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)
@@ -302,7 +302,7 @@ Function517a: ; 517a (1:517a)
Function519c: ; 519c (1:519c)
call DeleteMapObject
ld hl, wObjectFollow_Leader
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr nz, .asm_51a9
ld [hl], $ff
@@ -719,7 +719,7 @@ Function53b1: ; 53b1 (1:53b1)
call Function54f5
.asm_53cf
ld hl, wCenteredObject
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
cp [hl]
jr z, .asm_53de
ld hl, $9
@@ -740,7 +740,7 @@ Function53e5: ; 53e5 (1:53e5)
add hl, bc
ld [hl], $4
ld hl, wCenteredObject
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .asm_5400
ld hl, $9
@@ -761,7 +761,7 @@ Function5407: ; 5407 (1:5407)
add hl, bc
ld [hl], $1
ld hl, wCenteredObject
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
cp [hl]
jr z, .asm_5422
ld hl, $9
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index e776402a..84235570 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -224,7 +224,7 @@ CheckFacingObject:
.asm_70d0
ld bc, wObjectStructs
ld a, $0
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
call Function7120
ret nc
ld hl, $7
@@ -249,7 +249,7 @@ WillPersonBumpIntoSomeoneElse: ; 70e8 (1:70e8)
jr Function7120
Function70f4:
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
call GetObjectStruct
call Function7100
call Function7120
@@ -288,7 +288,7 @@ Function7120: ; 7120 (1:7120)
ld bc, wPlayerStruct
xor a
.asm_7124
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
call DoesObjectHaveASprite
jr z, .asm_7172
ld hl, $4
@@ -315,9 +315,9 @@ Function7120: ; 7120 (1:7120)
cp e
jr nz, .asm_715a
.asm_7152
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld l, a
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
cp l
jr nz, .asm_7181
.asm_715a
@@ -331,9 +331,9 @@ Function7120: ; 7120 (1:7120)
ld a, [hl]
cp e
jr nz, .asm_7172
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
ld l, a
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
cp l
jr nz, .asm_7181
.asm_7172
@@ -341,7 +341,7 @@ Function7120: ; 7120 (1:7120)
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
inc a
cp $d
jr nz, .asm_7124
@@ -445,7 +445,7 @@ Function71f2
ld bc, wObjectStructs
xor a
.asm_71fe
- ld [hConnectedMapWidth], a
+ ldh [hConnectedMapWidth], a
call DoesObjectHaveASprite
jr z, .asm_723f
ld hl, $3
@@ -468,7 +468,7 @@ Function71f2
ld a, [hl]
cp d
jr nz, .asm_722d
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
cp $0
jr z, .asm_723f
jr .asm_724e
@@ -491,7 +491,7 @@ Function71f2
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
inc a
cp $d
jr nz, .asm_71fe
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 8af7c726..3fa38cc0 100755
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -11,7 +11,7 @@ DoPlayerMovement:: ; 10000 (4:4000)
ret
Function10017: ; 10017 (4:4017)
- ld a, [hJoyDown]
+ ldh a, [hJoyDown]
ld [wcf29], a
CheckFlagHL ENGINE_DOWNHILL
ret z
@@ -87,7 +87,7 @@ Function1002d: ; 1002d (4:402d)
ld a, [wcf2e]
cp $ff
jr z, .asm_100b2
- ld a, [wTempTrainerHeader]
+ ld a, [wTempTrainer]
and a
jr nz, .asm_100ad
call Function103ee
@@ -367,7 +367,7 @@ Function10226: ; 10226 (4:4226)
cp [hl]
jr nz, .asm_10259
ld a, $1
- ld [wTempTrainerHeader], a
+ ld [wTempTrainer], a
ld a, [wcf2e]
cp $ff
jr z, .asm_10259
@@ -476,7 +476,7 @@ Function102b3: ; 102b3 (4:42b3)
Function102bf: ; 102bf (4:42bf)
ld a, $0
- ld [wTempTrainerHeaderEnd], a
+ ld [wTempTrainerEnd], a
ld a, $50
ld [wcf2d], a
xor a
@@ -485,7 +485,7 @@ Function102bf: ; 102bf (4:42bf)
Function102cb: ; 102cb (4:42cb)
call Function10404
ret nc
- ld a, [wTempTrainerHeaderEnd]
+ ld a, [wTempTrainerEnd]
.asm_102d2
cp $0
ret z
@@ -564,7 +564,7 @@ Function102ec: ; 102ec (4:42ec)
Function10341: ; 10341 (4:4341)
ld a, 0
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ld a, [wPlayerStandingMapX]
ld d, a
ld a, [wcf30]
@@ -705,7 +705,7 @@ Function103f9: ; 103f9 (4:43f9)
ret
Function10404: ; 10404 (4:4404)
- ld a, [wTempTrainerHeaderEnd]
+ ld a, [wTempTrainerEnd]
cp $0
jr z, .asm_10420
cp $f0
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 64977b97..0865dbf8 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -1,18 +1,18 @@
BlankScreen:
call DisableSpriteUpdates
xor a
- ld [hBGMapMode], a
+ 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
- call Function3456
+ call WaitBGMap2
call SetPalettes
ret
@@ -26,10 +26,10 @@ SpawnPlayer: ; 861a (2:461a)
ld b, $0
call PlayerSpawn_ConvertCoords
ld a, $0
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
ld de, wObjectStructs
ld a, $0
- ld [hMapObjectIndexBuffer], a
+ ldh [hMapObjectIndexBuffer], a
ld bc, wMapObjects
call CopyMapObjectToObjectStruct
ld a, $0
@@ -77,7 +77,7 @@ WritePersonXY:
ld hl, $11
add hl, bc
ld e, [hl]
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
ld b, a
call CopyDECoordsToMapObject
and a
@@ -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
@@ -130,12 +130,12 @@ CopyObjectStruct_:: ; 86d7 (2:46d7)
ld a, $1
ld de, $28
.asm_86e4
- ld [hObjectStructIndexBuffer], a
+ ldh [hObjectStructIndexBuffer], a
ld a, [hl]
and a
jr z, .asm_86f4
add hl, de
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
inc a
cp $d
jr nz, .asm_86e4
@@ -160,11 +160,11 @@ CopyMapObjectToObjectStruct: ; 8706 (2:4706)
ret
CopyMapObjectToTempObject: ; 870d (2:470d)
- ld a, [hConnectedMapWidth]
+ ldh a, [hConnectedMapWidth]
ld hl, $0
add hl, bc
ld [hl], a
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
ld [wce99], a
ld hl, $1
add hl, bc
@@ -210,7 +210,7 @@ InitializeVariableSprites:
ld bc, wMap2Object
ld a, $2
.asm_876c
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld hl, $1
add hl, bc
ld a, [hl]
@@ -242,7 +242,7 @@ InitializeVariableSprites:
cp $b
jr nc, .asm_87ab
push bc
- call CopyObjectStruct_
+ call CopyObjectStruct
pop bc
jp c, Function87b9
.asm_87ab
@@ -250,7 +250,7 @@ InitializeVariableSprites:
add hl, bc
ld b, h
ld c, l
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
inc a
cp $10
jr nz, .asm_876c
@@ -289,7 +289,7 @@ asm_87da
ld bc, wMap2Object
ld a, $2
.asm_87e4
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld hl, $1
add hl, bc
ld a, [hl]
@@ -315,7 +315,7 @@ asm_87da
jr nc, .asm_8814
push de
push bc
- call CopyObjectStruct_
+ call CopyObjectStruct
pop bc
pop de
.asm_8814
@@ -323,7 +323,7 @@ asm_87da
add hl, bc
ld b, h
ld c, l
- ld a, [hMapObjectIndexBuffer]
+ ldh a, [hMapObjectIndexBuffer]
inc a
cp $10
jr nz, .asm_87e4
@@ -344,7 +344,7 @@ asm_882e
ld bc, wMap2Object
ld a, $2
.asm_8838
- ld [hConnectionStripLength], a
+ ldh [hConnectionStripLength], a
ld hl, $1
add hl, bc
ld a, [hl]
@@ -370,7 +370,7 @@ asm_882e
jr nc, .asm_8868
push de
push bc
- call CopyObjectStruct_
+ call CopyObjectStruct
pop bc
pop de
.asm_8868
@@ -378,7 +378,7 @@ asm_882e
add hl, bc
ld b, h
ld c, l
- ld a, [hConnectionStripLength]
+ ldh a, [hConnectionStripLength]
inc a
cp $10
jr nz, .asm_8838
@@ -474,14 +474,14 @@ InitTempObjectRadius: ; 88fd (2:48fd)
ret
TrainerWalkToPlayer:
- ld a, [hLastTalked]
+ ldh a, [hLastTalked]
call InitMovementBuffer
ld a, movement_step_sleep
call AppendToMovementBuffer
ld a, [wcf2a]
dec a
jr z, .asm_892b
- ld a, [hLastTalked]
+ ldh a, [hLastTalked]
ld b, a
ld c, PLAYER
ld d, $1
@@ -624,7 +624,7 @@ FollowNotExact:
ld hl, $18
add hl, de
ld [hl], a
- ld a, [hObjectStructIndexBuffer]
+ ldh a, [hObjectStructIndexBuffer]
ld hl, $20
add hl, de
ld [hl], a
diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm
index 70947346..36698ed8 100755
--- a/engine/overworld/player_step.asm
+++ b/engine/overworld/player_step.asm
@@ -39,12 +39,12 @@ ScrollScreen::
ld d, a
ld a, [wPlayerStepVectorY]
ld e, a
- ld a, [hSCX]
+ ldh a, [hSCX]
add d
- ld [hSCX], a
- ld a, [hSCY]
+ ldh [hSCX], a
+ ldh a, [hSCY]
add e
- ld [hSCY], a
+ ldh [hSCY], a
ret
Functiond4f2: ; d4f2 (3:54f2)
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm
index ce847b18..01273a75 100755
--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@@ -305,7 +305,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7)
inc hl
inc hl
inc hl
- ld a, [hSeconds]
+ ldh a, [hSeconds]
ld c, a
sub [hl]
jr nc, .asm_119d2
@@ -315,7 +315,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7)
dec hl
ld [wSecsSince], a
CalcMinsHoursDaysSince_
- ld a, [hMinutes]
+ ldh a, [hMinutes]
ld c, a
sbc [hl]
jr nc, .asm_119df
@@ -325,7 +325,7 @@ CalcMinsHoursDaysSince_
dec hl
ld [wMinsSince], a
CalcHoursDaysSince_
- ld a, [hHours]
+ ldh a, [hHours]
ld c, a
sbc [hl]
jr nc, .asm_119ec
@@ -348,11 +348,11 @@ CalcDaysSince_:
CopyDayHourMinSecToHL: ; 119ff (4:59ff)
ld a, [wCurDay]
ld [hli], a
- ld a, [hHours]
+ ldh a, [hHours]
ld [hli], a
- ld a, [hMinutes]
+ ldh a, [hMinutes]
ld [hli], a
- ld a, [hSeconds]
+ ldh a, [hSeconds]
ld [hli], a
ret
@@ -364,15 +364,15 @@ CopyDayToHL: ; 11a0d (4:5a0d)
CopyDayHourToHL:
ld a, [wCurDay]
ld [hli], a
- ld a, [hHours]
+ ldh a, [hHours]
ld [hli], a
ret
CopyDayHourMinToHL: ; 11a1a (4:5a1a)
ld a, [wCurDay]
ld [hli], a
- ld a, [hHours]
+ ldh a, [hHours]
ld [hli], a
- ld a, [hMinutes]
+ ldh a, [hMinutes]
ld [hli], a
ret
diff --git a/engine/pack.asm b/engine/pack.asm
index 27db7cd2..620976a9 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -39,7 +39,7 @@ Function10456: ; 10456 (4:4456)
Pack_InitGFX:
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10d70
ld a, [wce64]
ld [wce63], a
@@ -57,7 +57,7 @@ Pack_InitItemsPocket:
Pack_ItemsPocketMenu:
ld hl, ItemsPocketMenuDataHeader
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfca]
ld [wMenuCursorBuffer], a
ld a, [wcfcf]
@@ -86,7 +86,7 @@ Pack_InitKeyItemsPocket:
Pack_KeyItemsPocketMenu:
ld hl, KeyItemsPocketMenuDataHeader ; $4e9a
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfcb]
ld [wMenuCursorBuffer], a
ld a, [wcfd0]
@@ -109,7 +109,7 @@ Pack_InitTMHMPocket:
call Function10e51
call Function10dd6
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10cca
call Function10c96
ret
@@ -120,7 +120,7 @@ Pack_TMHMPocketMenu:
ld c, $1
call Function10cef
ret c
- farcall CheckTossableItem_
+ farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_1053a
@@ -133,7 +133,7 @@ Pack_TMHMPocketMenu:
ld de, TMHMPocketSubmenuJumptable_NoGive ; $4567
.asm_10540
push de
- call LoadMenuDataHeader
+ call LoadMenuHeader
call VerticalMenu
call ExitMenu
pop hl
@@ -193,7 +193,7 @@ UseTMorHM:
ld [wOptions], a
.asm_105a9
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10d70
call Function10cca
call Function10e5b
@@ -210,7 +210,7 @@ Pack_InitBallsPocket:
Pack_BallsPocketMenu:
ld hl, BallsPocketMenuDataHeader ; $4eca
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfcc]
ld [wMenuCursorBuffer], a
ld a, [wcfd1]
@@ -228,7 +228,7 @@ Pack_BallsPocketMenu:
ret
Function105f5: ; 105f5 (4:45f5)
- farcall CheckTossableItem_
+ farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_10629
@@ -286,7 +286,7 @@ Function105f5: ; 105f5 (4:45f5)
ld de, ItemSubmenuJumptable_GiveTossQuit ; $473b
.asm_10665
push de
- call LoadMenuDataHeader
+ call LoadMenuHeader
call VerticalMenu
call ExitMenu
pop hl
@@ -447,7 +447,7 @@ UseItem:
jr z, .no_pokemon
call DoItemEffect
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10d70
call Function10cca
call Function10e5b
@@ -477,7 +477,7 @@ TossMenu:
jr c, .asm_107cc
call Function10e38
ld hl, Text_ConfirmThrowAway
- call MenuTextBox
+ call MenuTextbox
call YesNoBox
push af
call ExitMenu
@@ -597,7 +597,7 @@ GiveItem:
pop af
ld [wOptions], a
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10d70
call Function10cca
call Function10e5b
@@ -656,7 +656,7 @@ Function108e9: ; 108e9 (4:48e9)
BattlePack_InitGFX:
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10d70
ld a, [wce64]
ld [wce63], a
@@ -674,7 +674,7 @@ BattlePack_InitItemsPocket:
BattlePack_ItemsPocketMenu:
ld hl, $4e6a
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfca]
ld [wMenuCursorBuffer], a
ld a, [wcfcf]
@@ -702,7 +702,7 @@ BattlePack_InitKeyItemsPocket:
BattlePack_KeyItemsPocketMenu:
ld hl, $4e9a
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfcb]
ld [wMenuCursorBuffer], a
ld a, [wcfd0]
@@ -725,7 +725,7 @@ BattlePack_InitTMHMPocket:
call Function10e51
call Function10dd6
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10cca
ld hl, Text_PackEmptyString
call Function10cb9
@@ -753,7 +753,7 @@ BattlePack_InitBallsPocket:
BattlePack_BallsPocketMenu:
ld hl, $4eca
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfcc]
ld [wMenuCursorBuffer], a
ld a, [wcfd1]
@@ -785,7 +785,7 @@ Function10a0c: ; 10a0c (4:4a0c)
ld de, BattlePackQuitJumptable
.asm_10a1d
push de
- call LoadMenuDataHeader
+ call LoadMenuHeader
call VerticalMenu
call ExitMenu
pop hl
@@ -860,7 +860,7 @@ Function10a86:
and a
jr nz, asm_10aae
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Function10d70
call Function10cca
call Function10e5b
@@ -908,7 +908,7 @@ Function10aba: ; 10aba (4:4aba)
Function10ad5: ; 10ad5 (4:4ad5)
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld [wce63], a
ld [wce64], a
ld [wce65], a
@@ -940,7 +940,7 @@ DepositOrSell_ItemPocket:
xor a
call Function10b92
ld hl, PC_Mart_ItemsPocketMenuDataHeader ; $4e82
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfca]
ld [wMenuCursorBuffer], a
ld a, [wcfcf]
@@ -956,7 +956,7 @@ DepositOrSell_KeyItemsPocket:
ld a, $2
call Function10b92
ld hl, PC_Mart_KeyItemsPocketMenuDataHeader ; $4eb2
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfcb]
ld [wMenuCursorBuffer], a
ld a, [wcfd0]
@@ -981,7 +981,7 @@ DepositOrSell_BallsPocket:
ld a, $1
call Function10b92
ld hl, PC_Mart_BallsPocketMenuDataHeader ; $4ee2
- call CopyMenuDataHeader
+ call CopyMenuHeader
ld a, [wcfcc]
ld [wMenuCursorBuffer], a
ld a, [wcfd1]
@@ -1155,7 +1155,7 @@ asm_10c8a
push hl
call Function10b92
pop hl
- call CopyMenuDataHeader
+ call CopyMenuHeader
call ScrollingMenu
ret
@@ -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
@@ -1404,7 +1404,7 @@ Function10e38: ; 10e38 (4:4e38)
ld a, [wd002]
ld [wd151], a
call GetItemName
- call Function317b
+ call CopyName1
ret
Pack_ClearTilemap:
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 aa8aefdd..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
@@ -342,9 +342,9 @@ DummyNonfunctionalGameCornerGame: ; c4e7 (3:44e7)
ret
Functionc4f4: ; c4f4 (3:44f4)
- call Function3425
+ call FarQueueScript
call FadeToMenu
- ld hl, wcfd8
+ ld hl, wQueuedScriptBank
ld a, [hli]
push af
ld a, [hli]
@@ -524,10 +524,10 @@ PlayCurMonCry: ; c60b (3:460b)
jp PlayMonCry
GameboyCheck: ; c611 (3:4611)
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr nz, .asm_c622
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
jr nz, .asm_c61e
xor a
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 8427dfc9..94863c56 100755
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -12,9 +12,9 @@ StartTitleScreen:
call ClearBGPalettes
ld hl, rLCDC
res 2, [hl]
- call ClearTileMap
+ call ClearTilemap
xor a
- ld [hLCDCPointer], a
+ ldh [hLCDCPointer], a
ld b, $8
call GetSGBLayout
call UpdateTimePals
@@ -46,14 +46,14 @@ InitTitleScreen: ; 6291 (1:6291)
ld [wTimeOfDayPal], a
ld de, MUSIC_NONE
call PlayMusic
- call ClearTileMap
+ call ClearTilemap
call DisableLCD
call ClearSprites
xor a
- ld [hBGMapMode], a
- ld [hMapAnims], a
- ld [hSCY], a
- ld [hSCX], a
+ ldh [hBGMapMode], a
+ ldh [hMapAnims], a
+ ldh [hSCY], a
+ ldh [hSCX], a
ld hl, $8000
ld bc, $2000
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
@@ -110,7 +110,7 @@ InitTitleScreen: ; 6291 (1:6291)
xor a
call ByteFill
ld a, $43
- ld [hLCDCPointer], a
+ ldh [hLCDCPointer], a
ld b, $c
call GetSGBLayout
call Function6341
@@ -119,41 +119,41 @@ InitTitleScreen: ; 6291 (1:6291)
ret
Function6341: ; 6341 (1:6341)
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
jr nz, .asm_6365
- ld a, [hSGB]
+ ldh a, [hSGB]
and a
jr nz, .asm_6358
ld a, $d8
- ld [rBGP], a
+ ldh [rBGP], a
IF DEF(GOLD)
ld a, $ff
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, $f8
ENDC
IF DEF(SILVER)
ld a, $f0
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, $f0
ENDC
- ld [rOBP1], a
+ ldh [rOBP1], a
ret
.asm_6358
ld a, $e4
- ld [rBGP], a
+ ldh [rBGP], a
IF DEF(GOLD)
ld a, $ff
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, $e4
ENDC
IF DEF(SILVER)
ld a, $f0
- ld [rOBP0], a
+ ldh [rOBP0], a
ld a, $e0
ENDC
- ld [rOBP1], a
+ ldh [rOBP1], a
ret
.asm_6365
@@ -166,11 +166,11 @@ ENDC
ret
Function636e: ; 636e (1:636e)
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret z
ld a, $1
- ld [rVBK], a
+ ldh [rVBK], a
ld hl, $9800
ld bc, $240
xor a
@@ -188,7 +188,7 @@ Function636e: ; 636e (1:636e)
ld a, $4
call ByteFill
ld a, $0
- ld [rVBK], a
+ ldh [rVBK], a
ret
Function63a6: ; 63a6 (1:63a6)
@@ -220,7 +220,7 @@ Function63b6: ; 63b6 (1:63b6)
jr .asm_63bc
.asm_63ca
- ld a, [hCGB]
+ ldh a, [hCGB]
and a
ret nz
ld hl, $9960
@@ -236,10 +236,10 @@ TitleScreenFrame: ; 63da (1:63da)
jr nz, .asm_63fc
call Function640f
ld a, $1
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
farcall AnimatedObjects_PlayFrame
xor a
- ld [hOAMUpdate], a
+ ldh [hOAMUpdate], a
call Function64b1
call DelayFrame
and a
@@ -251,7 +251,7 @@ TitleScreenFrame: ; 63da (1:63da)
Function63fe: ; 63fe (1:63fe)
IF DEF(GOLD)
- ld a, [hVBlankCounter]
+ ldh a, [hVBlankCounter]
and $7
ret nz
ENDC
@@ -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
diff --git a/engine/variables.asm b/engine/variables.asm
index e2a399f0..7e6906ee 100755
--- a/engine/variables.asm
+++ b/engine/variables.asm
@@ -25,7 +25,7 @@ GetVarAction_::
jr .loadstringbuffer2
.call
- call jp_de
+ call _de_
ret
.loadstringbuffer2
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 04:56:52 +0000