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

start porting pokemon1

Browse Source
This commit is contained in:
DizzyEggg
2017-09-06 17:19:08 +02:00
parent 577e23a87d
commit c6eacc9be5
19 changed files with 703 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
asm/battle_4.s
View File

@@ -14635,7 +14635,7 @@ atk59_learnmove_inbattle: @ 804DEEC
ldr r1, =gPlayerParty
adds r0, r1
ldrb r1, [r2, 0x9]
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r5, r0, 16
ldr r0, =0x0000fffe
@@ -14651,7 +14651,7 @@ _0804DF3A:
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r7
@@ -14703,7 +14703,7 @@ _0804DF88:
bne _0804DFC8
adds r0, r2, r4
adds r1, r5, 0
bl sub_80691B0
bl GiveMoveToBattleMon
_0804DFC8:
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -14740,7 +14740,7 @@ _0804DFC8:
bne _0804E014
adds r0, r2, r4
adds r1, r5, 0
bl sub_80691B0
bl GiveMoveToBattleMon
_0804E014:
ldr r0, =gBattlescriptCurrInstr
str r6, [r0]
@@ -14898,7 +14898,7 @@ _0804E170:
lsls r2, 24
lsrs r2, 24
ldr r3, =sub_80A92F8
ldr r4, =gUnknown_020244E2
ldr r4, =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_81BFA38
@@ -15023,10 +15023,10 @@ _0804E274:
muls r1, r0
adds r0, r1, 0
adds r0, r7
ldr r7, =gUnknown_020244E2
ldr r7, =gMoveToLearn
ldrh r1, [r7]
adds r2, r5, 0
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, =gBattlePartyID
ldr r1, [r6]
ldrh r0, [r0]
@@ -15056,7 +15056,7 @@ _0804E274:
ldrh r1, [r7]
adds r0, r4, 0
adds r2, r5, 0
bl sub_8069234
bl SetBattleMonMoveSlot
_0804E30A:
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -15096,11 +15096,11 @@ _0804E30A:
adds r0, r4, 0
adds r1, r5, 0
bl sub_806B9E4
ldr r0, =gUnknown_020244E2
ldr r0, =gMoveToLearn
ldrh r1, [r0]
adds r0, r4, 0
adds r2, r5, 0
bl sub_8069234
bl SetBattleMonMoveSlot
b _0804E3B8
.pool
_0804E38C:
@@ -17178,7 +17178,7 @@ sub_804F574: @ 804F574
strb r0, [r2]
movs r0, 0x2
strb r0, [r2, 0x1]
ldr r0, =gUnknown_020244E2
ldr r0, =gMoveToLearn
ldrh r1, [r0]
strb r1, [r2, 0x2]
movs r0, 0xFF

12
asm/daycare.s
View File

@@ -347,14 +347,14 @@ _0806FCC4:
movs r6, 0
cmp r0, r7
bne _0806FCD4
ldr r0, =gUnknown_020244E2
ldr r0, =gMoveToLearn
ldrh r1, [r0]
adds r0, r4, 0
bl DeleteFirstMoveAndGiveMoveToMon
_0806FCD4:
adds r0, r4, 0
adds r1, r6, 0
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -1439,7 +1439,7 @@ _08070546:
adds r1, r0, 0
adds r0, r7, 0
str r2, [sp, 0x8]
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r2, [sp, 0x8]
@@ -1500,7 +1500,7 @@ _080705C2:
beq _080705FE
ldrh r1, [r4]
adds r0, r7, 0
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
cmp r0, r6
@@ -1601,7 +1601,7 @@ _0807068A:
adds r1, r0, 0
adds r0, r7, 0
str r2, [sp, 0x8]
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r2, [sp, 0x8]
@@ -1747,7 +1747,7 @@ _080707C6:
lsls r4, 1
adds r0, r6, 0
adds r1, r4, 0
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
ldr r1, =0xffff0000
cmp r0, r1

2
asm/egg_hatch.s
View File

@@ -246,7 +246,7 @@ sub_80714B8: @ 80714B8
movs r1, 0x23
bl SetMonData
adds r0, r5, 0
bl sub_806E924
bl RestoreMonMovesPP
adds r0, r5, 0
bl CalculateMonStats
add sp, 0x14

16
asm/evolution_scene.s
View File

