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

begin working on pokeemerald

Browse Source
This commit is contained in:
DizzyEggg
2017-08-31 16:48:24 +02:00
parent cbe13acff1
commit 6f03356237
103 changed files with 15767 additions and 15344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/calculate_base_damage.s
+26 -26
View File
@@ -36,7 +36,7 @@ sub_806957C: @ 806957C
movs r5, 0
cmp r3, 0
bne _080695D4
ldr r2, =gUnknown_020244E0
ldr r2, =gBattleMovePower
ldr r1, =gBattleMoves
ldr r3, [sp, 0x8]
lsls r0, r3, 1
@@ -48,7 +48,7 @@ sub_806957C: @ 806957C
b _080695D8
.pool
_080695D4:
ldr r0, =gUnknown_020244E0
ldr r0, =gBattleMovePower
strh r3, [r0]
_080695D8:
cmp r7, 0
@@ -82,7 +82,7 @@ _08069602:
ldrh r0, [r6, 0x2E]
cmp r0, 0xAF
bne _08069634
ldr r1, =gUnknown_02024404
ldr r1, =gEnigmaBerries
ldr r2, [sp, 0x10]
lsls r0, r2, 3
subs r0, r2
@@ -95,12 +95,12 @@ _08069602:
.pool
_08069634:
ldrh r0, [r6, 0x2E]
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldrh r0, [r6, 0x2E]
bl itemid_get_quality
bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r0, 24
_0806964A:
@@ -109,7 +109,7 @@ _0806964A:
ldrh r0, [r1, 0x2E]
cmp r0, 0xAF
bne _0806967E
ldr r1, =gUnknown_02024404
ldr r1, =gEnigmaBerries
ldr r2, [sp, 0x14]
lsls r0, r2, 3
subs r0, r2
@@ -131,13 +131,13 @@ _0806966C:
_0806967E:
ldr r3, [sp, 0x4]
ldrh r0, [r3, 0x2E]
bl itemid_get_x12
bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x20]
ldr r1, [sp, 0x4]
ldrh r0, [r1, 0x2E]
bl itemid_get_quality
bl ItemId_GetHoldEffectParam
_08069694:
adds r0, r6, 0
adds r0, 0x20
@@ -212,7 +212,7 @@ _08069708:
str r0, [sp, 0x1C]
_08069728:
movs r2, 0
ldr r4, =gUnknown_08329D74
ldr r4, =gHoldEffectToType
ldr r3, [sp, 0x4]
adds r3, 0x20
str r3, [sp, 0x2C]
@@ -405,7 +405,7 @@ _08069898:
movs r1, 0
movs r2, 0x3A
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _080698C6
@@ -429,7 +429,7 @@ _080698C6:
movs r1, 0
movs r2, 0x39
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _080698F8
@@ -483,11 +483,11 @@ _08069936:
movs r1, 0
movs r2, 0
movs r3, 0xFD
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _0806995A
ldr r1, =gUnknown_020244E0
ldr r1, =gBattleMovePower
ldrh r0, [r1]
lsrs r0, 1
strh r0, [r1]
@@ -501,11 +501,11 @@ _0806995A:
movs r1, 0
movs r2, 0
movs r3, 0xFE
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
beq _0806997E
ldr r1, =gUnknown_020244E0
ldr r1, =gBattleMovePower
ldrh r0, [r1]
lsrs r0, 1
strh r0, [r1]
@@ -525,7 +525,7 @@ _0806997E:
lsrs r0, 16
cmp r1, r0
bhi _080699AE
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -548,7 +548,7 @@ _080699AE:
lsrs r0, 16
cmp r1, r0
bhi _080699DE
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -571,7 +571,7 @@ _080699DE:
lsrs r0, 16
cmp r1, r0
bhi _08069A0E
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -594,7 +594,7 @@ _08069A0E:
lsrs r0, 16
cmp r1, r0
bhi _08069A3E
ldr r4, =gUnknown_020244E0
ldr r4, =gBattleMovePower
ldrh r1, [r4]
movs r0, 0x96
muls r0, r1
@@ -603,7 +603,7 @@ _08069A0E:
strh r0, [r4]
_08069A3E:
ldr r2, =gBattleMoves
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r1, [r0]
lsls r0, r1, 1
adds r0, r1
@@ -653,7 +653,7 @@ _08069AA6:
bl __divsi3
adds r5, r0, 0
_08069ABE:
ldr r0, =gUnknown_020244E0
ldr r0, =gBattleMovePower
ldrh r0, [r0]
muls r5, r0
adds r0, r6, 0
@@ -821,7 +821,7 @@ _08069C02:
bl __divsi3
adds r5, r0, 0
_08069C1A:
ldr r0, =gUnknown_020244E0
ldr r0, =gBattleMovePower
ldrh r0, [r0]
muls r5, r0
adds r0, r6, 0
@@ -933,7 +933,7 @@ _08069CFC:
movs r1, 0
movs r2, 0xD
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -943,7 +943,7 @@ _08069CFC:
movs r1, 0
movs r2, 0x4D
movs r3, 0
bl ability_something
bl AbilityBattleEffects
lsls r0, 24
cmp r0, 0
bne _08069DAC
@@ -978,7 +978,7 @@ _08069D64:
ands r0, r1
cmp r0, 0
beq _08069D7C
ldr r0, =gUnknown_020241EA
ldr r0, =gCurrentMove
ldrh r0, [r0]
cmp r0, 0x4C
bne _08069D7C
@@ -1010,7 +1010,7 @@ _08069DA6:
adds r0, r5, r0
asrs r5, r0, 1
_08069DAC:
ldr r0, =gUnknown_020244A8
ldr r0, =gBattleResources
ldr r0, [r0]
ldr r0, [r0, 0x4]
ldr r7, [sp, 0x10]