Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-28 13:24:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

split some files out of rom6.s

Browse Source
This commit is contained in:
YamaArashi
2016-10-25 19:57:15 -07:00
parent cfe4a52393
commit fb2f1c8bce
19 changed files with 42551 additions and 42375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -124,6 +124,22 @@ asm/contest_painting.o \
asm/battle_ai.o \
asm/trader.o \
asm/rom6.o \
asm/battle_records.o \
asm/pokedex_area_screen.o \
asm/evolution_scene.o \
asm/roulette.o \
asm/pokedex_cry_screen.o \
asm/coins.o \
asm/landmark.o \
asm/fldeff_strength.o \
asm/battle_transition.o \
asm/battle_811DA74.o \
asm/battle_message.o \
asm/choose_party.o \
asm/cable_car.o \
asm/roulette_util.o \
asm/cable_car_util.o \
asm/unused_8124F94.o \
asm/mystery_event_script.o \
asm/field_effect_helpers.o \
asm/contest_ai.o \

5890
asm/battle_811DA74.s Normal file
View File

File diff suppressed because it is too large Load Diff

2403
asm/battle_message.s Normal file
View File

File diff suppressed because it is too large Load Diff

908
asm/battle_records.s Normal file
View File

@@ -0,0 +1,908 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start sub_810FF78
sub_810FF78: @ 810FF78
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r2, _0810FFA4 @ =0x01000008
mov r0, sp
adds r1, r4, 0
bl CpuSet
movs r0, 0xFF
strb r0, [r4]
movs r0, 0
strh r0, [r4, 0x8]
strh r0, [r4, 0xA]
strh r0, [r4, 0xC]
strh r0, [r4, 0xE]
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0810FFA4: .4byte 0x01000008
thumb_func_end sub_810FF78
thumb_func_start sub_810FFA8
sub_810FFA8: @ 810FFA8
push {r4,r5,lr}
adds r4, r0, 0
movs r5, 0x4
_0810FFAE:
adds r0, r4, 0
bl sub_810FF78
adds r4, 0x10
subs r5, 0x1
cmp r5, 0
bge _0810FFAE
movs r0, 0x17
movs r1, 0
bl sav12_xor_set
movs r0, 0x18
movs r1, 0
bl sav12_xor_set
movs r0, 0x19
movs r1, 0
bl sav12_xor_set
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_810FFA8
thumb_func_start sub_810FFDC
sub_810FFDC: @ 810FFDC
adds r1, r0, 0
ldrh r0, [r1, 0xA]
ldrh r2, [r1, 0xC]
adds r0, r2
ldrh r1, [r1, 0xE]
adds r0, r1
bx lr
thumb_func_end sub_810FFDC
thumb_func_start sub_810FFEC
sub_810FFEC: @ 810FFEC
push {r4-r7,lr}
mov r7, r8
push {r7}
mov r8, r1
lsls r2, 16
lsrs r7, r2, 16
movs r5, 0
ldr r6, _08110024 @ =gStringVar1
adds r4, r0, 0
_0810FFFE:
adds r0, r6, 0
adds r1, r4, 0
movs r2, 0x7
bl memcpy
movs r0, 0xFF
strb r0, [r6, 0x7]
adds r0, r6, 0
mov r1, r8
bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
bne _08110028
ldrh r0, [r4, 0x8]
cmp r0, r7
bne _08110028
adds r0, r5, 0
b _08110032
.align 2, 0
_08110024: .4byte gStringVar1
_08110028:
adds r4, 0x10
adds r5, 0x1
cmp r5, 0x4
ble _0810FFFE
movs r0, 0x5
_08110032:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_810FFEC
thumb_func_start sub_811003C
sub_811003C: @ 811003C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x14
mov r8, r0
movs r0, 0x4
_0811004A:
subs r2, r0, 0x1
mov r9, r2
cmp r2, 0
blt _081100A4
lsls r0, 4
mov r1, r8
adds r6, r1, r0
lsls r0, r2, 4
adds r5, r0, r1
_0811005C:
adds r0, r6, 0
str r2, [sp, 0x10]
bl sub_810FFDC
adds r4, r0, 0
adds r0, r5, 0
bl sub_810FFDC
ldr r2, [sp, 0x10]
cmp r4, r0
ble _08110096
mov r1, sp
adds r0, r6, 0
ldm r0!, {r3,r4,r7}
stm r1!, {r3,r4,r7}
ldr r0, [r0]
str r0, [r1]
adds r1, r6, 0
adds r0, r5, 0
ldm r0!, {r3,r4,r7}
stm r1!, {r3,r4,r7}
ldr r0, [r0]
str r0, [r1]
adds r1, r5, 0
mov r0, sp
ldm r0!, {r3,r4,r7}
stm r1!, {r3,r4,r7}
ldr r0, [r0]
str r0, [r1]
_08110096:
subs r5, 0x10
movs r0, 0x1
negs r0, r0
add r9, r0
mov r1, r9
cmp r1, 0
bge _0811005C
_081100A4:
adds r0, r2, 0
cmp r0, 0
bgt _0811004A
add sp, 0x14
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_811003C
thumb_func_start sub_81100B8
sub_81100B8: @ 81100B8
push {lr}
adds r2, r0, 0
cmp r1, 0x2
beq _081100E8
cmp r1, 0x2
bgt _081100CA
cmp r1, 0x1
beq _081100D0
b _08110112
_081100CA:
cmp r1, 0x3
beq _08110100
b _08110112
_081100D0:
ldrh r0, [r2, 0xA]
adds r0, 0x1
strh r0, [r2, 0xA]
lsls r0, 16
lsrs r0, 16
ldr r1, _081100E4 @ =0x0000270f
cmp r0, r1
bls _08110112
strh r1, [r2, 0xA]
b _08110112
.align 2, 0
_081100E4: .4byte 0x0000270f
_081100E8:
ldrh r0, [r2, 0xC]
adds r0, 0x1
strh r0, [r2, 0xC]
lsls r0, 16
lsrs r0, 16
ldr r1, _081100FC @ =0x0000270f
cmp r0, r1
bls _08110112
strh r1, [r2, 0xC]
b _08110112
.align 2, 0
_081100FC: .4byte 0x0000270f
_08110100:
ldrh r0, [r2, 0xE]
adds r0, 0x1
strh r0, [r2, 0xE]
lsls r0, 16
lsrs r0, 16
ldr r1, _08110118 @ =0x0000270f
cmp r0, r1
bls _08110112
strh r1, [r2, 0xE]
_08110112:
pop {r0}
bx r0
.align 2, 0
_08110118: .4byte 0x0000270f
thumb_func_end sub_81100B8
thumb_func_start sub_811011C
sub_811011C: @ 811011C
push {r4,lr}
cmp r0, 0x2
beq _08110136
cmp r0, 0x2
bgt _0811012C
cmp r0, 0x1
beq _08110132
b _0811014E
_0811012C:
cmp r0, 0x3
beq _0811013A
b _0811014E
_08110132:
movs r4, 0x17
b _0811013C
_08110136:
movs r4, 0x18
b _0811013C
_0811013A:
movs r4, 0x19
_0811013C:
adds r0, r4, 0
bl sub_8053108
ldr r1, _08110154 @ =0x0000270e
cmp r0, r1
bhi _0811014E
adds r0, r4, 0
bl sav12_xor_increment
_0811014E:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08110154: .4byte 0x0000270e
thumb_func_end sub_811011C
thumb_func_start sub_8110158
sub_8110158: @ 8110158
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
adds r5, r0, 0
adds r7, r1, 0
mov r10, r3
ldr r0, [sp, 0x20]
lsls r2, 16
lsrs r2, 16
mov r9, r2
lsls r0, 24
lsrs r0, 24
mov r8, r0
mov r0, r10
bl sub_811011C
adds r0, r5, 0
bl sub_811003C
adds r0, r5, 0
adds r1, r7, 0
mov r2, r9
bl sub_810FFEC
adds r6, r0, 0
cmp r6, 0x5
bne _081101CC
movs r6, 0x4
adds r4, r5, 0
adds r4, 0x40
adds r0, r4, 0
bl sub_810FF78
mov r0, r8
cmp r0, 0x1
bne _081101BA
movs r0, 0xFC
strb r0, [r4]
movs r0, 0x15
strb r0, [r4, 0x1]
adds r0, r5, 0
adds r0, 0x42
adds r1, r7, 0
movs r2, 0x5
bl StringCopyN
b _081101C4
_081101BA:
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x7
bl StringCopyN
_081101C4:
lsls r0, r6, 4
adds r0, r5, r0
mov r1, r9
strh r1, [r0, 0x8]
_081101CC:
lsls r0, r6, 4
adds r0, r5, r0
mov r1, r10
bl sub_81100B8
adds r0, r5, 0
bl sub_811003C
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8110158
thumb_func_start GameFreakRTC_Reset
GameFreakRTC_Reset: @ 81101EC
push {lr}
ldr r0, _081101F8 @ =gSaveBlock1 + 0x30B8
bl sub_810FFA8
pop {r0}
bx r0
.align 2, 0
_081101F8: .4byte gSaveBlock1 + 0x30B8
thumb_func_end GameFreakRTC_Reset
thumb_func_start sub_81101FC
sub_81101FC: @ 81101FC
push {lr}
lsls r1, r0, 3
subs r1, r0
lsls r1, 3
ldr r0, _08110220 @ =gUnknown_0202FFD4
adds r1, r0
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
lsls r0, 16
lsrs r0, 16
ldr r2, _08110224 @ =0x0000270f
cmp r0, r2
bls _0811021A
strh r2, [r1]
_0811021A:
pop {r0}
bx r0
.align 2, 0
_08110220: .4byte gUnknown_0202FFD4
_08110224: .4byte 0x0000270f
thumb_func_end sub_81101FC
thumb_func_start sub_8110228
sub_8110228: @ 8110228
push {lr}
lsls r1, r0, 3
subs r1, r0
lsls r1, 3
ldr r0, _0811024C @ =gUnknown_0202FFD6
adds r1, r0
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
lsls r0, 16
lsrs r0, 16
ldr r2, _08110250 @ =0x0000270f
cmp r0, r2
bls _08110246
strh r2, [r1]
_08110246:
pop {r0}
bx r0
.align 2, 0
_0811024C: .4byte gUnknown_0202FFD6
_08110250: .4byte 0x0000270f
thumb_func_end sub_8110228
thumb_func_start sub_8110254
sub_8110254: @ 8110254
push {r4,lr}
adds r4, r0, 0
ldr r0, _08110268 @ =gUnknown_02024D26
ldrb r0, [r0]
cmp r0, 0x1
beq _0811026C
cmp r0, 0x2
beq _0811027A
b _08110288
.align 2, 0
_08110268: .4byte gUnknown_02024D26
_0811026C:
eors r0, r4
bl sub_81101FC
adds r0, r4, 0
bl sub_8110228
b _08110288
_0811027A:
movs r0, 0x1
eors r0, r4
bl sub_8110228
adds r0, r4, 0
bl sub_81101FC
_08110288:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8110254
thumb_func_start sub_8110290
sub_8110290: @ 8110290
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
bl sub_8110254
ldr r0, _081102D4 @ =gSaveBlock1 + 0x30B8
lsls r2, r4, 3
subs r2, r4
lsls r2, 3
ldr r3, _081102D8 @ =gUnknown_0202FFF0
adds r1, r2, r3
subs r3, 0x30
adds r2, r3
ldrh r2, [r2, 0xE]
ldr r3, _081102DC @ =gUnknown_02024D26
ldrb r3, [r3]
ldr r6, _081102E0 @ =gLinkPlayers
ldr r5, _081102E4 @ =gUnknown_02029818
lsls r4, 2
adds r4, r5
ldrb r5, [r4, 0x1]
lsls r4, r5, 3
subs r4, r5
lsls r4, 2
adds r4, r6
ldrb r4, [r4, 0x1A]
str r4, [sp]
bl sub_8110158
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_081102D4: .4byte gSaveBlock1 + 0x30B8
_081102D8: .4byte gUnknown_0202FFF0
_081102DC: .4byte gUnknown_02024D26
_081102E0: .4byte gLinkPlayers
_081102E4: .4byte gUnknown_02029818
thumb_func_end sub_8110290
thumb_func_start sub_81102E8
sub_81102E8: @ 81102E8
push {r4,lr}
ldr r4, _08110338 @ =gStringVar1
movs r0, 0x17
bl sub_8053108
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN_DigitWidth6
ldr r4, _0811033C @ =gStringVar2
movs r0, 0x18
bl sub_8053108
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN_DigitWidth6
ldr r4, _08110340 @ =gStringVar3
movs r0, 0x19
bl sub_8053108
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN_DigitWidth6
ldr r0, _08110344 @ =gOtherText_WinRecord
movs r1, 0x3
movs r2, 0x3
bl MenuPrint
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08110338: .4byte gStringVar1
_0811033C: .4byte gStringVar2
_08110340: .4byte gStringVar3
_08110344: .4byte gOtherText_WinRecord
thumb_func_end sub_81102E8
thumb_func_start sub_8110348
sub_8110348: @ 8110348
push {r4-r7,lr}
sub sp, 0x10
adds r7, r0, 0
lsls r1, 24
lsrs r6, r1, 24
ldrh r0, [r7, 0xA]
cmp r0, 0
bne _081103C0
ldr r0, [r7, 0xC]
cmp r0, 0
bne _081103C0
mov r0, sp
movs r2, 0xFC
strb r2, [r0]
mov r1, sp
movs r0, 0x14
strb r0, [r1, 0x1]
movs r0, 0x6
strb r0, [r1, 0x2]
mov r0, sp
strb r2, [r0, 0x3]
movs r0, 0x11
strb r0, [r1, 0x4]
movs r0, 0x1
strb r0, [r1, 0x5]
mov r4, sp
adds r4, 0x6
ldr r1, _081103B8 @ =gOtherText_SevenDashes
adds r0, r4, 0
bl StringCopy
mov r0, sp
movs r1, 0x3
adds r2, r6, 0
bl MenuPrint
ldr r1, _081103BC @ =gOtherText_FourDashes
adds r0, r4, 0
bl StringCopy
mov r0, sp
movs r1, 0xB
adds r2, r6, 0
bl MenuPrint
mov r0, sp
movs r1, 0x11
adds r2, r6, 0
bl MenuPrint
mov r0, sp
movs r1, 0x17
adds r2, r6, 0
bl MenuPrint
b _0811042E
.align 2, 0
_081103B8: .4byte gOtherText_SevenDashes
_081103BC: .4byte gOtherText_FourDashes
_081103C0:
ldr r4, _08110438 @ =gStringVar1
adds r0, r4, 0
movs r1, 0x8
bl StringFillWithTerminator
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x7
bl StringCopyN
adds r0, r4, 0
movs r1, 0x3
adds r2, r6, 0
bl MenuPrint
movs r0, 0xFC
strb r0, [r4]
movs r0, 0x14
strb r0, [r4, 0x1]
movs r0, 0x6
strb r0, [r4, 0x2]
adds r5, r4, 0x3
ldrh r1, [r7, 0xA]
adds r0, r5, 0
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
adds r0, r4, 0
movs r1, 0xB
adds r2, r6, 0
bl MenuPrint
ldrh r1, [r7, 0xC]
adds r0, r5, 0
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
adds r0, r4, 0
movs r1, 0x11
adds r2, r6, 0
bl MenuPrint
ldrh r1, [r7, 0xE]
adds r0, r5, 0
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
adds r0, r4, 0
movs r1, 0x17
adds r2, r6, 0
bl MenuPrint
_0811042E:
add sp, 0x10
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08110438: .4byte gStringVar1
thumb_func_end sub_8110348
thumb_func_start sub_811043C
sub_811043C: @ 811043C
push {r4,lr}
movs r0, 0x1
movs r1, 0
movs r2, 0x1C
movs r3, 0x12
bl MenuDrawTextWindow
ldr r0, _08110488 @ =gOtherText_BattleResults
movs r1, 0
movs r2, 0x1
movs r3, 0xF0
bl sub_8072BD8
ldr r0, _0811048C @ =gSaveBlock1 + 0x30B8
bl sub_81102E8
ldr r0, _08110490 @ =gOtherText_WinLoseDraw
movs r1, 0xC
movs r2, 0x6
bl MenuPrint
movs r4, 0
_08110468:
lsls r0, r4, 4
ldr r1, _0811048C @ =gSaveBlock1 + 0x30B8
adds r0, r1
adds r4, 0x1
lsls r1, r4, 25
movs r2, 0xC0
lsls r2, 19
adds r1, r2
lsrs r1, 24
bl sub_8110348
cmp r4, 0x4
ble _08110468
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08110488: .4byte gOtherText_BattleResults
_0811048C: .4byte gSaveBlock1 + 0x30B8
_08110490: .4byte gOtherText_WinLoseDraw
thumb_func_end sub_811043C
thumb_func_start sub_8110494
sub_8110494: @ 8110494
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, _081104B4 @ =gSaveBlock2 + 0xA8
ldr r2, _081104B8 @ =0x000004ae
adds r1, r2
adds r0, r1
ldrb r0, [r0]
cmp r0, 0x6
bhi _081104E0
lsls r0, 2
ldr r1, _081104BC @ =_081104C0
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_081104B4: .4byte gSaveBlock2 + 0xA8
_081104B8: .4byte 0x000004ae
_081104BC: .4byte _081104C0
.align 2, 0
_081104C0:
.4byte _081104E0
.4byte _081104E0
.4byte _081104DC
.4byte _081104DC
.4byte _081104E0
.4byte _081104E0
.4byte _081104DC
_081104DC:
movs r0, 0x1
b _081104E2
_081104E0:
movs r0, 0
_081104E2:
pop {r1}
bx r1
thumb_func_end sub_8110494
thumb_func_start sub_81104E8
sub_81104E8: @ 81104E8
push {r4-r6,lr}
lsls r1, 16
lsrs r4, r1, 16
lsls r2, 24
lsrs r2, 24
adds r5, r2, 0
lsls r3, 24
lsrs r3, 24
adds r6, r3, 0
adds r1, r5, 0
adds r2, r6, 0
bl MenuPrint
ldr r0, _0811052C @ =0x0000270f
cmp r4, r0
bls _0811050A
adds r4, r0, 0
_0811050A:
ldr r0, _08110530 @ =gStringVar1
adds r1, r4, 0
movs r2, 0x18
movs r3, 0x1
bl sub_8072C14
ldr r0, _08110534 @ =gOtherText_WinStreak
adds r1, r5, 0x7
lsls r1, 24
lsrs r1, 24
adds r2, r6, 0
bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0811052C: .4byte 0x0000270f
_08110530: .4byte gStringVar1
_08110534: .4byte gOtherText_WinStreak
thumb_func_end sub_81104E8
thumb_func_start sub_8110538
sub_8110538: @ 8110538
push {r4,lr}
adds r4, r1, 0
adds r3, r2, 0
lsls r0, 24
lsls r4, 24
lsrs r4, 24
lsls r3, 24
lsrs r3, 24
ldr r1, _08110564 @ =gSaveBlock2 + 0xA8
lsrs r0, 23
movs r2, 0x97
lsls r2, 3
adds r1, r2
adds r0, r1
ldrh r1, [r0]
ldr r0, _08110568 @ =gOtherText_Record
adds r2, r4, 0
bl sub_81104E8
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08110564: .4byte gSaveBlock2 + 0xA8
_08110568: .4byte gOtherText_Record
thumb_func_end sub_8110538
thumb_func_start sub_811056C
sub_811056C: @ 811056C
push {lr}
lsls r0, 24
ldr r1, _08110588 @ =gSaveBlock2
lsrs r0, 23
ldr r2, _0811058C @ =0x00000574
adds r1, r2
adds r0, r1
ldrh r0, [r0]
ldr r1, _08110590 @ =0x0000270f
cmp r0, r1
bls _08110584
adds r0, r1, 0
_08110584:
pop {r1}
bx r1
.align 2, 0
_08110588: .4byte gSaveBlock2
_0811058C: .4byte 0x00000574
_08110590: .4byte 0x0000270f
thumb_func_end sub_811056C
thumb_func_start sub_8110594
sub_8110594: @ 8110594
push {r4-r7,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r1, 24
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
adds r0, r4, 0
bl sub_811056C
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
bl sub_8110494
cmp r0, 0x1
bne _081105CC
ldr r0, _081105C8 @ =gOtherText_Current
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_81104E8
b _081105D8
.align 2, 0
_081105C8: .4byte gOtherText_Current
_081105CC:
ldr r0, _081105E0 @ =gOtherText_Prev
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_81104E8
_081105D8:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_081105E0: .4byte gOtherText_Prev
thumb_func_end sub_8110594
thumb_func_start sub_81105E4
sub_81105E4: @ 81105E4
push {r4,lr}
movs r0, 0x3
movs r1, 0x1
movs r2, 0x1B
movs r3, 0x11
bl MenuDrawTextWindow
ldr r0, _08110658 @ =gOtherText_BattleTowerResults
movs r1, 0x3
movs r2, 0x2
movs r3, 0xC8
bl sub_8072BD8
ldr r0, _0811065C @ =gOtherText_Lv50
movs r1, 0x5
movs r2, 0x6
bl MenuPrint
ldr r0, _08110660 @ =gOtherText_Lv100
movs r1, 0x5
movs r2, 0xC
bl MenuPrint
movs r4, 0x5
_08110614:
lsls r1, r4, 24
lsrs r1, 24
movs r0, 0xAE
movs r2, 0xA
bl sub_8071F60
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x19
bls _08110614
movs r0, 0
movs r1, 0xA
movs r2, 0x6
bl sub_8110594
movs r0, 0
movs r1, 0xA
movs r2, 0x8
bl sub_8110538
movs r0, 0x1
movs r1, 0xA
movs r2, 0xC
bl sub_8110594
movs r0, 0x1
movs r1, 0xA
movs r2, 0xE
bl sub_8110538
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08110658: .4byte gOtherText_BattleTowerResults
_0811065C: .4byte gOtherText_Lv50
_08110660: .4byte gOtherText_Lv100
thumb_func_end sub_81105E4
.align 2, 0 @ Don't pad with nop.

6254
asm/battle_transition.s Normal file
View File

File diff suppressed because it is too large Load Diff

2881
asm/cable_car.s Normal file
View File

File diff suppressed because it is too large Load Diff

163
asm/cable_car_util.s Normal file
View File

@@ -0,0 +1,163 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start sub_8124E7C
sub_8124E7C: @ 8124E7C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r7, r0, 24
lsls r4, 24
lsrs r4, 24
mov r8, r4
movs r0, 0
lsrs r4, r3, 24
cmp r0, r8
bcs _08124EF6
_08124EAE:
ldr r2, [sp]
movs r3, 0
adds r6, r4, 0x1
adds r0, 0x1
mov r12, r0
cmp r3, r7
bcs _08124EE0
lsls r5, r4, 6
_08124EBE:
lsls r0, r2, 1
adds r0, r5
add r0, r10
mov r1, r9
strh r1, [r0]
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r7
bcc _08124EBE
_08124EE0:
adds r0, r6, 0
asrs r0, 5
lsls r0, 5
subs r0, r6, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r12
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r8
bcc _08124EAE
_08124EF6:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8124E7C
thumb_func_start sub_8124F08
sub_8124F08: @ 8124F08
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
mov r10, r0
ldr r0, [sp, 0x24]
ldr r4, [sp, 0x28]
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsls r0, 24
lsrs r0, 24
mov r12, r0
lsls r4, 24
lsrs r4, 24
mov r9, r4
movs r0, 0
adds r5, r1, 0
lsrs r4, r3, 24
cmp r0, r9
bcs _08124F82
_08124F38:
ldr r2, [sp]
movs r3, 0
adds r7, r4, 0x1
adds r0, 0x1
mov r8, r0
cmp r3, r12
bcs _08124F6C
lsls r6, r4, 6
_08124F48:
lsls r0, r2, 1
adds r0, r6
add r0, r10
ldrh r1, [r5]
strh r1, [r0]
adds r5, 0x2
adds r1, r2, 0x1
adds r0, r1, 0
asrs r0, 5
lsls r0, 5
subs r0, r1, r0
lsls r0, 24
lsrs r2, r0, 24
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r12
bcc _08124F48
_08124F6C:
adds r0, r7, 0
asrs r0, 5
lsls r0, 5
subs r0, r7, r0
lsls r0, 24
lsrs r4, r0, 24
mov r1, r8
lsls r0, r1, 24
lsrs r0, 24
cmp r0, r9
bcc _08124F38
_08124F82:
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8124F08
.align 2, 0 @ Don't pad with nop.

2509
asm/choose_party.s Normal file
View File

File diff suppressed because it is too large Load Diff

251
asm/coins.s Normal file
View File

@@ -0,0 +1,251 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start sub_811A704
sub_811A704: @ 811A704
push {r4,lr}
adds r4, r1, 0
adds r3, r2, 0
lsls r4, 24
lsls r3, 24
movs r1, 0x80
lsls r1, 18
adds r4, r1
lsrs r4, 24
movs r1, 0x80
lsls r1, 17
adds r3, r1
lsrs r3, 24
movs r1, 0x4
adds r2, r4, 0
bl sub_811A798
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_811A704
thumb_func_start sub_811A72C
sub_811A72C: @ 811A72C
push {r4-r6,lr}
mov r6, r8
push {r6}
mov r8, r0
adds r4, r1, 0
adds r3, r2, 0
lsls r4, 24
lsls r3, 24
lsrs r6, r4, 24
movs r0, 0x90
lsls r0, 20
adds r4, r0
lsrs r4, 24
lsrs r5, r3, 24
movs r0, 0xC0
lsls r0, 18
adds r3, r0
lsrs r3, 24
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
bl MenuDrawTextWindow
mov r0, r8
adds r1, r6, 0
adds r2, r5, 0
bl sub_811A704
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_811A72C
thumb_func_start sub_811A770
sub_811A770: @ 811A770
push {r4,lr}
adds r2, r0, 0
adds r3, r1, 0
lsls r2, 24
lsls r3, 24
lsrs r0, r2, 24
movs r1, 0x90
lsls r1, 20
adds r2, r1
lsrs r2, 24
lsrs r1, r3, 24
movs r4, 0xC0
lsls r4, 18
adds r3, r4
lsrs r3, 24
bl MenuZeroFillWindowRect
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_811A770
thumb_func_start sub_811A798
sub_811A798: @ 811A798
push {r4-r7,lr}
sub sp, 0x10
adds r4, r0, 0
lsls r1, 24
lsrs r1, 24
adds r5, r1, 0
lsls r2, 24
lsrs r6, r2, 24
lsls r3, 24
lsrs r7, r3, 24
mov r0, sp
adds r1, r4, 0
bl ConvertIntToDecimalString
lsls r1, r5, 1
adds r1, r5
lsls r1, 1
adds r1, 0x21
adds r0, r5, 0x2
lsls r0, 3
subs r1, r0
lsls r1, 24
lsrs r0, r1, 27
subs r0, r6, r0
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0xE0
lsls r0, 19
ands r0, r1
lsrs r1, r0, 24
ldr r4, _0811A824 @ =gStringVar1
cmp r1, 0
beq _0811A7EA
movs r0, 0xFC
strb r0, [r4]
movs r0, 0x11
strb r0, [r4, 0x1]
movs r0, 0x8
subs r0, r1
strb r0, [r4, 0x2]
adds r4, 0x3
_0811A7EA:
movs r0, 0xFC
strb r0, [r4]
movs r0, 0x11
strb r0, [r4, 0x1]
mov r0, sp
bl StringLength
lsls r0, 16
lsrs r0, 16
subs r0, r5, r0
lsls r1, r0, 1
adds r1, r0
lsls r1, 1
strb r1, [r4, 0x2]
adds r4, 0x3
adds r0, r4, 0
mov r1, sp
bl StringCopy
ldr r0, _0811A828 @ =gOtherText_Coins2
adds r1, r6, 0
adds r2, r7, 0
bl MenuPrint
add sp, 0x10
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0811A824: .4byte gStringVar1
_0811A828: .4byte gOtherText_Coins2
thumb_func_end sub_811A798
thumb_func_start GetCoins
GetCoins: @ 811A82C
ldr r0, _0811A838 @ =gSaveBlock1
ldr r1, _0811A83C @ =0x00000494
adds r0, r1
ldrh r0, [r0]
bx lr
.align 2, 0
_0811A838: .4byte gSaveBlock1
_0811A83C: .4byte 0x00000494
thumb_func_end GetCoins
thumb_func_start GiveCoins
GiveCoins: @ 811A840
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl GetCoins
lsls r0, 16
ldr r1, _0811A858 @ =0x270e0000
cmp r0, r1
bls _0811A85C
movs r0, 0
b _0811A88C
.align 2, 0
_0811A858: .4byte 0x270e0000
_0811A85C:
ldr r0, _0811A874 @ =gSaveBlock1
ldr r1, _0811A878 @ =0x00000494
adds r3, r0, r1
ldrh r1, [r3]
adds r2, r4, r1
lsls r0, r2, 16
lsrs r0, 16
cmp r1, r0
bls _0811A880
ldr r0, _0811A87C @ =0x0000270f
strh r0, [r3]
b _0811A88A
.align 2, 0
_0811A874: .4byte gSaveBlock1
_0811A878: .4byte 0x00000494
_0811A87C: .4byte 0x0000270f
_0811A880:
strh r2, [r3]
ldr r1, _0811A894 @ =0x0000270f
cmp r0, r1
bls _0811A88A
strh r1, [r3]
_0811A88A:
movs r0, 0x1
_0811A88C:
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0811A894: .4byte 0x0000270f
thumb_func_end GiveCoins
thumb_func_start TakeCoins
TakeCoins: @ 811A898
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl GetCoins
lsls r0, 16
lsrs r0, 16
cmp r0, r4
bcs _0811A8AE
movs r0, 0
b _0811A8BC
_0811A8AE:
ldr r1, _0811A8C4 @ =gSaveBlock1
ldr r0, _0811A8C8 @ =0x00000494
adds r1, r0
ldrh r0, [r1]
subs r0, r4
strh r0, [r1]
movs r0, 0x1
_0811A8BC:
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0811A8C4: .4byte gSaveBlock1
_0811A8C8: .4byte 0x00000494
thumb_func_end TakeCoins
.align 2, 0 @ Don't pad with nop.

6717
asm/evolution_scene.s Normal file
View File

File diff suppressed because it is too large Load Diff

152
asm/fldeff_strength.s Normal file
View File

@@ -0,0 +1,152 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start SetUpFieldMove_Strength
SetUpFieldMove_Strength: @ 811A99C
push {lr}
bl sub_81474C8
lsls r0, 24
cmp r0, 0
beq _0811A9D4
ldr r1, _0811A9BC @ =gScriptResult
ldr r0, _0811A9C0 @ =gUnknown_03005CE0
ldrb r0, [r0]
strh r0, [r1]
ldr r1, _0811A9C4 @ =gUnknown_0300485C
ldr r0, _0811A9C8 @ =sub_808AB90
str r0, [r1]
ldr r1, _0811A9CC @ =gUnknown_03005CE4
ldr r0, _0811A9D0 @ =sub_811AA38
b _0811A9F8
.align 2, 0
_0811A9BC: .4byte gScriptResult
_0811A9C0: .4byte gUnknown_03005CE0
_0811A9C4: .4byte gUnknown_0300485C
_0811A9C8: .4byte sub_808AB90
_0811A9CC: .4byte gUnknown_03005CE4
_0811A9D0: .4byte sub_811AA38
_0811A9D4:
movs r0, 0x57
bl npc_before_player_of_type
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0811A9E6
movs r0, 0
b _0811A9FC
_0811A9E6:
ldr r1, _0811AA00 @ =gScriptResult
ldr r0, _0811AA04 @ =gUnknown_03005CE0
ldrb r0, [r0]
strh r0, [r1]
ldr r1, _0811AA08 @ =gUnknown_0300485C
ldr r0, _0811AA0C @ =sub_808AB90
str r0, [r1]
ldr r1, _0811AA10 @ =gUnknown_03005CE4
ldr r0, _0811AA14 @ =sub_811AA18
_0811A9F8:
str r0, [r1]
movs r0, 0x1
_0811A9FC:
pop {r1}
bx r1
.align 2, 0
_0811AA00: .4byte gScriptResult
_0811AA04: .4byte gUnknown_03005CE0
_0811AA08: .4byte gUnknown_0300485C
_0811AA0C: .4byte sub_808AB90
_0811AA10: .4byte gUnknown_03005CE4
_0811AA14: .4byte sub_811AA18
thumb_func_end SetUpFieldMove_Strength
thumb_func_start sub_811AA18
sub_811AA18: @ 811AA18
push {lr}
ldr r1, _0811AA2C @ =gUnknown_0202FF84
ldr r0, _0811AA30 @ =gUnknown_03005CE0
ldrb r0, [r0]
str r0, [r1]
ldr r0, _0811AA34 @ =UseStrengthScript
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_0811AA2C: .4byte gUnknown_0202FF84
_0811AA30: .4byte gUnknown_03005CE0
_0811AA34: .4byte UseStrengthScript
thumb_func_end sub_811AA18
thumb_func_start sub_811AA38
sub_811AA38: @ 811AA38
push {lr}
ldr r0, _0811AA4C @ =gUnknown_0202FF84
ldr r1, _0811AA50 @ =gUnknown_03005CE0
ldrb r1, [r1]
str r1, [r0]
movs r0, 0x28
bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_0811AA4C: .4byte gUnknown_0202FF84
_0811AA50: .4byte gUnknown_03005CE0
thumb_func_end sub_811AA38
thumb_func_start FldEff_UseStrength
FldEff_UseStrength: @ 811AA54
push {lr}
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _0811AA88 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _0811AA8C @ =sub_811AA9C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, _0811AA90 @ =gUnknown_0202FF84
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, _0811AA94 @ =gPlayerParty
adds r0, r1
ldr r1, _0811AA98 @ =gStringVar1
bl GetMonNickname
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0811AA88: .4byte gTasks
_0811AA8C: .4byte sub_811AA9C
_0811AA90: .4byte gUnknown_0202FF84
_0811AA94: .4byte gPlayerParty
_0811AA98: .4byte gStringVar1
thumb_func_end FldEff_UseStrength
thumb_func_start sub_811AA9C
sub_811AA9C: @ 811AA9C
push {lr}
bl sub_81474C8
lsls r0, 24
cmp r0, 0
beq _0811AAAE
bl sub_8147514
b _0811AAB8
_0811AAAE:
movs r0, 0x28
bl FieldEffectActiveListRemove
bl EnableBothScriptContexts
_0811AAB8:
pop {r0}
bx r0
thumb_func_end sub_811AA9C
.align 2, 0 @ Don't pad with nop.

132
asm/landmark.s Normal file
View File

@@ -0,0 +1,132 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start sub_811A8CC
sub_811A8CC: @ 811A8CC
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
lsls r2, 24
lsrs r5, r2, 24
bl sub_811A920
adds r4, r0, 0
cmp r4, 0
bne _0811A8E8
_0811A8E4:
movs r0, 0
b _0811A91A
_0811A8E8:
ldr r6, _0811A8EC @ =0x0000ffff
b _0811A8FE
.align 2, 0
_0811A8EC: .4byte 0x0000ffff
_0811A8F0:
subs r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
_0811A8F6:
adds r4, 0x4
ldr r0, [r4]
cmp r0, 0
beq _0811A8E4
_0811A8FE:
ldr r1, [r4]
ldrh r0, [r1, 0x4]
cmp r0, r6
beq _0811A912
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0811A8F6
_0811A912:
cmp r5, 0
bne _0811A8F0
ldr r0, [r4]
ldr r0, [r0]
_0811A91A:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_811A8CC
thumb_func_start sub_811A920
sub_811A920: @ 811A920
push {r4-r6,lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r1, 24
lsrs r6, r1, 24
movs r2, 0
ldr r0, _0811A964 @ =gLandmarkLists
ldrb r1, [r0]
adds r4, r0, 0
cmp r1, 0x58
beq _0811A990
adds r1, r4, 0
_0811A938:
lsls r0, r2, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, r3
bhi _0811A990
cmp r0, r3
beq _0811A956
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
lsls r0, r2, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0x58
bne _0811A938
_0811A956:
lsls r0, r2, 3
adds r0, r1
ldrb r0, [r0]
cmp r0, 0x58
bne _0811A970
b _0811A990
.align 2, 0
_0811A964: .4byte gLandmarkLists
_0811A968:
adds r0, r4, 0x4
adds r0, r1, r0
ldr r0, [r0]
b _0811A992
_0811A970:
cmp r0, r3
bne _0811A990
ldr r5, _0811A998 @ =gLandmarkLists
_0811A976:
lsls r1, r2, 3
adds r0, r1, r5
ldrb r0, [r0, 0x1]
cmp r0, r6
beq _0811A968
adds r0, r2, 0x1
lsls r0, 16
lsrs r2, r0, 16
lsls r0, r2, 3
adds r0, r4
ldrb r0, [r0]
cmp r0, r3
beq _0811A976
_0811A990:
movs r0, 0
_0811A992:
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0811A998: .4byte gLandmarkLists
thumb_func_end sub_811A920
.align 2, 0 @ Don't pad with nop.

2371
asm/pokedex_area_screen.s Normal file
View File

File diff suppressed because it is too large Load Diff

1164
asm/pokedex_cry_screen.s Normal file
View File

File diff suppressed because it is too large Load Diff

42375
asm/rom6.s
View File

File diff suppressed because it is too large Load Diff

9659
asm/roulette.s Normal file
View File

File diff suppressed because it is too large Load Diff

780
asm/roulette_util.s Normal file
View File

@@ -0,0 +1,780 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start sub_8124918
sub_8124918: @ 8124918
push {lr}
movs r1, 0
strb r1, [r0]
strh r1, [r0, 0x2]
adds r0, 0x4
movs r2, 0xC0
bl memset
pop {r0}
bx r0
thumb_func_end sub_8124918
thumb_func_start sub_812492C
sub_812492C: @ 812492C
push {r4-r7,lr}
adds r3, r0, 0
lsls r1, 24
lsrs r6, r1, 24
cmp r6, 0xF
bhi _08124948
lsls r0, r6, 1
adds r0, r6
lsls r0, 2
adds r5, r3, r0
ldrb r7, [r5, 0x4]
lsrs r0, r7, 7
cmp r0, 0
beq _0812494C
_08124948:
movs r0, 0xFF
b _081249AA
_0812494C:
ldrh r0, [r2]
movs r4, 0
strh r0, [r5, 0x8]
ldrh r0, [r2, 0x2]
strh r0, [r5, 0xA]
ldrb r0, [r2, 0x4]
strb r0, [r5, 0xC]
ldrb r0, [r2, 0x5]
strb r0, [r5, 0xD]
ldrb r0, [r2, 0x6]
strb r0, [r5, 0xE]
ldrb r3, [r2, 0x7]
lsls r0, r3, 27
lsrs r0, 27
ldrb r2, [r5, 0xF]
movs r1, 0x20
negs r1, r1
ands r1, r2
orrs r1, r0
movs r0, 0x60
ands r0, r3
movs r2, 0x61
negs r2, r2
ands r1, r2
orrs r1, r0
lsls r3, 24
asrs r3, 31
lsls r3, 7
movs r0, 0x7F
ands r1, r0
orrs r1, r3
strb r1, [r5, 0xF]
subs r0, 0xFF
ands r0, r7
movs r2, 0x80
orrs r0, r2
strb r0, [r5, 0x4]
strb r4, [r5, 0x6]
strb r4, [r5, 0x5]
lsls r1, 24
cmp r1, 0
bge _081249A4
movs r0, 0xFF
b _081249A6
_081249A4:
movs r0, 0x1
_081249A6:
strb r0, [r5, 0x7]
adds r0, r6, 0
_081249AA:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_812492C
thumb_func_start unref_sub_81249B0
unref_sub_81249B0: @ 81249B0
push {r4,lr}
adds r2, r0, 0
lsls r1, 24
lsrs r1, 24
adds r4, r1, 0
cmp r4, 0xF
bhi _081249DC
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
adds r1, r2, r0
ldrb r0, [r1, 0x4]
lsrs r0, 7
cmp r0, 0
beq _081249DC
adds r0, r1, 0x4
movs r1, 0
movs r2, 0xC
bl memset
adds r0, r4, 0
b _081249DE
_081249DC:
movs r0, 0xFF
_081249DE:
pop {r4}
pop {r1}
bx r1
thumb_func_end unref_sub_81249B0
thumb_func_start sub_81249E4
sub_81249E4: @ 81249E4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
adds r5, r0, 0
movs r0, 0
mov r12, r0
ldrb r1, [r5, 0x8]
cmp r12, r1
bcc _081249FC
b _08124B94
_081249FC:
movs r7, 0x1F
ldr r0, _08124A2C @ =0xfffffc1f
mov r10, r0
movs r1, 0x7D
negs r1, r1
mov r9, r1
movs r0, 0x1F
mov r8, r0
_08124A0C:
ldrh r0, [r5, 0x6]
add r0, r12
lsls r0, 1
ldr r1, _08124A30 @ =gPlttBufferFaded
adds r3, r0, r1
ldr r1, _08124A34 @ =gPlttBufferUnfaded
adds r6, r0, r1
ldrb r0, [r5]
lsls r0, 25
lsrs r0, 25
cmp r0, 0x1
beq _08124A38
cmp r0, 0x2
beq _08124A96
b _08124B82
.align 2, 0
_08124A2C: .4byte 0xfffffc1f
_08124A30: .4byte gPlttBufferFaded
_08124A34: .4byte gPlttBufferUnfaded
_08124A38:
ldr r0, [r3]
lsls r2, r0, 27
lsrs r0, r2, 27
movs r1, 0x3
ldrsb r1, [r5, r1]
adds r0, r1
cmp r0, 0x1F
bhi _08124A5A
lsrs r0, r2, 27
adds r0, r1
ands r0, r7
ldrb r2, [r3]
movs r1, 0x20
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r3]
_08124A5A:
ldr r0, [r3]
lsls r2, r0, 22
lsrs r0, r2, 27
movs r1, 0x3
ldrsb r1, [r5, r1]
adds r0, r1
cmp r0, 0x1F
bhi _08124A7E
lsrs r0, r2, 27
adds r0, r1
mov r1, r8
ands r0, r1
lsls r0, 5
ldrh r2, [r3]
mov r1, r10
ands r1, r2
orrs r1, r0
strh r1, [r3]
_08124A7E:
ldr r0, [r3]
lsls r2, r0, 17
lsrs r0, r2, 27
movs r1, 0x3
ldrsb r1, [r5, r1]
adds r0, r1
cmp r0, 0x1F
bls _08124A90
b _08124B82
_08124A90:
lsrs r0, r2, 27
adds r0, r1
b _08124B74
_08124A96:
movs r0, 0x3
ldrsb r0, [r5, r0]
cmp r0, 0
bge _08124B08
ldr r0, [r3]
lsls r4, r0, 27
lsrs r1, r4, 27
movs r2, 0x3
ldrsb r2, [r5, r2]
adds r1, r2
ldr r0, [r6]
lsls r0, 27
lsrs r0, 27
cmp r1, r0
blt _08124AC6
lsrs r0, r4, 27
adds r0, r2
ands r0, r7
ldrb r2, [r3]
movs r1, 0x20
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r3]
_08124AC6:
ldr r0, [r3]
lsls r4, r0, 22
lsrs r1, r4, 27
movs r2, 0x3
ldrsb r2, [r5, r2]
adds r1, r2
ldr r0, [r6]
lsls r0, 22
lsrs r0, 27
cmp r1, r0
blt _08124AF0
lsrs r0, r4, 27
adds r0, r2
mov r1, r8
ands r0, r1
lsls r0, 5
ldrh r2, [r3]
mov r1, r10
ands r1, r2
orrs r1, r0
strh r1, [r3]
_08124AF0:
ldr r0, [r3]
lsls r4, r0, 17
lsrs r1, r4, 27
movs r2, 0x3
ldrsb r2, [r5, r2]
adds r1, r2
ldr r0, [r6]
lsls r0, 17
lsrs r0, 27
cmp r1, r0
blt _08124B82
b _08124B70
_08124B08:
ldr r0, [r3]
lsls r4, r0, 27
lsrs r1, r4, 27
movs r2, 0x3
ldrsb r2, [r5, r2]
adds r1, r2
ldr r0, [r6]
lsls r0, 27
lsrs r0, 27
cmp r1, r0
bgt _08124B30
lsrs r0, r4, 27
adds r0, r2
ands r0, r7
ldrb r2, [r3]
movs r1, 0x20
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r3]
_08124B30:
ldr r0, [r3]
lsls r4, r0, 22
lsrs r1, r4, 27
movs r2, 0x3
ldrsb r2, [r5, r2]
adds r1, r2
ldr r0, [r6]
lsls r0, 22
lsrs r0, 27
cmp r1, r0
bgt _08124B5A
lsrs r0, r4, 27
adds r0, r2
mov r1, r8
ands r0, r1
lsls r0, 5
ldrh r2, [r3]
mov r1, r10
ands r1, r2
orrs r1, r0
strh r1, [r3]
_08124B5A:
ldr r0, [r3]
lsls r4, r0, 17
lsrs r1, r4, 27
movs r2, 0x3
ldrsb r2, [r5, r2]
adds r1, r2
ldr r0, [r6]
lsls r0, 17
lsrs r0, 27
cmp r1, r0
bgt _08124B82
_08124B70:
lsrs r0, r4, 27
adds r0, r2
_08124B74:
ands r0, r7
lsls r0, 2
ldrb r2, [r3, 0x1]
mov r1, r9
ands r1, r2
orrs r1, r0
strb r1, [r3, 0x1]
_08124B82:
mov r0, r12
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
mov r12, r0
ldrb r0, [r5, 0x8]
cmp r12, r0
bcs _08124B94
b _08124A0C
_08124B94:
ldrb r1, [r5, 0x2]
adds r0, r1, 0x1
strb r0, [r5, 0x2]
ldrb r0, [r5, 0xB]
lsls r0, 27
lsls r1, 24
asrs r0, 3
cmp r1, r0
beq _08124BAA
movs r0, 0
b _08124BDE
_08124BAA:
movs r0, 0
strb r0, [r5, 0x2]
movs r0, 0x3
ldrsb r0, [r5, r0]
negs r0, r0
strb r0, [r5, 0x3]
ldrb r2, [r5]
movs r1, 0x7F
movs r0, 0x7F
ands r0, r2
cmp r0, 0x1
bne _08124BCA
lsls r0, r2, 25
lsrs r0, 25
adds r0, 0x1
b _08124BD0
_08124BCA:
lsls r0, r2, 25
lsrs r0, 25
subs r0, 0x1
_08124BD0:
ands r0, r1
movs r1, 0x80
negs r1, r1
ands r1, r2
orrs r1, r0
strb r1, [r5]
movs r0, 0x1
_08124BDE:
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_81249E4
thumb_func_start sub_8124BEC
sub_8124BEC: @ 8124BEC
push {r4,r5,lr}
adds r3, r0, 0
movs r2, 0
ldrb r0, [r3]
lsls r0, 25
lsrs r0, 25
cmp r0, 0x1
beq _08124C02
cmp r0, 0x2
beq _08124C30
b _08124C6A
_08124C02:
ldrb r0, [r3, 0x8]
cmp r2, r0
bcs _08124C22
ldr r4, _08124C2C @ =gPlttBufferFaded
_08124C0A:
ldrh r0, [r3, 0x6]
adds r0, r2
lsls r0, 1
adds r0, r4
ldrh r1, [r3, 0x4]
strh r1, [r0]
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
ldrb r0, [r3, 0x8]
cmp r2, r0
bcc _08124C0A
_08124C22:
ldrb r2, [r3]
lsls r1, r2, 25
lsrs r1, 25
adds r1, 0x1
b _08124C5C
.align 2, 0
_08124C2C: .4byte gPlttBufferFaded
_08124C30:
ldrb r0, [r3, 0x8]
cmp r2, r0
bcs _08124C54
ldr r5, _08124C74 @ =gPlttBufferFaded
ldr r4, _08124C78 @ =gPlttBufferUnfaded
_08124C3A:
ldrh r0, [r3, 0x6]
adds r0, r2
lsls r0, 1
adds r1, r0, r5
adds r0, r4
ldrh r0, [r0]
strh r0, [r1]
adds r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
ldrb r0, [r3, 0x8]
cmp r2, r0
bcc _08124C3A
_08124C54:
ldrb r2, [r3]
lsls r1, r2, 25
lsrs r1, 25
subs r1, 0x1
_08124C5C:
movs r0, 0x7F
ands r1, r0
movs r0, 0x80
negs r0, r0
ands r0, r2
orrs r0, r1
strb r0, [r3]
_08124C6A:
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_08124C74: .4byte gPlttBufferFaded
_08124C78: .4byte gPlttBufferUnfaded
thumb_func_end sub_8124BEC
thumb_func_start task_tutorial_controls_fadein
task_tutorial_controls_fadein: @ 8124C7C
push {r4-r6,lr}
adds r4, r0, 0
movs r5, 0
ldrb r0, [r4]
cmp r0, 0
beq _08124CE0
_08124C88:
ldrh r0, [r4, 0x2]
asrs r0, r5
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _08124CD6
lsls r1, r5, 1
adds r0, r1, r5
lsls r3, r0, 2
adds r2, r4, r3
ldrb r0, [r2, 0x5]
subs r0, 0x1
strb r0, [r2, 0x5]
lsls r0, 24
lsrs r0, 24
adds r6, r1, 0
cmp r0, 0xFF
bne _08124CD6
ldrh r0, [r2, 0x8]
movs r2, 0x80
lsls r2, 8
adds r1, r2, 0
ands r0, r1
cmp r0, 0
beq _08124CC4
adds r0, r3, 0x4
adds r0, r4, r0
bl sub_81249E4
b _08124CCC
_08124CC4:
adds r0, r3, 0x4
adds r0, r4, r0
bl sub_8124BEC
_08124CCC:
adds r0, r6, r5
lsls r0, 2
adds r0, r4, r0
ldrb r1, [r0, 0xD]
strb r1, [r0, 0x5]
_08124CD6:
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xF
bls _08124C88
_08124CE0:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end task_tutorial_controls_fadein
thumb_func_start sub_8124CE8
sub_8124CE8: @ 8124CE8
push {r4-r7,lr}
adds r3, r0, 0
lsls r1, 16
lsrs r6, r1, 16
movs r4, 0
ldrb r0, [r3]
adds r0, 0x1
strb r0, [r3]
movs r5, 0x1
movs r7, 0x80
negs r7, r7
_08124CFE:
adds r0, r6, 0
asrs r0, r4
ands r0, r5
cmp r0, 0
beq _08124D2C
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
adds r2, r3, r0
ldrb r0, [r2, 0x4]
lsrs r0, 7
cmp r0, 0
beq _08124D2C
adds r0, r5, 0
lsls r0, r4
ldrh r1, [r3, 0x2]
orrs r0, r1
strh r0, [r3, 0x2]
ldrb r1, [r2, 0x4]
adds r0, r7, 0
ands r0, r1
orrs r0, r5
strb r0, [r2, 0x4]
_08124D2C:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xF
bls _08124CFE
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8124CE8
thumb_func_start sub_8124D3C
sub_8124D3C: @ 8124D3C
push {r4-r7,lr}
sub sp, 0x4
adds r6, r0, 0
lsls r1, 16
lsrs r7, r1, 16
movs r5, 0
movs r3, 0x1
_08124D4A:
ldrh r0, [r6, 0x2]
asrs r0, r5
ands r0, r3
cmp r0, 0
beq _08124DB2
lsls r0, r5, 1
adds r0, r5
lsls r0, 2
adds r4, r6, r0
ldrb r0, [r4, 0x4]
lsrs r0, 7
cmp r0, 0
beq _08124DB2
adds r0, r7, 0
asrs r0, r5
ands r0, r3
cmp r0, 0
beq _08124DB2
ldrh r1, [r4, 0xA]
lsls r1, 1
ldr r0, _08124DA8 @ =gPlttBufferFaded
adds r0, r1, r0
ldr r2, _08124DAC @ =gPlttBufferUnfaded
adds r1, r2
ldrb r2, [r4, 0xC]
lsls r2, 1
str r3, [sp]
bl memcpy
ldrb r0, [r4, 0x4]
movs r2, 0x80
negs r2, r2
adds r1, r2, 0
ands r0, r1
strb r0, [r4, 0x4]
movs r0, 0
strb r0, [r4, 0x6]
strb r0, [r4, 0x5]
ldrb r0, [r4, 0xF]
lsls r0, 24
ldr r3, [sp]
cmp r0, 0
bge _08124DB0
movs r0, 0xFF
strb r0, [r4, 0x7]
b _08124DB2
.align 2, 0
_08124DA8: .4byte gPlttBufferFaded
_08124DAC: .4byte gPlttBufferUnfaded
_08124DB0:
strb r3, [r4, 0x7]
_08124DB2:
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xF
bls _08124D4A
ldr r0, _08124DC8 @ =0x0000ffff
cmp r7, r0
bne _08124DCC
movs r0, 0
strb r0, [r6]
b _08124DD0
.align 2, 0
_08124DC8: .4byte 0x0000ffff
_08124DCC:
ldrh r0, [r6, 0x2]
bics r0, r7
_08124DD0:
strh r0, [r6, 0x2]
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8124D3C
thumb_func_start sub_8124DDC
sub_8124DDC: @ 8124DDC
push {r4-r7,lr}
adds r6, r0, 0
ldr r0, [sp, 0x14]
ldr r4, [sp, 0x18]
lsls r1, 16
lsrs r7, r1, 16
lsls r2, 24
lsrs r2, 24
lsls r3, 24
lsls r0, 24
lsrs r5, r0, 24
lsls r4, 24
lsrs r4, 24
movs r1, 0
lsrs r3, 19
adds r3, r2
lsls r3, 1
adds r6, r3
cmp r1, r4
bcs _08124E26
_08124E04:
lsls r0, r1, 6
adds r2, r6, r0
movs r0, 0
adds r3, r1, 0x1
cmp r0, r5
bcs _08124E1E
_08124E10:
strh r7, [r2]
adds r2, 0x2
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
cmp r0, r5
bcc _08124E10
_08124E1E:
lsls r0, r3, 24
lsrs r1, r0, 24
cmp r1, r4
bcc _08124E04
_08124E26:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8124DDC
thumb_func_start sub_8124E2C
sub_8124E2C: @ 8124E2C
push {r4-r7,lr}
adds r7, r0, 0
ldr r0, [sp, 0x14]
ldr r4, [sp, 0x18]
lsls r2, 24
lsrs r2, 24
lsls r3, 24
lsls r0, 24
lsrs r5, r0, 24
lsls r4, 24
lsrs r6, r4, 24
movs r4, 0
lsrs r3, 19
adds r3, r2
lsls r3, 1
adds r7, r3
cmp r4, r6
bcs _08124E76
_08124E50:
lsls r0, r4, 6
adds r2, r7, r0
movs r3, 0
adds r4, 0x1
cmp r3, r5
bcs _08124E6E
_08124E5C:
ldrh r0, [r1]
strh r0, [r2]
adds r1, 0x2
adds r2, 0x2
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r5
bcc _08124E5C
_08124E6E:
lsls r0, r4, 24
lsrs r4, r0, 24
cmp r4, r6
bcc _08124E50
_08124E76:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_8124E2C
.align 2, 0 @ Don't pad with nop.

