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/field_control_avatar.s
+18 -18
View File
@@ -364,8 +364,8 @@ sub_806CAC8: @ 806CAC8
beq _0806CB74
movs r0, 0x5
bl IncrementGameStat
bl sub_8146CA4
bl sub_815D8C8
bl MENewsJisanStepCounter
bl IncrementRenewableHiddenItemStepCounter
bl sub_80CC918
bl sub_80CB054
bl sub_80CCFBC
@@ -1100,11 +1100,11 @@ sub_806D0E4: @ 806D0E4
ldr r0, [r5, 0x8]
cmp r0, 0
bne _0806D120
ldr r0, _0806D11C @ =gUnknown_81C555B
ldr r0, _0806D11C @ =EventScript_1C555B
b _0806D1E6
.align 2, 0
_0806D118: .4byte gMapHeader
_0806D11C: .4byte gUnknown_81C555B
_0806D11C: .4byte EventScript_1C555B
_0806D120:
adds r0, r7, 0
adds r1, r6, 0
@@ -1330,10 +1330,10 @@ _0806D2F0:
lsrs r0, 24
cmp r0, 0x1
bne _0806D308
ldr r0, _0806D304 @ =gUnknown_81C549C
ldr r0, _0806D304 @ =EventScript_1C549C
b _0806D53E
.align 2, 0
_0806D304: .4byte gUnknown_81C549C
_0806D304: .4byte EventScript_1C549C
_0806D308:
adds r0, r4, 0
adds r1, r5, 0
@@ -1641,11 +1641,11 @@ _0806D570:
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
ldr r0, _0806D5A0 @ =gUnknown_81A6AC8
ldr r0, _0806D5A0 @ =EventScript_1A6AC8
b _0806D5E2
.align 2, 0
_0806D59C: .4byte 0x00000824
_0806D5A0: .4byte gUnknown_81A6AC8
_0806D5A0: .4byte EventScript_1A6AC8
_0806D5A4:
adds r0, r4, 0
bl MetatileBehavior_IsWaterfall
@@ -1670,10 +1670,10 @@ _0806D5A4:
_0806D5D0: .4byte 0x00000826
_0806D5D4: .4byte gUnknown_81BE2B7
_0806D5D8:
ldr r0, _0806D5DC @ =gUnknown_81BE2FF
ldr r0, _0806D5DC @ =EventScript_81BE2FF
b _0806D5E2
.align 2, 0
_0806D5DC: .4byte gUnknown_81BE2FF
_0806D5DC: .4byte EventScript_81BE2FF
_0806D5E0:
movs r0, 0
_0806D5E2:
@@ -1822,11 +1822,11 @@ _0806D6EC:
lsrs r0, 24
cmp r0, 0x1
bne _0806D704
ldr r0, _0806D700 @ =gUnknown_81A8DFD
ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut
bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D700: .4byte gUnknown_81A8DFD
_0806D700: .4byte EventScript_PoisonWhiteOut
_0806D704:
bl ShouldEggHatch
lsls r0, 24
@@ -1834,11 +1834,11 @@ _0806D704:
beq _0806D720
movs r0, 0xD
bl IncrementGameStat
ldr r0, _0806D71C @ =gUnknown_81BF546
ldr r0, _0806D71C @ =EventScript_81BF546
bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D71C: .4byte gUnknown_81BF546
_0806D71C: .4byte EventScript_81BF546
_0806D720:
bl SafariZoneTakeStep
lsls r0, 24
@@ -2150,13 +2150,13 @@ _0806D950:
ldr r0, [r0, 0x8]
cmp r0, 0
bne _0806D958
ldr r0, _0806D960 @ =gUnknown_81C555B
ldr r0, _0806D960 @ =EventScript_1C555B
_0806D958:
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806D960: .4byte gUnknown_81C555B
_0806D960: .4byte EventScript_1C555B
thumb_func_end sub_806D928
thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
@@ -2332,12 +2332,12 @@ _0806DAC4:
cmp r0, 0x1
bne _0806DAE4
bl ResetInitialPlayerAvatarState
ldr r0, _0806DAE0 @ =gUnknown_81C1361
ldr r0, _0806DAE0 @ =EventScript_1C1361
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0806DAEE
.align 2, 0
_0806DAE0: .4byte gUnknown_81C1361
_0806DAE0: .4byte EventScript_1C1361
_0806DAE4:
bl DoWarp
movs r0, 0x1