dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Frontier, finish ranking hall

Browse Source
This commit is contained in:
DizzyEggg
2018-10-28 21:11:53 +01:00
parent 98d8dbfd8a
commit 3a9eeef844
13 changed files with 417 additions and 1090 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
-799
View File
@@ -7,805 +7,6 @@
thumb_func_start sub_81A447C
sub_81A447C: @ 81A447C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
movs r0, 0
str r0, [sp]
_081A448C:
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, [sp]
lsls r1, r2, 1
ldr r4, =0x00000caa
adds r0, r4
adds r0, r1
ldrh r0, [r0]
subs r0, 0x1
lsls r0, 16
lsrs r0, 16
mov r9, r1
adds r2, 0x1
str r2, [sp, 0x4]
cmp r0, 0x5
bhi _081A454E
movs r6, 0
ldr r0, [sp]
movs r2, 0x64
adds r1, r0, 0
muls r1, r2
ldr r0, =gPlayerParty
adds r7, r1, r0
_081A44BA:
movs r5, 0
movs r4, 0xD
adds r4, r6
mov r8, r4
adds r0, r6, 0x1
mov r10, r0
_081A44C6:
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000caa
adds r0, r2
add r0, r9
ldrh r0, [r0]
movs r4, 0x64
adds r1, r0, 0
muls r1, r4
movs r0, 0xEA
lsls r0, 1
adds r1, r0
ldr r2, =gSaveBlock1Ptr
ldr r0, [r2]
adds r0, r1
adds r1, r5, 0
adds r1, 0xD
movs r2, 0
bl GetMonData
adds r4, r0, 0
adds r0, r7, 0
mov r1, r8
movs r2, 0
bl GetMonData
cmp r4, r0
beq _081A4508
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x3
bls _081A44C6
_081A4508:
cmp r5, 0x4
bne _081A4516
adds r0, r7, 0
movs r1, 0xA6
adds r2, r6, 0
bl SetMonMoveSlot
_081A4516:
mov r4, r10
lsls r0, r4, 24
lsrs r6, r0, 24
cmp r6, 0x3
bls _081A44BA
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =gSaveBlock2Ptr
ldr r1, [r2]
ldr r4, =0x00000caa
adds r1, r4
add r1, r9
ldrh r1, [r1]
subs r1, 0x1
movs r3, 0x64
muls r1, r3
adds r0, r1
movs r1, 0x8E
lsls r1, 2
adds r0, r1
ldr r2, =gPlayerParty
ldr r4, [sp]
adds r1, r4, 0
muls r1, r3
adds r1, r2
movs r2, 0x64
bl memcpy
_081A454E:
ldr r1, [sp, 0x4]
lsls r0, r1, 24
lsrs r0, 24
str r0, [sp]
cmp r0, 0x3
bls _081A448C
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A447C
thumb_func_start sub_81A457C
sub_81A457C: @ 81A457C
push {lr}
ldr r0, =0x000040cf
bl VarGet
lsls r0, 24
lsrs r0, 24
bl sub_81A5030
pop {r0}
bx r0
.pool
thumb_func_end sub_81A457C
thumb_func_start sub_81A4594
sub_81A4594: @ 81A4594
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x2C
mov r8, r1
adds r6, r3, 0
ldr r1, =gRecordsWindowId
ldrb r5, [r1]
lsls r4, r0, 1
adds r4, r0
ldr r1, =gText_1Dot
adds r4, r1
mov r1, r8
lsls r3, r1, 27
lsrs r3, 24
lsls r1, r0, 2
adds r1, r0
adds r2, r1
lsls r2, 3
adds r2, 0x1
lsls r2, 24
lsrs r7, r2, 24
str r7, [sp]
movs r0, 0xFF
mov r10, r0
str r0, [sp, 0x4]
movs r1, 0
mov r9, r1
str r1, [sp, 0x8]
adds r0, r5, 0
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
movs r0, 0xFF
strb r0, [r6, 0xD]
ldrh r0, [r6, 0x4]
cmp r0, 0
beq _081A465C
adds r1, r6, 0x6
ldrb r2, [r6, 0xE]
add r0, sp, 0xC
bl TVShowConvertInternationalString
ldr r1, =gRecordsWindowId
ldrb r0, [r1]
mov r3, r8
adds r3, 0x2
lsls r3, 27
lsrs r3, 24
str r7, [sp]
mov r1, r10
str r1, [sp, 0x4]
mov r1, r9
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl AddTextPrinterParameterized
ldrh r1, [r6, 0x4]
ldr r0, =0x0000270f
cmp r1, r0
bls _081A4618
adds r1, r0, 0
_081A4618:
ldr r0, =gStringVar2
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r5, =gStringVar4
ldr r1, =gUnknown_08611D08
ldr r0, [sp, 0x4C]
lsls r0, 2
adds r0, r1
ldr r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xC8
bl GetStringRightAlignXOffset
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
ldr r1, =gRecordsWindowId
ldrb r0, [r1]
str r7, [sp]
mov r1, r10
str r1, [sp, 0x4]
mov r1, r9
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParameterized
_081A465C:
add sp, 0x2C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A4594
thumb_func_start sub_81A4684
sub_81A4684: @ 81A4684
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x2C
adds r6, r0, 0
adds r7, r1, 0
mov r10, r2
adds r5, r3, 0
ldr r1, =gRecordsWindowId
ldrb r0, [r1]
lsls r2, r6, 1
adds r2, r6
ldr r1, =gText_1Dot
adds r2, r1
lsls r3, r7, 27
lsrs r3, 24
mov r12, r3
lsls r1, r6, 2
adds r1, r6
mov r3, r10
adds r4, r3, r1
lsls r1, r4, 3
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
str r1, [sp]
movs r1, 0xFF
mov r9, r1
str r1, [sp, 0x4]
movs r3, 0
mov r8, r3
str r3, [sp, 0x8]
movs r1, 0x1
mov r3, r12
bl AddTextPrinterParameterized
ldrh r0, [r5, 0x8]
cmp r0, 0
beq _081A47BC
movs r0, 0xFF
strb r0, [r5, 0x11]
movs r0, 0x1
negs r0, r0
strb r0, [r5, 0x19]
adds r1, r5, 0
adds r1, 0xA
ldrb r2, [r5, 0x1A]
add r0, sp, 0xC
bl TVShowConvertInternationalString
ldr r1, =gRecordsWindowId
ldrb r0, [r1]
adds r3, r7, 0x2
lsls r3, 27
lsrs r3, 24
subs r1, r4, 0x1
lsls r1, 3
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
str r1, [sp]
mov r2, r9
str r2, [sp, 0x4]
mov r1, r8
str r1, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl AddTextPrinterParameterized
adds r4, r5, 0
adds r4, 0x12
adds r0, r4, 0
bl IsStringJapanese
cmp r0, 0
beq _081A4734
add r0, sp, 0xC
adds r1, r4, 0
movs r2, 0x1
bl TVShowConvertInternationalString
b _081A473C
.pool
_081A4734:
add r0, sp, 0xC
adds r1, r4, 0
bl StringCopy
_081A473C:
ldr r2, =gRecordsWindowId
mov r9, r2
ldrb r0, [r2]
adds r3, r7, 0x4
lsls r3, 27
lsrs r3, 24
lsls r1, r6, 2
adds r1, r6
mov r2, r10
adds r6, r2, r1
adds r1, r6, 0x1
lsls r1, 3
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
str r1, [sp]
movs r1, 0xFF
mov r8, r1
str r1, [sp, 0x4]
movs r7, 0
str r7, [sp, 0x8]
movs r1, 0x1
add r2, sp, 0xC
bl AddTextPrinterParameterized
ldrh r1, [r5, 0x8]
ldr r0, =0x0000270f
cmp r1, r0
bls _081A4778
adds r1, r0, 0
_081A4778:
ldr r0, =gStringVar2
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r5, =gStringVar4
ldr r0, =gUnknown_08611D08
ldr r4, [r0, 0x24]
adds r0, r5, 0
adds r1, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xC8
bl GetStringRightAlignXOffset
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
mov r2, r9
ldrb r0, [r2]
lsls r1, r6, 3
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
str r1, [sp]
mov r1, r8
str r1, [sp, 0x4]
str r7, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParameterized
_081A47BC:
add sp, 0x2C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A4684
thumb_func_start sub_81A47E0
sub_81A47E0: @ 81A47E0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x44
mov r9, r0
mov r10, r1
str r2, [sp, 0x40]
movs r0, 0xAC
lsls r0, 1
bl AllocZeroed
mov r8, r0
bl sub_80E8260
add r0, sp, 0x30
mov r12, r0
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r3, [sp, 0x40]
lsls r1, r3, 1
adds r1, r3
lsls r1, 4
mov r4, r10
lsls r0, r4, 1
add r0, r10
lsls r0, 5
adds r1, r0
adds r4, r1, r2
mov r3, sp
movs r2, 0x2
_081A4820:
adds r0, r3, 0
movs r5, 0x87
lsls r5, 2
adds r1, r4, r5
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldr r1, [r1]
str r1, [r0]
adds r4, 0x10
adds r3, 0x10
subs r2, 0x1
cmp r2, 0
bge _081A4820
ldr r6, [sp, 0x40]
lsls r0, r6, 4
mov r7, r10
lsls r1, r7, 5
adds r0, r1
mov r1, r12
add r0, r8
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldr r0, [r0]
str r0, [r1]
movs r2, 0
_081A4852:
movs r1, 0
movs r4, 0
movs r3, 0
lsls r5, r2, 4
adds r6, r2, 0x1
mov r2, sp
_081A485E:
ldrh r0, [r2, 0x4]
cmp r0, r1
ble _081A4868
adds r4, r3, 0
adds r1, r0, 0
_081A4868:
adds r2, 0x10
adds r3, 0x1
cmp r3, 0x3
ble _081A485E
mov r0, sp
ldrh r0, [r0, 0x34]
cmp r0, r1
blt _081A487A
movs r4, 0x3
_081A487A:
lsls r0, r4, 4
mov r7, sp
adds r2, r7, r0
mov r0, r9
adds r1, r5, r0
adds r0, r2, 0
ldm r0!, {r3-r5}
stm r1!, {r3-r5}
ldr r0, [r0]
str r0, [r1]
movs r0, 0
strh r0, [r2, 0x4]
adds r2, r6, 0
cmp r2, 0x2
ble _081A4852
mov r0, r8
bl Free
add sp, 0x44
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A47E0
thumb_func_start sub_81A48B4
sub_81A48B4: @ 81A48B4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x74
mov r9, r0
mov r10, r1
movs r0, 0xAC
lsls r0, 1
bl AllocZeroed
mov r8, r0
bl sub_80E8260
mov r0, sp
adds r0, 0x54
str r0, [sp, 0x70]
add r1, sp, 0x5C
mov r12, r1
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
movs r0, 0x54
mov r2, r10
muls r2, r0
adds r0, r2, 0
adds r3, r0, r1
mov r2, sp
movs r4, 0x2
_081A48EE:
adds r0, r2, 0
ldr r5, =0x0000057c
adds r1, r3, r5
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldr r1, [r1]
str r1, [r0]
adds r3, 0x1C
adds r2, 0x1C
subs r4, 0x1
cmp r4, 0
bge _081A48EE
mov r6, r10
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
add r0, r8
ldr r1, [sp, 0x70]
movs r7, 0x90
lsls r7, 1
adds r0, r7
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldr r0, [r0]
str r0, [r1]
movs r4, 0
_081A492A:
movs r1, 0
movs r5, 0
movs r3, 0
lsls r6, r4, 3
adds r7, r4, 0x1
mov r2, sp
_081A4936:
ldrh r0, [r2, 0x8]
cmp r0, r1
ble _081A4940
adds r5, r3, 0
adds r1, r0, 0
_081A4940:
adds r2, 0x1C
adds r3, 0x1
cmp r3, 0x2
ble _081A4936
mov r2, r12
ldrh r0, [r2]
cmp r0, r1
blt _081A4952
movs r5, 0x3
_081A4952:
subs r1, r6, r4
lsls r1, 2
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
mov r3, sp
adds r2, r3, r0
add r1, r9
adds r0, r2, 0
ldm r0!, {r4-r6}
stm r1!, {r4-r6}
ldm r0!, {r3-r5}
stm r1!, {r3-r5}
ldr r0, [r0]
str r0, [r1]
movs r0, 0
strh r0, [r2, 0x8]
adds r4, r7, 0
cmp r4, 0x2
ble _081A492A
mov r0, r8
bl Free
add sp, 0x74
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A48B4
thumb_func_start sub_81A4998
sub_81A4998: @ 81A4998
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x94
adds r7, r0, 0
str r1, [sp, 0x90]
ldr r0, =gStringVar1
ldr r4, =gUnknown_08611CB0
lsls r5, r7, 3
adds r1, r5, r4
ldr r1, [r1]
bl StringCopy
ldr r6, =gStringVar4
adds r4, 0x4
adds r5, r4
ldr r1, [r5]
adds r0, r6, 0
bl StringExpandPlaceholders
ldr r0, =gRecordsWindowId
mov r8, r0
ldrb r0, [r0]
movs r1, 0x1
mov r10, r1
str r1, [sp]
movs r2, 0xFF
mov r9, r2
str r2, [sp, 0x4]
movs r5, 0
str r5, [sp, 0x8]
adds r2, r6, 0
movs r3, 0
bl AddTextPrinterParameterized
ldr r1, =gUnknown_08611D00
ldr r2, [sp, 0x90]
lsls r0, r2, 2
adds r0, r1
ldr r4, [r0]
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xD0
bl GetStringRightAlignXOffset
adds r3, r0, 0
mov r1, r8
ldrb r0, [r1]
lsls r3, 24
lsrs r3, 24
mov r2, r10
str r2, [sp]
mov r1, r9
str r1, [sp, 0x4]
str r5, [sp, 0x8]
movs r1, 0x1
adds r2, r4, 0
bl AddTextPrinterParameterized
cmp r7, 0x9
bne _081A4A6C
ldr r2, =gSaveBlock2Ptr
ldr r0, [r2]
ldr r1, =0x00000ee8
adds r0, r1
movs r1, 0xFF
strb r1, [r0]
ldr r0, [r2]
movs r2, 0xEF
lsls r2, 4
adds r0, r2
movs r1, 0x1
negs r1, r1
strb r1, [r0]
add r4, sp, 0x3C
adds r0, r4, 0
ldr r1, [sp, 0x90]
bl sub_81A48B4
_081A4A3A:
adds r0, r5, 0
movs r1, 0x1
movs r2, 0x4
adds r3, r4, 0
bl sub_81A4684
adds r4, 0x1C
adds r5, 0x1
cmp r5, 0x2
ble _081A4A3A
b _081A4A90
.pool
_081A4A6C:
add r0, sp, 0xC
adds r1, r7, 0
ldr r2, [sp, 0x90]
bl sub_81A47E0
movs r5, 0
add r4, sp, 0xC
_081A4A7A:
str r7, [sp]
adds r0, r5, 0
movs r1, 0x1
movs r2, 0x4
adds r3, r4, 0
bl sub_81A4594
adds r4, 0x10
adds r5, 0x1
cmp r5, 0x2
ble _081A4A7A
_081A4A90:
add sp, 0x94
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81A4998
thumb_func_start sub_81A4AA0
sub_81A4AA0: @ 81A4AA0
push {r4,lr}
ldr r4, =gRecordsWindowId
ldr r0, =gUnknown_08611C84
bl AddWindow
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
bl NewMenuHelpers_DrawStdWindowFrame
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gSpecialVar_0x8005
ldrh r0, [r0]
movs r1, 0
bl sub_81A4998
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A4AA0
thumb_func_start sub_81A4AE8
sub_81A4AE8: @ 81A4AE8
push {r4,lr}
ldr r4, =gRecordsWindowId
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gSpecialVar_0x8005
ldrh r0, [r0]
movs r1, 0x1
bl sub_81A4998
ldrb r0, [r4]
movs r1, 0x2
bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81A4AE8
thumb_func_start sub_81A4B14
sub_81A4B14: @ 81A4B14
push {r4-r7,lr}