@@ -1679,7 +1679,7 @@ _0813EA2A:
adds r4, r0, r1
ldrb r1, [r4, 0x10]
mov r0, r9
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0
@@ -2237,7 +2237,7 @@ _0813EF3E:
lsls r2, 24
lsrs r2, 24
ldr r3, =sub_813DD7C
ldr r4, =gUnknown_020244E2
ldr r4, =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_81BFA38
@@ -2318,11 +2318,11 @@ _0813F014:
mov r0, r9
adds r1, r4, 0
bl sub_806B9A8
ldr r0, =gUnknown_020244E2
ldr r0, =gMoveToLearn
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, =gTasks
mov r3, r8
adds r1, r3, r7
@@ -2870,7 +2870,7 @@ _0813F58C:
adds r5, r0, r1
ldrb r1, [r5, 0x10]
mov r0, r9
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r6, r0, 16
mov r8, r4
@@ -3388,7 +3388,7 @@ _0813FA3E:
lsls r2, 24
lsrs r2, 24
ldr r3, =sub_813DF70
ldr r4, =gUnknown_020244E2
ldr r4, =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_81BFA38
@@ -3471,11 +3471,11 @@ _0813FB3C:
mov r0, r9
adds r1, r4, 0
bl sub_806B9A8
ldr r0, =gUnknown_020244E2
ldr r0, =gMoveToLearn
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, =gUnknown_085CC270
movs r1, 0xCF
lsls r1, 2

1137
asm/pokemon_1.s
View File

File diff suppressed because it is too large Load Diff

26
asm/pokemon_2.s
View File

@@ -592,9 +592,9 @@ _0806A256:
bx r0
thumb_func_end pokemon_decrypt
thumb_func_start pokemon_data_permutator
@ int pokemon_data_permutator(pokemon *mon, int a2, u8 a3)
pokemon_data_permutator: @ 806A270
thumb_func_start GetSubstruct
@ int GetSubstruct(pokemon *mon, int a2, u8 a3)
GetSubstruct: @ 806A270
push {r4-r6,lr}
adds r5, r0, 0
adds r0, r1, 0
@@ -980,7 +980,7 @@ _0806A510:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end pokemon_data_permutator
thumb_func_end GetSubstruct
thumb_func_start GetMonData
@ int GetMonData(pokemon *mon, enum pokemon_data_request req, void *data)
@@ -1160,23 +1160,23 @@ GetBoxMonData: @ 806A674
ble _0806A6F2
ldr r1, [r0]
movs r2, 0
bl pokemon_data_permutator
bl GetSubstruct
mov r9, r0
mov r0, r8
ldr r1, [r0]
movs r2, 0x1
bl pokemon_data_permutator
bl GetSubstruct
mov r10, r0
mov r2, r8
ldr r1, [r2]
mov r0, r8
movs r2, 0x2
bl pokemon_data_permutator
bl GetSubstruct
adds r7, r0, 0
mov r0, r8
ldr r1, [r0]
movs r2, 0x3
bl pokemon_data_permutator
bl GetSubstruct
adds r5, r0, 0
mov r0, r8
bl pokemon_decrypt
@@ -2083,22 +2083,22 @@ SetBoxMonData: @ 806AD9C
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0
bl pokemon_data_permutator
bl GetSubstruct
mov r8, r0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x1
bl pokemon_data_permutator
bl GetSubstruct
mov r9, r0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x2
bl pokemon_data_permutator
bl GetSubstruct
adds r6, r0, 0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x3
bl pokemon_data_permutator
bl GetSubstruct
adds r5, r0, 0
adds r0, r7, 0
bl pokemon_decrypt
@@ -2963,7 +2963,7 @@ _0806B4B2:
cmp r0, 0
bne _0806B514
mov r0, r8
bl sub_806E924
bl RestoreMonMovesPP
adds r0, r4, 0
mov r1, r8
movs r2, 0x50

20
asm/pokemon_3.s
View File

