diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 19:32:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 19:32:42 -0700 |
| commit | b1d091e233b81262e0905ce06607cfa7c4d4c9dd (patch) | |
| tree | 183403f45e1319cf681698c943dab74773f81317 /include/battle.h | |
| parent | 781d0ca44c8eab2b7751fe8f337d6acde7fe8582 (diff) | |
| parent | 64c9fd3a29cfd56c1b7ba5812ca84e62427971a9 (diff) | |
Merge pull request #554 from Blampharos/btl_attrs
[Don't merge] Decompile btl_attrs.s into battle_1.c
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index d5add3d43..11bb9e387 100644 --- a/include/battle.h +++ b/include/battle.h @@ -53,7 +53,7 @@ struct Trainer /*0x18*/ bool8 doubleBattle; /*0x1C*/ u32 aiFlags; /*0x20*/ u8 partySize; - /*0x24*/ void *party; + /*0x24*/ const void *party; }; struct UnkBattleStruct1 // AI_Opponent_Info? @@ -726,6 +726,7 @@ void BattleMainCB2(void); void sub_800F838(struct Sprite *); u8 CreateNPCTrainerParty(struct Pokemon *, u16); void sub_800FCFC(void); +void nullsub_36(struct Sprite *); void c2_8011A1C(void); void sub_80101B8(void); void c2_081284E0(void); |