mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-13 15:13:42 +01:00
Merge pull request #378 from Diegoisawesome/script_menu
[WIP] Decompile/port script_menu
This commit is contained in:
Diegoisawesome
GitHub
commit
1507a290d5
@ -369,7 +369,7 @@ _0811AF86:
|
||||
thumb_func_start sub_811AF8C
|
||||
sub_811AF8C: @ 811AF8C
|
||||
push {lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -418,7 +418,7 @@ _0811AFE6:
|
||||
thumb_func_start sub_811AFEC
|
||||
sub_811AFEC: @ 811AFEC
|
||||
push {r4,lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -461,7 +461,7 @@ _0811B03A:
|
||||
thumb_func_start sub_811B040
|
||||
sub_811B040: @ 811B040
|
||||
push {lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -566,7 +566,7 @@ sub_811B0E8: @ 811B0E8
|
||||
thumb_func_start sub_811B0F8
|
||||
sub_811B0F8: @ 811B0F8
|
||||
push {r4,lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
|
||||
@ -2740,7 +2740,7 @@ sub_81B1708: @ 81B1708
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -4196,7 +4196,7 @@ sub_81B227C: @ 81B227C
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -8138,7 +8138,7 @@ sub_81B43DC: @ 81B43DC
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -8671,7 +8671,7 @@ sub_81B48DC: @ 81B48DC
|
||||
muls r1, r0
|
||||
ldr r0, =gPlayerParty
|
||||
adds r4, r1, r0
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -8963,7 +8963,7 @@ sub_81B4BA0: @ 81B4BA0
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -9069,7 +9069,7 @@ sub_81B4C94: @ 81B4C94
|
||||
push {r7}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -9877,7 +9877,7 @@ sub_81B5430: @ 81B5430
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -10171,7 +10171,7 @@ sub_81B56D8: @ 81B56D8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -12543,7 +12543,7 @@ ether_effect_related_3: @ 81B6AB4
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
adds r5, r4, 0
|
||||
bl ProcessMenuInput
|
||||
bl Menu_ProcessInput
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -13156,7 +13156,7 @@ sub_81B7028: @ 81B7028
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -13458,7 +13458,7 @@ sub_81B72C8: @ 81B72C8
|
||||
muls r1, r0
|
||||
ldr r0, =gPlayerParty
|
||||
adds r4, r1, r0
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r5, r0, 24
|
||||
cmp r5, 0
|
||||
@ -15240,7 +15240,7 @@ sub_81B82D4: @ 81B82D4
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
|
||||
@ -1904,7 +1904,7 @@ _080C8F0C:
|
||||
adds r0, 0x1
|
||||
strb r0, [r1]
|
||||
_080C8F22:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -2628,7 +2628,7 @@ _080C9584:
|
||||
b _080C9664
|
||||
.pool
|
||||
_080C95A4:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -3422,7 +3422,7 @@ _080C9C78:
|
||||
b _080C9CAA
|
||||
.pool
|
||||
_080C9C8C:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -3553,7 +3553,7 @@ _080C9DAC:
|
||||
b _080C9DE0
|
||||
.pool
|
||||
_080C9DC0:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
|
||||
@ -2905,7 +2905,7 @@ _080170CA:
|
||||
negs r0, r0
|
||||
b _08017110
|
||||
_080170D4:
|
||||
bl sub_8197930
|
||||
bl DisplayYesNoMenu
|
||||
ldrb r0, [r4]
|
||||
adds r0, 0x1
|
||||
strb r0, [r4]
|
||||
@ -2920,7 +2920,7 @@ _080170E0:
|
||||
negs r0, r0
|
||||
b _08017110
|
||||
_080170F2:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
movs r2, 0x80
|
||||
@ -6278,7 +6278,7 @@ _08018BD6:
|
||||
b _08018C3E
|
||||
.pool
|
||||
_08018BE4:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r6, r0, 24
|
||||
movs r1, 0x80
|
||||
@ -16904,7 +16904,7 @@ _0801E16A:
|
||||
b _0801E23A
|
||||
.pool
|
||||
_0801E17C:
|
||||
bl ProcessMenuInput
|
||||
bl Menu_ProcessInput
|
||||
lsls r0, 24
|
||||
asrs r0, 8
|
||||
lsrs r6, r0, 16
|
||||
@ -20614,7 +20614,7 @@ _0801FEFE:
|
||||
thumb_func_start sub_801FF08
|
||||
sub_801FF08: @ 801FF08
|
||||
push {lr}
|
||||
bl ProcessMenuInput
|
||||
bl Menu_ProcessInput
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
pop {r1}
|
||||
@ -28887,10 +28887,10 @@ _08024246:
|
||||
strb r0, [r5, 0xC]
|
||||
b _080242D8
|
||||
_0802426A:
|
||||
bl sub_8197930
|
||||
bl DisplayYesNoMenu
|
||||
b _080242D0
|
||||
_08024270:
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r4, r0, 24
|
||||
movs r0, 0x2
|
||||
@ -47811,7 +47811,7 @@ _0802DA84:
|
||||
thumb_func_start sub_802DA8C
|
||||
sub_802DA8C: @ 802DA8C
|
||||
push {lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
pop {r1}
|
||||
|
||||
@ -736,7 +736,7 @@ sub_8140914: @ 8140914
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_8197930
|
||||
bl DisplayYesNoMenu
|
||||
ldr r5, =gUnknown_0203AB8C
|
||||
ldrb r0, [r5]
|
||||
movs r1, 0
|
||||
@ -4502,7 +4502,7 @@ sub_81428C4: @ 81428C4
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
bl sub_8197930
|
||||
bl DisplayYesNoMenu
|
||||
ldr r1, =gUnknown_085B6408
|
||||
adds r0, r4, 0
|
||||
bl sub_8121F68
|
||||
|
||||
1883
asm/script_menu.s
1883
asm/script_menu.s
File diff suppressed because it is too large
Load Diff
@ -3349,7 +3349,7 @@ sub_8078EF8: @ 8078EF8
|
||||
sub_8078F50: @ 8078F50
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
bl Menu_ProcessInputNoWrapAround
|
||||
bl Menu_ProcessInputNoWrap
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
movs r1, 0x1
|
||||
@ -3695,7 +3695,7 @@ _0807920E:
|
||||
thumb_func_start sub_8079218
|
||||
sub_8079218: @ 8079218
|
||||
push {lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@ -3797,7 +3797,7 @@ _080792D8:
|
||||
thumb_func_start sub_80792E4
|
||||
sub_80792E4: @ 80792E4
|
||||
push {lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
|
||||
@ -900,7 +900,7 @@ sub_8166D44: @ 8166D44
|
||||
thumb_func_start sub_8166DE4
|
||||
sub_8166DE4: @ 8166DE4
|
||||
push {r4,lr}
|
||||
bl Menu_ProcessInputNoWrap_
|
||||
bl Menu_ProcessInputNoWrapClearOnChoose
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
asrs r1, r0, 24
|
||||
|
||||
@ -1772,7 +1772,7 @@ EventScript_PC:: @ 8271D92
|
||||
end
|
||||
|
||||
EventScript_271DAC:: @ 8271DAC
|
||||
message gUnknown_0827266F
|
||||
message gText_WhichPCShouldBeAccessed
|
||||
waitmessage
|
||||
special ScrSpecial_CreatePCMenu
|
||||
waitstate
|
||||
@ -3113,7 +3113,7 @@ Text_272640: @ 8272640
|
||||
Text_27265A: @ 827265A
|
||||
.string "{PLAYER} booted up the PC.$"
|
||||
|
||||
gUnknown_0827266F:: @ 827266F
|
||||
gText_WhichPCShouldBeAccessed:: @ 827266F
|
||||
.string "Which PC should be accessed?$"
|
||||
|
||||
gUnknown_0827268C:: @ 827268C
|
||||
|
||||
@ -1,780 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
gUnknown_0858ABD8:: @ 858ABD8
|
||||
.4byte gUnknown_085EAD37, 0
|
||||
.4byte gUnknown_085EAD41, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858ABF0:: @ 58ABF0
|
||||
.4byte gUnknown_085EAD67, 0
|
||||
.4byte gUnknown_085EAD6D, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AC08:: @ 58AC08
|
||||
.4byte gUnknown_085EAD72, 0
|
||||
.4byte gUnknown_085EAD84, 0
|
||||
.4byte gUnknown_085EAD96, 0
|
||||
.4byte gText_Cancel2, 0
|
||||
|
||||
gUnknown_0858AC28:: @ 58AC28
|
||||
.4byte gUnknown_085EADA4, 0
|
||||
.4byte gUnknown_085EADB5, 0
|
||||
.4byte gUnknown_085EADC4, 0
|
||||
.4byte gUnknown_085EADD5, 0
|
||||
.4byte gUnknown_085EADE7, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AC58:: @ 58AC58
|
||||
.4byte gUnknown_085EADF9, 0
|
||||
.4byte gUnknown_085EAE04, 0
|
||||
.4byte gUnknown_085EAE12, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AC78:: @ 58AC78
|
||||
.4byte gUnknown_085EADF9, 0
|
||||
.4byte gUnknown_085EAE04, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AC90:: @ 58AC90
|
||||
.4byte gMenuText_Register, 0
|
||||
.4byte gUnknown_085EAE12, 0
|
||||
.4byte gUnknown_085EAE1B, 0
|
||||
.4byte gText_Cancel2, 0
|
||||
|
||||
gUnknown_0858ACB0:: @ 58ACB0
|
||||
.4byte gUnknown_085EAE27, 0
|
||||
.4byte gUnknown_085EAE2C, 0
|
||||
|
||||
gUnknown_0858ACC0:: @ 58ACC0
|
||||
.4byte gUnknown_085EAE31, 0
|
||||
.4byte gUnknown_085EAE35, 0
|
||||
.4byte gUnknown_085EAE39, 0
|
||||
.4byte gUnknown_085EAE3D, 0
|
||||
.4byte gUnknown_085EAE41, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858ACF0:: @ 58ACF0
|
||||
.4byte gUnknown_085EAD5F, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AD00:: @ 58AD00
|
||||
.4byte gUnknown_085EAE53, 0
|
||||
.4byte gUnknown_085EAE5A, 0
|
||||
|
||||
gUnknown_0858AD10:: @ 58AD10
|
||||
.4byte gText_Yes, 0
|
||||
.4byte gText_No, 0
|
||||
.4byte gUnknown_085EAD6D, 0
|
||||
|
||||
gUnknown_0858AD28:: @ 58AD28
|
||||
.4byte gUnknown_085EAEA2, 0
|
||||
.4byte gUnknown_085EAEAC, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AD40:: @ 58AD40
|
||||
.4byte gText_Lv50, 0
|
||||
.4byte gText_OpenLevel, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AD58:: @ 58AD58
|
||||
.4byte gUnknown_0827ECBC, 0
|
||||
.4byte gUnknown_0827ECC3, 0
|
||||
.4byte gUnknown_0827ECCD, 0
|
||||
|
||||
gUnknown_0858AD70:: @ 58AD70
|
||||
.4byte gUnknown_0827ECD5, 0
|
||||
.4byte gUnknown_0827ECDD, 0
|
||||
.4byte gUnknown_0827ECE3, 0
|
||||
|
||||
gUnknown_0858AD88:: @ 58AD88
|
||||
.4byte gUnknown_0827ECEB, 0
|
||||
.4byte gUnknown_0827ECF2, 0
|
||||
.4byte gUnknown_0827ECF8, 0
|
||||
|
||||
gUnknown_0858ADA0:: @ 58ADA0
|
||||
.4byte gUnknown_0827ED00, 0
|
||||
.4byte gUnknown_0827ED06, 0
|
||||
.4byte gUnknown_0827ED10, 0
|
||||
|
||||
gUnknown_0858ADB8:: @ 58ADB8
|
||||
.4byte gUnknown_0827ED18, 0
|
||||
.4byte gUnknown_0827ED22, 0
|
||||
.4byte gUnknown_0827ED2C, 0
|
||||
|
||||
gUnknown_0858ADD0:: @ 58ADD0
|
||||
.4byte gUnknown_0827ED36, 0
|
||||
.4byte gUnknown_0827ED40, 0
|
||||
.4byte gUnknown_0827ED46, 0
|
||||
|
||||
gUnknown_0858ADE8:: @ 58ADE8
|
||||
.4byte gUnknown_0827ED4F, 0
|
||||
.4byte gUnknown_0827ED59, 0
|
||||
.4byte gUnknown_0827ED65, 0
|
||||
|
||||
gUnknown_0858AE00:: @ 58AE00
|
||||
.4byte gUnknown_0827ED70, 0
|
||||
.4byte gUnknown_0827ED74, 0
|
||||
.4byte gUnknown_0827ED78, 0
|
||||
|
||||
gUnknown_0858AE18:: @ 58AE18
|
||||
.4byte gUnknown_0827ED80, 0
|
||||
.4byte gUnknown_0827ED95, 0
|
||||
.4byte gUnknown_0827EDAA, 0
|
||||
|
||||
gUnknown_0858AE30:: @ 58AE30
|
||||
.4byte gUnknown_0827EDB5, 0
|
||||
.4byte gUnknown_0827EDBA, 0
|
||||
.4byte gUnknown_0827EDC1, 0
|
||||
|
||||
gUnknown_0858AE48:: @ 58AE48
|
||||
.4byte gUnknown_0827EDC9, 0
|
||||
.4byte gUnknown_0827EDD5, 0
|
||||
.4byte gUnknown_0827EDE4, 0
|
||||
|
||||
gUnknown_0858AE60:: @ 58AE60
|
||||
.4byte gUnknown_0827EDF0, 0
|
||||
.4byte gUnknown_0827EDF5, 0
|
||||
.4byte gUnknown_0827EDF7, 0
|
||||
|
||||
gUnknown_0858AE78:: @ 58AE78
|
||||
.4byte gUnknown_0827EDF9, 0
|
||||
.4byte gUnknown_0827EDFB, 0
|
||||
.4byte gUnknown_0827EDFD, 0
|
||||
|
||||
gUnknown_0858AE90:: @ 58AE90
|
||||
.4byte gUnknown_0827EDFF, 0
|
||||
.4byte gUnknown_0827EE01, 0
|
||||
.4byte gUnknown_0827EE03, 0
|
||||
|
||||
gUnknown_0858AEA8:: @ 58AEA8
|
||||
.4byte gUnknown_0827EE05, 0
|
||||
.4byte gUnknown_0827EE07, 0
|
||||
.4byte gUnknown_0827EE09, 0
|
||||
|
||||
gUnknown_0858AEC0:: @ 58AEC0
|
||||
.4byte gUnknown_085EAEC3, 0
|
||||
.4byte gUnknown_085EAED6, 0
|
||||
.4byte gUnknown_085EAEE6, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AEE0:: @ 58AEE0
|
||||
.4byte gUnknown_085EAEF6, 0
|
||||
.4byte gUnknown_085EAF02, 0
|
||||
.4byte gUnknown_085EAF0E, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AF00:: @ 58AF00
|
||||
.4byte gUnknown_085EAF1B, 0
|
||||
.4byte gUnknown_085EAF24, 0
|
||||
.4byte gUnknown_085EAF2F, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AF20:: @ 58AF20
|
||||
.4byte gUnknown_085EAF34, 0
|
||||
.4byte gUnknown_085EAF3E, 0
|
||||
|
||||
gUnknown_0858AF30:: @ 58AF30
|
||||
.4byte gUnknown_085EAF4B, 0
|
||||
.4byte gUnknown_085EAF58, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AF48:: @ 58AF48
|
||||
.4byte gUnknown_085EAF65, 0
|
||||
.4byte gUnknown_085EAF70, 0
|
||||
.4byte gUnknown_085EAF7D, 0
|
||||
.4byte gUnknown_085EAF87, 0
|
||||
.4byte gUnknown_085EAF93, 0
|
||||
.4byte gUnknown_085EAF9F, 0
|
||||
.4byte gUnknown_085EAFAB, 0
|
||||
.4byte gText_Cancel2, 0
|
||||
|
||||
gUnknown_0858AF88:: @ 58AF88
|
||||
.4byte gUnknown_085EAFB6, 0
|
||||
.4byte gUnknown_085EAFCF, 0
|
||||
.4byte gUnknown_085EAFE8, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AFA8:: @ 58AFA8
|
||||
.4byte gUnknown_085EB089, 0
|
||||
.4byte gUnknown_085EB09C, 0
|
||||
.4byte gUnknown_085EB0AF, 0
|
||||
.4byte gUnknown_085EB0C2, 0
|
||||
.4byte gUnknown_085EB0D5, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AFD8:: @ 58AFD8
|
||||
.4byte gUnknown_085EB002, 0
|
||||
.4byte gUnknown_085EB017, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858AFF0:: @ 58AFF0
|
||||
.4byte gUnknown_085EB02A, 0
|
||||
.4byte gUnknown_085EB034, 0
|
||||
|
||||
gUnknown_0858B000:: @ 58B000
|
||||
.4byte gText_LilycoveCity, 0
|
||||
.4byte gText_BattleFrontier, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B018:: @ 58B018
|
||||
.4byte gText_SlateportCity, 0
|
||||
.4byte gText_LilycoveCity, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B030:: @ 58B030
|
||||
.4byte gUnknown_085EB07E, 0
|
||||
.4byte gUnknown_085EB084, 0
|
||||
|
||||
gUnknown_0858B040:: @ 58B040
|
||||
.4byte gText_LilycoveCity, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B050:: @ 58B050
|
||||
.4byte gText_5F, 0
|
||||
.4byte gText_4F, 0
|
||||
.4byte gText_3F, 0
|
||||
.4byte gText_2F, 0
|
||||
.4byte gText_1F, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B080:: @ 58B080
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B090:: @ 58B090
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B0A0:: @ 58B0A0
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B0B8:: @ 58B0B8
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B0C8:: @ 58B0C8
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B0E0:: @ 58B0E0
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B0F8:: @ 58B0F8
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B118:: @ 58B118
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B128:: @ 58B128
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B140:: @ 58B140
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B158:: @ 58B158
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B178:: @ 58B178
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B190:: @ 58B190
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B1B0:: @ 58B1B0
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B1D0:: @ 58B1D0
|
||||
.4byte gUnknown_085EB040, 0
|
||||
.4byte gUnknown_085EB04A, 0
|
||||
.4byte gUnknown_085EB057, 0
|
||||
.4byte gUnknown_085EB062, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B1F8:: @ 58B1F8
|
||||
.4byte gText_Opponent, 0
|
||||
.4byte gText_Tourney_Tree, 0
|
||||
.4byte gText_ReadyToStart, 0
|
||||
.4byte gUnknown_085EB5BC, 0
|
||||
.4byte gUnknown_085EB5C3, 0
|
||||
.4byte gUnknown_085EB5C8, 0
|
||||
|
||||
gUnknown_0858B228:: @ 58B228
|
||||
.4byte gText_Opponent, 0
|
||||
.4byte gText_Tourney_Tree, 0
|
||||
.4byte gText_ReadyToStart, 0
|
||||
.4byte gUnknown_085EB5C3, 0
|
||||
.4byte gUnknown_085EB5C8, 0
|
||||
|
||||
gUnknown_0858B250:: @ 58B250
|
||||
.4byte gUnknown_085EB29A, 0
|
||||
.4byte gUnknown_085EB2A3, 0
|
||||
|
||||
gUnknown_0858B260:: @ 58B260
|
||||
.4byte gUnknown_085EB372, 0
|
||||
.4byte gUnknown_085EB37F, 0
|
||||
.4byte gUnknown_085EB389, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B280:: @ 58B280
|
||||
.4byte gText_Yes, 0
|
||||
.4byte gText_No, 0
|
||||
.4byte gUnknown_085EAD6D, 0
|
||||
|
||||
gUnknown_0858B298:: @ 58B298
|
||||
.4byte gUnknown_085EAE6E, 0
|
||||
.4byte gUnknown_085EAE7C, 0
|
||||
.4byte gUnknown_085EAE8A, 0
|
||||
.4byte gUnknown_085EAD6D, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B2C0:: @ 58B2C0
|
||||
.4byte gUnknown_085EB372, 0
|
||||
.4byte gUnknown_085EB37F, 0
|
||||
.4byte gUnknown_085EB397, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B2E0:: @ 58B2E0
|
||||
.4byte gUnknown_085EB372, 0
|
||||
.4byte gUnknown_085EB37F, 0
|
||||
.4byte gUnknown_085EB389, 0
|
||||
.4byte gUnknown_085EB397, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B308:: @ 58B308
|
||||
.4byte gUnknown_085EB372, 0
|
||||
.4byte gUnknown_085EB37F, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B320:: @ 58B320
|
||||
.4byte gUnknown_085EB3A4, 0
|
||||
.4byte gUnknown_085EB3B1, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B338:: @ 58B338
|
||||
.4byte gUnknown_085EB3D4, 0
|
||||
.4byte gUnknown_085EB3C6, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B350:: @ 58B350
|
||||
.4byte gText_NormalRank, 0
|
||||
.4byte gText_SuperRank, 0
|
||||
.4byte gText_HyperRank, 0
|
||||
.4byte gText_MasterRank, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B378:: @ 58B378
|
||||
.4byte gText_BattleBag, 0
|
||||
.4byte gText_HeldItem, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B390:: @ 58B390
|
||||
.4byte gText_LinkContest, 0
|
||||
.4byte gText_AboutE_Mode, 0
|
||||
.4byte gText_AboutG_Mode, 0
|
||||
.4byte gText_Cancel2, 0
|
||||
|
||||
gUnknown_0858B3B0:: @ 58B3B0
|
||||
.4byte gText_E_Mode, 0
|
||||
.4byte gText_G_Mode, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B3C8:: @ 58B3C8
|
||||
.4byte gText_MenuOptionPokedex, 0
|
||||
.4byte gText_MenuOptionPokemon, 0
|
||||
.4byte gText_MenuOptionBag, 0
|
||||
.4byte gText_MenuOptionPokenav, 0
|
||||
.4byte gUnknown_085EB278, 0
|
||||
.4byte gText_MenuOptionSave, 0
|
||||
.4byte gText_MenuOptionOption, 0
|
||||
.4byte gText_MenuOptionExit, 0
|
||||
|
||||
gUnknown_0858B408:: @ 58B408
|
||||
.4byte gUnknown_085EB28A, 0
|
||||
.4byte gUnknown_085EB290, 0
|
||||
.4byte gUnknown_085EB295, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B428:: @ 58B428
|
||||
.4byte gText_SouthernIsland, 0
|
||||
.4byte gText_BirthIsland, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B440:: @ 58B440
|
||||
.4byte gText_SouthernIsland, 0
|
||||
.4byte gText_FarawayIsland, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B458:: @ 58B458
|
||||
.4byte gText_BirthIsland, 0
|
||||
.4byte gText_FarawayIsland, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B470:: @ 58B470
|
||||
.4byte gText_SouthernIsland, 0
|
||||
.4byte gText_BirthIsland, 0
|
||||
.4byte gText_FarawayIsland, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B490:: @ 58B490
|
||||
.4byte gUnknown_085EB2E4, 0
|
||||
.4byte gUnknown_085EB2F0, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B4A8:: @ 58B4A8
|
||||
.4byte gText_Yes, 0
|
||||
.4byte gUnknown_085EB2FC, 0
|
||||
|
||||
gUnknown_0858B4B8:: @ 58B4B8
|
||||
.4byte gUnknown_085EB3DF, 0
|
||||
.4byte gUnknown_085EB3EA, 0
|
||||
.4byte gUnknown_085EB3F1, 0
|
||||
.4byte gUnknown_085EB3FC, 0
|
||||
.4byte gUnknown_085EB40A, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B4E8:: @ 58B4E8
|
||||
.4byte gUnknown_085EB415, 0
|
||||
.4byte gUnknown_085EB41D, 0
|
||||
.4byte gUnknown_085EB424, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B508:: @ 58B508
|
||||
.4byte gUnknown_085EB45C, 0
|
||||
.4byte gUnknown_085EB469, 0
|
||||
.4byte gUnknown_085EB475, 0
|
||||
.4byte gUnknown_085EB482, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B530:: @ 58B530
|
||||
.4byte gUnknown_085EB42F, 0
|
||||
.4byte gUnknown_085EB43A, 0
|
||||
.4byte gUnknown_085EB444, 0
|
||||
.4byte gUnknown_085EB451, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B558:: @ 58B558
|
||||
.4byte gUnknown_085EB48E, 0
|
||||
.4byte gUnknown_085EB496, 0
|
||||
.4byte gUnknown_085EB4A3, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B578:: @ 58B578
|
||||
.4byte gUnknown_085EB4AD, 0
|
||||
.4byte gUnknown_085EB4B9, 0
|
||||
.4byte gUnknown_085EB4C7, 0
|
||||
.4byte gUnknown_085EB4D4, 0
|
||||
.4byte gUnknown_085EB4E0, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B5A8:: @ 58B5A8
|
||||
.4byte gText_BattleBasics, 0
|
||||
.4byte gText_PokemonNature, 0
|
||||
.4byte gText_PokemonMoves, 0
|
||||
.4byte gText_Underpowered, 0
|
||||
.4byte gText_WhenInDanger, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B5D8:: @ 58B5D8
|
||||
.4byte gUnknown_085EB532, 0
|
||||
.4byte gUnknown_085EB543, 0
|
||||
.4byte gUnknown_085EB555, 0
|
||||
.4byte gUnknown_085EB563, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B600:: @ 58B600
|
||||
.4byte gUnknown_085EB56E, 0
|
||||
.4byte gUnknown_085EB57E, 0
|
||||
.4byte gUnknown_085EB589, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B620:: @ 58B620
|
||||
.4byte gUnknown_085EB5B6, 0
|
||||
.4byte gUnknown_085EB5BC, 0
|
||||
.4byte gUnknown_085EB5C3, 0
|
||||
.4byte gUnknown_085EB5C8, 0
|
||||
|
||||
gUnknown_0858B640:: @ 58B640
|
||||
.4byte gUnknown_085EB5B6, 0
|
||||
.4byte gUnknown_085EB5C3, 0
|
||||
.4byte gUnknown_085EB5C8, 0
|
||||
|
||||
gUnknown_0858B658:: @ 58B658
|
||||
.4byte gUnknown_085EB5B6, 0
|
||||
.4byte gUnknown_085EB5BC, 0
|
||||
.4byte gUnknown_085EB5C8, 0
|
||||
|
||||
gUnknown_0858B670:: @ 58B670
|
||||
.4byte gUnknown_085EB5B6, 0
|
||||
.4byte gUnknown_085EB5C8, 0
|
||||
|
||||
gUnknown_0858B680:: @ 58B680
|
||||
.4byte gUnknown_085EE14B, 0
|
||||
.4byte gUnknown_085EE14F, 0
|
||||
|
||||
gUnknown_0858B690:: @ 58B690
|
||||
.4byte gUnknown_085EB2FF, 0
|
||||
.4byte gUnknown_085EB310, 0
|
||||
.4byte gUnknown_085EB317, 0
|
||||
.4byte gUnknown_085EB31F, 0
|
||||
|
||||
gUnknown_0858B6B0:: @ 58B6B0
|
||||
.4byte gText_CaveOfOrigin, 0
|
||||
.4byte gText_MtPyre, 0
|
||||
.4byte gText_SkyPillar, 0
|
||||
.4byte gText_DontRemember, 0
|
||||
|
||||
gUnknown_0858B6D0:: @ 58B6D0
|
||||
.4byte gUnknown_085EB4AD, 0
|
||||
.4byte gUnknown_085EB4B9, 0
|
||||
.4byte gUnknown_085EB4C7, 0
|
||||
.4byte gUnknown_085EB4D4, 0
|
||||
.4byte gUnknown_085EB597, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B700:: @ 58B700
|
||||
.4byte gText_BattleTrainers, 0
|
||||
.4byte gUnknown_085EB45C, 0
|
||||
.4byte gUnknown_085EB469, 0
|
||||
.4byte gUnknown_085EB475, 0
|
||||
.4byte gUnknown_085EB482, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B730:: @ 58B730
|
||||
.4byte gUnknown_085EB32D, 0
|
||||
.4byte gUnknown_085EB33E, 0
|
||||
.4byte gUnknown_085EB350, 0
|
||||
.4byte gUnknown_085EB361, 0
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
gUnknown_0858B758:: @ 58B758
|
||||
.4byte gText_Exit, 0
|
||||
|
||||
|
||||
gUnknown_0858B760:: @ 858B760
|
||||
.4byte gUnknown_0858ABD8, 3
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858ABF0, 3
|
||||
.4byte gUnknown_0858AC08, 4
|
||||
.4byte gUnknown_0858AC28, 6
|
||||
.4byte gUnknown_0858AC78, 3
|
||||
.4byte gUnknown_0858AC58, 4
|
||||
.4byte gUnknown_0858AC90, 4
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858B4E8, 4
|
||||
.4byte gUnknown_0858ACB0, 2
|
||||
.4byte gUnknown_0858ACC0, 6
|
||||
.4byte gUnknown_0858ACF0, 2
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858AD00, 2
|
||||
.4byte gUnknown_0858B280, 3
|
||||
.4byte gUnknown_0858B298, 5
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858AD10, 3
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858AD28, 3
|
||||
.4byte gUnknown_0858AD40, 3
|
||||
.4byte gUnknown_0858AD58, 3
|
||||
.4byte gUnknown_0858AD70, 3
|
||||
.4byte gUnknown_0858AD88, 3
|
||||
.4byte gUnknown_0858ADA0, 3
|
||||
.4byte gUnknown_0858ADB8, 3
|
||||
.4byte gUnknown_0858ADD0, 3
|
||||
.4byte gUnknown_0858ADE8, 3
|
||||
.4byte gUnknown_0858AE00, 3
|
||||
.4byte gUnknown_0858AE18, 3
|
||||
.4byte gUnknown_0858AE30, 3
|
||||
.4byte gUnknown_0858AE48, 3
|
||||
.4byte gUnknown_0858AE60, 3
|
||||
.4byte gUnknown_0858AE78, 3
|
||||
.4byte gUnknown_0858AE90, 3
|
||||
.4byte gUnknown_0858AEA8, 3
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858AEC0, 4
|
||||
.4byte gUnknown_0858AEE0, 4
|
||||
.4byte gUnknown_0858AF00, 4
|
||||
.4byte gUnknown_0858AF20, 2
|
||||
.4byte gUnknown_0858AF30, 3
|
||||
.4byte gUnknown_0858AF48, 8
|
||||
.4byte gUnknown_0858AF88, 4
|
||||
.4byte gUnknown_0858AFD8, 3
|
||||
.4byte gUnknown_0858AFF0, 2
|
||||
.4byte gUnknown_0858B758, 1
|
||||
.4byte gUnknown_0858B000, 3
|
||||
.4byte gUnknown_0858B018, 3
|
||||
.4byte gUnknown_0858B030, 2
|
||||
.4byte gUnknown_0858AFA8, 6
|
||||
.4byte gUnknown_0858B040, 2
|
||||
.4byte gUnknown_0858B050, 6
|
||||
.4byte gUnknown_0858B080, 2
|
||||
.4byte gUnknown_0858B090, 2
|
||||
.4byte gUnknown_0858B0A0, 3
|
||||
.4byte gUnknown_0858B0B8, 2
|
||||
.4byte gUnknown_0858B0C8, 3
|
||||
.4byte gUnknown_0858B0E0, 3
|
||||
.4byte gUnknown_0858B0F8, 4
|
||||
.4byte gUnknown_0858B118, 2
|
||||
.4byte gUnknown_0858B128, 3
|
||||
.4byte gUnknown_0858B140, 3
|
||||
.4byte gUnknown_0858B158, 4
|
||||
.4byte gUnknown_0858B178, 3
|
||||
.4byte gUnknown_0858B190, 4
|
||||
.4byte gUnknown_0858B1B0, 4
|
||||
.4byte gUnknown_0858B1D0, 5
|
||||
.4byte gUnknown_0858B1F8, 6
|
||||
.4byte gUnknown_0858B308, 3
|
||||
.4byte gUnknown_0858B308, 3
|
||||
.4byte gUnknown_0858B260, 4
|
||||
.4byte gUnknown_0858B260, 4
|
||||
.4byte gUnknown_0858B2C0, 4
|
||||
.4byte gUnknown_0858B2E0, 5
|
||||
.4byte gUnknown_0858B320, 3
|
||||
.4byte gUnknown_0858B338, 3
|
||||
.4byte gUnknown_0858B350, 5
|
||||
.4byte gUnknown_0858B378, 3
|
||||
.4byte gUnknown_0858B390, 4
|
||||
.4byte gUnknown_0858B3B0, 3
|
||||
.4byte gUnknown_0858B3C8, 8
|
||||
.4byte gUnknown_0858B408, 4
|
||||
.4byte gUnknown_0858B250, 2
|
||||
.4byte gUnknown_0858B428, 3
|
||||
.4byte gUnknown_0858B440, 3
|
||||
.4byte gUnknown_0858B458, 3
|
||||
.4byte gUnknown_0858B470, 4
|
||||
.4byte gUnknown_0858B490, 3
|
||||
.4byte gUnknown_0858B4A8, 2
|
||||
.4byte gUnknown_0858B4B8, 6
|
||||
.4byte gUnknown_0858B508, 5
|
||||
.4byte gUnknown_0858B530, 5
|
||||
.4byte gUnknown_0858B558, 4
|
||||
.4byte gUnknown_0858B578, 6
|
||||
.4byte gUnknown_0858B5A8, 6
|
||||
.4byte gUnknown_0858B5D8, 5
|
||||
.4byte gUnknown_0858B600, 4
|
||||
.4byte gUnknown_0858B620, 4
|
||||
.4byte gUnknown_0858B640, 3
|
||||
.4byte gUnknown_0858B658, 3
|
||||
.4byte gUnknown_0858B670, 2
|
||||
.4byte gUnknown_0858B228, 5
|
||||
.4byte gUnknown_0858B680, 2
|
||||
.4byte gUnknown_0858B690, 4
|
||||
.4byte gUnknown_0858B6B0, 4
|
||||
.4byte gUnknown_0858B6D0, 6
|
||||
.4byte gUnknown_0858B700, 6
|
||||
.4byte gUnknown_0858B730, 5
|
||||
|
||||
gUnknown_0858BAF0:: @ 858BAF0
|
||||
.4byte gText_Cool
|
||||
.4byte gText_Beauty
|
||||
.4byte gText_Cute
|
||||
.4byte gText_Smart
|
||||
.4byte gText_Tough
|
||||
.4byte gText_Normal
|
||||
.4byte gText_Super
|
||||
.4byte gText_Hyper
|
||||
.4byte gText_Master
|
||||
.4byte gText_Cool2
|
||||
.4byte gText_Beauty2
|
||||
.4byte gText_Cute2
|
||||
.4byte gText_Smart2
|
||||
.4byte gText_Tough2
|
||||
.4byte gText_Items
|
||||
.4byte gText_Key_Items
|
||||
.4byte gText_Poke_Balls
|
||||
.4byte gText_TMs_Hms
|
||||
.4byte gText_Berries2
|
||||
.4byte gText_Single2
|
||||
.4byte gText_Double2
|
||||
.4byte gText_Multi
|
||||
.4byte gText_MultiLink
|
||||
.4byte gText_BattleTower2
|
||||
.4byte gText_BattleDome
|
||||
.4byte gText_BattleFactory
|
||||
.4byte gText_BattlePalace
|
||||
.4byte gText_BattleArena
|
||||
.4byte gText_BattlePike
|
||||
.4byte gText_BattlePyramid
|
||||
|
||||
gUnknown_0858BB68:: @ 858BB68
|
||||
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
|
||||
|
||||
.align 2
|
||||
gUnknown_0858BB70:: @ 858BB70
|
||||
.4byte gText_SomeonesPC
|
||||
.4byte gText_LanettesPC
|
||||
.4byte gText_PlayersPC
|
||||
.4byte gText_LogOff
|
||||
|
||||
gUnknown_0858BB80:: @ 858BB80
|
||||
.4byte gText_SlateportCity
|
||||
.4byte gText_BattleFrontier
|
||||
.4byte gText_SouthernIsland
|
||||
.4byte gText_NavelRock
|
||||
.4byte gText_BirthIsland
|
||||
.4byte gText_FarawayIsland
|
||||
.4byte gText_Exit
|
||||
|
||||
gUnknown_0858BB9C:: @ 858BB9C
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_277F96
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
|
||||
|
||||
gUnknown_0858BBAC:: @ 858BBAC
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_278831
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
|
||||
|
||||
gUnknown_0858BBBC:: @ 858BBBC
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
|
||||
|
||||
gUnknown_0858BBCC:: @ 858BBCC
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_278831
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
|
||||
|
||||
gUnknown_0858BBE0:: @ 858BBE0
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
|
||||
|
||||
gUnknown_0858BBEC:: @ 858BBEC
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27879F
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
|
||||
.4byte OldaleTown_PokemonCenter_2F_Text_27889C
|
||||
@ -237,5 +237,7 @@ void sub_80B7CAC(struct Sprite*);
|
||||
void sub_80B7A58(struct Sprite*);
|
||||
|
||||
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
|
||||
void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);
|
||||
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority);
|
||||
|
||||
#endif //GUARD_FIELD_EFFECTS_H
|
||||
|
||||
@ -15,6 +15,7 @@ bool32 sub_8138168(void);
|
||||
bool32 sub_81381B0(void);
|
||||
bool32 sub_81381F8(void);
|
||||
bool32 CountSSTidalStep(u16 delta);
|
||||
void sub_813A128(void);
|
||||
void sub_813A878(u8 a0);
|
||||
|
||||
#endif // GUARD_FIELD_SPECIALS_H
|
||||
|
||||
@ -31,7 +31,8 @@ void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
|
||||
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
|
||||
void sub_8197434(u8 windowId, bool8 copyToVram);
|
||||
void SetStandardWindowBorderStyle(u8 a0, u8 a1);
|
||||
void sub_8197930(void);
|
||||
void DisplayYesNoMenu(void);
|
||||
u32 GetPlayerTextSpeed(void);
|
||||
u8 GetPlayerTextSpeedDelay(void);
|
||||
void sub_81978B0(u16 arg0);
|
||||
void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16));
|
||||
@ -43,8 +44,8 @@ void schedule_bg_copy_tilemap_to_vram(u8 bgNum);
|
||||
void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
|
||||
u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos);
|
||||
u8 GetMenuCursorPos(void);
|
||||
s8 ProcessMenuInput(void);
|
||||
s8 Menu_ProcessInputNoWrapAround(void);
|
||||
s8 Menu_ProcessInput(void);
|
||||
s8 Menu_ProcessInputNoWrap(void);
|
||||
void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
|
||||
void reset_temp_tile_data_buffers(void);
|
||||
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
|
||||
@ -52,7 +53,7 @@ bool8 free_temp_tile_data_buffers_if_possible(void);
|
||||
struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock);
|
||||
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
|
||||
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, int size, u16 offset, u8 mode);
|
||||
s8 Menu_ProcessInputNoWrap_(void);
|
||||
s8 Menu_ProcessInputNoWrapClearOnChoose(void);
|
||||
s8 ProcessMenuInput_other(void);
|
||||
void do_scheduled_bg_tilemap_copies_to_vram(void);
|
||||
void clear_scheduled_bg_copies_to_vram(void);
|
||||
@ -87,5 +88,7 @@ void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
|
||||
void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP);
|
||||
void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram);
|
||||
void sub_8197AE8(bool8 copyToVram);
|
||||
void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs);
|
||||
s8 Menu_ProcessInputGridLayout(void);
|
||||
|
||||
#endif // GUARD_MENU_H
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef GUARD_SCRIPT_MENU_H
|
||||
#define GUARD_SCRIPT_MENU_H
|
||||
|
||||
extern const u8 *const gUnknown_0858BAF0[9];
|
||||
extern const u8 *const gUnknown_0858BAF0[];
|
||||
|
||||
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
|
||||
bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
|
||||
@ -9,10 +9,10 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
|
||||
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
|
||||
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
|
||||
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
|
||||
s32 convert_pixel_width_to_tile_width(s32);
|
||||
int convert_pixel_width_to_tile_width(int);
|
||||
u8 CreateWindowFromRect(u8, u8, u8, u8);
|
||||
void sub_80E2A78(u8);
|
||||
u32 display_text_and_get_width(const u8*, u32);
|
||||
u8 sub_80E2D5C(u8 arg0, u8 tileWidth);
|
||||
int display_text_and_get_width(const u8*, int);
|
||||
int sub_80E2D5C(int arg0, int tileWidth);
|
||||
|
||||
#endif //GUARD_SCRIPT_MENU_H
|
||||
|
||||
@ -15,6 +15,28 @@ extern const u8 gText_Cute[];
|
||||
extern const u8 gText_Smart[];
|
||||
extern const u8 gText_Tough[];
|
||||
|
||||
extern const u8 gText_Normal[];
|
||||
extern const u8 gText_Super[];
|
||||
extern const u8 gText_Hyper[];
|
||||
extern const u8 gText_Master[];
|
||||
|
||||
extern const u8 gText_Cool2[];
|
||||
extern const u8 gText_Beauty2[];
|
||||
extern const u8 gText_Cute2[];
|
||||
extern const u8 gText_Smart2[];
|
||||
extern const u8 gText_Tough2[];
|
||||
|
||||
extern const u8 gText_Items[];
|
||||
extern const u8 gText_Key_Items[];
|
||||
extern const u8 gText_Poke_Balls[];
|
||||
extern const u8 gText_TMs_Hms[];
|
||||
extern const u8 gText_Berries2[];
|
||||
|
||||
extern const u8 gText_Single2[];
|
||||
extern const u8 gText_Double2[];
|
||||
extern const u8 gText_Multi[];
|
||||
extern const u8 gText_MultiLink[];
|
||||
|
||||
extern const u8 gText_Single[];
|
||||
extern const u8 gText_Double[];
|
||||
|
||||
@ -201,6 +223,14 @@ extern const u8 gText_Peak[];
|
||||
extern const u8 gText_SafariBallStock[];
|
||||
extern const u8 gText_BattlePyramidFloor[];
|
||||
|
||||
extern const u8 gText_MenuOptionPokedex[];
|
||||
extern const u8 gText_MenuOptionPokemon[];
|
||||
extern const u8 gText_MenuOptionBag[];
|
||||
extern const u8 gText_MenuOptionPokenav[];
|
||||
extern const u8 gText_MenuOptionSave[];
|
||||
extern const u8 gText_MenuOptionOption[];
|
||||
extern const u8 gText_MenuOptionExit[];
|
||||
|
||||
// save menu texts
|
||||
extern const u8 gText_ConfirmSave[];
|
||||
extern const u8 gText_DifferentSaveFile[];
|
||||
@ -877,6 +907,237 @@ extern const u8 gText_PokemonOnHook[];
|
||||
extern const u8 gText_NotEvenANibble[];
|
||||
extern const u8 gText_ItGotAway[];
|
||||
|
||||
extern const u8 gText_HallOfFame[];
|
||||
extern const u8 gText_LogOff[];
|
||||
extern const u8 gText_LanettesPC[];
|
||||
extern const u8 gText_SomeonesPC[];
|
||||
extern const u8 gText_PlayersPC[];
|
||||
extern const u8 gText_WhichPCShouldBeAccessed[];
|
||||
|
||||
extern const u8 gUnknown_085EAD37[];
|
||||
extern const u8 gUnknown_085EAD41[];
|
||||
extern const u8 gUnknown_085EAD67[];
|
||||
extern const u8 gUnknown_085EAD6D[];
|
||||
extern const u8 gUnknown_085EAD72[];
|
||||
extern const u8 gUnknown_085EAD84[];
|
||||
extern const u8 gUnknown_085EAD96[];
|
||||
extern const u8 gUnknown_085EADA4[];
|
||||
extern const u8 gUnknown_085EADB5[];
|
||||
extern const u8 gUnknown_085EADC4[];
|
||||
extern const u8 gUnknown_085EADD5[];
|
||||
extern const u8 gUnknown_085EADE7[];
|
||||
extern const u8 gUnknown_085EADF9[];
|
||||
extern const u8 gUnknown_085EAE04[];
|
||||
extern const u8 gUnknown_085EAE12[];
|
||||
extern const u8 gUnknown_085EAE1B[];
|
||||
extern const u8 gUnknown_085EAE27[];
|
||||
extern const u8 gUnknown_085EAE2C[];
|
||||
extern const u8 gUnknown_085EAE31[];
|
||||
extern const u8 gUnknown_085EAE35[];
|
||||
extern const u8 gUnknown_085EAE39[];
|
||||
extern const u8 gUnknown_085EAE3D[];
|
||||
extern const u8 gUnknown_085EAE41[];
|
||||
extern const u8 gUnknown_085EAD5F[];
|
||||
extern const u8 gUnknown_085EAE53[];
|
||||
extern const u8 gUnknown_085EAE5A[];
|
||||
extern const u8 gText_Yes[];
|
||||
extern const u8 gText_No[];
|
||||
extern const u8 gUnknown_085EAEA2[];
|
||||
extern const u8 gUnknown_085EAEAC[];
|
||||
extern const u8 gUnknown_0827ECBC[];
|
||||
extern const u8 gUnknown_0827ECC3[];
|
||||
extern const u8 gUnknown_0827ECCD[];
|
||||
extern const u8 gUnknown_0827ECD5[];
|
||||
extern const u8 gUnknown_0827ECDD[];
|
||||
extern const u8 gUnknown_0827ECE3[];
|
||||
extern const u8 gUnknown_0827ECEB[];
|
||||
extern const u8 gUnknown_0827ECF2[];
|
||||
extern const u8 gUnknown_0827ECF8[];
|
||||
extern const u8 gUnknown_0827ED00[];
|
||||
extern const u8 gUnknown_0827ED06[];
|
||||
extern const u8 gUnknown_0827ED10[];
|
||||
extern const u8 gUnknown_0827ED18[];
|
||||
extern const u8 gUnknown_0827ED22[];
|
||||
extern const u8 gUnknown_0827ED2C[];
|
||||
extern const u8 gUnknown_0827ED36[];
|
||||
extern const u8 gUnknown_0827ED40[];
|
||||
extern const u8 gUnknown_0827ED46[];
|
||||
extern const u8 gUnknown_0827ED4F[];
|
||||
extern const u8 gUnknown_0827ED59[];
|
||||
extern const u8 gUnknown_0827ED65[];
|
||||
extern const u8 gUnknown_0827ED70[];
|
||||
extern const u8 gUnknown_0827ED74[];
|
||||
extern const u8 gUnknown_0827ED78[];
|
||||
extern const u8 gUnknown_0827ED80[];
|
||||
extern const u8 gUnknown_0827ED95[];
|
||||
extern const u8 gUnknown_0827EDAA[];
|
||||
extern const u8 gUnknown_0827EDB5[];
|
||||
extern const u8 gUnknown_0827EDBA[];
|
||||
extern const u8 gUnknown_0827EDC1[];
|
||||
extern const u8 gUnknown_0827EDC9[];
|
||||
extern const u8 gUnknown_0827EDD5[];
|
||||
extern const u8 gUnknown_0827EDE4[];
|
||||
extern const u8 gUnknown_0827EDF0[];
|
||||
extern const u8 gUnknown_0827EDF5[];
|
||||
extern const u8 gUnknown_0827EDF7[];
|
||||
extern const u8 gUnknown_0827EDF9[];
|
||||
extern const u8 gUnknown_0827EDFB[];
|
||||
extern const u8 gUnknown_0827EDFD[];
|
||||
extern const u8 gUnknown_0827EDFF[];
|
||||
extern const u8 gUnknown_0827EE01[];
|
||||
extern const u8 gUnknown_0827EE03[];
|
||||
extern const u8 gUnknown_0827EE05[];
|
||||
extern const u8 gUnknown_0827EE07[];
|
||||
extern const u8 gUnknown_0827EE09[];
|
||||
extern const u8 gUnknown_085EAEC3[];
|
||||
extern const u8 gUnknown_085EAED6[];
|
||||
extern const u8 gUnknown_085EAEE6[];
|
||||
extern const u8 gUnknown_085EAEF6[];
|
||||
extern const u8 gUnknown_085EAF02[];
|
||||
extern const u8 gUnknown_085EAF0E[];
|
||||
extern const u8 gUnknown_085EAF1B[];
|
||||
extern const u8 gUnknown_085EAF24[];
|
||||
extern const u8 gUnknown_085EAF2F[];
|
||||
extern const u8 gUnknown_085EAF34[];
|
||||
extern const u8 gUnknown_085EAF3E[];
|
||||
extern const u8 gUnknown_085EAF4B[];
|
||||
extern const u8 gUnknown_085EAF58[];
|
||||
extern const u8 gUnknown_085EAF65[];
|
||||
extern const u8 gUnknown_085EAF70[];
|
||||
extern const u8 gUnknown_085EAF7D[];
|
||||
extern const u8 gUnknown_085EAF87[];
|
||||
extern const u8 gUnknown_085EAF93[];
|
||||
extern const u8 gUnknown_085EAF9F[];
|
||||
extern const u8 gUnknown_085EAFAB[];
|
||||
extern const u8 gUnknown_085EAFB6[];
|
||||
extern const u8 gUnknown_085EAFCF[];
|
||||
extern const u8 gUnknown_085EAFE8[];
|
||||
extern const u8 gUnknown_085EB089[];
|
||||
extern const u8 gUnknown_085EB09C[];
|
||||
extern const u8 gUnknown_085EB0AF[];
|
||||
extern const u8 gUnknown_085EB0C2[];
|
||||
extern const u8 gUnknown_085EB0D5[];
|
||||
extern const u8 gUnknown_085EB002[];
|
||||
extern const u8 gUnknown_085EB017[];
|
||||
extern const u8 gUnknown_085EB02A[];
|
||||
extern const u8 gUnknown_085EB034[];
|
||||
extern const u8 gText_LilycoveCity[];
|
||||
extern const u8 gUnknown_085EB07E[];
|
||||
extern const u8 gUnknown_085EB084[];
|
||||
extern const u8 gUnknown_085EB040[];
|
||||
extern const u8 gUnknown_085EB04A[];
|
||||
extern const u8 gUnknown_085EB057[];
|
||||
extern const u8 gUnknown_085EB062[];
|
||||
extern const u8 gText_Opponent[];
|
||||
extern const u8 gText_Tourney_Tree[];
|
||||
extern const u8 gText_ReadyToStart[];
|
||||
extern const u8 gUnknown_085EB5BC[];
|
||||
extern const u8 gUnknown_085EB5C3[];
|
||||
extern const u8 gUnknown_085EB5C8[];
|
||||
extern const u8 gUnknown_085EB29A[];
|
||||
extern const u8 gUnknown_085EB2A3[];
|
||||
extern const u8 gUnknown_085EB372[];
|
||||
extern const u8 gUnknown_085EB37F[];
|
||||
extern const u8 gUnknown_085EB389[];
|
||||
extern const u8 gUnknown_085EAE6E[];
|
||||
extern const u8 gUnknown_085EAE7C[];
|
||||
extern const u8 gUnknown_085EAE8A[];
|
||||
extern const u8 gUnknown_085EAD6D[];
|
||||
extern const u8 gUnknown_085EB397[];
|
||||
extern const u8 gUnknown_085EB3A4[];
|
||||
extern const u8 gUnknown_085EB3B1[];
|
||||
extern const u8 gUnknown_085EB3D4[];
|
||||
extern const u8 gUnknown_085EB3C6[];
|
||||
extern const u8 gText_NormalRank[];
|
||||
extern const u8 gText_SuperRank[];
|
||||
extern const u8 gText_HyperRank[];
|
||||
extern const u8 gText_MasterRank[];
|
||||
extern const u8 gText_BattleBag[];
|
||||
extern const u8 gText_HeldItem[];
|
||||
extern const u8 gText_LinkContest[];
|
||||
extern const u8 gText_AboutE_Mode[];
|
||||
extern const u8 gText_AboutG_Mode[];
|
||||
extern const u8 gText_E_Mode[];
|
||||
extern const u8 gText_G_Mode[];
|
||||
extern const u8 gUnknown_085EB278[];
|
||||
extern const u8 gUnknown_085EB28A[];
|
||||
extern const u8 gUnknown_085EB290[];
|
||||
extern const u8 gUnknown_085EB295[];
|
||||
extern const u8 gUnknown_085EB2E4[];
|
||||
extern const u8 gUnknown_085EB2F0[];
|
||||
extern const u8 gUnknown_085EB2FC[];
|
||||
extern const u8 gUnknown_085EB3DF[];
|
||||
extern const u8 gUnknown_085EB3EA[];
|
||||
extern const u8 gUnknown_085EB3F1[];
|
||||
extern const u8 gUnknown_085EB3FC[];
|
||||
extern const u8 gUnknown_085EB40A[];
|
||||
extern const u8 gUnknown_085EB415[];
|
||||
extern const u8 gUnknown_085EB41D[];
|
||||
extern const u8 gUnknown_085EB424[];
|
||||
extern const u8 gUnknown_085EB45C[];
|
||||
extern const u8 gUnknown_085EB469[];
|
||||
extern const u8 gUnknown_085EB475[];
|
||||
extern const u8 gUnknown_085EB482[];
|
||||
extern const u8 gUnknown_085EB42F[];
|
||||
extern const u8 gUnknown_085EB43A[];
|
||||
extern const u8 gUnknown_085EB444[];
|
||||
extern const u8 gUnknown_085EB451[];
|
||||
extern const u8 gUnknown_085EB48E[];
|
||||
extern const u8 gUnknown_085EB496[];
|
||||
extern const u8 gUnknown_085EB4A3[];
|
||||
extern const u8 gUnknown_085EB4AD[];
|
||||
extern const u8 gUnknown_085EB4B9[];
|
||||
extern const u8 gUnknown_085EB4C7[];
|
||||
extern const u8 gUnknown_085EB4D4[];
|
||||
extern const u8 gUnknown_085EB4E0[];
|
||||
extern const u8 gUnknown_085EB532[];
|
||||
extern const u8 gUnknown_085EB543[];
|
||||
extern const u8 gUnknown_085EB555[];
|
||||
extern const u8 gUnknown_085EB563[];
|
||||
extern const u8 gUnknown_085EB56E[];
|
||||
extern const u8 gUnknown_085EB57E[];
|
||||
extern const u8 gUnknown_085EB589[];
|
||||
extern const u8 gUnknown_085EB5B6[];
|
||||
extern const u8 gUnknown_085EE14B[];
|
||||
extern const u8 gUnknown_085EE14F[];
|
||||
extern const u8 gUnknown_085EB2FF[];
|
||||
extern const u8 gUnknown_085EB310[];
|
||||
extern const u8 gUnknown_085EB317[];
|
||||
extern const u8 gUnknown_085EB31F[];
|
||||
extern const u8 gText_CaveOfOrigin[];
|
||||
extern const u8 gText_MtPyre[];
|
||||
extern const u8 gText_SkyPillar[];
|
||||
extern const u8 gText_DontRemember[];
|
||||
extern const u8 gUnknown_085EB597[];
|
||||
extern const u8 gUnknown_085EB32D[];
|
||||
extern const u8 gUnknown_085EB33E[];
|
||||
extern const u8 gUnknown_085EB350[];
|
||||
extern const u8 gUnknown_085EB361[];
|
||||
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_277F96[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_278831[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_2787FC[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_278831[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_2787FC[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[];
|
||||
extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[];
|
||||
|
||||
// Frontier records.
|
||||
extern const u8 gText_WinStreak[];
|
||||
extern const u8 gText_Record[];
|
||||
|
||||
@ -139,7 +139,7 @@ SECTIONS {
|
||||
src/shop.o(.text);
|
||||
src/fldeff_escalator.o(.text);
|
||||
src/berry.o(.text);
|
||||
asm/script_menu.o(.text);
|
||||
src/script_menu.o(.text);
|
||||
src/naming_screen.o(.text);
|
||||
src/money.o(.text);
|
||||
src/contest_effect.o(.text);
|
||||
@ -462,7 +462,7 @@ SECTIONS {
|
||||
src/shop.o(.rodata);
|
||||
src/fldeff_escalator.o(.rodata);
|
||||
src/berry.o(.rodata);
|
||||
data/script_menu.o(.rodata);
|
||||
src/script_menu.o(.rodata);
|
||||
src/naming_screen.o(.rodata);
|
||||
src/money.o(.rodata);
|
||||
src/contest_effect.o(.rodata);
|
||||
|
||||
@ -1579,9 +1579,9 @@ static void Task_ChooseAnswer(u8 taskId)
|
||||
s16 *data = gTasks[taskId].data;
|
||||
|
||||
if (!tWrapAround)
|
||||
input = Menu_ProcessInputNoWrapAround();
|
||||
input = Menu_ProcessInputNoWrap();
|
||||
else
|
||||
input = ProcessMenuInput();
|
||||
input = Menu_ProcessInput();
|
||||
|
||||
switch (input)
|
||||
{
|
||||
|
||||
@ -942,7 +942,7 @@ static void HandleFewMenuActionsInput(u8 taskId)
|
||||
{
|
||||
if (sub_81221EC() != TRUE)
|
||||
{
|
||||
s32 id = Menu_ProcessInputNoWrapAround();
|
||||
s32 id = Menu_ProcessInputNoWrap();
|
||||
switch (id)
|
||||
{
|
||||
case -2:
|
||||
|
||||
@ -2499,7 +2499,7 @@ static void CB2_HandleBlenderEndGame(void)
|
||||
sBerryBlenderData->gameEndState++;
|
||||
break;
|
||||
case 10:
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 1:
|
||||
case -1:
|
||||
|
||||
@ -86,7 +86,7 @@ static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
|
||||
|
||||
static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
|
||||
{
|
||||
switch(Menu_ProcessInputNoWrap_())
|
||||
switch(Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
FillWindowPixelBuffer(0, 17);
|
||||
|
||||
@ -520,7 +520,7 @@ void sub_8126B80(u8 taskId)
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
menuPos = GetMenuCursorPos();
|
||||
switch (ProcessMenuInput())
|
||||
switch (Menu_ProcessInput())
|
||||
{
|
||||
default:
|
||||
PlaySE(SE_SELECT);
|
||||
@ -710,7 +710,7 @@ void sub_8127088(u8 taskId)
|
||||
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
input = ProcessMenuInput();
|
||||
input = Menu_ProcessInput();
|
||||
switch (input)
|
||||
{
|
||||
case -1:
|
||||
@ -1628,7 +1628,7 @@ void sub_8128950(u8 taskId)
|
||||
|
||||
void sub_81289D0(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
sub_8121F68(taskId, &gUnknown_085A72C4);
|
||||
}
|
||||
|
||||
@ -1693,7 +1693,7 @@ void sub_8128AAC(u8 taskId)
|
||||
|
||||
void sub_8128B80(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
sub_8121F68(taskId, &gUnknown_085A72CC);
|
||||
}
|
||||
|
||||
@ -2588,7 +2588,7 @@ void sub_812A0E8(u8 taskId)
|
||||
|
||||
void sub_812A1A0(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
sub_8121F68(taskId, &gUnknown_085A7348);
|
||||
}
|
||||
|
||||
@ -2601,7 +2601,7 @@ void sub_812A1C0(u8 taskId)
|
||||
|
||||
void sub_812A1F0(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
sub_8121F68(taskId, &gUnknown_085A7350);
|
||||
}
|
||||
|
||||
@ -2725,7 +2725,7 @@ void sub_812A3D4(u8 taskId)
|
||||
|
||||
void sub_812A458(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
sub_8121F68(taskId, &gUnknown_085A741C);
|
||||
}
|
||||
|
||||
|
||||
@ -671,7 +671,7 @@ static void CB2_EggHatch_1(void)
|
||||
}
|
||||
break;
|
||||
case 10:
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3);
|
||||
|
||||
@ -1218,7 +1218,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
sEvoCursorPos = 0;
|
||||
|
||||
@ -553,18 +553,18 @@ u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority)
|
||||
}
|
||||
|
||||
#ifdef NONMATCHING
|
||||
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
|
||||
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
|
||||
{
|
||||
u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag);
|
||||
PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10);
|
||||
if (spriteId == 0xFFFF)
|
||||
return 0x40;
|
||||
return MAX_SPRITES;
|
||||
|
||||
return spriteId;
|
||||
}
|
||||
#else
|
||||
NAKED
|
||||
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
|
||||
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
|
||||
{
|
||||
asm_unified("push {r4,r5,lr}\n\
|
||||
sub sp, 0x10\n\
|
||||
|
||||
@ -1545,7 +1545,7 @@ void Task_HandleInBattleItemMenuInput(u8 taskId)
|
||||
{
|
||||
if (sub_81221EC() != TRUE)
|
||||
{
|
||||
s8 r4 = Menu_ProcessInputNoWrapAround();
|
||||
s8 r4 = Menu_ProcessInputNoWrap();
|
||||
switch (r4)
|
||||
{
|
||||
case -2:
|
||||
|
||||
@ -377,7 +377,7 @@ static void LearnMoveMain(void)
|
||||
break;
|
||||
case 9:
|
||||
{
|
||||
s8 selection = Menu_ProcessInputNoWrap_();
|
||||
s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
|
||||
|
||||
if (selection == 0)
|
||||
{
|
||||
@ -414,7 +414,7 @@ static void LearnMoveMain(void)
|
||||
break;
|
||||
case 13:
|
||||
{
|
||||
s8 selection = Menu_ProcessInputNoWrap_();
|
||||
s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
|
||||
|
||||
if (selection == 0)
|
||||
{
|
||||
@ -447,7 +447,7 @@ static void LearnMoveMain(void)
|
||||
break;
|
||||
case 18:
|
||||
{
|
||||
s8 var = Menu_ProcessInputNoWrap_();
|
||||
s8 var = Menu_ProcessInputNoWrapClearOnChoose();
|
||||
|
||||
if (var == 0)
|
||||
{
|
||||
@ -474,7 +474,7 @@ static void LearnMoveMain(void)
|
||||
break;
|
||||
case 26:
|
||||
{
|
||||
s8 var = Menu_ProcessInputNoWrap_();
|
||||
s8 var = Menu_ProcessInputNoWrapClearOnChoose();
|
||||
|
||||
if (var == 0)
|
||||
{
|
||||
|
||||
@ -1501,7 +1501,7 @@ static void Task_NewGameBirchSpeech_CreateNameYesNo(u8 taskId)
|
||||
|
||||
static void Task_NewGameBirchSpeech_ProcessNameYesNoMenu(u8 taskId)
|
||||
{
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
PlaySE(SE_SELECT);
|
||||
@ -1976,7 +1976,7 @@ static void NewGameBirchSpeech_ShowGenderMenu(void)
|
||||
|
||||
static s8 NewGameBirchSpeech_ProcessGenderMenuInput(void)
|
||||
{
|
||||
return Menu_ProcessInputNoWrapAround();
|
||||
return Menu_ProcessInputNoWrap();
|
||||
}
|
||||
|
||||
static void NewGameBirchSpeech_SetDefaultPlayerName(u8 nameId)
|
||||
|
||||
@ -1179,7 +1179,7 @@ static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu
|
||||
task->data[0]++;
|
||||
break;
|
||||
case 1:
|
||||
selection = ProcessMenuInput();
|
||||
selection = Menu_ProcessInput();
|
||||
if (selection == -2)
|
||||
break;
|
||||
if (selection == -1 || selection == GetFreeStorySlot())
|
||||
|
||||
12
src/menu.c
12
src/menu.c
@ -458,7 +458,7 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback)
|
||||
CopyWindowToVram(0, 3);
|
||||
}
|
||||
|
||||
void sub_8197930(void)
|
||||
void DisplayYesNoMenu(void)
|
||||
{
|
||||
CreateYesNoMenu(&gUnknown_0860F0A8, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0);
|
||||
}
|
||||
@ -972,7 +972,7 @@ u8 GetMenuCursorPos(void)
|
||||
return gUnknown_0203CD90.cursorPos;
|
||||
}
|
||||
|
||||
s8 ProcessMenuInput(void)
|
||||
s8 Menu_ProcessInput(void)
|
||||
{
|
||||
if (gMain.newKeys & A_BUTTON)
|
||||
{
|
||||
@ -1000,7 +1000,7 @@ s8 ProcessMenuInput(void)
|
||||
return MENU_NOTHING_CHOSEN;
|
||||
}
|
||||
|
||||
s8 Menu_ProcessInputNoWrapAround(void)
|
||||
s8 Menu_ProcessInputNoWrap(void)
|
||||
{
|
||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
||||
|
||||
@ -1201,9 +1201,9 @@ void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum
|
||||
sub_8198AF8(window, fontId, 0, 1, baseTileNum, paletteNum, 0);
|
||||
}
|
||||
|
||||
s8 Menu_ProcessInputNoWrap_(void)
|
||||
s8 Menu_ProcessInputNoWrapClearOnChoose(void)
|
||||
{
|
||||
s8 result = Menu_ProcessInputNoWrapAround();
|
||||
s8 result = Menu_ProcessInputNoWrap();
|
||||
if (result != MENU_NOTHING_CHOSEN)
|
||||
sub_8198C78();
|
||||
return result;
|
||||
@ -1447,7 +1447,7 @@ s8 sub_8199284(void)
|
||||
return MENU_NOTHING_CHOSEN;
|
||||
}
|
||||
|
||||
s8 sub_8199334(void)
|
||||
s8 Menu_ProcessInputGridLayout(void)
|
||||
{
|
||||
u8 oldPos = gUnknown_0203CD90.cursorPos;
|
||||
|
||||
|
||||
@ -167,7 +167,7 @@ void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *templa
|
||||
|
||||
static void Task_CallYesOrNoCallback(u8 taskId)
|
||||
{
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
PlaySE(SE_SELECT);
|
||||
|
||||
@ -3144,7 +3144,7 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion)
|
||||
eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
|
||||
break;
|
||||
case VERSION_EMERALD:
|
||||
eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
|
||||
eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@ -352,9 +352,9 @@ static void PlayerPCProcessMenuInput(u8 taskId)
|
||||
|
||||
data = gTasks[taskId].data;
|
||||
if(gPcItemMenuOptionsNum > 3)
|
||||
inputOptionId = ProcessMenuInput();
|
||||
inputOptionId = Menu_ProcessInput();
|
||||
else
|
||||
inputOptionId = Menu_ProcessInputNoWrapAround();
|
||||
inputOptionId = Menu_ProcessInputNoWrap();
|
||||
|
||||
switch(inputOptionId)
|
||||
{
|
||||
@ -463,7 +463,7 @@ static void ItemStorageMenuProcessInput(u8 taskId)
|
||||
s8 inputOptionId;
|
||||
|
||||
r5 = GetMenuCursorPos();
|
||||
inputOptionId = ProcessMenuInput();
|
||||
inputOptionId = Menu_ProcessInput();
|
||||
r2 = GetMenuCursorPos();
|
||||
switch(inputOptionId)
|
||||
{
|
||||
@ -762,13 +762,13 @@ static void Mailbox_MoveToBag(u8 taskId)
|
||||
|
||||
static void Mailbox_DrawYesNoBeforeMove(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt;
|
||||
}
|
||||
|
||||
static void Mailbox_MoveToBagYesNoPrompt(u8 taskId)
|
||||
{
|
||||
switch(Menu_ProcessInputNoWrap_())
|
||||
switch(Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
Mailbox_DoMailMoveToBag(taskId);
|
||||
|
||||
@ -1139,7 +1139,7 @@ static void Task_HandlePokeblockOptionsInput(u8 taskId)
|
||||
if (sub_81221EC() == TRUE)
|
||||
return;
|
||||
|
||||
itemId = Menu_ProcessInputNoWrapAround();
|
||||
itemId = Menu_ProcessInputNoWrap();
|
||||
if (itemId == MENU_NOTHING_CHOSEN)
|
||||
{
|
||||
return;
|
||||
|
||||
@ -270,7 +270,7 @@ void Task_PokemonStorageSystem(u8 taskId)
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
task->data[2] = ProcessMenuInput();
|
||||
task->data[2] = Menu_ProcessInput();
|
||||
switch(task->data[2])
|
||||
{
|
||||
case -2:
|
||||
|
||||
@ -18,7 +18,6 @@ int GameClear(void)
|
||||
u8 partyIndex;
|
||||
u8 count;
|
||||
} ribbonCounts[6];
|
||||
s8 val;
|
||||
|
||||
HealPlayerParty();
|
||||
|
||||
|
||||
1925
src/script_menu.c
1925
src/script_menu.c
File diff suppressed because it is too large
Load Diff
@ -998,7 +998,7 @@ void sub_80E9FB0(u8 taskId)
|
||||
{
|
||||
s8 input;
|
||||
|
||||
input = Menu_ProcessInputNoWrapAround();
|
||||
input = Menu_ProcessInputNoWrap();
|
||||
switch (input)
|
||||
{
|
||||
case -1:
|
||||
@ -1032,7 +1032,7 @@ void sub_80E9FFC(u8 taskId)
|
||||
|
||||
void sub_80EA06C(u8 taskId)
|
||||
{
|
||||
sub_8197930();
|
||||
DisplayYesNoMenu();
|
||||
sub_8121F68(taskId, &gUnknown_0858D058);
|
||||
}
|
||||
|
||||
|
||||
@ -325,7 +325,7 @@ static void SetShopItemsForSale(const u16 *items)
|
||||
|
||||
static void Task_ShopMenu(u8 taskId)
|
||||
{
|
||||
s8 inputCode = Menu_ProcessInputNoWrapAround();
|
||||
s8 inputCode = Menu_ProcessInputNoWrap();
|
||||
switch (inputCode)
|
||||
{
|
||||
case LIST_B_PRESSED:
|
||||
|
||||
@ -1269,7 +1269,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
|
||||
|
||||
/*static */bool8 sub_8102344(struct Task *task)
|
||||
{
|
||||
s8 input = Menu_ProcessInputNoWrap_();
|
||||
s8 input = Menu_ProcessInputNoWrapClearOnChoose();
|
||||
if (input == 0)
|
||||
{
|
||||
sub_8197434(0, TRUE);
|
||||
|
||||
@ -979,14 +979,14 @@ static u8 SaveConfirmSaveCallback(void)
|
||||
|
||||
static u8 SaveYesNoCallback(void)
|
||||
{
|
||||
sub_8197930(); // Show Yes/No menu
|
||||
DisplayYesNoMenu(); // Show Yes/No menu
|
||||
sSaveDialogCallback = SaveConfirmInputCallback;
|
||||
return SAVE_IN_PROGRESS;
|
||||
}
|
||||
|
||||
static u8 SaveConfirmInputCallback(void)
|
||||
{
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0: // Yes
|
||||
switch (gSaveFileStatus)
|
||||
@ -1039,14 +1039,14 @@ static u8 SaveConfirmOverwriteNoCallback(void)
|
||||
|
||||
static u8 SaveConfirmOverwriteCallback(void)
|
||||
{
|
||||
sub_8197930(); // Show Yes/No menu
|
||||
DisplayYesNoMenu(); // Show Yes/No menu
|
||||
sSaveDialogCallback = SaveOverwriteInputCallback;
|
||||
return SAVE_IN_PROGRESS;
|
||||
}
|
||||
|
||||
static u8 SaveOverwriteInputCallback(void)
|
||||
{
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0: // Yes
|
||||
sSaveDialogCallback = SaveSavingMessageCallback;
|
||||
@ -1170,7 +1170,7 @@ static u8 BattlePyramidRetireYesNoCallback(void)
|
||||
|
||||
static u8 BattlePyramidRetireInputCallback(void)
|
||||
{
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0: // Yes
|
||||
return SAVE_CANCELED;
|
||||
|
||||
@ -534,7 +534,7 @@ static void Task_StarterChoose5(u8 taskId)
|
||||
{
|
||||
u8 spriteId;
|
||||
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0: // YES
|
||||
// Return the starter choice and exit.
|
||||
|
||||
@ -109,7 +109,7 @@ void sub_8133BE4(u8 taskId, u8 decorationId)
|
||||
void Task_HandleGetDecorationMenuInput(u8 taskId)
|
||||
{
|
||||
struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
|
||||
s8 input = ProcessMenuInput();
|
||||
s8 input = Menu_ProcessInput();
|
||||
|
||||
switch (input)
|
||||
{
|
||||
|
||||
@ -792,7 +792,7 @@ static void Task_SetClock3(u8 taskId)
|
||||
|
||||
static void Task_SetClock4(u8 taskId)
|
||||
{
|
||||
switch (Menu_ProcessInputNoWrap_())
|
||||
switch (Menu_ProcessInputNoWrapClearOnChoose())
|
||||
{
|
||||
case 0:
|
||||
PlaySE(SE_SELECT);
|
||||
|
||||
@ -359,11 +359,7 @@ gUnknown_02039F5D: @ 2039F5D
|
||||
|
||||
.include "src/shop.o"
|
||||
.include "src/fldeff_escalator.o"
|
||||
|
||||
.align 2
|
||||
gUnknown_02039F90: @ 2039F90
|
||||
.space 0x4
|
||||
|
||||
.include "src/script_menu.o"
|
||||
.include "src/naming_screen.o"
|
||||
.include "src/money.o"
|
||||
.include "src/record_mixing.o"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user