diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 16:08:43 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 16:08:43 -0500 |
| commit | ead103d2c6d21cd4774e5c32b9c66f9435f7adbb (patch) | |
| tree | 2eb0fb2875fe9597167e83f88d5f8db287983292 /engine/intro_menu.asm | |
| parent | 8f2878c37e6755a4ac41ea65568bbfabd77bbe83 (diff) | |
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
Diffstat (limited to 'engine/intro_menu.asm')
| -rwxr-xr-x | engine/intro_menu.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index e8a3f221a..dc640c4dc 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -352,7 +352,7 @@ Continue: ; 5d65 farcall TryLoadSaveFile jr c, .FailToLoad farcall _LoadData - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call DisplaySaveInfoOnContinue ld a, $1 ld [hBGMapMode], a @@ -539,27 +539,27 @@ DisplayContinueDataWithRTCError: ; 5eaf Continue_LoadMenuHeader: ; 5ebf xor a ld [hBGMapMode], a - ld hl, .MenuDataHeader_Dex + ld hl, .MenuHeader_Dex ld a, [wStatusFlags] bit STATUSFLAGS_POKEDEX_F, a jr nz, .show_menu - ld hl, .MenuDataHeader_NoDex + ld hl, .MenuHeader_NoDex .show_menu - call _OffsetMenuDataHeader + call _OffsetMenuHeader call MenuBox call PlaceVerticalMenuItems ret ; 5ed9 -.MenuDataHeader_Dex: ; 5ed9 +.MenuHeader_Dex: ; 5ed9 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 9 - dw .MenuData2_Dex + dw .MenuData_Dex db 1 ; default option ; 5ee1 -.MenuData2_Dex: ; 5ee1 +.MenuData_Dex: ; 5ee1 db 0 ; flags db 4 ; items db "PLAYER@" @@ -568,14 +568,14 @@ Continue_LoadMenuHeader: ; 5ebf db "TIME@" ; 5efb -.MenuDataHeader_NoDex: ; 5efb +.MenuHeader_NoDex: ; 5efb db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 9 - dw .MenuData2_NoDex + dw .MenuData_NoDex db 1 ; default option ; 5f03 -.MenuData2_NoDex: ; 5f03 +.MenuData_NoDex: ; 5f03 db 0 ; flags db 4 ; items db "PLAYER <PLAYER>@" @@ -826,7 +826,7 @@ NamePlayer: ; 0x6074 ; 60e9 Unreferenced_Function60e9: - call LoadMenuDataHeader + call LoadMenuHeader call VerticalMenu ld a, [wMenuCursorY] dec a |