diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/mon_menu.asm | 67 | ||||
| -rwxr-xr-x | engine/start_menu.asm | 40 |
2 files changed, 36 insertions, 71 deletions
diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index d7e8446d0..cb070e555 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -1,39 +1,4 @@ -MonMenuOptionStrings: ; 24caf - db "STATS@" - db "SWITCH@" - db "ITEM@" - db "CANCEL@" - db "MOVE@" - db "MAIL@" - db "ERROR!@" -; 24cd9 - -MonMenuOptions: ; 24cd9 -; moves - db MONMENU_FIELD_MOVE, MONMENU_CUT, CUT - db MONMENU_FIELD_MOVE, MONMENU_FLY, FLY - db MONMENU_FIELD_MOVE, MONMENU_SURF, SURF - db MONMENU_FIELD_MOVE, MONMENU_STRENGTH, STRENGTH - db MONMENU_FIELD_MOVE, MONMENU_FLASH, FLASH - db MONMENU_FIELD_MOVE, MONMENU_WATERFALL, WATERFALL - db MONMENU_FIELD_MOVE, MONMENU_WHIRLPOOL, WHIRLPOOL - db MONMENU_FIELD_MOVE, MONMENU_DIG, DIG - db MONMENU_FIELD_MOVE, MONMENU_TELEPORT, TELEPORT - db MONMENU_FIELD_MOVE, MONMENU_SOFTBOILED, SOFTBOILED - db MONMENU_FIELD_MOVE, MONMENU_HEADBUTT, HEADBUTT - db MONMENU_FIELD_MOVE, MONMENU_ROCKSMASH, ROCK_SMASH - db MONMENU_FIELD_MOVE, MONMENU_MILKDRINK, MILK_DRINK - db MONMENU_FIELD_MOVE, MONMENU_SWEETSCENT, SWEET_SCENT -; options - db MONMENU_MENUOPTION, MONMENU_STATS, 1 ; STATS - db MONMENU_MENUOPTION, MONMENU_SWITCH, 2 ; SWITCH - db MONMENU_MENUOPTION, MONMENU_ITEM, 3 ; ITEM - db MONMENU_MENUOPTION, MONMENU_CANCEL, 4 ; CANCEL - db MONMENU_MENUOPTION, MONMENU_MOVE, 5 ; MOVE - db MONMENU_MENUOPTION, MONMENU_MAIL, 6 ; MAIL - db MONMENU_MENUOPTION, MONMENU_ERROR, 7 ; ERROR! - db -1 -; 24d19 +INCLUDE "data/mon_menu.asm" MonSubmenu: ; 24d19 xor a @@ -95,7 +60,7 @@ MonMenuLoop: ; 24d59 jr .loop .cancel - ld a, MONMENU_CANCEL ; CANCEL + ld a, MONMENUITEM_CANCEL ret .select @@ -111,7 +76,7 @@ MonMenuLoop: ; 24d59 PopulateMonMenu: ; 24d91 call MenuBoxCoord2Tile - ld bc, $2a ; 42 + ld bc, 2 * SCREEN_WIDTH + 2 add hl, bc ld de, Buffer2 .loop @@ -124,7 +89,7 @@ PopulateMonMenu: ; 24d91 call GetMonMenuString pop hl call PlaceString - ld bc, $28 ; 40 + ld bc, 2 * SCREEN_WIDTH add hl, bc pop de jr .loop @@ -136,7 +101,7 @@ GetMonMenuString: ; 24db0 call IsInArray dec hl ld a, [hli] - cp 1 + cp MONMENU_MENUOPTION jr z, .NotMove inc hl ld a, [hl] @@ -188,11 +153,11 @@ GetMonSubmenuItems: ; 24dd4 jr nz, .loop .skip_moves - ld a, MONMENU_STATS + ld a, MONMENUITEM_STATS call AddMonMenuItem - ld a, MONMENU_SWITCH + ld a, MONMENUITEM_SWITCH call AddMonMenuItem - ld a, MONMENU_MOVE + ld a, MONMENUITEM_MOVE call AddMonMenuItem ld a, [wLinkMode] and a @@ -203,9 +168,9 @@ GetMonSubmenuItems: ; 24dd4 ld d, [hl] farcall ItemIsMail pop hl - ld a, MONMENU_MAIL + ld a, MONMENUITEM_MAIL jr c, .ok - ld a, MONMENU_ITEM + ld a, MONMENUITEM_ITEM .ok call AddMonMenuItem @@ -214,7 +179,7 @@ GetMonSubmenuItems: ; 24dd4 ld a, [Buffer1] cp NUM_MONMENU_ITEMS jr z, .ok2 - ld a, MONMENU_CANCEL + ld a, MONMENUITEM_CANCEL call AddMonMenuItem .ok2 @@ -222,11 +187,11 @@ GetMonSubmenuItems: ; 24dd4 ret .egg - ld a, MONMENU_STATS + ld a, MONMENUITEM_STATS call AddMonMenuItem - ld a, MONMENU_SWITCH + ld a, MONMENUITEM_SWITCH call AddMonMenuItem - ld a, MONMENU_CANCEL + ld a, MONMENUITEM_CANCEL call AddMonMenuItem call TerminateMonSubmenu ret @@ -265,7 +230,7 @@ ResetMonSubmenu: ; 24e68 TerminateMonSubmenu: ; 24e76 ld a, [Buffer1] ld e, a - ld d, $0 + ld d, 0 ld hl, Buffer2 add hl, de ld [hl], -1 @@ -280,7 +245,7 @@ AddMonMenuItem: ; 24e83 ld e, a inc a ld [Buffer1], a - ld d, $0 + ld d, 0 ld hl, Buffer2 add hl, de pop af diff --git a/engine/start_menu.asm b/engine/start_menu.asm index a60a8b3ce..8784c6bb6 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -729,26 +729,26 @@ PokemonActionSubmenu: ; 12a88 ret .Actions: - dbw MONMENU_CUT, MonMenu_Cut - dbw MONMENU_FLY, MonMenu_Fly - dbw MONMENU_SURF, MonMenu_Surf - dbw MONMENU_STRENGTH, MonMenu_Strength - dbw MONMENU_FLASH, MonMenu_Flash - dbw MONMENU_WHIRLPOOL, MonMenu_Whirlpool - dbw MONMENU_DIG, MonMenu_Dig - dbw MONMENU_TELEPORT, MonMenu_Teleport - dbw MONMENU_SOFTBOILED, MonMenu_Softboiled_MilkDrink - dbw MONMENU_MILKDRINK, MonMenu_Softboiled_MilkDrink - dbw MONMENU_HEADBUTT, MonMenu_Headbutt - dbw MONMENU_WATERFALL, MonMenu_Waterfall - dbw MONMENU_ROCKSMASH, MonMenu_RockSmash - dbw MONMENU_SWEETSCENT, MonMenu_SweetScent - dbw MONMENU_STATS, OpenPartyStats - dbw MONMENU_SWITCH, SwitchPartyMons - dbw MONMENU_ITEM, GiveTakePartyMonItem - dbw MONMENU_CANCEL, CancelPokemonAction - dbw MONMENU_MOVE, ManagePokemonMoves - dbw MONMENU_MAIL, MonMailAction + dbw MONMENUITEM_CUT, MonMenu_Cut + dbw MONMENUITEM_FLY, MonMenu_Fly + dbw MONMENUITEM_SURF, MonMenu_Surf + dbw MONMENUITEM_STRENGTH, MonMenu_Strength + dbw MONMENUITEM_FLASH, MonMenu_Flash + dbw MONMENUITEM_WHIRLPOOL, MonMenu_Whirlpool + dbw MONMENUITEM_DIG, MonMenu_Dig + dbw MONMENUITEM_TELEPORT, MonMenu_Teleport + dbw MONMENUITEM_SOFTBOILED, MonMenu_Softboiled_MilkDrink + dbw MONMENUITEM_MILKDRINK, MonMenu_Softboiled_MilkDrink + dbw MONMENUITEM_HEADBUTT, MonMenu_Headbutt + dbw MONMENUITEM_WATERFALL, MonMenu_Waterfall + dbw MONMENUITEM_ROCKSMASH, MonMenu_RockSmash + dbw MONMENUITEM_SWEETSCENT, MonMenu_SweetScent + dbw MONMENUITEM_STATS, OpenPartyStats + dbw MONMENUITEM_SWITCH, SwitchPartyMons + dbw MONMENUITEM_ITEM, GiveTakePartyMonItem + dbw MONMENUITEM_CANCEL, CancelPokemonAction + dbw MONMENUITEM_MOVE, ManagePokemonMoves + dbw MONMENUITEM_MAIL, MonMailAction ; 12aec |