diff options
Diffstat (limited to 'asm/mystery_event_script.s')
| -rw-r--r-- | asm/mystery_event_script.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index 057517bb2..4b8717bac 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified @@ -631,7 +631,7 @@ sub_81264F0: @ 81264F0 ldrb r1, [r2] adds r2, 0x1 str r2, [r4, 0x8] - bl GiveSpecialRibbonToParty + bl GiveGiftRibbonToParty ldr r0, _0812651C @ =gStringVar4 ldr r1, _08126520 @ =gOtherText_SpecialRibbonReceived bl StringExpandPlaceholders @@ -822,7 +822,7 @@ _08126680: .4byte gPlayerPartyCount _08126684: .4byte gStringVar4 _08126688: .4byte gOtherText_PartyIsFull _0812668C: - ldr r7, _08126708 @ =gUnknown_03004554 + ldr r7, _08126708 @ =gPlayerParty + 5 * 0x64 adds r0, r7, 0 adds r1, r5, 0 movs r2, 0x64 @@ -876,7 +876,7 @@ _081266F6: pop {r1} bx r1 .align 2, 0 -_08126708: .4byte gUnknown_03004554 +_08126708: .4byte gPlayerParty + 5 * 0x64 _0812670C: .4byte gStringVar4 _08126710: .4byte gOtherText_PokeWasSentOver thumb_func_end sub_8126608 |