dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/wild_encounter.s
+5 -5
View File
@@ -966,8 +966,8 @@ _08082E48:
bx r1
thumb_func_end sub_8082CBC
thumb_func_start sub_8082E54
sub_8082E54: @ 8082E54
thumb_func_start Special_RockSmashEncounter
Special_RockSmashEncounter: @ 8082E54
push {r4,lr}
bl sub_8082934
lsls r0, 16
@@ -1018,7 +1018,7 @@ _08082EB6:
bx r0
.align 2, 0
_08082EBC: .4byte gSpecialVar_Result
thumb_func_end sub_8082E54
thumb_func_end Special_RockSmashEncounter
thumb_func_start SweetScentWildEncounter
SweetScentWildEncounter: @ 8082EC0
@@ -1302,14 +1302,14 @@ sub_80830B8: @ 80830B8
bl VarSet
cmp r4, 0
bne _08083104
ldr r0, _08083100 @ =gUnknown_81BFB65
ldr r0, _08083100 @ =EventScript_1BFB65
bl ScriptContext1_SetupScript
movs r0, 0x1
b _08083106
.align 2, 0
_080830F8: .4byte gUnknown_203ADFA
_080830FC: .4byte 0x00004020
_08083100: .4byte gUnknown_81BFB65
_08083100: .4byte EventScript_1BFB65
_08083104:
movs r0, 0
_08083106: