summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/billspctop.asm20
-rwxr-xr-xengine/color.asm2
-rwxr-xr-xengine/events/overworld.asm18
-rwxr-xr-xengine/events/whiteout.asm2
-rw-r--r--engine/learn.asm4
-rwxr-xr-xengine/main_menu.asm8
-rwxr-xr-xengine/move_mon.asm2
-rwxr-xr-xengine/overworld/player_object.asm2
-rwxr-xr-xengine/pack.asm28
9 files changed, 43 insertions, 43 deletions
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index f323d906..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
@@ -21,7 +21,7 @@ Text_GottaHavePokemon:
BillsPC_LogIn: ; e3f7 (3:63f7)
xor a
ldh [hBGMapMode], a
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call Functione566
ld hl, wOptions
ld a, [hl]
@@ -44,7 +44,7 @@ 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
@@ -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
@@ -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 fa041873..2d959df5 100755
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -243,7 +243,7 @@ Function91b4:
ld a, [wc605]
and $3
call Function9af1
- call LoadEDTile
+ call CopyTilemapAtOnce
ret
ApplyMonOrTrainerPals: ; 91e5 (2:51e5)
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index a00f35aa..0787d094 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -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
@@ -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
@@ -543,7 +543,7 @@ TryToFly:
.asm_ca83
xor a
ldh [hMapAnims], a
- call LoadStandardMenuDataHeader
+ 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
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 33098f13..075274a4 100755
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -32,7 +32,7 @@ Script_Whiteout:
OverworldBGMap:
call ClearPalettes
call FillScreenWithTextboxPal
- call Function3456
+ call WaitBGMap2
call HideSprites
call RotateThreePalettesLeft
ret
diff --git a/engine/learn.asm b/engine/learn.asm
index 854f2f3c..8f599208 100644
--- a/engine/learn.asm
+++ b/engine/learn.asm
@@ -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,7 +140,7 @@ LearnMove:
ld a, $3
ld [wMenuJoypadFilter], a
ld a, $20
- ld [wcedc], a
+ ld [w2DMenuFlags1], a
xor a
ld [wcedd], a
ld a, $20
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 0dd1804b..7b01ff59 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -18,7 +18,7 @@ MainMenu_:
ld [wWhichIndexSet], a
call Function5b27
ld hl, .MenuDataHeader
- call LoadMenuDataHeader
+ call LoadMenuHeader
call Function5b0a
call CloseWindow
jr c, .asm_5a94
@@ -478,7 +478,7 @@ LoadOrRegenerateLuckyIDNumber: ; 5da7 (1:5da7)
MainMenu_Continue:
farcall TryLoadSaveFile
jr c, .asm_5e41
- call LoadStandardMenuDataHeader
+ call LoadStandardMenuHeader
call DisplaySaveInfoOnContinue
ld a, $1
ldh [hBGMapMode], a
@@ -619,7 +619,7 @@ Continue_LoadMenuHeader: ; 5ed7 (1:5ed7)
jr nz, .asm_5ee7
ld hl, .MenuDataHeader_NoDex
.asm_5ee7
- call OffsetMenuDataHeader_
+ call _OffsetMenuHeader
call MenuBox
call PlaceVerticalMenuItems
ret
@@ -905,7 +905,7 @@ ENDC
db 2, "NAME@"
SelectPresetName: ; 6108 (1:6108)
- call LoadMenuDataHeader
+ call LoadMenuHeader
call VerticalMenu
ld a, [wMenuCursorY]
dec a
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index dfa51a8e..7410375f 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1636,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/overworld/player_object.asm b/engine/overworld/player_object.asm
index a706f8aa..06b38e94 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -12,7 +12,7 @@ BlankScreen:
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, $7
call ByteFill
- call Function3456
+ call WaitBGMap2
call SetPalettes
ret
diff --git a/engine/pack.asm b/engine/pack.asm
index 05d4952e..210cb9b2 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -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]
@@ -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
@@ -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]
@@ -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
@@ -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
@@ -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]
@@ -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
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 12:45:35 +0000