diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /asm/macros/event.inc | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 35314ac3f..86c2e2b1e 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1603,12 +1603,12 @@ callstd STD_PUT_ITEM_AWAY .endm - .macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_FANFA1 + .macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP additem \item, \amount msgreceiveditem \msg, \item, \amount, \fanfare .endm - .macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_FANFA1 + .macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP loadword 0, \msg setorcopyvar VAR_0x8000, \item setorcopyvar VAR_0x8001, \amount |