diff options
| -rw-r--r-- | asm/contest_effect.s | 76 | ||||
| -rw-r--r-- | src/contest_effect.c | 30 |
2 files changed, 30 insertions, 76 deletions
diff --git a/asm/contest_effect.s b/asm/contest_effect.s index ff19558d6..3013759a1 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -5,82 +5,6 @@ .text - thumb_func_start ContestEffect_34 -ContestEffect_34: @ 80B8830 - push {r4,lr} - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xA - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x2 - bhi _080B885C - movs r4, 0xA - ldr r0, _080B8858 @ =gSharedMem + 0x192D0 - ldrb r0, [r0, 0x11] - movs r1, 0x1A - bl SetContestantStatusUnk13 - b _080B88B0 - .align 2, 0 -_080B8858: .4byte gSharedMem + 0x192D0 -_080B885C: - cmp r0, 0x5 - bhi _080B8874 - movs r4, 0x14 - ldr r0, _080B8870 @ =gSharedMem + 0x192D0 - ldrb r0, [r0, 0x11] - movs r1, 0x1B - bl SetContestantStatusUnk13 - b _080B88B0 - .align 2, 0 -_080B8870: .4byte gSharedMem + 0x192D0 -_080B8874: - cmp r0, 0x7 - bhi _080B888C - movs r4, 0x28 - ldr r0, _080B8888 @ =gSharedMem + 0x192D0 - ldrb r0, [r0, 0x11] - movs r1, 0x1C - bl SetContestantStatusUnk13 - b _080B88B0 - .align 2, 0 -_080B8888: .4byte gSharedMem + 0x192D0 -_080B888C: - cmp r1, 0x8 - bhi _080B88A4 - movs r4, 0x3C - ldr r0, _080B88A0 @ =gSharedMem + 0x192D0 - ldrb r0, [r0, 0x11] - movs r1, 0x1D - bl SetContestantStatusUnk13 - b _080B88B0 - .align 2, 0 -_080B88A0: .4byte gSharedMem + 0x192D0 -_080B88A4: - movs r4, 0x50 - ldr r0, _080B88C8 @ =gSharedMem + 0x192D0 - ldrb r0, [r0, 0x11] - movs r1, 0x1E - bl SetContestantStatusUnk13 -_080B88B0: - ldr r0, _080B88C8 @ =gSharedMem + 0x192D0 - ldrb r2, [r0, 0x11] - lsls r1, r2, 3 - subs r1, r2 - lsls r1, 2 - subs r0, 0x70 - adds r1, r0 - strh r4, [r1, 0x2] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080B88C8: .4byte gSharedMem + 0x192D0 - thumb_func_end ContestEffect_34 - thumb_func_start ContestEffect_35 ContestEffect_35: @ 80B88CC push {r4-r7,lr} diff --git a/src/contest_effect.c b/src/contest_effect.c index 415732003..86eb78dac 100644 --- a/src/contest_effect.c +++ b/src/contest_effect.c @@ -505,3 +505,33 @@ void ContestEffect_33(void) else SetContestantStatusUnk13(shared192D0.unk11, 24); } + +void ContestEffect_34(void) +{ + u8 r0 = Random() % 10; + s16 r4; + + if (r0 < 3) + { + r4 = 10; + SetContestantStatusUnk13(shared192D0.unk11, 26); + } else if (r0 < 6) + { + r4 = 20; + SetContestantStatusUnk13(shared192D0.unk11, 27); + } else if (r0 < 8) + { + r4 = 40; + SetContestantStatusUnk13(shared192D0.unk11, 28); + } else if (r0 < 9) + { + r4 = 60; + SetContestantStatusUnk13(shared192D0.unk11, 29); + } + else + { + r4 = 80; + SetContestantStatusUnk13(shared192D0.unk11, 30); + } + curContestant->appeal2 = r4; +} |