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

finish event data

Browse Source
This commit is contained in:
DizzyEggg
2017-09-02 22:31:37 +02:00
parent a4cc67008e
commit b5fea95a46
60 changed files with 1265 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/berry.s
+7 -7
View File
@@ -836,7 +836,7 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
lsrs r6, r0, 24
adds r0, r5, 0
bl ResetBerryTreeSparkleFlag
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
@@ -846,26 +846,26 @@ FieldObjectInteractionGetBerryTreeData: @ 80E1B94
lsls r0, 24
cmp r0, 0
beq _080E1BE0
ldr r1, =gUnknown_020375E0
ldr r1, =gSpecialVar_0x8004
movs r0, 0xFF
strh r0, [r1]
b _080E1BEE
.pool
_080E1BE0:
ldr r4, =gUnknown_020375E0
ldr r4, =gSpecialVar_0x8004
adds r0, r5, 0
bl GetStageByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
_080E1BEE:
ldr r4, =gUnknown_020375E2
ldr r4, =gSpecialVar_0x8005
adds r0, r5, 0
bl GetNumStagesWateredByBerryTreeId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r4, =gUnknown_020375E4
ldr r4, =gSpecialVar_0x8006
adds r0, r5, 0
bl GetBerryCountByBerryTreeId
lsls r0, 24
@@ -980,7 +980,7 @@ FieldObjectInteractionPickBerryTree: @ 80E1CDC
bl GetBerryTypeByBerryTreeId
lsls r0, 24
lsrs r0, 24
ldr r6, =gUnknown_020375E0
ldr r6, =gSpecialVar_0x8004
bl BerryTypeToItemId
adds r4, r0, 0
lsls r4, 16
@@ -1011,7 +1011,7 @@ FieldObjectInteractionRemoveBerryTree: @ 80E1D28
lsls r0, 24
lsrs r0, 24
bl RemoveBerryTree
ldr r0, =gUnknown_020375F2
ldr r0, =gScriptLastTalked
ldrb r0, [r0]
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]