diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/menu/start_sub_menus.asm | |
| parent | b35294752c55b5df88ccfc785279c36f30a43fd6 (diff) | |
| parent | 7b7c563c93155e121e05149779cfb78b0bf9d259 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/menu/start_sub_menus.asm')
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index cdd93875..589224ab 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -29,8 +29,8 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) call LoadGBPal jp RedisplayStartMenu .chosePokemon - call SaveScreenTilesToBuffer1 ; save screen - ld a,$04 + call SaveScreenTilesToBuffer1 + ld a,FIELD_MOVE_MON_MENU ld [wTextBoxID],a call DisplayTextBoxID ; display pokemon menu options ld hl,wWhichTrade @@ -308,10 +308,10 @@ StartMenu_Item: ; 13302 (4:7302) jr .exitMenu .notInCableClubRoom ld bc,wNumBagItems - ld hl,wcf8b + ld hl,wList ld a,c ld [hli],a - ld [hl],b ; store item bag pointer at wcf8b (for DisplayListMenuID) + ld [hl],b ; store item bag pointer at wList (for DisplayListMenuID) xor a ld [wcf93],a ld a,ITEMLISTMENU @@ -341,7 +341,7 @@ StartMenu_Item: ; 13302 (4:7302) cp a,BICYCLE jp z,.useOrTossItem .notBicycle1 - ld a,$06 ; use/toss menu + ld a,USE_TOSS_MENU_TEMPLATE ld [wTextBoxID],a call DisplayTextBoxID ld hl,wTopMenuItemY |