285
asm/unused_8124F94.s Normal file
View File

@@ -0,0 +1,285 @@
.include "constants/gba_constants.s"
.include "constants/species_constants.s"
.include "asm/macros.s"
.syntax unified
.text
thumb_func_start unref_sub_8124F94
unref_sub_8124F94: @ 8124F94
sub sp, 0x4
movs r3, 0
strb r3, [r0, 0x1]
strb r3, [r0]
strh r3, [r0, 0x2]
movs r1, 0xC0
lsls r1, 19
str r1, [r0, 0x4]
mov r1, sp
strh r3, [r1]
ldr r2, _08124FCC @ =0x040000d4
str r1, [r2]
adds r1, r0, 0
adds r1, 0x8
str r1, [r2, 0x4]
ldr r1, _08124FD0 @ =0x81000040
str r1, [r2, 0x8]
ldr r1, [r2, 0x8]
mov r1, sp
strh r3, [r1]
str r1, [r2]
adds r0, 0x88
str r0, [r2, 0x4]
ldr r0, _08124FD4 @ =0x810000c0
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
add sp, 0x4
bx lr
.align 2, 0
_08124FCC: .4byte 0x040000d4
_08124FD0: .4byte 0x81000040
_08124FD4: .4byte 0x810000c0
thumb_func_end unref_sub_8124F94
thumb_func_start unref_sub_8124FD8
unref_sub_8124FD8: @ 8124FD8
push {r4-r7,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r7, _08124FE4 @ =0x040000d4
b _0812508A
.align 2, 0
_08124FE4: .4byte 0x040000d4
_08124FE8:
ldrb r0, [r4, 0x1]
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
adds r0, r4, 0
adds r0, 0x88
adds r0, r1
str r3, [r0]
ldrb r1, [r4, 0x1]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r4, r0
ldrb r1, [r5, 0x6]
adds r0, 0x8E
strb r1, [r0]
ldrb r1, [r4, 0x1]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r4, r0
ldrb r1, [r5, 0x4]
adds r0, 0x8C
strb r1, [r0]
ldrb r1, [r4, 0x1]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r4, r0
ldrb r1, [r5, 0x5]
adds r0, 0x8D
strb r1, [r0]
ldrb r1, [r5, 0x4]
ldrb r0, [r5, 0x5]
adds r6, r1, 0
muls r6, r0
ldrh r2, [r4, 0x2]
adds r1, r2, r6
movs r0, 0x80
lsls r0, 3
cmp r1, r0
ble _08125040
movs r0, 0x2
b _0812509C
_08125040:
ldrh r0, [r5, 0x8]
cmp r0, 0
bne _08125060
str r3, [r7]
ldrh r1, [r4, 0x2]
lsls r1, 6
ldr r0, [r4, 0x4]
adds r0, r1
str r0, [r7, 0x4]
lsls r0, r6, 4
movs r1, 0x80
lsls r1, 24
orrs r0, r1
str r0, [r7, 0x8]
ldr r0, [r7, 0x8]
b _0812506C
_08125060:
lsls r0, r2, 6
ldr r1, [r4, 0x4]
adds r1, r0
adds r0, r3, 0
bl sub_800D238
_0812506C:
ldrb r1, [r4, 0x1]
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
adds r0, r4, r0
ldrh r1, [r4, 0x2]
adds r0, 0x90
strh r1, [r0]
ldrh r0, [r4, 0x2]
adds r0, r6, r0
strh r0, [r4, 0x2]
ldrb r0, [r4, 0x1]
adds r0, 0x1
strb r0, [r4, 0x1]
adds r5, 0xC
_0812508A:
ldrb r0, [r4, 0x1]
cmp r0, 0x1F
bhi _0812509A
ldr r3, [r5]
cmp r3, 0
bne _08124FE8
movs r0, 0
b _0812509C
_0812509A:
movs r0, 0x1
_0812509C:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end unref_sub_8124FD8
thumb_func_start unref_sub_81250A4
unref_sub_81250A4: @ 81250A4
push {r4,r5,lr}
sub sp, 0x20
adds r4, r0, 0
adds r5, r1, 0
b _081250FC
_081250AE:
ldrb r1, [r4]
lsls r1, 3
adds r0, r4, 0
adds r0, 0x8
adds r0, r1
str r2, [r0]
ldrb r0, [r4]
lsls r0, 3
adds r0, r4, r0
ldrb r1, [r5, 0x4]
strb r1, [r0, 0xC]
ldrb r0, [r5, 0x5]
cmp r0, 0
bne _081250D8
ldrb r1, [r4]
lsls r1, 4
adds r0, r2, 0
movs r2, 0x20
bl LoadPalette
b _081250EC
_081250D8:
adds r0, r2, 0
mov r1, sp
bl sub_800D238
ldrb r1, [r4]
lsls r1, 4
mov r0, sp
movs r2, 0x20
bl LoadPalette
_081250EC:
ldrb r0, [r4]
lsls r1, r0, 3
adds r1, r4, r1
strb r0, [r1, 0xD]
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
adds r5, 0x8
_081250FC:
ldrb r0, [r4]
cmp r0, 0xF
bhi _0812510C
ldr r2, [r5]
cmp r2, 0
bne _081250AE
movs r0, 0
b _0812510E
_0812510C:
movs r0, 0x1
_0812510E:
add sp, 0x20
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end unref_sub_81250A4
thumb_func_start unref_sub_8125118
unref_sub_8125118: @ 8125118
push {r4-r7,lr}
ldr r4, _0812514C @ =0xfffffe00
add sp, r4
adds r5, r0, 0
adds r6, r1, 0
movs r2, 0x80
lsls r2, 2
mov r0, sp
movs r1, 0
bl memset
ldrb r7, [r6, 0x5]
ldr r0, [r6]
mov r1, sp
bl sub_800D238
ldrb r4, [r5]
cmp r4, r7
bcs _08125186
_0812513E:
ldrb r0, [r5]
adds r0, r4
cmp r0, 0xF
ble _08125150
movs r0, 0x1
b _08125188
.align 2, 0
_0812514C: .4byte 0xfffffe00
_08125150:
lsls r2, r4, 3
adds r0, r5, 0
adds r0, 0x8
adds r0, r2
ldr r1, [r6]
str r1, [r0]
adds r2, r5, r2
ldrb r0, [r6, 0x4]
adds r0, r4, r0
strb r0, [r2, 0xC]
ldrb r0, [r5]
strb r0, [r2, 0xD]
lsls r0, r4, 5
add r0, sp
ldrb r1, [r5]
lsls r1, 4
movs r2, 0x20
bl LoadPalette
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, r7
bcc _0812513E
_08125186:
movs r0, 0
_08125188:
movs r3, 0x80
lsls r3, 2
add sp, r3
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end unref_sub_8125118
.align 2, 0 @ Don't pad with nop.

16
ld_script.txt
View File

@@ -149,6 +149,22 @@ SECTIONS {
src/starter_choose.o(.text);
src/wallclock.o(.text);
asm/rom6.o(.text);
asm/battle_records.o(.text);
asm/pokedex_area_screen.o(.text);
asm/evolution_scene.o(.text);
asm/roulette.o(.text);
asm/pokedex_cry_screen.o(.text);
asm/coins.o(.text);
asm/landmark.o(.text);
asm/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
asm/battle_811DA74.o(.text);
asm/battle_message.o(.text);
asm/choose_party.o(.text);
asm/cable_car.o(.text);
asm/roulette_util.o(.text);
asm/cable_car_util.o(.text);
asm/unused_8124F94.o(.text);
src/save.o(.text);
asm/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text);