diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-02-03 21:34:56 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-02-03 18:34:56 -0800 |
| commit | 689df5cff8386d85f1f1da1fc332db18d282f928 (patch) | |
| tree | 0c8b3264268315422064aa8960c0007f5f5d9341 /asm/lottery_corner.s | |
| parent | e2b834d21d96332c5bcf788b390a09e285c7a5cb (diff) | |
finish decompiling battle_ai.c (#16)
* partially decompile battle_ai.c up to tai60_unk
* nonmatching tai60_unk
* decompile more of battle_ai.c
* formatting
* finish porting battle_ai.c
* formatting
Diffstat (limited to 'asm/lottery_corner.s')
| -rw-r--r-- | asm/lottery_corner.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/lottery_corner.s b/asm/lottery_corner.s index b9fc1cc51..49f20137f 100644 --- a/asm/lottery_corner.s +++ b/asm/lottery_corner.s @@ -91,21 +91,21 @@ _081775FC: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, =gUnknown_020244EC + ldr r0, =gPlayerParty adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB - bl pokemon_getattr + bl GetMonData cmp r0, 0 beq _08177658 adds r0, r4, 0 movs r1, 0x2D - bl pokemon_getattr + bl GetMonData cmp r0, 0 bne _0817764E adds r0, r4, 0 movs r1, 0x1 - bl pokemon_getattr + bl GetMonData adds r1, r0, 0 ldr r0, =gUnknown_020375F0 ldrh r0, [r0] @@ -222,11 +222,11 @@ _081776D2: movs r0, 0x64 ldr r1, [sp, 0x4] muls r0, r1 - ldr r1, =gUnknown_020244EC + ldr r1, =gPlayerParty adds r0, r1 ldr r2, =gStringVar1 movs r1, 0x2 - bl pokemon_getattr + bl GetMonData b _08177768 .pool _0817773C: |