diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-16 14:24:47 -0500 |
| commit | 5a74c0e91354276a92ea01152b76a85462d30d4e (patch) | |
| tree | 8bca428892e561dcca4c75be7a91fed1406d4890 /asm/mystery_event_script.s | |
| parent | 3c63063831f7d26874dc49143e2d19f6acc1be18 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge remote-tracking branch 'pret/master'
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 d85d17897..d481c2a3b 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -432,7 +432,7 @@ sub_8153AE8: @ 8153AE8 mov r6, r8 push {r6,r7} adds r7, r0, 0 - bl sub_80E162C + bl IsEnigmaBerryValid mov r8, r0 adds r0, r7, 0 bl ScriptReadWord @@ -450,7 +450,7 @@ sub_8153AE8: @ 8153AE8 movs r2, 0x7 bl StringCopyN adds r0, r4, 0 - bl sub_80E15E4 + bl SetEnigmaBerry ldr r4, =gStringVar2 ldr r1, [r6] adds r1, r5 @@ -481,7 +481,7 @@ _08153B74: bl StringExpandPlaceholders movs r0, 0x2 str r0, [r7, 0x6C] - bl sub_80E162C + bl IsEnigmaBerryValid cmp r0, 0x1 bne _08153B9C ldr r0, =0x0000402d @@ -669,7 +669,7 @@ sub_8153CC8: @ 8153CC8 cmp r4, r0 bne _08153D18 ldr r0, =gStringVar1 - ldr r1, =gText_Egg + ldr r1, =gText_EggNickname movs r2, 0xB bl StringCopyN b _08153D22 @@ -711,10 +711,10 @@ _08153D4C: lsrs r4, 16 adds r0, r4, 0 movs r1, 0x2 - bl pokedex_flag_operation + bl GetSetPokedexFlag adds r0, r4, 0 movs r1, 0x3 - bl pokedex_flag_operation + bl GetSetPokedexFlag _08153D86: adds r0, r7, 0 movs r1, 0xC |