@@ -4528,7 +4528,7 @@ _0806E0EA:
cmp r5, 0x3
ble _0806E0EA
movs r5, 0
ldr r6, =gLevelUpLearnsetPointers
ldr r6, =gLevelUpLearnsets
lsls r1, r7, 2
adds r2, r1, r6
ldr r3, [r2]
@@ -4562,7 +4562,7 @@ _0806E118:
cmp r1, r0
beq _0806E168
ldr r0, [sp, 0x14]
ldr r1, =gLevelUpLearnsetPointers
ldr r1, =gLevelUpLearnsets
adds r6, r0, r1
ldr r2, =0x000001ff
mov r8, r2
@@ -4598,7 +4598,7 @@ _0806E168:
cmp r2, r0
beq _0806E1AC
ldr r1, [sp, 0x14]
ldr r2, =gLevelUpLearnsetPointers
ldr r2, =gLevelUpLearnsets
adds r6, r1, r2
ldr r0, =0x000001ff
mov r8, r0
@@ -4667,7 +4667,7 @@ sub_806E204: @ 806E204
lsls r0, 16
movs r5, 0
movs r4, 0
ldr r1, =gLevelUpLearnsetPointers
ldr r1, =gLevelUpLearnsets
lsrs r0, 14
adds r0, r1
ldr r2, [r0]
@@ -4752,7 +4752,7 @@ _0806E2A0:
cmp r5, 0x3
ble _0806E2A0
movs r5, 0
ldr r3, =gLevelUpLearnsetPointers
ldr r3, =gLevelUpLearnsets
ldr r2, [sp, 0x38]
adds r1, r2, r3
ldr r0, [r1]
@@ -4788,7 +4788,7 @@ _0806E2D0:
cmp r1, r0
beq _0806E322
ldr r0, [sp, 0x38]
ldr r1, =gLevelUpLearnsetPointers
ldr r1, =gLevelUpLearnsets
adds r6, r0, r1
ldr r2, =0x000001ff
mov r8, r2
@@ -4825,7 +4825,7 @@ _0806E322:
cmp r2, r0
beq _0806E368
ldr r2, [sp, 0x38]
ldr r0, =gLevelUpLearnsetPointers
ldr r0, =gLevelUpLearnsets
adds r6, r2, r0
ldr r2, =0x000001ff
mov r8, r2
@@ -5533,13 +5533,13 @@ _0806E91E:
bx r1
thumb_func_end sub_806E8D4
thumb_func_start sub_806E924
sub_806E924: @ 806E924
thumb_func_start RestoreMonMovesPP
RestoreMonMovesPP: @ 806E924
push {lr}
bl pokemon_restore_pp
pop {r0}
bx r0
thumb_func_end sub_806E924
thumb_func_end RestoreMonMovesPP
thumb_func_start pokemon_restore_pp
pokemon_restore_pp: @ 806E930

4
asm/rom_815A0D4.s
View File

@@ -12852,7 +12852,7 @@ _081609A8:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
ldr r1, =0xffff0000
cmp r0, r1
@@ -13291,7 +13291,7 @@ _08160D6C:
adds r0, 0x45
ldrb r2, [r0]
adds r0, r4, 0
bl sub_80691F4
bl SetMonMoveSlot
ldr r4, =gStringVar2
bl sub_8161054
mov r1, r8

8
asm/rom_8161F74.s
View File

@@ -2379,7 +2379,7 @@ _081633B8:
mov r7, r10
adds r0, r3, r7
str r3, [sp, 0x38]
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, [r5]
ldr r1, [sp, 0x3C]
adds r0, r1, r0
@@ -6179,7 +6179,7 @@ _081654DE:
ldr r0, [sp, 0x64]
ldrb r2, [r0]
adds r0, r4, r6
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, [sp, 0x44]
adds r0, 0x1
str r0, [sp, 0x44]
@@ -6311,7 +6311,7 @@ _08165604:
lsrs r2, 24
adds r0, r4, r3
str r3, [sp, 0x68]
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, [r6]
adds r0, r5, r0
ldr r2, [sp, 0x44]
@@ -7578,7 +7578,7 @@ _0816602E:
mov r0, r8
add r0, r10
str r3, [sp, 0x34]
bl sub_80691F4
bl SetMonMoveSlot
ldr r3, [sp, 0x34]
ldr r0, [r3]
adds r0, r5, r0

36
asm/rom_818CFC8.s
View File

