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/rom5.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/rom5.s')
| -rw-r--r-- | asm/rom5.s | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 4d5788e28..f90aabca5 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -233,10 +233,10 @@ _080A94F8: ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, =gUnknown_02024744 + ldr r5, =gEnemyParty adds r0, r5 movs r1, 0xB - bl pokemon_getattr + bl GetMonData adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -257,7 +257,7 @@ _080A94F8: muls r0, r6 adds r0, r5 movs r1, 0xB - bl pokemon_getattr + bl GetMonData adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 @@ -364,7 +364,7 @@ sub_80A9614: @ 80A9614 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, =gUnknown_02024744 + ldr r1, =gEnemyParty adds r0, r1 adds r1, r4, 0 bl sub_805DC0C @@ -420,7 +420,7 @@ _080A96B2: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, =gUnknown_020244EC + ldr r1, =gPlayerParty adds r0, r1 adds r1, r4, 0 bl sub_805DD7C @@ -497,11 +497,11 @@ _080A9762: mov r2, r10 muls r2, r0 adds r0, r2, 0 - ldr r1, =gUnknown_02024744 + ldr r1, =gEnemyParty mov r9, r1 add r0, r9 movs r1, 0x39 - bl pokemon_getattr + bl GetMonData cmp r0, 0 bne _080A9786 b _080A9AA0 @@ -512,7 +512,7 @@ _080A9786: adds r0, r2, 0 add r0, r9 movs r1, 0xB - bl pokemon_getattr + bl GetMonData adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -575,7 +575,7 @@ _080A9786: adds r0, r1, 0 add r0, r9 movs r1, 0xB - bl pokemon_getattr + bl GetMonData ldrb r2, [r4] lsls r1, r2, 4 adds r1, r2 @@ -714,11 +714,11 @@ _080A9968: mov r1, r10 muls r1, r0 adds r0, r1, 0 - ldr r2, =gUnknown_020244EC + ldr r2, =gPlayerParty mov r9, r2 add r0, r9 movs r1, 0x39 - bl pokemon_getattr + bl GetMonData cmp r0, 0 bne _080A998C b _080A9AA0 @@ -729,7 +729,7 @@ _080A998C: adds r0, r1, 0 add r0, r9 movs r1, 0xB - bl pokemon_getattr + bl GetMonData adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -792,7 +792,7 @@ _080A998C: adds r0, r2, 0 add r0, r9 movs r1, 0xB - bl pokemon_getattr + bl GetMonData ldrb r2, [r4] lsls r1, r2, 4 adds r1, r2 @@ -924,7 +924,7 @@ _080A9B24: ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, =gUnknown_02024744 + ldr r2, =gEnemyParty adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -944,7 +944,7 @@ _080A9B6C: ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, =gUnknown_020244EC + ldr r2, =gPlayerParty adds r1, r2 movs r2, 0xA bl healthbar_draw_field_maybe @@ -958,7 +958,7 @@ _080A9BA0: ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, =gUnknown_020244EC + ldr r2, =gPlayerParty adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -1000,10 +1000,10 @@ _080A9BFC: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, =gUnknown_02024744 + ldr r1, =gEnemyParty adds r0, r1 movs r1, 0x39 - bl pokemon_getattr + bl GetMonData cmp r0, 0 bne _080A9C5E adds r0, r6, 0 @@ -1022,10 +1022,10 @@ _080A9C34: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, =gUnknown_020244EC + ldr r1, =gPlayerParty adds r0, r1 movs r1, 0x39 - bl pokemon_getattr + bl GetMonData cmp r0, 0 bne _080A9C5E adds r0, r6, 0 |