summaryrefslogtreecommitdiff
path: root/engine/menu
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-16 13:03:05 -0700
committeryenatch <yenatch@gmail.com>2014-06-16 13:03:05 -0700
commit35f2bb90d4a8f8e4dcac3fbab7d89cbc590285e8 (patch)
tree22edd68ca5b17147a1733a1781e9eaf78f379e2f /engine/menu
parent38ac74f22285974bda6a0ed537958def8415076e (diff)
Rename predef functions so they aren't excessive in length.
This is mostly because of an rgbasm bug that prevents macro arguments from exceeding 16 characters, but the names were bad anyway.
Diffstat (limited to 'engine/menu')
-rwxr-xr-xengine/menu/naming_screen.asm2
-rwxr-xr-xengine/menu/pokedex.asm2
-rwxr-xr-xengine/menu/vending_machine.asm2
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 35c8be12..e065d98d 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -1,4 +1,4 @@
-AskForMonNickname: ; 64eb (1:64eb)
+AskName: ; 64eb (1:64eb)
call SaveScreenTilesToBuffer1
call GetPredefRegisters
push hl
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 3f50d8c5..2336cb47 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -1,4 +1,4 @@
-DisplayPokedexMenu_: ; 40000 (10:4000)
+ShowPokedexMenu: ; 40000 (10:4000)
call GBPalWhiteOut
call ClearScreen
call UpdateSprites ; move sprites
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 8a84c5e2..19550899 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -71,7 +71,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
ld hl, $ffde
ld de, wPlayerMoney + 2 ; wd349
ld c, $3
- ld a, $c ; SubtractBCDPredef
+ ld a, $c ; SubBCDPredef
call Predef
ld a, $13
ld [wd125], a