diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-09-10 06:31:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 00:31:11 -0400 |
| commit | d237b01cfb241f417567c964e0df0658cf921570 (patch) | |
| tree | 799e92e48259443aa6cf4c553ed7adf38bd442d4 /engine/menus | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.gz pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.xz pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.zip | |
Misc. naming and cleanup (#139)
* Name some printer/diploma routines
* Name `wd434`
* Name `NAME_LENGTH_JP`
* Rename `callabd`/`calladb` to `farcall`/`callfar`
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/link_menu.asm | 14 | ||||
| -rw-r--r-- | engine/menus/party_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menus/save.asm | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm index 94384cb3..dcb609e2 100644 --- a/engine/menus/link_menu.asm +++ b/engine/menus/link_menu.asm @@ -5,19 +5,19 @@ Func_f531b:: ld [wBuffer], a xor a ld [wUnknownSerialFlag_d499], a - coord hl, 0, 0 + hlcoord 0, 0 lb bc, 4, 5 call TextBoxBorder ld de, Text_f5791 - coord hl, 1, 2 + hlcoord 1, 2 call PlaceString - coord hl, 8, 0 + hlcoord 8, 0 lb bc, 8, 10 call TextBoxBorder - coord hl, 10, 2 + hlcoord 10, 2 ld de, Text_f579c call PlaceString - coord hl, 0, 10 + hlcoord 0, 10 lb bc, 6, 18 call TextBoxBorder call UpdateSprites @@ -513,7 +513,7 @@ asm_f56ad:: Func_f56bd:: xor a ldh [hAutoBGTransferEnabled], a - coord hl, 1, 11 + hlcoord 1, 11 lb bc, 6, 18 call ClearScreenArea ld a, [wCurrentMenuItem] @@ -530,7 +530,7 @@ Func_f56bd:: ld l, a ld d, h ld e, l - coord hl, 1, 12 + hlcoord 1, 12 call PlaceString .asm_f56e6 call Delay3 diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index 169a0ac7..493f2e98 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -32,7 +32,7 @@ RedrawPartyMenu_:: call PlaceString ; print the pokemon's name ldh a, [hPartyMonIndex] ld [wWhichPokemon], a - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .regularMon call CheckPikachuFollowingPlayer jr z, .regularMon diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 0ad7eeac..e4575793 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -358,7 +358,7 @@ ChangeBox:: res BIT_DOUBLE_SPACED_MENU, [hl] bit B_PAD_B, a ret nz - ld a, $b6 + ld a, SFX_SAVE call PlaySoundWaitForCurrent call WaitForSoundToFinish call GetBoxSRAMLocation |