@@ -5177,7 +5177,7 @@ _0818FB18:
adds r0, r7, r2
mov r2, r12
str r3, [sp, 0x24]
bl sub_80691F4
bl SetMonMoveSlot
ldr r7, =gSaveBlock2Ptr
ldr r0, [r7]
add r0, r9
@@ -14798,7 +14798,7 @@ _08194DEA:
adds r0, r7, r1
movs r1, 0xA6
str r3, [sp, 0x4]
bl sub_80691F4
bl SetMonMoveSlot
ldr r3, [sp, 0x4]
_08194E00:
mov r6, r8
@@ -36656,7 +36656,7 @@ _0819FFE4:
adds r1, r3
ldrh r1, [r1]
str r1, [sp, 0x8]
ldr r1, =gLevelUpLearnsetPointers
ldr r1, =gLevelUpLearnsets
ldr r2, [sp, 0x8]
lsls r0, r2, 2
adds r0, r1
@@ -36922,7 +36922,7 @@ sub_81A01E8: @ 81A01E8
bne _081A0204
movs r4, 0x32
_081A0204:
ldr r1, =gLevelUpLearnsetPointers
ldr r1, =gLevelUpLearnsets
lsls r0, r2, 2
adds r0, r1
ldr r6, [r0]
@@ -44759,7 +44759,7 @@ _081A4508:
adds r0, r7, 0
movs r1, 0xA6
adds r2, r6, 0
bl sub_80691F4
bl SetMonMoveSlot
_081A4516:
mov r4, r10
lsls r0, r4, 24
@@ -46018,7 +46018,7 @@ _081A4F6A:
adds r0, r6, r3
adds r1, r4, 0
str r3, [sp, 0x40]
bl sub_80691F4
bl SetMonMoveSlot
ldr r3, [sp, 0x40]
cmp r4, 0xDA
bne _081A4F9C
@@ -49892,7 +49892,7 @@ sub_81A7024: @ 81A7024
bne _081A7034
movs r1, 0xDA
_081A7034:
bl sub_80691F4
bl SetMonMoveSlot
pop {r0}
bx r0
thumb_func_end sub_81A7024
@@ -51446,7 +51446,7 @@ _081A7CBA:
lsls r2, r4, 24
lsrs r2, 24
ldr r0, =gEnemyParty
bl sub_80691F4
bl SetMonMoveSlot
adds r4, 0x1
cmp r4, 0x3
ble _081A7CBA
@@ -54887,7 +54887,7 @@ _081A98EE:
mov r5, r10
adds r0, r7, r5
movs r1, 0xA6
bl sub_80691F4
bl SetMonMoveSlot
_081A9900:
mov r6, r8
cmp r6, 0x3
@@ -55449,7 +55449,7 @@ _081A9DA4:
lsls r2, 24
lsrs r2, 24
ldr r0, =gEnemyParty
bl sub_80691F4
bl SetMonMoveSlot
ldr r0, [sp, 0xC]
adds r0, 0x1
str r0, [sp, 0xC]
@@ -80216,7 +80216,7 @@ sub_81B6DC4: @ 81B6DC4
beq _081B6E78
ldrh r1, [r7, 0xE]
adds r0, r5, 0
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
ldr r1, =0xffff0000
cmp r0, r1
@@ -80644,7 +80644,7 @@ sub_81B71D4: @ 81B71D4
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
bl sub_80691F4
bl SetMonMoveSlot
adds r0, r6, 0
bl sub_81B6EB4
_081B7220:
@@ -81202,7 +81202,7 @@ _081B772C:
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r1, r0, 16
strh r6, [r4, 0x10]
@@ -81261,7 +81261,7 @@ sub_81B77AC: @ 81B77AC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0
bl sub_8069318
bl MonTryLearningNewMove
lsls r0, 16
lsrs r1, r0, 16
ldr r0, =0x0000fffe
@@ -81363,7 +81363,7 @@ sub_81B787C: @ 81B787C
ldr r1, =gStringVar1
bl GetMonNickname
ldr r0, =gStringVar2
ldr r6, =gUnknown_020244E2
ldr r6, =gMoveToLearn
ldrh r2, [r6]
movs r1, 0xD
muls r1, r2
@@ -82059,7 +82059,7 @@ sub_81B7E4C: @ 81B7E4C
beq _081B7EF8
ldrh r1, [r7, 0xE]
adds r0, r5, 0
bl GiveMoveToBoxMon_
bl GiveMoveToMon
lsls r0, 16
ldr r1, =0xffff0000
cmp r0, r1
@@ -85026,7 +85026,7 @@ sub_81B9770: @ 81B9770
ldr r4, =gSpecialVar_0x8005
ldrb r2, [r4]
movs r1, 0
bl sub_80691F4
bl SetMonMoveSlot
mov r1, r8
ldrh r0, [r1]
muls r0, r6
@@ -86877,4 +86877,4 @@ GetGlyphWidthFont6: @ 81BA6CC
thumb_func_end GetGlyphWidthFont6
.align 2, 0 @ Don't pad with nop.
.align 2, 0 @ Don't pad with nop.

6
asm/rom_81BE66C.s
View File

@@ -33116,7 +33116,7 @@ sub_81CF8E4: @ 81CF8E4
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
bl level_by_exp
bl GetLevelFromMonExp
lsls r0, 24
lsrs r7, r0, 24
ldr r2, =gStringVar3
@@ -34492,7 +34492,7 @@ sub_81D035C: @ 81D035C
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
bl level_by_exp
bl GetLevelFromMonExp
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -34982,7 +34982,7 @@ sub_81D06E4: @ 81D06E4
adds r2, r5, 0
bl GetMonData
adds r0, r4, 0
bl level_by_exp
bl GetLevelFromMonExp
strb r0, [r7]
adds r0, r4, 0
bl pokemon_get_gender

2
asm/script_pokemon_util_80F87D8.s
View File

@@ -1520,7 +1520,7 @@ _080F941C:
ldr r1, =gPlayerParty
adds r0, r1
adds r1, r4, 0
bl sub_80691F4
bl SetMonMoveSlot
pop {r4}
pop {r0}
bx r0

2
asm/wild_encounter.s
View File

@@ -1063,7 +1063,7 @@ _080B50A2:
lsls r2, r4, 24
lsrs r2, 24
ldr r0, =gEnemyParty
bl sub_80691F4
bl SetMonMoveSlot
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16