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

Sync split scripts, more misc splits/doc

Browse Source
This commit is contained in:
GriffinR
2020-01-10 05:01:48 -05:00
parent 9fafa12285
commit 91bf7665c6
96 changed files with 955 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+4 -4
View File
@@ -1620,10 +1620,10 @@ sub_806D548: @ 806D548
lsrs r0, 24
cmp r0, 0x1
bne _0806D570
ldr r0, _0806D56C @ =gUnknown_81A6B0D
ldr r0, _0806D56C @ =EventScript_CurrentTooFast
b _0806D5E2
.align 2, 0
_0806D56C: .4byte gUnknown_81A6B0D
_0806D56C: .4byte EventScript_CurrentTooFast
_0806D570:
ldr r0, _0806D59C @ =0x00000824
bl FlagGet
@@ -1664,11 +1664,11 @@ _0806D5A4:
lsrs r0, 24
cmp r0, 0x1
bne _0806D5D8
ldr r0, _0806D5D4 @ =gUnknown_81BE2B7
ldr r0, _0806D5D4 @ =EventScript_InteractWithWaterfall
b _0806D5E2
.align 2, 0
_0806D5D0: .4byte 0x00000826
_0806D5D4: .4byte gUnknown_81BE2B7
_0806D5D4: .4byte EventScript_InteractWithWaterfall
_0806D5D8:
ldr r0, _0806D5DC @ =EventScript_81BE2FF
b _0806D5E2
asm/fldeff_cut.s
+2 -2
View File
@@ -189,13 +189,13 @@ sub_80979D0: @ 80979D0
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, _080979EC @ =gUnknown_81BDF6B
ldr r0, _080979EC @ =EventScript_FldEffCut
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_080979E8: .4byte gFieldEffectArguments
_080979EC: .4byte gUnknown_81BDF6B
_080979EC: .4byte EventScript_FldEffCut
thumb_func_end sub_80979D0
thumb_func_start sub_80979F0
asm/fldeff_flash.s
+2 -2
View File
@@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0
bl PlaySE
ldr r0, _080C9BC8 @ =0x00000806
bl FlagSet
ldr r0, _080C9BCC @ =EventScript_81BFB5F
ldr r0, _080C9BCC @ =EventScript_FldEffFlash
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
_080C9BC8: .4byte 0x00000806
_080C9BCC: .4byte EventScript_81BFB5F
_080C9BCC: .4byte EventScript_FldEffFlash
thumb_func_end sub_80C9BB0
thumb_func_start sub_80C9BD0