mirror of
https://github.com/pret/pokeruby.git
synced 2026-08-21 18:04:34 -05:00
almost finish decompiling matsuda_debug_menu.c (#158)
* almost finish decompiling matsuda_debug_menu.c * rename sub_8071C20 to CloseMenu
This commit is contained in:
Cameron Hall
@@ -9,7 +9,7 @@
|
||||
thumb_func_start unref_sub_80A2F44
|
||||
unref_sub_80A2F44: @ 80A2F44
|
||||
push {lr}
|
||||
bl sub_8071C20
|
||||
bl CloseMenu
|
||||
bl AddMapNamePopUpWindowTask
|
||||
movs r0, 0x1
|
||||
pop {r1}
|
||||
|
||||
@@ -1,685 +0,0 @@
|
||||
.include "constants/gba_constants.inc"
|
||||
.include "constants/species_constants.inc"
|
||||
.include "asm/macros.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80AAC5C
|
||||
sub_80AAC5C: @ 80AAC5C
|
||||
push {r4,r5,lr}
|
||||
adds r5, r0, 0
|
||||
lsls r1, 24
|
||||
cmp r1, 0
|
||||
ble _080AAC78
|
||||
ldr r1, _080AAC74 @ =gScriptContestRank
|
||||
ldrh r0, [r1]
|
||||
adds r0, 0x1
|
||||
strh r0, [r1]
|
||||
adds r4, r1, 0
|
||||
b _080AAC86
|
||||
.align 2, 0
|
||||
_080AAC74: .4byte gScriptContestRank
|
||||
_080AAC78:
|
||||
ldr r0, _080AACBC @ =gScriptContestRank
|
||||
ldrh r2, [r0]
|
||||
adds r4, r0, 0
|
||||
cmp r2, 0
|
||||
beq _080AAC86
|
||||
subs r0, r2, 0x1
|
||||
strh r0, [r4]
|
||||
_080AAC86:
|
||||
adds r1, r4, 0
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0x3
|
||||
bls _080AAC92
|
||||
movs r0, 0x3
|
||||
strh r0, [r1]
|
||||
_080AAC92:
|
||||
ldrb r0, [r4]
|
||||
bl sub_80AA5E8
|
||||
ldr r0, _080AACC0 @ =gScriptContestCategory
|
||||
ldrb r0, [r0]
|
||||
ldrb r1, [r4]
|
||||
bl sub_80AE398
|
||||
ldrh r0, [r5, 0x32]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80AA280
|
||||
ldrh r0, [r5, 0x32]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_80AA658
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AACBC: .4byte gScriptContestRank
|
||||
_080AACC0: .4byte gScriptContestCategory
|
||||
thumb_func_end sub_80AAC5C
|
||||
|
||||
thumb_func_start sub_80AACC4
|
||||
sub_80AACC4: @ 80AACC4
|
||||
push {lr}
|
||||
bl UpdatePaletteFade
|
||||
ldr r0, _080AACF8 @ =gPaletteFade
|
||||
ldrb r1, [r0, 0x7]
|
||||
movs r0, 0x80
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080AACF4
|
||||
bl SetDebugMonForContest
|
||||
ldr r0, _080AACFC @ =gIsLinkContest
|
||||
ldrb r1, [r0]
|
||||
movs r0, 0x1
|
||||
ands r0, r1
|
||||
cmp r0, 0
|
||||
bne _080AACEE
|
||||
ldr r0, _080AAD00 @ =0x02000000
|
||||
ldrb r0, [r0]
|
||||
bl sub_80AE82C
|
||||
_080AACEE:
|
||||
ldr r0, _080AAD04 @ =sub_80AB47C
|
||||
bl SetMainCallback2
|
||||
_080AACF4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AACF8: .4byte gPaletteFade
|
||||
_080AACFC: .4byte gIsLinkContest
|
||||
_080AAD00: .4byte 0x02000000
|
||||
_080AAD04: .4byte sub_80AB47C
|
||||
thumb_func_end sub_80AACC4
|
||||
|
||||
thumb_func_start sub_80AAD08
|
||||
sub_80AAD08: @ 80AAD08
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
cmp r1, 0x1
|
||||
bne _080AAD32
|
||||
ldr r1, _080AAD3C @ =0x02000000
|
||||
ldrh r0, [r0, 0x34]
|
||||
movs r4, 0
|
||||
strb r0, [r1]
|
||||
ldr r0, _080AAD40 @ =sub_80AACC4
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
str r4, [sp]
|
||||
movs r1, 0
|
||||
movs r2, 0
|
||||
movs r3, 0x10
|
||||
bl BeginNormalPaletteFade
|
||||
_080AAD32:
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AAD3C: .4byte 0x02000000
|
||||
_080AAD40: .4byte sub_80AACC4
|
||||
thumb_func_end sub_80AAD08
|
||||
|
||||
thumb_func_start sub_80AAD44
|
||||
sub_80AAD44: @ 80AAD44
|
||||
push {r4,r5,lr}
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
cmp r1, 0x1
|
||||
bne _080AAD72
|
||||
bl SetDebugMonForContest
|
||||
movs r4, 0
|
||||
ldr r5, _080AAD78 @ =gUnknown_02038670
|
||||
_080AAD56:
|
||||
lsls r0, r4, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, _080AAD7C @ =gScriptContestCategory
|
||||
ldrb r1, [r1]
|
||||
bl sub_80AE770
|
||||
strh r0, [r5]
|
||||
adds r5, 0x2
|
||||
adds r4, 0x1
|
||||
cmp r4, 0x3
|
||||
ble _080AAD56
|
||||
ldr r0, _080AAD80 @ =sub_805469C
|
||||
bl SetMainCallback2
|
||||
_080AAD72:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AAD78: .4byte gUnknown_02038670
|
||||
_080AAD7C: .4byte gScriptContestCategory
|
||||
_080AAD80: .4byte sub_805469C
|
||||
thumb_func_end sub_80AAD44
|
||||
|
||||
thumb_func_start sub_80AAD84
|
||||
sub_80AAD84: @ 80AAD84
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
mov r5, r8
|
||||
push {r5-r7}
|
||||
sub sp, 0x64
|
||||
mov r9, r0
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
str r1, [sp, 0x48]
|
||||
lsls r2, 24
|
||||
lsrs r2, 24
|
||||
str r2, [sp, 0x4C]
|
||||
lsls r3, 24
|
||||
lsrs r3, 24
|
||||
mov r10, r3
|
||||
mov r5, r10
|
||||
adds r5, 0x1
|
||||
lsls r1, r5, 8
|
||||
ldr r0, _080AAEC4 @ =0x06018000
|
||||
subs r1, r0, r1
|
||||
movs r0, 0
|
||||
str r0, [sp, 0x44]
|
||||
ldr r4, _080AAEC8 @ =0x040000d4
|
||||
add r0, sp, 0x44
|
||||
str r0, [r4]
|
||||
str r1, [r4, 0x4]
|
||||
ldr r0, _080AAECC @ =0x85000040
|
||||
str r0, [r4, 0x8]
|
||||
ldr r0, [r4, 0x8]
|
||||
mov r0, r9
|
||||
bl StringLength
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
cmp r7, 0x8
|
||||
bls _080AADD0
|
||||
movs r7, 0x8
|
||||
_080AADD0:
|
||||
movs r6, 0
|
||||
mov r8, r5
|
||||
mov r1, r10
|
||||
lsls r1, 1
|
||||
str r1, [sp, 0x58]
|
||||
ldr r2, [sp, 0x48]
|
||||
adds r2, 0x20
|
||||
str r2, [sp, 0x5C]
|
||||
cmp r6, r7
|
||||
bge _080AAE1E
|
||||
add r5, sp, 0x40
|
||||
add r0, sp, 0x20
|
||||
mov r10, r0
|
||||
ldr r2, _080AAEC4 @ =0x06018000
|
||||
_080AADEC:
|
||||
mov r1, r9
|
||||
adds r0, r1, r6
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r5]
|
||||
movs r0, 0xFF
|
||||
strb r0, [r5, 0x1]
|
||||
mov r0, sp
|
||||
adds r1, r5, 0
|
||||
str r2, [sp, 0x60]
|
||||
bl sub_80034D4
|
||||
mov r1, r8
|
||||
lsls r0, r1, 8
|
||||
ldr r2, [sp, 0x60]
|
||||
subs r0, r2, r0
|
||||
mov r1, r10
|
||||
str r1, [r4]
|
||||
str r0, [r4, 0x4]
|
||||
ldr r0, _080AAED0 @ =0x84000008
|
||||
str r0, [r4, 0x8]
|
||||
ldr r0, [r4, 0x8]
|
||||
adds r2, 0x20
|
||||
adds r6, 0x1
|
||||
cmp r6, r7
|
||||
blt _080AADEC
|
||||
_080AAE1E:
|
||||
movs r1, 0x7C
|
||||
ldr r2, [sp, 0x58]
|
||||
subs r1, r2
|
||||
lsls r1, 24
|
||||
lsrs r7, r1, 24
|
||||
ldr r0, _080AAED4 @ =gMain
|
||||
mov r9, r0
|
||||
lsls r3, r7, 3
|
||||
add r3, r9
|
||||
ldr r0, _080AAED8 @ =gUnknown_083C9400
|
||||
ldr r1, [r0]
|
||||
ldr r2, [r0, 0x4]
|
||||
str r1, [sp, 0x50]
|
||||
str r2, [sp, 0x54]
|
||||
str r1, [r3, 0x3C]
|
||||
str r2, [r3, 0x40]
|
||||
mov r2, r8
|
||||
lsls r0, r2, 3
|
||||
movs r1, 0x80
|
||||
lsls r1, 3
|
||||
adds r2, r1, 0
|
||||
subs r2, r0
|
||||
adds r6, r3, 0
|
||||
adds r6, 0x40
|
||||
ldr r0, _080AAEDC @ =0x000003ff
|
||||
mov r8, r0
|
||||
mov r1, r8
|
||||
ands r2, r1
|
||||
ldrh r5, [r6]
|
||||
ldr r4, _080AAEE0 @ =0xfffffc00
|
||||
adds r0, r4, 0
|
||||
ands r0, r5
|
||||
orrs r0, r2
|
||||
strh r0, [r6]
|
||||
ldrh r5, [r3, 0x3E]
|
||||
ldr r2, _080AAEE4 @ =0xfffffe00
|
||||
adds r0, r2, 0
|
||||
ands r0, r5
|
||||
ldr r1, [sp, 0x48]
|
||||
orrs r0, r1
|
||||
strh r0, [r3, 0x3E]
|
||||
adds r3, 0x3C
|
||||
add r0, sp, 0x4C
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r3]
|
||||
adds r1, r7, 0x1
|
||||
lsls r1, 3
|
||||
mov r0, r9
|
||||
adds r7, r1, r0
|
||||
ldr r0, [sp, 0x50]
|
||||
ldr r1, [sp, 0x54]
|
||||
str r0, [r7, 0x3C]
|
||||
str r1, [r7, 0x40]
|
||||
ldrh r0, [r6]
|
||||
lsls r0, 22
|
||||
lsrs r0, 22
|
||||
adds r0, 0x4
|
||||
adds r5, r7, 0
|
||||
adds r5, 0x40
|
||||
mov r1, r8
|
||||
ands r0, r1
|
||||
ldrh r3, [r5]
|
||||
ands r4, r3
|
||||
orrs r4, r0
|
||||
strh r4, [r5]
|
||||
ldrh r0, [r7, 0x3E]
|
||||
ands r2, r0
|
||||
ldr r0, [sp, 0x5C]
|
||||
orrs r2, r0
|
||||
strh r2, [r7, 0x3E]
|
||||
adds r1, r7, 0
|
||||
adds r1, 0x3C
|
||||
add r2, sp, 0x4C
|
||||
ldrb r2, [r2]
|
||||
strb r2, [r1]
|
||||
add sp, 0x64
|
||||
pop {r3-r5}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
mov r10, r5
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AAEC4: .4byte 0x06018000
|
||||
_080AAEC8: .4byte 0x040000d4
|
||||
_080AAECC: .4byte 0x85000040
|
||||
_080AAED0: .4byte 0x84000008
|
||||
_080AAED4: .4byte gMain
|
||||
_080AAED8: .4byte gUnknown_083C9400
|
||||
_080AAEDC: .4byte 0x000003ff
|
||||
_080AAEE0: .4byte 0xfffffc00
|
||||
_080AAEE4: .4byte 0xfffffe00
|
||||
thumb_func_end sub_80AAD84
|
||||
|
||||
thumb_func_start unref_sub_80AAEE8
|
||||
unref_sub_80AAEE8: @ 80AAEE8
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0xC
|
||||
adds r4, r0, 0
|
||||
lsls r1, 24
|
||||
lsrs r7, r1, 24
|
||||
lsls r2, 24
|
||||
lsrs r6, r2, 24
|
||||
lsls r3, 24
|
||||
lsrs r5, r3, 24
|
||||
movs r0, 0
|
||||
cmp r4, 0
|
||||
bge _080AAF08
|
||||
mov r1, sp
|
||||
movs r0, 0xAE
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
_080AAF08:
|
||||
add r0, sp
|
||||
adds r1, r4, 0
|
||||
cmp r1, 0
|
||||
bge _080AAF12
|
||||
negs r1, r1
|
||||
_080AAF12:
|
||||
movs r2, 0
|
||||
movs r3, 0x8
|
||||
bl ConvertIntToDecimalStringN
|
||||
mov r0, sp
|
||||
adds r1, r7, 0
|
||||
adds r2, r6, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_80AAD84
|
||||
add sp, 0xC
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end unref_sub_80AAEE8
|
||||
|
||||
thumb_func_start sub_80AAF30
|
||||
sub_80AAF30: @ 80AAF30
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
push {r6,r7}
|
||||
sub sp, 0x4
|
||||
ldr r1, _080AAFC0 @ =gUnknown_0203856C
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
ldr r1, _080AAFC4 @ =gContestPlayerMonIndex
|
||||
movs r0, 0x3
|
||||
strb r0, [r1]
|
||||
movs r0, 0
|
||||
bl sub_80AE098
|
||||
movs r4, 0x3
|
||||
movs r5, 0x1
|
||||
negs r5, r5
|
||||
ldr r3, _080AAFC8 @ =gUnknown_02038690
|
||||
movs r2, 0x3
|
||||
_080AAF56:
|
||||
adds r1, r4, r3
|
||||
subs r0, r2, r4
|
||||
strb r0, [r1]
|
||||
subs r4, 0x1
|
||||
cmp r4, r5
|
||||
bgt _080AAF56
|
||||
movs r4, 0
|
||||
movs r6, 0
|
||||
ldr r7, _080AAFCC @ =gUnknown_02038670
|
||||
ldr r5, _080AAFD0 @ =gContestMons
|
||||
mov r9, r5
|
||||
_080AAF6C:
|
||||
lsls r1, r4, 1
|
||||
strh r6, [r7]
|
||||
ldr r0, _080AAFD4 @ =gUnknown_02038680
|
||||
mov r8, r0
|
||||
adds r0, r1, r0
|
||||
strh r6, [r0]
|
||||
ldr r3, _080AAFD8 @ =gUnknown_02038678
|
||||
adds r1, r3
|
||||
strh r6, [r1]
|
||||
adds r0, r5, 0
|
||||
mov r1, r9
|
||||
adds r1, 0xC0
|
||||
movs r2, 0x40
|
||||
str r3, [sp]
|
||||
bl memcpy
|
||||
adds r7, 0x2
|
||||
adds r5, 0x40
|
||||
adds r4, 0x1
|
||||
ldr r3, [sp]
|
||||
cmp r4, 0x2
|
||||
ble _080AAF6C
|
||||
ldr r0, _080AAFCC @ =gUnknown_02038670
|
||||
movs r1, 0x96
|
||||
lsls r1, 1
|
||||
strh r1, [r0, 0x6]
|
||||
movs r0, 0xC8
|
||||
lsls r0, 1
|
||||
mov r1, r8
|
||||
strh r0, [r1, 0x6]
|
||||
strh r0, [r3, 0x6]
|
||||
movs r0, 0xFE
|
||||
bl sub_80B2A7C
|
||||
add sp, 0x4
|
||||
pop {r3,r4}
|
||||
mov r8, r3
|
||||
mov r9, r4
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AAFC0: .4byte gUnknown_0203856C
|
||||
_080AAFC4: .4byte gContestPlayerMonIndex
|
||||
_080AAFC8: .4byte gUnknown_02038690
|
||||
_080AAFCC: .4byte gUnknown_02038670
|
||||
_080AAFD0: .4byte gContestMons
|
||||
_080AAFD4: .4byte gUnknown_02038680
|
||||
_080AAFD8: .4byte gUnknown_02038678
|
||||
thumb_func_end sub_80AAF30
|
||||
|
||||
thumb_func_start MatsudaDebugMenu_SetHighScore
|
||||
MatsudaDebugMenu_SetHighScore: @ 80AAFDC
|
||||
push {lr}
|
||||
bl sub_80AAF30
|
||||
bl sub_8071C20
|
||||
movs r0, 0x1
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end MatsudaDebugMenu_SetHighScore
|
||||
|
||||
thumb_func_start MatsudaDebugMenu_ResetHighScore
|
||||
MatsudaDebugMenu_ResetHighScore: @ 80AAFEC
|
||||
push {r4,lr}
|
||||
ldr r1, _080AB01C @ =gUnknown_0203856C
|
||||
movs r0, 0
|
||||
strb r0, [r1]
|
||||
movs r4, 0
|
||||
ldr r3, _080AB020 @ =gUnknown_02038678
|
||||
ldr r2, _080AB024 @ =gUnknown_02038680
|
||||
ldr r1, _080AB028 @ =gUnknown_02038670
|
||||
movs r0, 0x3
|
||||
_080AAFFE:
|
||||
strh r4, [r1]
|
||||
strh r4, [r2]
|
||||
strh r4, [r3]
|
||||
adds r3, 0x2
|
||||
adds r2, 0x2
|
||||
adds r1, 0x2
|
||||
subs r0, 0x1
|
||||
cmp r0, 0
|
||||
bge _080AAFFE
|
||||
bl sub_8071C20
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080AB01C: .4byte gUnknown_0203856C
|
||||
_080AB020: .4byte gUnknown_02038678
|
||||
_080AB024: .4byte gUnknown_02038680
|
||||
_080AB028: .4byte gUnknown_02038670
|
||||
thumb_func_end MatsudaDebugMenu_ResetHighScore
|
||||
|
||||
thumb_func_start MatsudaDebugMenu_SetArtMuseumItems
|
||||
MatsudaDebugMenu_SetArtMuseumItems: @ 80AB02C
|
||||
push {r4,r5,lr}
|
||||
ldr r1, _080AB078 @ =gContestPlayerMonIndex
|
||||
movs r0, 0x3
|
||||
strb r0, [r1]
|
||||
movs r0, 0
|
||||
bl sub_80AE098
|
||||
movs r2, 0x3
|
||||
movs r5, 0x1
|
||||
negs r5, r5
|
||||
ldr r4, _080AB07C @ =gUnknown_02038690
|
||||
movs r3, 0x3
|
||||
_080AB044:
|
||||
adds r1, r2, r4
|
||||
subs r0, r3, r2
|
||||
strb r0, [r1]
|
||||
subs r2, 0x1
|
||||
cmp r2, r5
|
||||
bgt _080AB044
|
||||
ldr r1, _080AB080 @ =gScriptContestCategory
|
||||
movs r0, 0
|
||||
strh r0, [r1]
|
||||
adds r4, r1, 0
|
||||
_080AB058:
|
||||
movs r0, 0xFF
|
||||
bl sub_80B2A7C
|
||||
ldrh r0, [r4]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4]
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0x4
|
||||
bls _080AB058
|
||||
bl sub_8071C20
|
||||
movs r0, 0x1
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080AB078: .4byte gContestPlayerMonIndex
|
||||
_080AB07C: .4byte gUnknown_02038690
|
||||
_080AB080: .4byte gScriptContestCategory
|
||||
thumb_func_end MatsudaDebugMenu_SetArtMuseumItems
|
||||
|
||||
thumb_func_start unref_sub_80AB084
|
||||
unref_sub_80AB084: @ 80AB084
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
sub sp, 0x8
|
||||
mov r8, r0
|
||||
ldr r0, _080AB160 @ =REG_BG0HOFS
|
||||
movs r1, 0
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x22
|
||||
strh r1, [r0]
|
||||
adds r0, 0x4
|
||||
strh r1, [r0]
|
||||
subs r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x4
|
||||
strh r1, [r0]
|
||||
movs r2, 0x80
|
||||
lsls r2, 19
|
||||
movs r3, 0xFA
|
||||
lsls r3, 5
|
||||
adds r0, r3, 0
|
||||
strh r0, [r2]
|
||||
ldr r3, _080AB164 @ =0x04000208
|
||||
ldrh r2, [r3]
|
||||
strh r1, [r3]
|
||||
ldr r4, _080AB168 @ =0x04000200
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0x1
|
||||
orrs r0, r1
|
||||
strh r0, [r4]
|
||||
strh r2, [r3]
|
||||
ldr r1, _080AB16C @ =REG_DISPSTAT
|
||||
movs r0, 0x8
|
||||
strh r0, [r1]
|
||||
bl ResetTasks
|
||||
bl ResetSpriteData
|
||||
ldr r0, _080AB170 @ =sub_80AB184
|
||||
bl SetMainCallback2
|
||||
movs r2, 0xC0
|
||||
lsls r2, 19
|
||||
movs r3, 0xC0
|
||||
lsls r3, 9
|
||||
movs r5, 0
|
||||
ldr r1, _080AB174 @ =0x040000d4
|
||||
movs r4, 0x80
|
||||
lsls r4, 5
|
||||
ldr r6, _080AB178 @ =0x85000400
|
||||
movs r7, 0x85
|
||||
lsls r7, 24
|
||||
_080AB108:
|
||||
str r5, [sp, 0x4]
|
||||
add r0, sp, 0x4
|
||||
str r0, [r1]
|
||||
str r2, [r1, 0x4]
|
||||
str r6, [r1, 0x8]
|
||||
ldr r0, [r1, 0x8]
|
||||
adds r2, r4
|
||||
subs r3, r4
|
||||
cmp r3, r4
|
||||
bhi _080AB108
|
||||
str r5, [sp, 0x4]
|
||||
add r0, sp, 0x4
|
||||
str r0, [r1]
|
||||
str r2, [r1, 0x4]
|
||||
lsrs r0, r3, 2
|
||||
orrs r0, r7
|
||||
str r0, [r1, 0x8]
|
||||
ldr r0, [r1, 0x8]
|
||||
ldr r4, _080AB17C @ =gWindowConfig_81E6FD8
|
||||
adds r0, r4, 0
|
||||
bl SetUpWindowConfig
|
||||
ldr r5, _080AB180 @ =gUnknown_03004210
|
||||
adds r0, r5, 0
|
||||
adds r1, r4, 0
|
||||
bl InitWindowFromConfig
|
||||
adds r0, r4, 0
|
||||
bl LoadFontDefaultPalette
|
||||
movs r0, 0x7
|
||||
str r0, [sp]
|
||||
adds r0, r5, 0
|
||||
mov r1, r8
|
||||
movs r2, 0x1
|
||||
movs r3, 0x9
|
||||
bl sub_8003460
|
||||
add sp, 0x8
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080AB160: .4byte REG_BG0HOFS
|
||||
_080AB164: .4byte 0x04000208
|
||||
_080AB168: .4byte 0x04000200
|
||||
_080AB16C: .4byte REG_DISPSTAT
|
||||
_080AB170: .4byte sub_80AB184
|
||||
_080AB174: .4byte 0x040000d4
|
||||
_080AB178: .4byte 0x85000400
|
||||
_080AB17C: .4byte gWindowConfig_81E6FD8
|
||||
_080AB180: .4byte gUnknown_03004210
|
||||
thumb_func_end unref_sub_80AB084
|
||||
|
||||
thumb_func_start sub_80AB184
|
||||
sub_80AB184: @ 80AB184
|
||||
ldr r0, _080AB1A8 @ =REG_BG0HOFS
|
||||
movs r1, 0
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
adds r0, 0x2
|
||||
strh r1, [r0]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080AB1A8: .4byte REG_BG0HOFS
|
||||
thumb_func_end sub_80AB184
|
||||
|
||||
.align 2, 0 @ Don't pad with nop.
|
||||
@@ -79,7 +79,7 @@ _0814A4A0: .4byte gUnknown_02024D1E
|
||||
_0814A4A4: .4byte gCallback_03004AE8
|
||||
_0814A4A8: .4byte gUnknown_0842C29C
|
||||
_0814A4AC:
|
||||
bl sub_8071C20
|
||||
bl CloseMenu
|
||||
movs r0, 0x1
|
||||
_0814A4B2:
|
||||
pop {r1}
|
||||
@@ -115,7 +115,7 @@ sub_814A4B8: @ 814A4B8
|
||||
ldr r0, _0814A514 @ =0x0000055a
|
||||
adds r2, r0
|
||||
strh r1, [r2]
|
||||
bl sub_8071C20
|
||||
bl CloseMenu
|
||||
movs r0, 0x1
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
|
||||
@@ -9,38 +9,38 @@ typedef void (*IntrFunc)(void);
|
||||
|
||||
struct Main
|
||||
{
|
||||
MainCallback callback1;
|
||||
MainCallback callback2;
|
||||
/*0x000*/ MainCallback callback1;
|
||||
/*0x004*/ MainCallback callback2;
|
||||
|
||||
MainCallback field_8;
|
||||
/*0x008*/ MainCallback field_8;
|
||||
|
||||
IntrCallback vblankCallback;
|
||||
IntrCallback hblankCallback;
|
||||
IntrCallback vcountCallback;
|
||||
IntrCallback serialCallback;
|
||||
/*0x00C*/ IntrCallback vblankCallback;
|
||||
/*0x010*/ IntrCallback hblankCallback;
|
||||
/*0x014*/ IntrCallback vcountCallback;
|
||||
/*0x018*/ IntrCallback serialCallback;
|
||||
|
||||
vu16 intrCheck;
|
||||
/*0x01C*/ vu16 intrCheck;
|
||||
|
||||
u32 vblankCounter1;
|
||||
u32 vblankCounter2;
|
||||
/*0x020*/ u32 vblankCounter1;
|
||||
/*0x024*/ u32 vblankCounter2;
|
||||
|
||||
u16 heldKeysRaw; // held keys without L=A remapping
|
||||
u16 newKeysRaw; // newly pressed keys without L=A remapping
|
||||
u16 heldKeys; // held keys with L=A remapping
|
||||
u16 newKeys; // newly pressed keys with L=A remapping
|
||||
u16 newAndRepeatedKeys; // newly pressed keys plus key repeat
|
||||
u16 keyRepeatCounter; // counts down to 0, triggering key repeat
|
||||
bool16 watchedKeysPressed; // whether one of the watched keys was pressed
|
||||
u16 watchedKeysMask; // bit mask for watched keys
|
||||
/*0x028*/ u16 heldKeysRaw; // held keys without L=A remapping
|
||||
/*0x02A*/ u16 newKeysRaw; // newly pressed keys without L=A remapping
|
||||
/*0x02C*/ u16 heldKeys; // held keys with L=A remapping
|
||||
/*0x02E*/ u16 newKeys; // newly pressed keys with L=A remapping
|
||||
/*0x030*/ u16 newAndRepeatedKeys; // newly pressed keys plus key repeat
|
||||
/*0x032*/ u16 keyRepeatCounter; // counts down to 0, triggering key repeat
|
||||
/*0x034*/ bool16 watchedKeysPressed; // whether one of the watched keys was pressed
|
||||
/*0x036*/ u16 watchedKeysMask; // bit mask for watched keys
|
||||
|
||||
u8 objCount;
|
||||
/*0x038*/ u8 objCount;
|
||||
|
||||
struct OamData oamBuffer[128];
|
||||
/*0x03C*/ struct OamData oamBuffer[128];
|
||||
|
||||
u8 state;
|
||||
/*0x43C*/ u8 state;
|
||||
|
||||
u8 oamLoadDisabled:1;
|
||||
u8 inBattle:1;
|
||||
/*0x43D*/ u8 oamLoadDisabled:1;
|
||||
/*0x43D*/ u8 inBattle:1;
|
||||
};
|
||||
|
||||
extern u8 gUnknown_3001764;
|
||||
|
||||
@@ -9,7 +9,7 @@ struct MenuAction
|
||||
u8 (*func)();
|
||||
};
|
||||
|
||||
void sub_8071C20(void);
|
||||
void CloseMenu(void);
|
||||
void AppendToList(u8 *list, u8 *pindex, u32 value);
|
||||
void InitMenuWindow(const struct WindowConfig *);
|
||||
void MultistepInitMenuWindowBegin(const struct WindowConfig *);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,7 @@ EWRAM_DATA u16 gMenuMessageBoxContentTileOffset = 0;
|
||||
|
||||
extern const struct MenuAction gMenuYesNoItems[];
|
||||
|
||||
void sub_8071C20(void)
|
||||
void CloseMenu(void)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
MenuZeroFillScreen();
|
||||
|
||||
@@ -37,7 +37,7 @@ bool8 sub_8083D4C(void)
|
||||
{
|
||||
if ( gMain.newKeys & A_BUTTON )
|
||||
{
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
@@ -67,7 +67,7 @@ s8 MoriDebugMenu_Egg(void)
|
||||
{
|
||||
if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() )
|
||||
sub_8041940();
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -76,7 +76,7 @@ s8 MoriDebugMenu_MaleEgg(void)
|
||||
{
|
||||
if ( daycare_count_pokemon(gSaveBlock1.filler_2F9C) == 2 && daycare_relationship_score_from_savegame() )
|
||||
sub_8041950();
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -84,21 +84,21 @@ s8 MoriDebugMenu_MaleEgg(void)
|
||||
s8 MoriDebugMenu_1000Steps(void)
|
||||
{
|
||||
sub_8041790(1000);
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
s8 MoriDebugMenu_10000Steps(void)
|
||||
{
|
||||
sub_8041790(10000);
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
s8 MoriDebugMenu_MoveTutor(void)
|
||||
{
|
||||
sub_8132670();
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -116,14 +116,14 @@ s8 MoriDebugMenu_BreedEgg(void)
|
||||
}
|
||||
}
|
||||
gSaveBlock1.filler_30B6 = -3;
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
s8 MoriDebugMenu_LongName(void)
|
||||
{
|
||||
SetMonData(gPlayerParty, MON_DATA_NICKNAME, gUnknown_0839B257);
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ s8 MoriDebugMenu_PokeblockCase(void)
|
||||
for(loopCounter = 0; loopCounter <= 39; loopCounter++)
|
||||
sub_810CA6C((u8)loopCounter);
|
||||
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ bool8 MoriDebugMenuProcessInput(void)
|
||||
case -2:
|
||||
return FALSE;
|
||||
case -1:
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -317,7 +317,7 @@ static u8 StartMenu_InputProcessCallback(void)
|
||||
}
|
||||
if(gMain.newKeys & (START_BUTTON | B_BUTTON))
|
||||
{
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
@@ -408,14 +408,14 @@ u8 StartMenu_OptionCallback(void)
|
||||
//When player selects EXIT
|
||||
u8 StartMenu_ExitCallback(void)
|
||||
{
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
return 1;
|
||||
}
|
||||
|
||||
//When player selects RETIRE
|
||||
u8 StartMenu_RetireCallback(void)
|
||||
{
|
||||
sub_8071C20();
|
||||
CloseMenu();
|
||||
SafariZoneRetirePrompt();
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user