diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
| commit | a1368c545df5d49c2cde32c09c14aba8d4bdc967 (patch) | |
| tree | 0dd69e9a676d0d4872e51552d465cbc0364e2a55 /asm/mystery_event_script.s | |
| parent | f29fc55796cc5500f954b396264edc863f96f486 (diff) | |
| parent | eb280768a48eba5332468b463aab962e1eafb18e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/mystery_event_script.s')
| -rw-r--r-- | asm/mystery_event_script.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index 389b8146a..af9b0a745 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -513,7 +513,7 @@ sub_8153BB0: @ 8153BB0 ldrb r1, [r2] adds r2, 0x1 str r2, [r4, 0x8] - bl sub_80F9B30 + bl GiveGiftRibbonToParty ldr r0, =gStringVar4 ldr r1, =gUnknown_08674B6A bl StringExpandPlaceholders @@ -691,7 +691,7 @@ _08153D22: b _08153DB6 .pool _08153D4C: - ldr r7, =gUnknown_020246E0 + ldr r7, =gPlayerParty + 500 adds r0, r7, 0 adds r1, r5, 0 movs r2, 0x64 @@ -730,7 +730,7 @@ _08153D86: bl sub_80D460C _08153DA4: bl party_compaction - bl calc_player_party_count + bl CalculatePlayerPartyCount ldr r0, =gStringVar4 ldr r1, =gUnknown_08674BF0 bl StringExpandPlaceholders |