diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-04 00:37:07 +0000 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-05-03 17:37:07 -0700 |
| commit | 7f03ba4951c5045274dab3f2a3de8e8d498b8df3 (patch) | |
| tree | eea2b7a29e0eccff7057d6f4cb5eef42f5cd124c /asm/contest.s | |
| parent | f2eb51932811b66b083ab0c6a7663d846f274888 (diff) | |
decompile a little more of player_pc.c and dump half of battle_anim data incbins (#254)
* matching sub_813A280 and sub_813A4B4
* move data to item_use.c
* slightly less ugly NewGameInitPCItems
* more less ugly NewGameInitPCItems - Game Freak doesn't know how to use structs
* decompile HandleQuantityRolling and sub_813A6FC
* partially label and comment battle_anim.c
* decompile sub_813A794 and sub_813A83C
* minor comments on battle_anim.c
* decompile up to GF shenanigans #14390
* up to GF shenanigans #38571
* dump half of battle_anim_80CA710.s incbins
* dump most incbins from battle_anim_812C144.s
* obj_rot_scal fixes
* subsprite
* i cant even identify byte arrays
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/contest.s b/asm/contest.s index a851ac05a..fe3536218 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -2531,7 +2531,7 @@ _080AC730: adds r0, r4, 0 bl sub_80B29B4 adds r0, r4, 0 - bl move_anim_start_t1 + bl ExecuteMoveAnim ldr r1, _080AC778 @ =gTasks mov r3, r8 lsls r0, r3, 2 @@ -2544,10 +2544,10 @@ _080AC730: .align 2, 0 _080AC778: .4byte gTasks _080AC77C: - ldr r0, _080AC7B8 @ =gUnknown_0202F7AC + ldr r0, _080AC7B8 @ =gAnimScriptCallback ldr r0, [r0] bl _call_via_r0 - ldr r0, _080AC7BC @ =gUnknown_0202F7B1 + ldr r0, _080AC7BC @ =gAnimScriptActive ldrb r4, [r0] cmp r4, 0 beq _080AC790 @@ -2572,8 +2572,8 @@ _080AC790: strh r0, [r1, 0x8] bl _080AD8CA .align 2, 0 -_080AC7B8: .4byte gUnknown_0202F7AC -_080AC7BC: .4byte gUnknown_0202F7B1 +_080AC7B8: .4byte gAnimScriptCallback +_080AC7BC: .4byte gAnimScriptActive _080AC7C0: .4byte 0x02019204 _080AC7C4: .4byte gTasks _080AC7C8: |