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

quest_log_8150454

Browse Source
This commit is contained in:
PikalaxALT
2018-11-23 15:17:38 -05:00
parent 76f0c361ed
commit d347a95390
28 changed files with 765 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_transition.s
+4 -4
View File
@@ -1522,7 +1522,7 @@ Phase2_Transition_PokeballsTrail_Func2: @ 80D144C
ands r5, r0
movs r1, 0
mov r8, r4
ldr r6, _080D14D4 @ =gUnknown_20386E0
ldr r6, _080D14D4 @ =gFieldEffectArguments
_080D147A:
lsls r5, 16
asrs r5, 16
@@ -1567,7 +1567,7 @@ _080D147A:
.align 2, 0
_080D14CC: .4byte gUnknown_83FA400
_080D14D0: .4byte gUnknown_83FA404
_080D14D4: .4byte gUnknown_20386E0
_080D14D4: .4byte gFieldEffectArguments
thumb_func_end Phase2_Transition_PokeballsTrail_Func2
thumb_func_start Phase2_Transition_PokeballsTrail_Func3
@@ -1596,7 +1596,7 @@ _080D1500: .4byte sub_80D13C8
FldEff_Pokeball: @ 80D1504
push {r4,r5,lr}
ldr r0, _080D1560 @ =gUnknown_83FA5CC
ldr r5, _080D1564 @ =gUnknown_20386E0
ldr r5, _080D1564 @ =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r5, r2]
movs r3, 0x4
@@ -1639,7 +1639,7 @@ FldEff_Pokeball: @ 80D1504
bx r1
.align 2, 0
_080D1560: .4byte gUnknown_83FA5CC
_080D1564: .4byte gUnknown_20386E0
_080D1564: .4byte gFieldEffectArguments
_080D1568: .4byte gSprites
_080D156C: .4byte 0x0000ffff
thumb_func_end FldEff_Pokeball
asm/field_effect.s
+40 -40
View File
@@ -2019,7 +2019,7 @@ task00_8084310: @ 8084310
cmp r0, 0
beq _08084376
bl GetCursorSelectionMonId
ldr r1, _08084380 @ =gUnknown_20386E0
ldr r1, _08084380 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -2053,7 +2053,7 @@ _08084376:
bx r0
.align 2, 0
_0808437C: .4byte gTasks
_08084380: .4byte gUnknown_20386E0
_08084380: .4byte gFieldEffectArguments
_08084384: .4byte sub_805671C
_08084388: .4byte gUnknown_3005020
_0808438C: .4byte mapldr_08084390
@@ -3238,7 +3238,7 @@ oei_waterfall: @ 8084CA0
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _08084CD4 @ =gUnknown_20386E0
ldr r2, _08084CD4 @ =gFieldEffectArguments
ldr r2, [r2]
strh r2, [r1, 0xA]
bl _call_via_r4
@@ -3249,7 +3249,7 @@ oei_waterfall: @ 8084CA0
.align 2, 0
_08084CCC: .4byte sub_8084CD8
_08084CD0: .4byte gTasks
_08084CD4: .4byte gUnknown_20386E0
_08084CD4: .4byte gFieldEffectArguments
thumb_func_end oei_waterfall
thumb_func_start sub_8084CD8
@@ -3323,7 +3323,7 @@ waterfall_1_do_anim_probably: @ 8084D44
bne _08084D74
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, _08084D7C @ =gUnknown_20386E0
ldr r1, _08084D7C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -3338,7 +3338,7 @@ _08084D74:
pop {r1}
bx r1
.align 2, 0
_08084D7C: .4byte gUnknown_20386E0
_08084D7C: .4byte gFieldEffectArguments
thumb_func_end waterfall_1_do_anim_probably
thumb_func_start waterfall_2_wait_anim_finish_probably
@@ -3442,7 +3442,7 @@ FldEff_UseDive: @ 8084E24
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r3, _08084E5C @ =gUnknown_20386E0
ldr r3, _08084E5C @ =gFieldEffectArguments
ldr r2, [r3]
strh r2, [r1, 0x26]
ldr r2, [r3, 0x4]
@@ -3455,7 +3455,7 @@ FldEff_UseDive: @ 8084E24
.align 2, 0
_08084E54: .4byte sub_8084E60
_08084E58: .4byte gTasks
_08084E5C: .4byte gUnknown_20386E0
_08084E5C: .4byte gFieldEffectArguments
thumb_func_end FldEff_UseDive
thumb_func_start sub_8084E60
@@ -3507,7 +3507,7 @@ dive_2_unknown: @ 8084EAC
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, _08084ED0 @ =gUnknown_20386E0
ldr r1, _08084ED0 @ =gFieldEffectArguments
movs r2, 0x26
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -3521,7 +3521,7 @@ dive_2_unknown: @ 8084EAC
pop {r1}
bx r1
.align 2, 0
_08084ED0: .4byte gUnknown_20386E0
_08084ED0: .4byte gFieldEffectArguments
thumb_func_end dive_2_unknown
thumb_func_start dive_3_unknown
@@ -3691,7 +3691,7 @@ sub_808500C: @ 808500C
strh r0, [r2, 0x26]
movs r0, 0x1
strh r0, [r4, 0xE]
ldr r3, _08085054 @ =gUnknown_20386E0
ldr r3, _08085054 @ =gFieldEffectArguments
movs r5, 0x10
ldrsh r0, [r1, r5]
str r0, [r3]
@@ -3719,7 +3719,7 @@ sub_808500C: @ 808500C
pop {r1}
bx r1
.align 2, 0
_08085054: .4byte gUnknown_20386E0
_08085054: .4byte gFieldEffectArguments
thumb_func_end sub_808500C
thumb_func_start sub_8085058
@@ -4006,7 +4006,7 @@ sub_8085274: @ 8085274
lsls r0, 24
cmp r0, 0
beq _080852B4
ldr r1, _080852BC @ =gUnknown_20386E0
ldr r1, _080852BC @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -4034,7 +4034,7 @@ _080852B4:
pop {r1}
bx r1
.align 2, 0
_080852BC: .4byte gUnknown_20386E0
_080852BC: .4byte gFieldEffectArguments
thumb_func_end sub_8085274
thumb_func_start sub_80852C0
@@ -4110,7 +4110,7 @@ _08085348: .4byte sub_80851E8
thumb_func_start FldEff_LavaridgeGymWarp
FldEff_LavaridgeGymWarp: @ 808534C
push {r4,lr}
ldr r4, _080853A4 @ =gUnknown_20386E0
ldr r4, _080853A4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -4151,7 +4151,7 @@ FldEff_LavaridgeGymWarp: @ 808534C
pop {r1}
bx r1
.align 2, 0
_080853A4: .4byte gUnknown_20386E0
_080853A4: .4byte gFieldEffectArguments
_080853A8: .4byte gUnknown_83A0010
_080853AC: .4byte gSprites
thumb_func_end FldEff_LavaridgeGymWarp
@@ -4275,7 +4275,7 @@ sub_8085470: @ 8085470
ldrsh r0, [r5, r2]
cmp r0, 0x3
ble _080854C4
ldr r1, _080854C0 @ =gUnknown_20386E0
ldr r1, _080854C0 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -4299,7 +4299,7 @@ sub_8085470: @ 8085470
strh r0, [r5, 0x8]
b _080854E4
.align 2, 0
_080854C0: .4byte gUnknown_20386E0
_080854C0: .4byte gFieldEffectArguments
_080854C4:
adds r0, r1, 0x1
strh r0, [r5, 0xA]
@@ -4414,7 +4414,7 @@ _0808559C: .4byte sub_80853E4
thumb_func_start FldEff_PopOutOfAsh
FldEff_PopOutOfAsh: @ 80855A0
push {r4,lr}
ldr r4, _080855F8 @ =gUnknown_20386E0
ldr r4, _080855F8 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -4455,7 +4455,7 @@ FldEff_PopOutOfAsh: @ 80855A0
pop {r1}
bx r1
.align 2, 0
_080855F8: .4byte gUnknown_20386E0
_080855F8: .4byte gFieldEffectArguments
_080855FC: .4byte gUnknown_83A0010
_08085600: .4byte gSprites
thumb_func_end FldEff_PopOutOfAsh
@@ -5777,7 +5777,7 @@ _0808604A:
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _0808607C @ =gUnknown_20386E0
ldr r2, _0808607C @ =gFieldEffectArguments
ldr r0, [r2]
ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8]
@@ -5796,14 +5796,14 @@ _0808604A:
bx r1
.align 2, 0
_08086078: .4byte sub_8086468
_0808607C: .4byte gUnknown_20386E0
_0808607C: .4byte gFieldEffectArguments
_08086080: .4byte gTasks
thumb_func_end FldEff_FieldMoveShowMon
thumb_func_start FldEff_FieldMoveShowMonInit
FldEff_FieldMoveShowMonInit: @ 8086084
push {r4-r6,lr}
ldr r5, _080860D8 @ =gUnknown_20386E0
ldr r5, _080860D8 @ =gFieldEffectArguments
ldr r0, [r5]
movs r6, 0x80
lsls r6, 24
@@ -5839,7 +5839,7 @@ FldEff_FieldMoveShowMonInit: @ 8086084
pop {r1}
bx r1
.align 2, 0
_080860D8: .4byte gUnknown_20386E0
_080860D8: .4byte gFieldEffectArguments
_080860DC: .4byte gPlayerParty
thumb_func_end FldEff_FieldMoveShowMonInit
@@ -6945,7 +6945,7 @@ sub_8086944: @ 8086944
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, _08086988 @ =gUnknown_20386E0
ldr r0, _08086988 @ =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r1, 0x26]
bl sav1_reset_battle_music_maybe
@@ -6964,7 +6964,7 @@ _08086978:
.align 2, 0
_08086980: .4byte sub_8086990
_08086984: .4byte gTasks
_08086988: .4byte gUnknown_20386E0
_08086988: .4byte gFieldEffectArguments
_0808698C: .4byte 0x00000131
thumb_func_end sub_8086944
@@ -7091,7 +7091,7 @@ sub_8086A6C: @ 8086A6C
lsls r0, 24
cmp r0, 0
beq _08086AA2
ldr r2, _08086AB0 @ =gUnknown_20386E0
ldr r2, _08086AB0 @ =gFieldEffectArguments
movs r1, 0x26
ldrsh r0, [r4, r1]
movs r1, 0x80
@@ -7110,7 +7110,7 @@ _08086AA2:
.align 2, 0
_08086AA8: .4byte gPlayerAvatar
_08086AAC: .4byte gMapObjects
_08086AB0: .4byte gUnknown_20386E0
_08086AB0: .4byte gFieldEffectArguments
thumb_func_end sub_8086A6C
thumb_func_start sub_8086AB4
@@ -7146,7 +7146,7 @@ sub_8086AB4: @ 8086AB4
lsrs r1, 24
adds r0, r4, 0
bl sub_8063CA4
ldr r1, _08086B2C @ =gUnknown_20386E0
ldr r1, _08086B2C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r6, r2]
str r0, [r1]
@@ -7168,7 +7168,7 @@ _08086B1E:
.align 2, 0
_08086B24: .4byte gPlayerAvatar
_08086B28: .4byte gMapObjects
_08086B2C: .4byte gUnknown_20386E0
_08086B2C: .4byte gFieldEffectArguments
thumb_func_end sub_8086AB4
thumb_func_start sub_8086B30
@@ -7456,7 +7456,7 @@ sub_8086D38: @ 8086D38
strb r0, [r2, 0x5]
ldr r0, _08086D8C @ =sub_8086D94
str r0, [r2, 0x1C]
ldr r0, _08086D90 @ =gUnknown_20386E0
ldr r0, _08086D90 @ =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r2, 0x30]
movs r0, 0x97
@@ -7469,7 +7469,7 @@ sub_8086D38: @ 8086D38
_08086D84: .4byte gUnknown_83A0010
_08086D88: .4byte gSprites
_08086D8C: .4byte sub_8086D94
_08086D90: .4byte gUnknown_20386E0
_08086D90: .4byte gFieldEffectArguments
thumb_func_end sub_8086D38
thumb_func_start sub_8086D94
@@ -7550,7 +7550,7 @@ FldEff_UseFly: @ 8086E10
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, _08086E3C @ =gUnknown_20386E0
ldr r0, _08086E3C @ =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r1, 0xA]
movs r0, 0
@@ -7559,7 +7559,7 @@ FldEff_UseFly: @ 8086E10
.align 2, 0
_08086E34: .4byte sub_8086E40
_08086E38: .4byte gTasks
_08086E3C: .4byte gUnknown_20386E0
_08086E3C: .4byte gFieldEffectArguments
thumb_func_end FldEff_UseFly
thumb_func_start sub_8086E40
@@ -7648,7 +7648,7 @@ sub_8086EC8: @ 8086EC8
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r1, _08086F08 @ =gUnknown_20386E0
ldr r1, _08086F08 @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -7661,7 +7661,7 @@ _08086EF8:
.align 2, 0
_08086F00: .4byte gPlayerAvatar
_08086F04: .4byte gMapObjects
_08086F08: .4byte gUnknown_20386E0
_08086F08: .4byte gFieldEffectArguments
thumb_func_end sub_8086EC8
thumb_func_start sub_8086F0C
@@ -8977,7 +8977,7 @@ _08087920: .4byte sub_80872F0
sub_8087924: @ 8087924
push {r4-r7,lr}
sub sp, 0x4
ldr r7, _080879C4 @ =gUnknown_20386E0
ldr r7, _080879C4 @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -9054,7 +9054,7 @@ _080879BA:
pop {r1}
bx r1
.align 2, 0
_080879C4: .4byte gUnknown_20386E0
_080879C4: .4byte gFieldEffectArguments
_080879C8: .4byte gMapObjects
_080879CC: .4byte sub_80879D8
_080879D0: .4byte gTasks
@@ -9176,7 +9176,7 @@ _08087AB0: .4byte gMapObjects
sub_8087AB4: @ 8087AB4
push {r4,lr}
sub sp, 0x4
ldr r4, _08087AF8 @ =gUnknown_20386E0
ldr r4, _08087AF8 @ =gFieldEffectArguments
ldrb r0, [r4]
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8]
@@ -9206,7 +9206,7 @@ sub_8087AB4: @ 8087AB4
strh r0, [r1, 0x18]
b _08087B0A
.align 2, 0
_08087AF8: .4byte gUnknown_20386E0
_08087AF8: .4byte gFieldEffectArguments
_08087AFC: .4byte sub_8087BC0
_08087B00: .4byte gTasks
_08087B04:
asm/field_effect_helpers.s
+54 -54
View File
@@ -580,7 +580,7 @@ _080DB1D8: .4byte gSprites
thumb_func_start oei_shadow
oei_shadow: @ 80DB1DC
push {r4,r5,lr}
ldr r5, _080DB268 @ =gUnknown_20386E0
ldr r5, _080DB268 @ =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -648,7 +648,7 @@ _080DB260:
pop {r1}
bx r1
.align 2, 0
_080DB268: .4byte gUnknown_20386E0
_080DB268: .4byte gFieldEffectArguments
_080DB26C: .4byte gMapObjects
_080DB270: .4byte gUnknown_83A0010
_080DB274: .4byte gUnknown_83FECD2
@@ -757,7 +757,7 @@ _080DB344: .4byte 0x00400001
oei_grass_normal: @ 80DB348
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DB3E0 @ =gUnknown_20386E0
ldr r5, _080DB3E0 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -829,7 +829,7 @@ _080DB3D4:
pop {r1}
bx r1
.align 2, 0
_080DB3E0: .4byte gUnknown_20386E0
_080DB3E0: .4byte gFieldEffectArguments
_080DB3E4: .4byte gUnknown_83A0010
_080DB3E8: .4byte gSprites
thumb_func_end oei_grass_normal
@@ -972,7 +972,7 @@ _080DB4F0: .4byte gMapObjects
thumb_func_start FldEff_JumpTallGrass
FldEff_JumpTallGrass: @ 80DB4F4
push {r4,lr}
ldr r4, _080DB558 @ =gUnknown_20386E0
ldr r4, _080DB558 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1021,7 +1021,7 @@ _080DB550:
pop {r1}
bx r1
.align 2, 0
_080DB558: .4byte gUnknown_20386E0
_080DB558: .4byte gFieldEffectArguments
_080DB55C: .4byte gUnknown_83A0010
_080DB560: .4byte gSprites
thumb_func_end FldEff_JumpTallGrass
@@ -1107,7 +1107,7 @@ _080DB5E8:
FldEff_LongGrass: @ 80DB5F4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DB690 @ =gUnknown_20386E0
ldr r5, _080DB690 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -1180,7 +1180,7 @@ _080DB684:
pop {r1}
bx r1
.align 2, 0
_080DB690: .4byte gUnknown_20386E0
_080DB690: .4byte gFieldEffectArguments
_080DB694: .4byte gUnknown_83A0010
_080DB698: .4byte gSprites
thumb_func_end FldEff_LongGrass
@@ -1315,7 +1315,7 @@ _080DB794: .4byte gMapObjects
thumb_func_start FldEff_JumpLongGrass
FldEff_JumpLongGrass: @ 80DB798
push {r4,lr}
ldr r4, _080DB7FC @ =gUnknown_20386E0
ldr r4, _080DB7FC @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1364,7 +1364,7 @@ _080DB7F4:
pop {r1}
bx r1
.align 2, 0
_080DB7FC: .4byte gUnknown_20386E0
_080DB7FC: .4byte gFieldEffectArguments
_080DB800: .4byte gUnknown_83A0010
_080DB804: .4byte gSprites
thumb_func_end FldEff_JumpLongGrass
@@ -1372,7 +1372,7 @@ _080DB804: .4byte gSprites
thumb_func_start sub_80DB808
sub_80DB808: @ 80DB808
push {r4-r6,lr}
ldr r6, _080DB89C @ =gUnknown_20386E0
ldr r6, _080DB89C @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1445,7 +1445,7 @@ _080DB894:
pop {r1}
bx r1
.align 2, 0
_080DB89C: .4byte gUnknown_20386E0
_080DB89C: .4byte gFieldEffectArguments
_080DB8A0: .4byte gMapObjects
_080DB8A4: .4byte gUnknown_83A0010
_080DB8A8: .4byte gSprites
@@ -1579,7 +1579,7 @@ _080DB99C: .4byte gSprites
thumb_func_start FldEff_SandFootprints
FldEff_SandFootprints: @ 80DB9A0
push {r4,lr}
ldr r4, _080DBA08 @ =gUnknown_20386E0
ldr r4, _080DBA08 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1628,7 +1628,7 @@ _080DB9FE:
pop {r1}
bx r1
.align 2, 0
_080DBA08: .4byte gUnknown_20386E0
_080DBA08: .4byte gFieldEffectArguments
_080DBA0C: .4byte gUnknown_83A0010
_080DBA10: .4byte gSprites
thumb_func_end FldEff_SandFootprints
@@ -1636,7 +1636,7 @@ _080DBA10: .4byte gSprites
thumb_func_start FldEff_DeepSandFootprints
FldEff_DeepSandFootprints: @ 80DBA14
push {r4,r5,lr}
ldr r4, _080DBA7C @ =gUnknown_20386E0
ldr r4, _080DBA7C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1686,7 +1686,7 @@ _080DBA74:
pop {r1}
bx r1
.align 2, 0
_080DBA7C: .4byte gUnknown_20386E0
_080DBA7C: .4byte gFieldEffectArguments
_080DBA80: .4byte gUnknown_83A0010
_080DBA84: .4byte gSprites
thumb_func_end FldEff_DeepSandFootprints
@@ -1694,7 +1694,7 @@ _080DBA84: .4byte gSprites
thumb_func_start FldEff_BikeTireTracks
FldEff_BikeTireTracks: @ 80DBA88
push {r4,r5,lr}
ldr r4, _080DBAF0 @ =gUnknown_20386E0
ldr r4, _080DBAF0 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1744,7 +1744,7 @@ _080DBAE8:
pop {r1}
bx r1
.align 2, 0
_080DBAF0: .4byte gUnknown_20386E0
_080DBAF0: .4byte gFieldEffectArguments
_080DBAF4: .4byte gUnknown_83A0010
_080DBAF8: .4byte gSprites
thumb_func_end FldEff_BikeTireTracks
@@ -1829,7 +1829,7 @@ _080DBB80:
thumb_func_start FldEff_Splash
FldEff_Splash: @ 80DBB88
push {r4-r6,lr}
ldr r6, _080DBC1C @ =gUnknown_20386E0
ldr r6, _080DBC1C @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1899,7 +1899,7 @@ _080DBC12:
pop {r1}
bx r1
.align 2, 0
_080DBC1C: .4byte gUnknown_20386E0
_080DBC1C: .4byte gFieldEffectArguments
_080DBC20: .4byte gMapObjects
_080DBC24: .4byte gUnknown_83A0010
_080DBC28: .4byte gSprites
@@ -1980,7 +1980,7 @@ _080DBCB4: .4byte gMapObjects
thumb_func_start FldEff_JumpSmallSplash
FldEff_JumpSmallSplash: @ 80DBCB8
push {r4,lr}
ldr r4, _080DBD1C @ =gUnknown_20386E0
ldr r4, _080DBD1C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2029,7 +2029,7 @@ _080DBD14:
pop {r1}
bx r1
.align 2, 0
_080DBD1C: .4byte gUnknown_20386E0
_080DBD1C: .4byte gFieldEffectArguments
_080DBD20: .4byte gUnknown_83A0010
_080DBD24: .4byte gSprites
thumb_func_end FldEff_JumpSmallSplash
@@ -2037,7 +2037,7 @@ _080DBD24: .4byte gSprites
thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 80DBD28
push {r4,lr}
ldr r4, _080DBD8C @ =gUnknown_20386E0
ldr r4, _080DBD8C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2086,7 +2086,7 @@ _080DBD84:
pop {r1}
bx r1
.align 2, 0
_080DBD8C: .4byte gUnknown_20386E0
_080DBD8C: .4byte gFieldEffectArguments
_080DBD90: .4byte gUnknown_83A0010
_080DBD94: .4byte gSprites
thumb_func_end oei_water_drop_tall
@@ -2094,7 +2094,7 @@ _080DBD94: .4byte gSprites
thumb_func_start FldEff_FeetInFlowingWater
FldEff_FeetInFlowingWater: @ 80DBD98
push {r4-r7,lr}
ldr r7, _080DBE38 @ =gUnknown_20386E0
ldr r7, _080DBE38 @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -2170,7 +2170,7 @@ _080DBE2E:
pop {r1}
bx r1
.align 2, 0
_080DBE38: .4byte gUnknown_20386E0
_080DBE38: .4byte gFieldEffectArguments
_080DBE3C: .4byte gMapObjects
_080DBE40: .4byte gUnknown_83A0010
_080DBE44: .4byte gSprites
@@ -2265,7 +2265,7 @@ oei_ripples: @ 80DBEF0
push {r4,lr}
ldr r0, _080DBF44 @ =gUnknown_83A0010
ldr r0, [r0, 0x14]
ldr r4, _080DBF48 @ =gUnknown_20386E0
ldr r4, _080DBF48 @ =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@@ -2306,14 +2306,14 @@ _080DBF3C:
bx r1
.align 2, 0
_080DBF44: .4byte gUnknown_83A0010
_080DBF48: .4byte gUnknown_20386E0
_080DBF48: .4byte gFieldEffectArguments
_080DBF4C: .4byte gSprites
thumb_func_end oei_ripples
thumb_func_start sub_80DBF50
sub_80DBF50: @ 80DBF50
push {r4-r6,lr}
ldr r6, _080DBFE4 @ =gUnknown_20386E0
ldr r6, _080DBFE4 @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -2386,7 +2386,7 @@ _080DBFDC:
pop {r1}
bx r1
.align 2, 0
_080DBFE4: .4byte gUnknown_20386E0
_080DBFE4: .4byte gFieldEffectArguments
_080DBFE8: .4byte gMapObjects
_080DBFEC: .4byte gUnknown_83A0010
_080DBFF0: .4byte gSprites
@@ -2474,7 +2474,7 @@ _080DC088: .4byte gSprites
thumb_func_start FldEff_Unknown19
FldEff_Unknown19: @ 80DC08C
push {r4,lr}
ldr r4, _080DC0EC @ =gUnknown_20386E0
ldr r4, _080DC0EC @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2521,7 +2521,7 @@ _080DC0E4:
pop {r1}
bx r1
.align 2, 0
_080DC0EC: .4byte gUnknown_20386E0
_080DC0EC: .4byte gFieldEffectArguments
_080DC0F0: .4byte gUnknown_83A0010
_080DC0F4: .4byte gSprites
thumb_func_end FldEff_Unknown19
@@ -2529,7 +2529,7 @@ _080DC0F4: .4byte gSprites
thumb_func_start FldEff_Unknown20
FldEff_Unknown20: @ 80DC0F8
push {r4,lr}
ldr r4, _080DC158 @ =gUnknown_20386E0
ldr r4, _080DC158 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2576,7 +2576,7 @@ _080DC150:
pop {r1}
bx r1
.align 2, 0
_080DC158: .4byte gUnknown_20386E0
_080DC158: .4byte gFieldEffectArguments
_080DC15C: .4byte gUnknown_83A0010
_080DC160: .4byte gSprites
thumb_func_end FldEff_Unknown20
@@ -2584,7 +2584,7 @@ _080DC160: .4byte gSprites
thumb_func_start FldEff_Unknown21
FldEff_Unknown21: @ 80DC164
push {r4,lr}
ldr r4, _080DC1C4 @ =gUnknown_20386E0
ldr r4, _080DC1C4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2631,7 +2631,7 @@ _080DC1BC:
pop {r1}
bx r1
.align 2, 0
_080DC1C4: .4byte gUnknown_20386E0
_080DC1C4: .4byte gFieldEffectArguments
_080DC1C8: .4byte gUnknown_83A0010
_080DC1CC: .4byte gSprites
thumb_func_end FldEff_Unknown21
@@ -2639,7 +2639,7 @@ _080DC1CC: .4byte gSprites
thumb_func_start FldEff_Unknown22
FldEff_Unknown22: @ 80DC1D0
push {r4,lr}
ldr r4, _080DC230 @ =gUnknown_20386E0
ldr r4, _080DC230 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2686,7 +2686,7 @@ _080DC228:
pop {r1}
bx r1
.align 2, 0
_080DC230: .4byte gUnknown_20386E0
_080DC230: .4byte gFieldEffectArguments
_080DC234: .4byte gUnknown_83A0010
_080DC238: .4byte gSprites
thumb_func_end FldEff_Unknown22
@@ -2696,7 +2696,7 @@ ash: @ 80DC23C
push {r4,lr}
lsls r2, 16
lsrs r2, 16
ldr r4, _080DC26C @ =gUnknown_20386E0
ldr r4, _080DC26C @ =gFieldEffectArguments
lsls r0, 16
asrs r0, 16
str r0, [r4]
@@ -2717,14 +2717,14 @@ ash: @ 80DC23C
pop {r0}
bx r0
.align 2, 0
_080DC26C: .4byte gUnknown_20386E0
_080DC26C: .4byte gFieldEffectArguments
thumb_func_end ash
thumb_func_start oei_ash
oei_ash: @ 80DC270
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DC2F0 @ =gUnknown_20386E0
ldr r5, _080DC2F0 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -2786,7 +2786,7 @@ _080DC2E6:
pop {r1}
bx r1
.align 2, 0
_080DC2F0: .4byte gUnknown_20386E0
_080DC2F0: .4byte gFieldEffectArguments
_080DC2F4: .4byte gUnknown_83A0010
_080DC2F8: .4byte gSprites
thumb_func_end oei_ash
@@ -2909,7 +2909,7 @@ _080DC3C8:
thumb_func_start sub_80DC3D0
sub_80DC3D0: @ 80DC3D0
push {r4,r5,lr}
ldr r4, _080DC43C @ =gUnknown_20386E0
ldr r4, _080DC43C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2960,7 +2960,7 @@ _080DC42C:
pop {r1}
bx r1
.align 2, 0
_080DC43C: .4byte gUnknown_20386E0
_080DC43C: .4byte gFieldEffectArguments
_080DC440: .4byte gUnknown_83A0010
_080DC444: .4byte gSprites
_080DC448: .4byte 0x0000ffff
@@ -3387,7 +3387,7 @@ _080DC73C: .4byte gSprites
thumb_func_start FldEff_Dust
FldEff_Dust: @ 80DC740
push {r4,lr}
ldr r4, _080DC7A4 @ =gUnknown_20386E0
ldr r4, _080DC7A4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3436,7 +3436,7 @@ _080DC79C:
pop {r1}
bx r1
.align 2, 0
_080DC7A4: .4byte gUnknown_20386E0
_080DC7A4: .4byte gFieldEffectArguments
_080DC7A8: .4byte gUnknown_83A0010
_080DC7AC: .4byte gSprites
thumb_func_end FldEff_Dust
@@ -3444,7 +3444,7 @@ _080DC7AC: .4byte gSprites
thumb_func_start FldEff_SandPile
FldEff_SandPile: @ 80DC7B0
push {r4-r7,lr}
ldr r7, _080DC85C @ =gUnknown_20386E0
ldr r7, _080DC85C @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -3527,7 +3527,7 @@ _080DC854:
pop {r1}
bx r1
.align 2, 0
_080DC85C: .4byte gUnknown_20386E0
_080DC85C: .4byte gFieldEffectArguments
_080DC860: .4byte gMapObjects
_080DC864: .4byte gUnknown_83A0010
_080DC868: .4byte gSprites
@@ -3641,7 +3641,7 @@ _080DC934: .4byte gMapObjects
thumb_func_start FldEff_Bubbles
FldEff_Bubbles: @ 80DC938
push {r4,lr}
ldr r4, _080DC990 @ =gUnknown_20386E0
ldr r4, _080DC990 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3684,7 +3684,7 @@ _080DC988:
pop {r1}
bx r1
.align 2, 0
_080DC990: .4byte gUnknown_20386E0
_080DC990: .4byte gFieldEffectArguments
_080DC994: .4byte gUnknown_83A0010
_080DC998: .4byte gSprites
thumb_func_end FldEff_Bubbles
@@ -3775,7 +3775,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
ldr r5, _080DCA44 @ =gUnknown_20386E0
ldr r5, _080DCA44 @ =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -3789,7 +3789,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
movs r0, 0x40
b _080DCAB4
.align 2, 0
_080DCA44: .4byte gUnknown_20386E0
_080DCA44: .4byte gFieldEffectArguments
_080DCA48:
ldr r1, _080DCAC0 @ =gUnknown_83A0010
lsls r0, r6, 2
@@ -4043,7 +4043,7 @@ _080DCC18:
thumb_func_start FldEff_Sparkle
FldEff_Sparkle: @ 80DCC1C
push {r4,lr}
ldr r4, _080DCC84 @ =gUnknown_20386E0
ldr r4, _080DCC84 @ =gFieldEffectArguments
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]
@@ -4094,7 +4094,7 @@ _080DCC7C:
pop {r1}
bx r1
.align 2, 0
_080DCC84: .4byte gUnknown_20386E0
_080DCC84: .4byte gFieldEffectArguments
_080DCC88: .4byte gUnknown_83A0010
_080DCC8C: .4byte gSprites
thumb_func_end FldEff_Sparkle
asm/field_ground_effect.s
+24 -24
View File
@@ -1139,7 +1139,7 @@ _08068378:
thumb_func_start GroundEffect_SpawnOnTallGrass
GroundEffect_SpawnOnTallGrass: @ 806837C
push {lr}
ldr r3, _080683C0 @ =gUnknown_20386E0
ldr r3, _080683C0 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1172,14 +1172,14 @@ GroundEffect_SpawnOnTallGrass: @ 806837C
pop {r0}
bx r0
.align 2, 0
_080683C0: .4byte gUnknown_20386E0
_080683C0: .4byte gFieldEffectArguments
_080683C4: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_SpawnOnTallGrass
thumb_func_start GroundEffect_StepOnTallGrass
GroundEffect_StepOnTallGrass: @ 80683C8
push {lr}
ldr r3, _0806840C @ =gUnknown_20386E0
ldr r3, _0806840C @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1212,14 +1212,14 @@ GroundEffect_StepOnTallGrass: @ 80683C8
pop {r0}
bx r0
.align 2, 0
_0806840C: .4byte gUnknown_20386E0
_0806840C: .4byte gFieldEffectArguments
_08068410: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_StepOnTallGrass
thumb_func_start GroundEffect_SpawnOnLongGrass
GroundEffect_SpawnOnLongGrass: @ 8068414
push {lr}
ldr r3, _08068458 @ =gUnknown_20386E0
ldr r3, _08068458 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1252,14 +1252,14 @@ GroundEffect_SpawnOnLongGrass: @ 8068414
pop {r0}
bx r0
.align 2, 0
_08068458: .4byte gUnknown_20386E0
_08068458: .4byte gFieldEffectArguments
_0806845C: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_SpawnOnLongGrass
thumb_func_start GroundEffect_StepOnLongGrass
GroundEffect_StepOnLongGrass: @ 8068460
push {lr}
ldr r3, _080684A4 @ =gUnknown_20386E0
ldr r3, _080684A4 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1292,7 +1292,7 @@ GroundEffect_StepOnLongGrass: @ 8068460
pop {r0}
bx r0
.align 2, 0
_080684A4: .4byte gUnknown_20386E0
_080684A4: .4byte gFieldEffectArguments
_080684A8: .4byte gSaveBlock1Ptr
thumb_func_end GroundEffect_StepOnLongGrass
@@ -1386,7 +1386,7 @@ DoTracksGroundEffect_Footprints: @ 8068530
mov r0, sp
movs r2, 0x4
bl memcpy
ldr r1, _0806857C @ =gUnknown_20386E0
ldr r1, _0806857C @ =gFieldEffectArguments
movs r2, 0x14
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1412,7 +1412,7 @@ DoTracksGroundEffect_Footprints: @ 8068530
bx r0
.align 2, 0
_08068578: .4byte gUnknown_83A70A8
_0806857C: .4byte gUnknown_20386E0
_0806857C: .4byte gFieldEffectArguments
thumb_func_end DoTracksGroundEffect_Footprints
thumb_func_start DoTracksGroundEffect_BikeTireTracks
@@ -1423,7 +1423,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8068580
ldr r0, [r4, 0x14]
cmp r1, r0
beq _080685C2
ldr r2, _080685C8 @ =gUnknown_20386E0
ldr r2, _080685C8 @ =gFieldEffectArguments
movs r1, 0x14
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -1454,7 +1454,7 @@ _080685C2:
pop {r0}
bx r0
.align 2, 0
_080685C8: .4byte gUnknown_20386E0
_080685C8: .4byte gFieldEffectArguments
_080685CC: .4byte gUnknown_83A70AC
thumb_func_end DoTracksGroundEffect_BikeTireTracks
@@ -1492,7 +1492,7 @@ GroundEffect_JumpOnTallGrass: @ 80685FC
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r1, _08068650 @ =gUnknown_20386E0
ldr r1, _08068650 @ =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1528,13 +1528,13 @@ _08068646:
pop {r0}
bx r0
.align 2, 0
_08068650: .4byte gUnknown_20386E0
_08068650: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnTallGrass
thumb_func_start GroundEffect_JumpOnLongGrass
GroundEffect_JumpOnLongGrass: @ 8068654
push {lr}
ldr r2, _08068678 @ =gUnknown_20386E0
ldr r2, _08068678 @ =gFieldEffectArguments
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@@ -1551,13 +1551,13 @@ GroundEffect_JumpOnLongGrass: @ 8068654
pop {r0}
bx r0
.align 2, 0
_08068678: .4byte gUnknown_20386E0
_08068678: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnLongGrass
thumb_func_start GroundEffect_JumpOnShallowWater
GroundEffect_JumpOnShallowWater: @ 806867C
push {r4,lr}
ldr r3, _080686A8 @ =gUnknown_20386E0
ldr r3, _080686A8 @ =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1577,13 +1577,13 @@ GroundEffect_JumpOnShallowWater: @ 806867C
pop {r0}
bx r0
.align 2, 0
_080686A8: .4byte gUnknown_20386E0
_080686A8: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnShallowWater
thumb_func_start GroundEffect_JumpOnWater
GroundEffect_JumpOnWater: @ 80686AC
push {r4,lr}
ldr r3, _080686D8 @ =gUnknown_20386E0
ldr r3, _080686D8 @ =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1603,13 +1603,13 @@ GroundEffect_JumpOnWater: @ 80686AC
pop {r0}
bx r0
.align 2, 0
_080686D8: .4byte gUnknown_20386E0
_080686D8: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpOnWater
thumb_func_start GroundEffect_JumpLandingDust
GroundEffect_JumpLandingDust: @ 80686DC
push {r4,lr}
ldr r3, _08068708 @ =gUnknown_20386E0
ldr r3, _08068708 @ =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1629,7 +1629,7 @@ GroundEffect_JumpLandingDust: @ 80686DC
pop {r0}
bx r0
.align 2, 0
_08068708: .4byte gUnknown_20386E0
_08068708: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_JumpLandingDust
thumb_func_start GroundEffect_ShortGrass
@@ -1655,7 +1655,7 @@ GroundEffect_HotSprings: @ 806871C
thumb_func_start GroundEffect_Seaweed
GroundEffect_Seaweed: @ 806872C
push {lr}
ldr r2, _08068748 @ =gUnknown_20386E0
ldr r2, _08068748 @ =gFieldEffectArguments
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@@ -1667,7 +1667,7 @@ GroundEffect_Seaweed: @ 806872C
pop {r0}
bx r0
.align 2, 0
_08068748: .4byte gUnknown_20386E0
_08068748: .4byte gFieldEffectArguments
thumb_func_end GroundEffect_Seaweed
thumb_func_start DoFlaggedGroundEffects
asm/field_map_obj.s
+14 -14
View File
@@ -11168,7 +11168,7 @@ FieldObjectCB_TreeDisguise: @ 8062F08
cmp r0, 0
bne _08062F50
_08062F30:
ldr r1, _08062F70 @ =gUnknown_20386E0
ldr r1, _08062F70 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -11198,7 +11198,7 @@ _08062F50:
bx r0
.align 2, 0
_08062F6C: .4byte gMapObjects
_08062F70: .4byte gUnknown_20386E0
_08062F70: .4byte gFieldEffectArguments
_08062F74: .4byte sub_8062F78
thumb_func_end FieldObjectCB_TreeDisguise
@@ -11234,7 +11234,7 @@ FieldObjectCB_MountainDisguise: @ 8062F84
cmp r0, 0
bne _08062FCC
_08062FAC:
ldr r1, _08062FEC @ =gUnknown_20386E0
ldr r1, _08062FEC @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -11264,7 +11264,7 @@ _08062FCC:
bx r0
.align 2, 0
_08062FE8: .4byte gMapObjects
_08062FEC: .4byte gUnknown_20386E0
_08062FEC: .4byte gFieldEffectArguments
_08062FF0: .4byte sub_8062F78
thumb_func_end FieldObjectCB_MountainDisguise
@@ -19462,7 +19462,7 @@ sub_8066910: @ 8066910
do_exclamation_mark_bubble_1: @ 8066920
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066940 @ =gUnknown_20386E0
ldr r1, _08066940 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19475,14 +19475,14 @@ do_exclamation_mark_bubble_1: @ 8066920
pop {r1}
bx r1
.align 2, 0
_08066940: .4byte gUnknown_20386E0
_08066940: .4byte gFieldEffectArguments
thumb_func_end do_exclamation_mark_bubble_1
thumb_func_start do_exclamation_mark_bubble_2
do_exclamation_mark_bubble_2: @ 8066944
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066964 @ =gUnknown_20386E0
ldr r1, _08066964 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19495,14 +19495,14 @@ do_exclamation_mark_bubble_2: @ 8066944
pop {r1}
bx r1
.align 2, 0
_08066964: .4byte gUnknown_20386E0
_08066964: .4byte gFieldEffectArguments
thumb_func_end do_exclamation_mark_bubble_2
thumb_func_start do_heart_bubble
do_heart_bubble: @ 8066968
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066988 @ =gUnknown_20386E0
ldr r1, _08066988 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19515,14 +19515,14 @@ do_heart_bubble: @ 8066968
pop {r1}
bx r1
.align 2, 0
_08066988: .4byte gUnknown_20386E0
_08066988: .4byte gFieldEffectArguments
thumb_func_end do_heart_bubble
thumb_func_start sub_806698C
sub_806698C: @ 806698C
push {r4,lr}
adds r4, r1, 0
ldr r1, _080669AC @ =gUnknown_20386E0
ldr r1, _080669AC @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19535,14 +19535,14 @@ sub_806698C: @ 806698C
pop {r1}
bx r1
.align 2, 0
_080669AC: .4byte gUnknown_20386E0
_080669AC: .4byte gFieldEffectArguments
thumb_func_end sub_806698C
thumb_func_start sub_80669B0
sub_80669B0: @ 80669B0
push {r4,lr}
adds r4, r1, 0
ldr r1, _080669D0 @ =gUnknown_20386E0
ldr r1, _080669D0 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -19555,7 +19555,7 @@ sub_80669B0: @ 80669B0
pop {r1}
bx r1
.align 2, 0
_080669D0: .4byte gUnknown_20386E0
_080669D0: .4byte gFieldEffectArguments
thumb_func_end sub_80669B0
thumb_func_start sub_80669D4
asm/field_player_avatar.s
+2 -2
View File
@@ -3559,7 +3559,7 @@ sub_805CD84: @ 805CD84
lsrs r1, 24
adds r0, r4, 0
bl sub_805C0A4
ldr r2, _0805CE18 @ =gUnknown_20386E0
ldr r2, _0805CE18 @ =gFieldEffectArguments
movs r1, 0x10
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -3592,7 +3592,7 @@ _0805CE0E:
pop {r1}
bx r1
.align 2, 0
_0805CE18: .4byte gUnknown_20386E0
_0805CE18: .4byte gFieldEffectArguments
_0805CE1C: .4byte gSprites
thumb_func_end sub_805CD84
asm/field_specials.s
+2 -2
View File
@@ -5338,7 +5338,7 @@ _080CCF32:
ldr r0, _080CCF64 @ =sub_80CCF98
movs r1, 0x8
bl CreateTask
ldr r3, _080CCF68 @ =gUnknown_20386E0
ldr r3, _080CCF68 @ =gFieldEffectArguments
movs r0, 0x1
str r0, [r3]
movs r0, 0x38
@@ -5361,7 +5361,7 @@ _080CCF32:
b _080CCF72
.align 2, 0
_080CCF64: .4byte sub_80CCF98
_080CCF68: .4byte gUnknown_20386E0
_080CCF68: .4byte gFieldEffectArguments
_080CCF6C: .4byte gUnknown_83F6366
_080CCF70:
movs r0, 0x5
asm/fldeff_cut.s
+4 -4
View File
@@ -146,14 +146,14 @@ sub_8097984: @ 8097984
movs r0, 0x1
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _0809799C @ =gUnknown_20386E0
ldr r1, _0809799C @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0809799C: .4byte gUnknown_20386E0
_0809799C: .4byte gFieldEffectArguments
thumb_func_end sub_8097984
thumb_func_start sub_80979A0
@@ -185,7 +185,7 @@ _080979CC: .4byte sub_8097A20
sub_80979D0: @ 80979D0
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080979E8 @ =gUnknown_20386E0
ldr r1, _080979E8 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -194,7 +194,7 @@ sub_80979D0: @ 80979D0
pop {r0}
bx r0
.align 2, 0
_080979E8: .4byte gUnknown_20386E0
_080979E8: .4byte gFieldEffectArguments
_080979EC: .4byte gUnknown_81BDF6B
thumb_func_end sub_80979D0
asm/fldeff_flash.s
+2 -2
View File
@@ -47,7 +47,7 @@ sub_80C9B74: @ 80C9B74
lsls r4, 24
lsrs r4, 24
bl GetCursorSelectionMonId
ldr r1, _080C9BA4 @ =gUnknown_20386E0
ldr r1, _080C9BA4 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -64,7 +64,7 @@ sub_80C9B74: @ 80C9B74
pop {r0}
bx r0
.align 2, 0
_080C9BA4: .4byte gUnknown_20386E0
_080C9BA4: .4byte gFieldEffectArguments
_080C9BA8: .4byte gTasks
_080C9BAC: .4byte sub_80C9BB0
thumb_func_end sub_80C9B74
asm/fldeff_strength.s
+4 -4
View File
@@ -51,7 +51,7 @@ _080D083C: .4byte sub_80D0840
sub_80D0840: @ 80D0840
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080D0858 @ =gUnknown_20386E0
ldr r1, _080D0858 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -60,7 +60,7 @@ sub_80D0840: @ 80D0840
pop {r0}
bx r0
.align 2, 0
_080D0858: .4byte gUnknown_20386E0
_080D0858: .4byte gFieldEffectArguments
_080D085C: .4byte gUnknown_81BE16E
thumb_func_end sub_80D0840
@@ -79,7 +79,7 @@ sub_80D0860: @ 80D0860
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, _080D089C @ =gUnknown_20386E0
ldr r0, _080D089C @ =gFieldEffectArguments
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -93,7 +93,7 @@ sub_80D0860: @ 80D0860
.align 2, 0
_080D0894: .4byte gTasks
_080D0898: .4byte sub_80D08A8
_080D089C: .4byte gUnknown_20386E0
_080D089C: .4byte gFieldEffectArguments
_080D08A0: .4byte gPlayerParty
_080D08A4: .4byte gStringVar1
thumb_func_end sub_80D0860
asm/fldeff_sweetscent.s
+2 -2
View File
@@ -41,14 +41,14 @@ hm2_sweet_scent: @ 80DE0E8
movs r0, 0x33
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080DE100 @ =gUnknown_20386E0
ldr r1, _080DE100 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080DE100: .4byte gUnknown_20386E0
_080DE100: .4byte gFieldEffectArguments
thumb_func_end hm2_sweet_scent
thumb_func_start FldEff_SweetScent
asm/fldeff_teleport.s
+2 -2
View File
@@ -44,14 +44,14 @@ hm_teleport_run_dp02scr: @ 80F6730
movs r0, 0x3F
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080F674C @ =gUnknown_20386E0
ldr r1, _080F674C @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080F674C: .4byte gUnknown_20386E0
_080F674C: .4byte gFieldEffectArguments
thumb_func_end hm_teleport_run_dp02scr
thumb_func_start FldEff_UseTeleport
asm/map_obj_80688E4.s
+4 -4
View File
@@ -1437,7 +1437,7 @@ oe_exec_and_other_stuff: @ 80692C8
adds r0, r1, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _080692EC @ =gUnknown_20386E0
ldr r1, _080692EC @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -1448,7 +1448,7 @@ oe_exec_and_other_stuff: @ 80692C8
pop {r1}
bx r1
.align 2, 0
_080692EC: .4byte gUnknown_20386E0
_080692EC: .4byte gFieldEffectArguments
thumb_func_end oe_exec_and_other_stuff
thumb_func_start DoShadowFieldEffect
@@ -1475,7 +1475,7 @@ DoRippleFieldEffect: @ 806930C
adds r4, r1, 0
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
ldr r2, _08069344 @ =gUnknown_20386E0
ldr r2, _08069344 @ =gFieldEffectArguments
movs r3, 0x20
ldrsh r1, [r4, r3]
str r1, [r2]
@@ -1497,7 +1497,7 @@ DoRippleFieldEffect: @ 806930C
pop {r0}
bx r0
.align 2, 0
_08069344: .4byte gUnknown_20386E0
_08069344: .4byte gFieldEffectArguments
thumb_func_end DoRippleFieldEffect
.align 2, 0 @ Don't pad with nop.
asm/party_menu.s
+6 -6
View File
@@ -11984,7 +11984,7 @@ task_launch_hm_phase_2: @ 81248C8
cmp r0, 0x1
bne _081248F4
bl brm_get_selected_species
ldr r1, _081248FC @ =gUnknown_20386E0
ldr r1, _081248FC @ =gFieldEffectArguments
lsls r0, 16
lsrs r0, 16
str r0, [r1]
@@ -11998,7 +11998,7 @@ _081248F4:
pop {r0}
bx r0
.align 2, 0
_081248FC: .4byte gUnknown_20386E0
_081248FC: .4byte gFieldEffectArguments
_08124900: .4byte gUnknown_203B0C4
thumb_func_end task_launch_hm_phase_2
@@ -12074,7 +12074,7 @@ _08124976:
hm_surf_run_dp02scr: @ 812497C
push {lr}
bl GetCursorSelectionMonId
ldr r1, _08124994 @ =gUnknown_20386E0
ldr r1, _08124994 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -12083,7 +12083,7 @@ hm_surf_run_dp02scr: @ 812497C
pop {r0}
bx r0
.align 2, 0
_08124994: .4byte gUnknown_20386E0
_08124994: .4byte gFieldEffectArguments
thumb_func_end hm_surf_run_dp02scr
thumb_func_start sub_8124998
@@ -12250,7 +12250,7 @@ _08124AD8: .4byte sub_80568A8
hm2_waterfall: @ 8124ADC
push {lr}
bl GetCursorSelectionMonId
ldr r1, _08124AF4 @ =gUnknown_20386E0
ldr r1, _08124AF4 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -12259,7 +12259,7 @@ hm2_waterfall: @ 8124ADC
pop {r0}
bx r0
.align 2, 0
_08124AF4: .4byte gUnknown_20386E0
_08124AF4: .4byte gFieldEffectArguments
thumb_func_end hm2_waterfall
thumb_func_start hm_prepare_waterfall
asm/quest_log_8150454.s
-482
View File
@@ -1,482 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8150454
sub_8150454: @ 8150454
push {lr}
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x8
bhi _0815046A
ldr r0, _08150470 @ =gUnknown_8471EDC
lsls r1, 2
adds r1, r0
ldr r0, [r1]
bl _call_via_r0
_0815046A:
pop {r0}
bx r0
.align 2, 0
_08150470: .4byte gUnknown_8471EDC
thumb_func_end sub_8150454
thumb_func_start sub_8150474
sub_8150474: @ 8150474
push {lr}
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _08150488 @ =gUnknown_3005E88
ldrb r0, [r0]
cmp r0, 0x2
beq _0815048C
movs r0, 0
b _08150494
.align 2, 0
_08150488: .4byte gUnknown_3005E88
_0815048C:
adds r0, r1, 0
bl sub_8112720
movs r0, 0x1
_08150494:
pop {r1}
bx r1
thumb_func_end sub_8150474
thumb_func_start sub_8150498
sub_8150498: @ 8150498
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8150454
pop {r0}
bx r0
thumb_func_end sub_8150498
thumb_func_start sub_81504A8
sub_81504A8: @ 81504A8
push {r4,lr}
ldr r0, _081504E0 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _081504E4 @ =gMapObjects
adds r4, r0
movs r0, 0
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl FieldObjectTurn
movs r0, 0x1
bl SetPlayerAvatarStateMask
pop {r4}
pop {r0}
bx r0
.align 2, 0
_081504E0: .4byte gPlayerAvatar
_081504E4: .4byte gMapObjects
thumb_func_end sub_81504A8
thumb_func_start sub_81504E8
sub_81504E8: @ 81504E8
push {r4,lr}
ldr r0, _08150528 @ =gPlayerAvatar
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _0815052C @ =gMapObjects
adds r4, r0
movs r0, 0x1
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl FieldObjectTurn
movs r0, 0x2
bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_80BD620
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08150528: .4byte gPlayerAvatar
_0815052C: .4byte gMapObjects
thumb_func_end sub_81504E8
thumb_func_start sub_8150530
sub_8150530: @ 8150530
push {r4-r6,lr}
ldr r6, _0815057C @ =gPlayerAvatar
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150580 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _08150584 @ =gSprites
adds r5, r0, r1
ldr r0, _08150588 @ =gUnknown_3005E88
ldrb r0, [r0]
cmp r0, 0x1
beq _08150558
cmp r0, 0x3
bne _08150594
_08150558:
bl ScriptContext2_Enable
movs r4, 0
movs r0, 0x1
strb r0, [r6, 0x6]
ldr r0, _0815058C @ =sub_81505C4
movs r1, 0xFF
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08150590 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
strh r4, [r1, 0x8]
b _081505BC
.align 2, 0
_0815057C: .4byte gPlayerAvatar
_08150580: .4byte gMapObjects
_08150584: .4byte gSprites
_08150588: .4byte gUnknown_3005E88
_0815058C: .4byte sub_81505C4
_08150590: .4byte gTasks
_08150594:
movs r0, 0x4
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_80634F0
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl StartSpriteAnim
_081505BC:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8150530
thumb_func_start sub_81505C4
sub_81505C4: @ 81505C4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _0815060C @ =gPlayerAvatar
mov r9, r0
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150610 @ =gMapObjects
adds r5, r0, r1
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _08150614 @ =gSprites
adds r7, r0, r1
ldr r1, _08150618 @ =gTasks
mov r2, r8
lsls r0, r2, 2
add r0, r8
lsls r0, 3
adds r4, r0, r1
movs r0, 0x8
ldrsh r6, [r4, r0]
cmp r6, 0x1
beq _08150666
cmp r6, 0x1
bgt _0815061C
cmp r6, 0
beq _08150626
b _081506FC
.align 2, 0
_0815060C: .4byte gPlayerAvatar
_08150610: .4byte gMapObjects
_08150614: .4byte gSprites
_08150618: .4byte gTasks
_0815061C:
cmp r6, 0x2
beq _0815067C
cmp r6, 0x3
beq _0815069C
b _081506FC
_08150626:
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimActive
ldrb r0, [r5, 0x1]
movs r1, 0x8
orrs r0, r1
strb r0, [r5, 0x1]
movs r0, 0x4
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_81507BC
ldrb r0, [r5, 0x18]
lsls r0, 28
lsrs r0, 28
bl sub_80634F0
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
bl StartSpriteAnim
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
strh r6, [r4, 0xA]
b _081506FC
_08150666:
adds r0, r7, 0
bl sub_805D9C4
ldrh r1, [r4, 0xA]
movs r2, 0xA
ldrsh r0, [r4, r2]
cmp r0, 0x3B
bgt _08150694
adds r0, r1, 0x1
strh r0, [r4, 0xA]
b _081506FC
_0815067C:
bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063500
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
bl StartSpriteAnim
_08150694:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081506FC
_0815069C:
adds r0, r7, 0
bl sub_805D9C4
adds r0, r7, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _081506FC
mov r0, r9
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
cmp r0, 0
bne _081506D0
movs r0, 0
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_81507BC
b _081506E2
_081506D0:
movs r0, 0x2
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl sub_81507BC
_081506E2:
ldrb r1, [r5, 0x18]
lsrs r1, 4
adds r0, r5, 0
bl FieldObjectTurn
movs r0, 0
strh r0, [r7, 0x24]
strh r0, [r7, 0x26]
bl ScriptContext2_Disable
mov r0, r8
bl DestroyTask
_081506FC:
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81505C4
thumb_func_start sub_8150708
sub_8150708: @ 8150708
push {r4,r5,lr}
ldr r5, _08150770 @ =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08150774 @ =gMapObjects
adds r4, r0, r1
ldrb r1, [r5]
movs r0, 0x8
ands r0, r1
cmp r0, 0
bne _08150768
movs r0, 0x2
bl sub_805C808
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81507BC
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
bl FieldObjectTurn
movs r0, 0x8
bl SetPlayerAvatarStateMask
ldr r1, _08150778 @ =gUnknown_20386E0
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
movs r2, 0x12
ldrsh r0, [r4, r2]
str r0, [r1, 0x4]
ldrb r0, [r5, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
bl FieldEffectStart
lsls r0, 24
lsrs r0, 24
strb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_80DC44C
_08150768:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08150770: .4byte gPlayerAvatar
_08150774: .4byte gMapObjects
_08150778: .4byte gUnknown_20386E0
thumb_func_end sub_8150708
thumb_func_start sub_815077C
sub_815077C: @ 815077C
push {lr}
movs r0, 0x41
bl FieldEffectStart
ldr r0, _08150790 @ =sub_8150794
movs r1, 0
bl CreateTask
pop {r0}
bx r0
.align 2, 0
_08150790: .4byte sub_8150794
thumb_func_end sub_815077C
thumb_func_start sub_8150794
sub_8150794: @ 8150794
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x41
bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _081507B4
bl UnfreezeMapObjects
bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
_081507B4:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8150794
thumb_func_start sub_81507BC
sub_81507BC: @ 81507BC
push {lr}
lsls r1, 24
lsrs r1, 24
bl sub_805F060
pop {r0}
bx r0
thumb_func_end sub_81507BC
thumb_func_start sub_81507CC
sub_81507CC: @ 81507CC
push {lr}
movs r0, 0x1
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507CC
thumb_func_start sub_81507D8
sub_81507D8: @ 81507D8
push {lr}
movs r0, 0x2
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507D8
thumb_func_start sub_81507E4
sub_81507E4: @ 81507E4
push {lr}
movs r0, 0x3
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507E4
thumb_func_start sub_81507F0
sub_81507F0: @ 81507F0
push {lr}
movs r0, 0x4
bl sub_805D154
pop {r0}
bx r0
thumb_func_end sub_81507F0
.align 2, 0 @ Don't pad with nop.
asm/rom6.s
+6 -6
View File
@@ -183,7 +183,7 @@ sub_80C98FC: @ 80C98FC
cmp r4, 0
bne _080C9980
bl player_get_direction_lower_nybble
ldr r6, _080C9988 @ =gUnknown_20386E0
ldr r6, _080C9988 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r6, 0x4]
@@ -242,7 +242,7 @@ _080C9980:
pop {r0}
bx r0
.align 2, 0
_080C9988: .4byte gUnknown_20386E0
_080C9988: .4byte gFieldEffectArguments
_080C998C: .4byte gPlayerAvatar
_080C9990: .4byte gMapObjects
_080C9994: .4byte gSprites
@@ -312,7 +312,7 @@ _080C9A0C: .4byte sub_80C9A10
sub_80C9A10: @ 80C9A10
push {lr}
bl GetCursorSelectionMonId
ldr r1, _080C9A28 @ =gUnknown_20386E0
ldr r1, _080C9A28 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -321,7 +321,7 @@ sub_80C9A10: @ 80C9A10
pop {r0}
bx r0
.align 2, 0
_080C9A28: .4byte gUnknown_20386E0
_080C9A28: .4byte gFieldEffectArguments
_080C9A2C: .4byte gUnknown_81BE064
thumb_func_end sub_80C9A10
@@ -397,14 +397,14 @@ hm2_dig: @ 80C9AAC
movs r0, 0x26
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, _080C9AC8 @ =gUnknown_20386E0
ldr r1, _080C9AC8 @ =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080C9AC8: .4byte gUnknown_20386E0
_080C9AC8: .4byte gFieldEffectArguments
thumb_func_end hm2_dig
thumb_func_start sub_80C9ACC
asm/scrcmd.s
+2 -2
View File
@@ -5060,7 +5060,7 @@ ScrCmd_setfieldeffectarg: @ 806C458
lsls r0, 16
lsrs r0, 16
bl VarGet
ldr r1, _0806C484 @ =gUnknown_20386E0
ldr r1, _0806C484 @ =gFieldEffectArguments
lsls r4, 2
adds r4, r1
lsls r0, 16
@@ -5071,7 +5071,7 @@ ScrCmd_setfieldeffectarg: @ 806C458
pop {r1}
bx r1
.align 2, 0
_0806C484: .4byte gUnknown_20386E0
_0806C484: .4byte gFieldEffectArguments
thumb_func_end ScrCmd_setfieldeffectarg
thumb_func_start WaitForFieldEffectFinish
asm/trainer_see.s
+8 -8
View File
@@ -585,7 +585,7 @@ sub_8081F38: @ 8081F38
movs r0, 0xC
b _08081F82
_08081F54:
ldr r1, _08081F8C @ =gUnknown_20386E0
ldr r1, _08081F8C @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -611,7 +611,7 @@ _08081F82:
pop {r1}
bx r1
.align 2, 0
_08081F8C: .4byte gUnknown_20386E0
_08081F8C: .4byte gFieldEffectArguments
thumb_func_end sub_8081F38
thumb_func_start sub_8081F90
@@ -888,7 +888,7 @@ sub_8082184: @ 8082184
lsls r0, 24
cmp r0, 0
beq _080821CA
ldr r2, _080821D4 @ =gUnknown_20386E0
ldr r2, _080821D4 @ =gFieldEffectArguments
movs r1, 0x10
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -919,7 +919,7 @@ _080821CA:
pop {r1}
bx r1
.align 2, 0
_080821D4: .4byte gUnknown_20386E0
_080821D4: .4byte gFieldEffectArguments
_080821D8: .4byte gSprites
thumb_func_end sub_8082184
@@ -1113,7 +1113,7 @@ _08082312:
_08082348: .4byte gSaveBlock1Ptr
_0808234C: .4byte gMapObjects
_08082350:
ldr r1, _08082378 @ =gUnknown_20386E0
ldr r1, _08082378 @ =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -1133,7 +1133,7 @@ _0808236E:
pop {r1}
bx r1
.align 2, 0
_08082378: .4byte gUnknown_20386E0
_08082378: .4byte gFieldEffectArguments
thumb_func_end sub_80822CC
thumb_func_start sub_808237C
@@ -1525,7 +1525,7 @@ sub_808265C: @ 808265C
orrs r3, r4
mov r4, r12
strb r3, [r4]
ldr r4, _080826A0 @ =gUnknown_20386E0
ldr r4, _080826A0 @ =gFieldEffectArguments
ldr r3, [r4]
strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4]
@@ -1541,7 +1541,7 @@ sub_808265C: @ 808265C
pop {r0}
bx r0
.align 2, 0
_080826A0: .4byte gUnknown_20386E0
_080826A0: .4byte gFieldEffectArguments
_080826A4: .4byte 0x0000fffb
thumb_func_end sub_808265C