diff options
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/mon_submenu.asm | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 5992beab4..5c2437749 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -513,16 +513,16 @@ _MovePKMNWithoutMail: inc a ld [wBillsPC_LoadedBox], a call DelayFrame -.asm_e2781 +.loop call JoyTextDelay ld a, [wJumptableIndex] bit 7, a - jr nz, .asm_e2793 + jr nz, .done call .RunJumptable call DelayFrame - jr .asm_e2781 + jr .loop -.asm_e2793 +.done call ClearSprites pop af ldh [hInMenu], a diff --git a/engine/pokemon/mon_submenu.asm b/engine/pokemon/mon_submenu.asm index 39c2c86bc..bd20b7c1f 100644 --- a/engine/pokemon/mon_submenu.asm +++ b/engine/pokemon/mon_submenu.asm @@ -245,7 +245,7 @@ AddMonMenuItem: ret BattleMonMenu: - ld hl, MenuHeader_0x24ed4 + ld hl, .MenuHeader call CopyMenuHeader xor a ldh [hBGMapMode], a @@ -276,13 +276,13 @@ BattleMonMenu: and a ret -MenuHeader_0x24ed4: +.MenuHeader: db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 - dw MenuData_0x24edc + dw .MenuData db 1 ; default option -MenuData_0x24edc: +.MenuData: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "SWITCH@" |