diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-05-16 14:59:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 14:59:02 -0400 |
| commit | fa52c7fc159a749cb97f4a78d7cf39781b55c62f (patch) | |
| tree | 8a88de09420ad7f53eb2154ba49f04d3d93c4e0b /asm | |
| parent | 683c9edf348c8a7730e72eb4a21a934e158a58c0 (diff) | |
| parent | 4156dd6b5789e613e4c25ec2cfe9867ec491f85a (diff) | |
Merge pull request #56 from pret/document_map_vars
Document map vars, 1
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/heal_location.s | 12 | ||||
| -rw-r--r-- | asm/macros/event.inc | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/asm/heal_location.s b/asm/heal_location.s index 34eb1461b..bdf12aa5d 100644 --- a/asm/heal_location.s +++ b/asm/heal_location.s @@ -13,7 +13,7 @@ GetHealLocationIndexFromMapGroupAndNum: @ 80BFC50 lsls r1, 16 lsrs r1, 16 movs r3, 0 - ldr r2, _080BFC74 @ =gUnknown_83EEBF8 + ldr r2, _080BFC74 @ =sSpawnPoints _080BFC5E: movs r0, 0 ldrsb r0, [r2, r0] @@ -26,7 +26,7 @@ _080BFC5E: adds r0, r3, 0x1 b _080BFC82 .align 2, 0 -_080BFC74: .4byte gUnknown_83EEBF8 +_080BFC74: .4byte sSpawnPoints _080BFC78: adds r2, 0x8 adds r3, 0x1 @@ -50,11 +50,11 @@ GetHealLocationPointerFromMapGroupAndNum: @ 80BFC88 cmp r0, 0 beq _080BFCA8 lsls r0, 3 - ldr r1, _080BFCA4 @ =gUnknown_83EEBF0 + ldr r1, _080BFCA4 @ =sSpawnPoints - 8 adds r0, r1 b _080BFCAA .align 2, 0 -_080BFCA4: .4byte gUnknown_83EEBF0 +_080BFCA4: .4byte sSpawnPoints - 8 _080BFCA8: movs r0, 0 _080BFCAA: @@ -70,11 +70,11 @@ GetHealLocationPointer: @ 80BFCB0 cmp r0, 0x14 bhi _080BFCC8 lsls r0, 3 - ldr r1, _080BFCC4 @ =gUnknown_83EEBF0 + ldr r1, _080BFCC4 @ =sSpawnPoints - 8 adds r0, r1 b _080BFCCA .align 2, 0 -_080BFCC4: .4byte gUnknown_83EEBF0 +_080BFCC4: .4byte sSpawnPoints - 8 _080BFCC8: movs r0, 0 _080BFCCA: diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 11ec30d74..7ce50a5e1 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1434,3 +1434,11 @@ setorcopyvar 0x8001, \amount callstd \function .endm + + .macro giveitemfanfaremsg msg, item, amount=1, fanfare=MUS_FANFA1 + loadword 0, \msg + setorcopyvar 0x8000, \item + setorcopyvar 0x8001, \amount + setorcopyvar 0x8002, \fanfare + callstd 9 + .endm |