mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-27 05:43:51 +01:00
split item effects and organize sym ewram
This commit is contained in:
parent
c3cc1b3370
commit
b7d75cb615
@ -479,7 +479,7 @@ _0803FF2E:
|
|||||||
adds r6, r7, 0
|
adds r6, r7, 0
|
||||||
muls r6, r2
|
muls r6, r2
|
||||||
str r6, [sp, 0x8]
|
str r6, [sp, 0x8]
|
||||||
ldr r2, =gUnknown_02024090
|
ldr r2, =gBattleMons + 0xC
|
||||||
adds r5, r6, r2
|
adds r5, r6, r2
|
||||||
movs r6, 0
|
movs r6, 0
|
||||||
str r6, [sp, 0x10]
|
str r6, [sp, 0x10]
|
||||||
@ -538,7 +538,7 @@ _0803FFAC:
|
|||||||
muls r2, r0
|
muls r2, r0
|
||||||
ldr r1, [sp, 0x10]
|
ldr r1, [sp, 0x10]
|
||||||
adds r0, r1, r2
|
adds r0, r1, r2
|
||||||
ldr r1, =gUnknown_02024090
|
ldr r1, =gBattleMons + 0xC
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
mov r12, r0
|
mov r12, r0
|
||||||
ldr r1, =gLastUsedMovesByBanks
|
ldr r1, =gLastUsedMovesByBanks
|
||||||
@ -737,7 +737,7 @@ sub_8040130: @ 8040130
|
|||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
cmp r6, r0
|
cmp r6, r0
|
||||||
bge _080401B4
|
bge _080401B4
|
||||||
ldr r7, =gUnknown_02024090
|
ldr r7, =gBattleMons + 0xC
|
||||||
mov r8, r7
|
mov r8, r7
|
||||||
_0804015A:
|
_0804015A:
|
||||||
lsls r0, r4, 24
|
lsls r0, r4, 24
|
||||||
@ -3598,7 +3598,7 @@ b_clear_atk_up_if_hit_flag_unless_enraged: @ 8041A1C
|
|||||||
ldr r4, =gUnknown_02024274
|
ldr r4, =gUnknown_02024274
|
||||||
movs r6, 0x80
|
movs r6, 0x80
|
||||||
lsls r6, 16
|
lsls r6, 16
|
||||||
ldr r2, =gUnknown_020240D4
|
ldr r2, =gBattleMons + 0x50
|
||||||
_08041A32:
|
_08041A32:
|
||||||
ldr r1, [r2]
|
ldr r1, [r2]
|
||||||
adds r0, r1, 0
|
adds r0, r1, 0
|
||||||
@ -4545,7 +4545,7 @@ _08042388:
|
|||||||
ldrb r1, [r4]
|
ldrb r1, [r4]
|
||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_020240D0
|
ldr r1, =gBattleMons + 0x4C
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
str r0, [sp]
|
str r0, [sp]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
@ -7166,7 +7166,7 @@ _08043BFC:
|
|||||||
ldrb r1, [r4]
|
ldrb r1, [r4]
|
||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_020240D0
|
ldr r1, =gBattleMons + 0x4C
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
str r0, [sp]
|
str r0, [sp]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
@ -9315,7 +9315,7 @@ _08044EB4:
|
|||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r7
|
muls r0, r7
|
||||||
adds r4, r0, 0x1
|
adds r4, r0, 0x1
|
||||||
ldr r5, =gUnknown_0202409C
|
ldr r5, =gBattleMons + 0x18
|
||||||
_08044EBC:
|
_08044EBC:
|
||||||
bl Random
|
bl Random
|
||||||
lsls r0, 16
|
lsls r0, 16
|
||||||
@ -10158,7 +10158,7 @@ _0804567A:
|
|||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
_0804568C:
|
_0804568C:
|
||||||
ldr r1, =gUnknown_020240D0
|
ldr r1, =gBattleMons + 0x4C
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
str r0, [sp]
|
str r0, [sp]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
|
@ -3958,7 +3958,7 @@ _0804823A:
|
|||||||
ldrb r1, [r5]
|
ldrb r1, [r5]
|
||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_020240AC
|
ldr r1, =gBattleMons + 0x28
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
str r0, [sp]
|
str r0, [sp]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
@ -5401,7 +5401,7 @@ _08048E64:
|
|||||||
ldrb r1, [r1]
|
ldrb r1, [r1]
|
||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_020240D0
|
ldr r1, =gBattleMons + 0x4C
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
str r0, [sp]
|
str r0, [sp]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
@ -10435,7 +10435,7 @@ _0804BA18:
|
|||||||
beq _0804BAC0
|
beq _0804BAC0
|
||||||
movs r0, 0x1
|
movs r0, 0x1
|
||||||
mov r10, r0
|
mov r10, r0
|
||||||
ldr r0, =gUnknown_0202409C
|
ldr r0, =gBattleMons + 0x18
|
||||||
mov r9, r0
|
mov r9, r0
|
||||||
lsls r5, r1, 16
|
lsls r5, r1, 16
|
||||||
_0804BA26:
|
_0804BA26:
|
||||||
@ -10541,7 +10541,7 @@ _0804BAF8:
|
|||||||
mov r9, r5
|
mov r9, r5
|
||||||
cmp r4, 0
|
cmp r4, 0
|
||||||
beq _0804BB34
|
beq _0804BB34
|
||||||
ldr r6, =gUnknown_0202409C
|
ldr r6, =gBattleMons + 0x18
|
||||||
adds r5, r2, 0
|
adds r5, r2, 0
|
||||||
lsls r2, r1, 16
|
lsls r2, r1, 16
|
||||||
_0804BB04:
|
_0804BB04:
|
||||||
@ -11324,7 +11324,7 @@ _0804C1D8:
|
|||||||
ldr r2, =gDisableStructs
|
ldr r2, =gDisableStructs
|
||||||
ldr r5, =0xfeffffff
|
ldr r5, =0xfeffffff
|
||||||
adds r3, r0, 0
|
adds r3, r0, 0
|
||||||
ldr r1, =gUnknown_020240D4
|
ldr r1, =gBattleMons + 0x50
|
||||||
_0804C1EA:
|
_0804C1EA:
|
||||||
ldrb r0, [r2, 0xA]
|
ldrb r0, [r2, 0xA]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
@ -15608,13 +15608,13 @@ _0804E7AC:
|
|||||||
bne _0804E800
|
bne _0804E800
|
||||||
ldrb r0, [r6]
|
ldrb r0, [r6]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023868
|
ldr r1, =gBattleBufferB + 4
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
mov r12, r0
|
mov r12, r0
|
||||||
movs r2, 0
|
movs r2, 0
|
||||||
adds r4, r6, 0
|
adds r4, r6, 0
|
||||||
movs r5, 0x58
|
movs r5, 0x58
|
||||||
ldr r6, =gUnknown_020240A8
|
ldr r6, =gBattleMons + 0x24
|
||||||
adds r7, r6, 0
|
adds r7, r6, 0
|
||||||
subs r7, 0x18
|
subs r7, 0x18
|
||||||
mov r3, r12
|
mov r3, r12
|
||||||
@ -22212,7 +22212,7 @@ _08052170:
|
|||||||
bls _08052170
|
bls _08052170
|
||||||
movs r4, 0
|
movs r4, 0
|
||||||
ldr r7, =gBattleMoves
|
ldr r7, =gBattleMoves
|
||||||
ldr r3, =gUnknown_02024090
|
ldr r3, =gBattleMons + 0xC
|
||||||
adds r5, r3, 0
|
adds r5, r3, 0
|
||||||
adds r5, 0x18
|
adds r5, 0x18
|
||||||
_08052188:
|
_08052188:
|
||||||
@ -23955,7 +23955,7 @@ atkA9_sleeptalk_choose_move: @ 8053018
|
|||||||
mov r9, r0
|
mov r9, r0
|
||||||
movs r1, 0x58
|
movs r1, 0x58
|
||||||
mov r8, r1
|
mov r8, r1
|
||||||
ldr r7, =gUnknown_02024090
|
ldr r7, =gBattleMons + 0xC
|
||||||
movs r0, 0x84
|
movs r0, 0x84
|
||||||
lsls r0, 1
|
lsls r0, 1
|
||||||
mov r10, r0
|
mov r10, r0
|
||||||
@ -25908,7 +25908,7 @@ atkBD_copyfoestats: @ 8054134
|
|||||||
ldr r7, =gBattlescriptCurrInstr
|
ldr r7, =gBattlescriptCurrInstr
|
||||||
ldr r6, =gBankAttacker
|
ldr r6, =gBankAttacker
|
||||||
movs r4, 0x58
|
movs r4, 0x58
|
||||||
ldr r3, =gUnknown_0202409C
|
ldr r3, =gBattleMons + 0x18
|
||||||
ldr r5, =gBankTarget
|
ldr r5, =gBankTarget
|
||||||
_08054142:
|
_08054142:
|
||||||
ldrb r0, [r6]
|
ldrb r0, [r6]
|
||||||
|
@ -555,7 +555,7 @@ _08057406:
|
|||||||
ldrb r1, [r4]
|
ldrb r1, [r4]
|
||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_020240D0
|
ldr r1, =gBattleMons + 0x4C
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
str r0, [sp]
|
str r0, [sp]
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
|
@ -80,7 +80,7 @@ sub_805D19C: @ 805D19C
|
|||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
lsls r2, r0, 9
|
lsls r2, r0, 9
|
||||||
ldr r1, =gUnknown_02023068
|
ldr r1, =gBattleBufferA + 4
|
||||||
adds r2, r1
|
adds r2, r1
|
||||||
mov r10, r2
|
mov r10, r2
|
||||||
movs r1, 0
|
movs r1, 0
|
||||||
@ -124,7 +124,7 @@ _0805D20E:
|
|||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r1, =gUnknown_020240CC
|
ldr r1, =gBattleMons + 0x48
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldr r0, [r0]
|
ldr r0, [r0]
|
||||||
bl GetNatureFromPersonality
|
bl GetNatureFromPersonality
|
||||||
|
@ -2367,7 +2367,7 @@ _08063F8E:
|
|||||||
bne _08063FA6
|
bne _08063FA6
|
||||||
b _08064370
|
b _08064370
|
||||||
_08063FA6:
|
_08063FA6:
|
||||||
ldr r1, =gItemEffectInfoPointers
|
ldr r1, =gItemEffectTable
|
||||||
subs r0, 0xD
|
subs r0, 0xD
|
||||||
lsls r0, 2
|
lsls r0, 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -2451,7 +2451,7 @@ _08064074:
|
|||||||
mov r0, r9
|
mov r0, r9
|
||||||
movs r1, 0x4
|
movs r1, 0x4
|
||||||
movs r2, 0x4
|
movs r2, 0x4
|
||||||
bl sub_806CDDC
|
bl GetItemEffectParamOffset
|
||||||
lsls r0, 24
|
lsls r0, 24
|
||||||
lsrs r4, r0, 24
|
lsrs r4, r0, 24
|
||||||
cmp r4, 0
|
cmp r4, 0
|
||||||
|
@ -2522,7 +2522,7 @@ sub_8065964: @ 8065964
|
|||||||
ldr r3, =gActiveBank
|
ldr r3, =gActiveBank
|
||||||
ldrb r0, [r3]
|
ldrb r0, [r3]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r4, r0, r2
|
adds r4, r0, r2
|
||||||
adds r7, r4, 0
|
adds r7, r4, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -5039,7 +5039,7 @@ sub_8066FF4: @ 8066FF4
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r4, [r5]
|
ldrb r4, [r5]
|
||||||
lsls r4, 9
|
lsls r4, 9
|
||||||
ldr r0, =gUnknown_02023066
|
ldr r0, =gBattleBufferA + 2
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
ldrh r0, [r4]
|
ldrh r0, [r4]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -5946,7 +5946,7 @@ _080677B4:
|
|||||||
adds r5, r7, 0
|
adds r5, r7, 0
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
@ -6177,7 +6177,7 @@ sub_80679A4: @ 80679A4
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
bl sub_81851A8
|
bl sub_81851A8
|
||||||
bl LinkOpponentBufferExecCompleted
|
bl LinkOpponentBufferExecCompleted
|
||||||
@ -6200,7 +6200,7 @@ sub_80679D0: @ 80679D0
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
bl sub_81851A8
|
bl sub_81851A8
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
|
@ -2063,7 +2063,7 @@ sub_814C09C: @ 814C09C
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r3, r0, r2
|
adds r3, r0, r2
|
||||||
adds r6, r3, 0
|
adds r6, r3, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -4348,7 +4348,7 @@ sub_814D590: @ 814D590
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r4, [r5]
|
ldrb r4, [r5]
|
||||||
lsls r4, 9
|
lsls r4, 9
|
||||||
ldr r0, =gUnknown_02023066
|
ldr r0, =gBattleBufferA + 2
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
ldrh r0, [r4]
|
ldrh r0, [r4]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -5341,7 +5341,7 @@ _0814DE08:
|
|||||||
strb r1, [r0]
|
strb r1, [r0]
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
@ -5571,7 +5571,7 @@ sub_814E014: @ 814E014
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
bl sub_81851A8
|
bl sub_81851A8
|
||||||
bl LinkPartnerBufferExecCompleted
|
bl LinkPartnerBufferExecCompleted
|
||||||
@ -5594,7 +5594,7 @@ sub_814E040: @ 814E040
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
bl sub_81851A8
|
bl sub_81851A8
|
||||||
ldr r2, =gBattleOutcome
|
ldr r2, =gBattleOutcome
|
||||||
|
@ -2672,7 +2672,7 @@ sub_8060890: @ 8060890
|
|||||||
ldr r3, =gActiveBank
|
ldr r3, =gActiveBank
|
||||||
ldrb r0, [r3]
|
ldrb r0, [r3]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r4, r0, r2
|
adds r4, r0, r2
|
||||||
adds r7, r4, 0
|
adds r7, r4, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -5179,7 +5179,7 @@ sub_8061F34: @ 8061F34
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r4, [r5]
|
ldrb r4, [r5]
|
||||||
lsls r4, 9
|
lsls r4, 9
|
||||||
ldr r0, =gUnknown_02023066
|
ldr r0, =gBattleBufferA + 2
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
ldrh r0, [r4]
|
ldrh r0, [r4]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -5252,7 +5252,7 @@ _08061FE4:
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023068
|
ldr r1, =gBattleBufferA + 4
|
||||||
adds r5, r0, r1
|
adds r5, r0, r1
|
||||||
movs r0, 0x93
|
movs r0, 0x93
|
||||||
lsls r0, 3
|
lsls r0, 3
|
||||||
@ -6401,7 +6401,7 @@ _080629B4:
|
|||||||
adds r5, r7, 0
|
adds r5, r7, 0
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
|
@ -856,7 +856,7 @@ sub_8057BFC: @ 8057BFC
|
|||||||
ldr r3, =gActiveBank
|
ldr r3, =gActiveBank
|
||||||
ldrb r0, [r3]
|
ldrb r0, [r3]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023068
|
ldr r1, =gBattleBufferA + 4
|
||||||
adds r6, r0, r1
|
adds r6, r0, r1
|
||||||
ldr r2, =gMain
|
ldr r2, =gMain
|
||||||
ldrh r1, [r2, 0x2C]
|
ldrh r1, [r2, 0x2C]
|
||||||
@ -1471,7 +1471,7 @@ _08058152:
|
|||||||
b _080584A8
|
b _080584A8
|
||||||
_08058170:
|
_08058170:
|
||||||
lsls r1, 9
|
lsls r1, 9
|
||||||
ldr r0, =gUnknown_02023068
|
ldr r0, =gBattleBufferA + 4
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
mov r9, r1
|
mov r9, r1
|
||||||
ldrb r1, [r2]
|
ldrb r1, [r2]
|
||||||
@ -4332,7 +4332,7 @@ sub_8059AAC: @ 8059AAC
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
lsls r1, 9
|
lsls r1, 9
|
||||||
ldr r3, =gUnknown_02023068
|
ldr r3, =gBattleBufferA + 4
|
||||||
ldr r2, =gUnknown_03005D78
|
ldr r2, =gUnknown_03005D78
|
||||||
movs r0, 0
|
movs r0, 0
|
||||||
strb r0, [r2]
|
strb r0, [r2]
|
||||||
@ -4446,7 +4446,7 @@ sub_8059BB0: @ 8059BB0
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r4, [r5]
|
ldrb r4, [r5]
|
||||||
lsls r4, 9
|
lsls r4, 9
|
||||||
ldr r0, =gUnknown_02023068
|
ldr r0, =gBattleBufferA + 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
ldr r6, =gUnknown_02022E2C
|
ldr r6, =gUnknown_02022E2C
|
||||||
ldr r1, =gUnknown_085CCA73
|
ldr r1, =gUnknown_085CCA73
|
||||||
@ -5778,7 +5778,7 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r3, r0, r2
|
adds r3, r0, r2
|
||||||
adds r6, r3, 0
|
adds r6, r3, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -8452,7 +8452,7 @@ sub_805BF80: @ 805BF80
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r4, [r5]
|
ldrb r4, [r5]
|
||||||
lsls r4, 9
|
lsls r4, 9
|
||||||
ldr r0, =gUnknown_02023066
|
ldr r0, =gBattleBufferA + 2
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
ldrh r0, [r4]
|
ldrh r0, [r4]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -10030,7 +10030,7 @@ _0805CDA4:
|
|||||||
strb r1, [r0]
|
strb r1, [r0]
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
@ -10269,7 +10269,7 @@ dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r4, =gUnknown_02023066
|
ldr r4, =gBattleBufferA + 2
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
bl sub_81851A8
|
bl sub_81851A8
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
@ -10366,7 +10366,7 @@ sub_805D094: @ 805D094
|
|||||||
ldr r5, =gActiveBank
|
ldr r5, =gActiveBank
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
bl sub_81851A8
|
bl sub_81851A8
|
||||||
ldr r2, =gBattleOutcome
|
ldr r2, =gBattleOutcome
|
||||||
|
@ -2638,7 +2638,7 @@ sub_81BC4E8: @ 81BC4E8
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r3, r0, r2
|
adds r3, r0, r2
|
||||||
adds r6, r3, 0
|
adds r6, r3, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -4960,7 +4960,7 @@ sub_81BDA4C: @ 81BDA4C
|
|||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrh r0, [r0]
|
ldrh r0, [r0]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -5010,7 +5010,7 @@ sub_81BDAC8: @ 81BDAC8
|
|||||||
ldr r6, =gActiveBank
|
ldr r6, =gActiveBank
|
||||||
ldrb r4, [r6]
|
ldrb r4, [r6]
|
||||||
lsls r4, 9
|
lsls r4, 9
|
||||||
ldr r0, =gUnknown_02023068
|
ldr r0, =gBattleBufferA + 4
|
||||||
adds r4, r0
|
adds r4, r0
|
||||||
movs r0, 0xF
|
movs r0, 0xF
|
||||||
bl BattleAI_SetupAIData
|
bl BattleAI_SetupAIData
|
||||||
@ -6074,7 +6074,7 @@ _081BE404:
|
|||||||
strb r1, [r0]
|
strb r1, [r0]
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
|
@ -2503,7 +2503,7 @@ dp01_setattr_for_opponent_pokemon: @ 8187AA8
|
|||||||
ldr r3, =gActiveBank
|
ldr r3, =gActiveBank
|
||||||
ldrb r0, [r3]
|
ldrb r0, [r3]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r4, r0, r2
|
adds r4, r0, r2
|
||||||
adds r7, r4, 0
|
adds r7, r4, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -4716,7 +4716,7 @@ sub_8188E90: @ 8188E90
|
|||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrh r0, [r0]
|
ldrh r0, [r0]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -5685,7 +5685,7 @@ _081896E4:
|
|||||||
adds r5, r7, 0
|
adds r5, r7, 0
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
|
@ -2439,7 +2439,7 @@ sub_818AE70: @ 818AE70
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r3, r0, r2
|
adds r3, r0, r2
|
||||||
adds r6, r3, 0
|
adds r6, r3, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -4816,7 +4816,7 @@ sub_818C43C: @ 818C43C
|
|||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrh r0, [r0]
|
ldrh r0, [r0]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -5870,7 +5870,7 @@ _0818CD60:
|
|||||||
strb r1, [r0]
|
strb r1, [r0]
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r3, r0, 9
|
lsls r3, r0, 9
|
||||||
ldr r4, =gUnknown_02023068
|
ldr r4, =gBattleBufferA + 4
|
||||||
adds r1, r3, r4
|
adds r1, r3, r4
|
||||||
subs r2, r4, 0x3
|
subs r2, r4, 0x3
|
||||||
adds r2, r3, r2
|
adds r2, r3, r2
|
||||||
|
@ -786,7 +786,7 @@ dp01t_10_6_message: @ 81599DC
|
|||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrh r0, [r0]
|
ldrh r0, [r0]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
|
@ -1925,7 +1925,7 @@ sub_8169424: @ 8169424
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r2, =gUnknown_02023067
|
ldr r2, =gBattleBufferA + 3
|
||||||
adds r3, r0, r2
|
adds r3, r0, r2
|
||||||
adds r6, r3, 0
|
adds r6, r3, 0
|
||||||
subs r1, r2, 0x2
|
subs r1, r2, 0x2
|
||||||
@ -3600,7 +3600,7 @@ sub_816A3B8: @ 816A3B8
|
|||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
lsls r0, 9
|
lsls r0, 9
|
||||||
ldr r1, =gUnknown_02023066
|
ldr r1, =gBattleBufferA + 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldrh r0, [r0]
|
ldrh r0, [r0]
|
||||||
bl BufferStringBattle
|
bl BufferStringBattle
|
||||||
@ -4637,7 +4637,7 @@ _0816ACA8:
|
|||||||
strb r1, [r0]
|
strb r1, [r0]
|
||||||
ldrb r0, [r5]
|
ldrb r0, [r5]
|
||||||
lsls r4, r0, 9
|
lsls r4, r0, 9
|
||||||
ldr r3, =gUnknown_02023068
|
ldr r3, =gBattleBufferA + 4
|
||||||
adds r1, r4, r3
|
adds r1, r4, r3
|
||||||
subs r2, r3, 0x3
|
subs r2, r3, 0x3
|
||||||
adds r2, r4, r2
|
adds r2, r4, r2
|
||||||
|
@ -20,7 +20,7 @@ BufferStringBattle: @ 814E0C4
|
|||||||
mov r8, r0
|
mov r8, r0
|
||||||
ldrb r1, [r0]
|
ldrb r1, [r0]
|
||||||
lsls r1, 9
|
lsls r1, 9
|
||||||
ldr r0, =gUnknown_02023068
|
ldr r0, =gBattleBufferA + 4
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
str r1, [r4]
|
str r1, [r4]
|
||||||
ldr r2, =gLastUsedItem
|
ldr r2, =gLastUsedItem
|
||||||
@ -2995,7 +2995,7 @@ sub_814FBAC: @ 814FBAC
|
|||||||
ldr r0, =gActiveBank
|
ldr r0, =gActiveBank
|
||||||
ldrb r2, [r0]
|
ldrb r2, [r0]
|
||||||
lsls r1, r2, 9
|
lsls r1, r2, 9
|
||||||
ldr r0, =gUnknown_02023068
|
ldr r0, =gBattleBufferA + 4
|
||||||
adds r1, r0
|
adds r1, r0
|
||||||
ldr r4, =gUnknown_08D85620
|
ldr r4, =gUnknown_08D85620
|
||||||
ldr r0, =gUnknown_020244B0
|
ldr r0, =gUnknown_020244B0
|
||||||
|
1971
asm/pokemon_3.s
1971
asm/pokemon_3.s
File diff suppressed because it is too large
Load Diff
1967
asm/pokemon_item_effect.s
Normal file
1967
asm/pokemon_item_effect.s
Normal file
File diff suppressed because it is too large
Load Diff
@ -2115,7 +2115,7 @@ sub_8185FD0: @ 8185FD0
|
|||||||
movs r3, 0
|
movs r3, 0
|
||||||
ldr r7, =gUnknown_0203CC70
|
ldr r7, =gUnknown_0203CC70
|
||||||
adds r6, r4, 0
|
adds r6, r4, 0
|
||||||
ldr r5, =gUnknown_02024090
|
ldr r5, =gBattleMons + 0xC
|
||||||
movs r4, 0x58
|
movs r4, 0x58
|
||||||
_08186000:
|
_08186000:
|
||||||
lsls r2, r3, 1
|
lsls r2, r3, 1
|
||||||
@ -2192,7 +2192,7 @@ _0818608A:
|
|||||||
movs r1, 0x58
|
movs r1, 0x58
|
||||||
mov r0, r10
|
mov r0, r10
|
||||||
muls r0, r1
|
muls r0, r1
|
||||||
ldr r3, =gUnknown_02024090
|
ldr r3, =gBattleMons + 0xC
|
||||||
adds r1, r0, r3
|
adds r1, r0, r3
|
||||||
_081860AA:
|
_081860AA:
|
||||||
ldrh r0, [r1]
|
ldrh r0, [r1]
|
||||||
@ -2227,7 +2227,7 @@ _081860DE:
|
|||||||
lsls r0, r5, 1
|
lsls r0, r5, 1
|
||||||
adds r5, 0x1
|
adds r5, 0x1
|
||||||
adds r0, r7
|
adds r0, r7
|
||||||
ldr r1, =gUnknown_02024090
|
ldr r1, =gBattleMons + 0xC
|
||||||
adds r3, r0, r1
|
adds r3, r0, r1
|
||||||
lsls r0, r4, 3
|
lsls r0, r4, 3
|
||||||
mov r6, r8
|
mov r6, r8
|
||||||
@ -2341,7 +2341,7 @@ _081861A6:
|
|||||||
adds r1, r2, r5
|
adds r1, r2, r5
|
||||||
ldrb r0, [r4]
|
ldrb r0, [r4]
|
||||||
adds r0, r7
|
adds r0, r7
|
||||||
ldr r3, =gUnknown_020240A8
|
ldr r3, =gBattleMons + 0x24
|
||||||
adds r0, r3
|
adds r0, r3
|
||||||
ldrb r0, [r0]
|
ldrb r0, [r0]
|
||||||
strb r0, [r1]
|
strb r0, [r1]
|
||||||
|
@ -9790,7 +9790,7 @@ _0803A2D4:
|
|||||||
ldrb r7, [r7]
|
ldrb r7, [r7]
|
||||||
cmp r5, r7
|
cmp r5, r7
|
||||||
bge _0803A348
|
bge _0803A348
|
||||||
ldr r0, =gUnknown_020240D4
|
ldr r0, =gBattleMons + 0x50
|
||||||
mov r8, r0
|
mov r8, r0
|
||||||
ldr r4, =gDisableStructs
|
ldr r4, =gDisableStructs
|
||||||
ldr r3, =gStatuses3
|
ldr r3, =gStatuses3
|
||||||
@ -9945,7 +9945,7 @@ _0803A430:
|
|||||||
ldrb r7, [r7]
|
ldrb r7, [r7]
|
||||||
cmp r5, r7
|
cmp r5, r7
|
||||||
bge _0803A490
|
bge _0803A490
|
||||||
ldr r3, =gUnknown_020240D4
|
ldr r3, =gBattleMons + 0x50
|
||||||
ldr r7, =gBitTable
|
ldr r7, =gBitTable
|
||||||
ldr r6, =gActiveBank
|
ldr r6, =gActiveBank
|
||||||
_0803A448:
|
_0803A448:
|
||||||
@ -11062,7 +11062,7 @@ _0803AD0E:
|
|||||||
movs r2, 0
|
movs r2, 0
|
||||||
ldr r4, =gActiveBank
|
ldr r4, =gActiveBank
|
||||||
movs r5, 0x58
|
movs r5, 0x58
|
||||||
ldr r1, =gUnknown_0202409C
|
ldr r1, =gBattleMons + 0x18
|
||||||
adds r6, r4, 0
|
adds r6, r4, 0
|
||||||
movs r0, 0x18
|
movs r0, 0x18
|
||||||
negs r0, r0
|
negs r0, r0
|
||||||
@ -15568,7 +15568,7 @@ sub_803D580: @ 803D580
|
|||||||
beq _0803D678
|
beq _0803D678
|
||||||
ldr r7, =gProtectStructs
|
ldr r7, =gProtectStructs
|
||||||
adds r6, r5, 0
|
adds r6, r5, 0
|
||||||
ldr r0, =gUnknown_020240D4
|
ldr r0, =gBattleMons + 0x50
|
||||||
mov r12, r0
|
mov r12, r0
|
||||||
ldr r1, =gDisableStructs
|
ldr r1, =gDisableStructs
|
||||||
mov r8, r1
|
mov r8, r1
|
||||||
@ -19047,7 +19047,7 @@ _0803F6AE:
|
|||||||
ldrh r0, [r1]
|
ldrh r0, [r1]
|
||||||
cmp r0, 0xC3
|
cmp r0, 0xC3
|
||||||
beq _0803F6DE
|
beq _0803F6DE
|
||||||
ldr r1, =gUnknown_02024090
|
ldr r1, =gBattleMons + 0xC
|
||||||
add r1, r9
|
add r1, r9
|
||||||
_0803F6D0:
|
_0803F6D0:
|
||||||
adds r1, 0x2
|
adds r1, 0x2
|
||||||
@ -19062,7 +19062,7 @@ _0803F6DE:
|
|||||||
beq _0803F6F4
|
beq _0803F6F4
|
||||||
adds r6, r2, 0
|
adds r6, r2, 0
|
||||||
adds r0, r6, r5
|
adds r0, r6, r5
|
||||||
ldr r2, =gUnknown_020240A8
|
ldr r2, =gBattleMons + 0x24
|
||||||
adds r1, r0, r2
|
adds r1, r0, r2
|
||||||
ldrb r0, [r1]
|
ldrb r0, [r1]
|
||||||
cmp r0, 0
|
cmp r0, 0
|
||||||
|
@ -5381,7 +5381,7 @@ sub_8164E04: @ 8164E04
|
|||||||
movs r2, 0
|
movs r2, 0
|
||||||
movs r5, 0xBE
|
movs r5, 0xBE
|
||||||
lsls r5, 4
|
lsls r5, 4
|
||||||
ldr r3, =gUnknown_020240B4
|
ldr r3, =gBattleMons + 0x30
|
||||||
adds r6, r4, 0
|
adds r6, r4, 0
|
||||||
_08164E7C:
|
_08164E7C:
|
||||||
ldr r0, [r4]
|
ldr r0, [r4]
|
||||||
|
@ -4606,7 +4606,7 @@ _0817F11A:
|
|||||||
movs r0, 0x58
|
movs r0, 0x58
|
||||||
adds r4, r3, 0
|
adds r4, r3, 0
|
||||||
muls r4, r0
|
muls r4, r0
|
||||||
ldr r5, =gUnknown_02024090
|
ldr r5, =gBattleMons + 0xC
|
||||||
adds r3, r4, r5
|
adds r3, r4, r5
|
||||||
lsls r0, r7, 1
|
lsls r0, r7, 1
|
||||||
adds r0, r4
|
adds r0, r4
|
||||||
|
@ -78954,7 +78954,7 @@ IsHPRecoveryItem: @ 81B62D0
|
|||||||
b _081B62F6
|
b _081B62F6
|
||||||
.pool
|
.pool
|
||||||
_081B62EC:
|
_081B62EC:
|
||||||
ldr r1, =gItemEffectInfoPointers
|
ldr r1, =gItemEffectTable
|
||||||
subs r0, 0xD
|
subs r0, 0xD
|
||||||
lsls r0, 2
|
lsls r0, 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -79858,7 +79858,7 @@ dp05_ether: @ 81B6AFC
|
|||||||
b _081B6B2A
|
b _081B6B2A
|
||||||
.pool
|
.pool
|
||||||
_081B6B20:
|
_081B6B20:
|
||||||
ldr r1, =gItemEffectInfoPointers
|
ldr r1, =gItemEffectTable
|
||||||
subs r0, 0xD
|
subs r0, 0xD
|
||||||
lsls r0, 2
|
lsls r0, 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
@ -81825,7 +81825,7 @@ _081B7D00:
|
|||||||
b _081B7D20
|
b _081B7D20
|
||||||
.pool
|
.pool
|
||||||
_081B7D18:
|
_081B7D18:
|
||||||
ldr r1, =gItemEffectInfoPointers
|
ldr r1, =gItemEffectTable
|
||||||
lsls r0, r2, 2
|
lsls r0, r2, 2
|
||||||
adds r0, r1
|
adds r0, r1
|
||||||
ldr r4, [r0]
|
ldr r4, [r0]
|
||||||
|
@ -658,7 +658,7 @@ gTamatoBerryItemEffectInfo:: @ 831E57F
|
|||||||
.byte 0x02
|
.byte 0x02
|
||||||
|
|
||||||
.align 2
|
.align 2
|
||||||
gItemEffectInfoPointers:: @ 831E58C
|
gItemEffectTable:: @ 831E58C
|
||||||
.4byte gPotionItemEffectInfo
|
.4byte gPotionItemEffectInfo
|
||||||
.4byte gAntidoteItemEffectInfo
|
.4byte gAntidoteItemEffectInfo
|
||||||
.4byte gBurnHealItemEffectInfo
|
.4byte gBurnHealItemEffectInfo
|
||||||
|
@ -71,6 +71,7 @@ SECTIONS {
|
|||||||
src/calculate_base_damage.o(.text);
|
src/calculate_base_damage.o(.text);
|
||||||
src/pokemon_2.o(.text);
|
src/pokemon_2.o(.text);
|
||||||
asm/pokemon_2.o(.text);
|
asm/pokemon_2.o(.text);
|
||||||
|
asm/pokemon_item_effect.o(.text);
|
||||||
asm/pokemon_3.o(.text);
|
asm/pokemon_3.o(.text);
|
||||||
src/trig.o(.text);
|
src/trig.o(.text);
|
||||||
src/rng.o(.text);
|
src/rng.o(.text);
|
||||||
|
@ -745,7 +745,7 @@ _08130E10:\n\
|
|||||||
ldrb r1, [r0]\n\
|
ldrb r1, [r0]\n\
|
||||||
movs r0, 0x58\n\
|
movs r0, 0x58\n\
|
||||||
muls r0, r1\n\
|
muls r0, r1\n\
|
||||||
ldr r2, =gUnknown_02024090\n\
|
ldr r2, =gBattleMons + 0xC\n\
|
||||||
adds r0, r2\n\
|
adds r0, r2\n\
|
||||||
adds r4, r0, 0x2\n\
|
adds r4, r0, 0x2\n\
|
||||||
add r7, sp, 0x14\n\
|
add r7, sp, 0x14\n\
|
||||||
|
@ -290,22 +290,10 @@ gUnknown_02023060: @ 2023060
|
|||||||
.space 0x4
|
.space 0x4
|
||||||
|
|
||||||
gBattleBufferA: @ 2023064
|
gBattleBufferA: @ 2023064
|
||||||
.space 0x2
|
.space 0x800
|
||||||
|
|
||||||
gUnknown_02023066: @ 2023066
|
|
||||||
.space 0x1
|
|
||||||
|
|
||||||
gUnknown_02023067: @ 2023067
|
|
||||||
.space 0x1
|
|
||||||
|
|
||||||
gUnknown_02023068: @ 2023068
|
|
||||||
.space 0x7FC
|
|
||||||
|
|
||||||
gBattleBufferB: @ 2023864
|
gBattleBufferB: @ 2023864
|
||||||
.space 0x4
|
.space 0x800
|
||||||
|
|
||||||
gUnknown_02023868: @ 2023868
|
|
||||||
.space 0x7FC
|
|
||||||
|
|
||||||
gActiveBank: @ 2024064
|
gActiveBank: @ 2024064
|
||||||
.space 0x4
|
.space 0x4
|
||||||
@ -335,31 +323,7 @@ gFightStateTracker: @ 2024083
|
|||||||
.space 0x1
|
.space 0x1
|
||||||
|
|
||||||
gBattleMons: @ 2024084
|
gBattleMons: @ 2024084
|
||||||
.space 0xC
|
.space 0x160
|
||||||
|
|
||||||
gUnknown_02024090: @ 2024090
|
|
||||||
.space 0xC
|
|
||||||
|
|
||||||
gUnknown_0202409C: @ 202409C
|
|
||||||
.space 0xC
|
|
||||||
|
|
||||||
gUnknown_020240A8: @ 20240A8
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_020240AC: @ 20240AC
|
|
||||||
.space 0x8
|
|
||||||
|
|
||||||
gUnknown_020240B4: @ 20240B4
|
|
||||||
.space 0x18
|
|
||||||
|
|
||||||
gUnknown_020240CC: @ 20240CC
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_020240D0: @ 20240D0
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_020240D4: @ 20240D4
|
|
||||||
.space 0x110
|
|
||||||
|
|
||||||
gBankSpriteIds: @ 20241E4
|
gBankSpriteIds: @ 20241E4
|
||||||
.space 0x4
|
.space 0x4
|
||||||
@ -524,10 +488,7 @@ gUnknown_02024402: @ 2024402
|
|||||||
.space 0x2
|
.space 0x2
|
||||||
|
|
||||||
gEnigmaBerries: @ 2024404
|
gEnigmaBerries: @ 2024404
|
||||||
.space 0x8
|
.space 0x70
|
||||||
|
|
||||||
gUnknown_0202440C: @ 202440C
|
|
||||||
.space 0x68
|
|
||||||
|
|
||||||
gBattleScripting: @ 2024474
|
gBattleScripting: @ 2024474
|
||||||
.space 0x4
|
.space 0x4
|
||||||
|
Loading…
x
Reference in New Issue
Block a user