diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-25 20:12:52 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-25 20:12:52 -0400 |
| commit | f85513f76999c79c6355711fcefaf058d02c7c46 (patch) | |
| tree | ad60d6edad654974f1ef82538da0a402abd69903 /src/battle_811DA74.c | |
| parent | 637774362fdbedd8a54b651e6196a1e1a4f4c093 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into sound_check_menu
Diffstat (limited to 'src/battle_811DA74.c')
| -rw-r--r-- | src/battle_811DA74.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 743dd2554..42c700844 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -35,15 +35,7 @@ struct UnknownStruct3 u8 ppBonuses; }; -struct UnknownStruct5 -{ - u8 unk0_0:7; - u8 unk0_7:1; -}; - extern u16 gBattleTypeFlags; - -extern struct UnknownStruct5 gUnknown_020238C8; extern u8 gDisplayedStringBattle[]; extern u8 gBattleBufferA[][0x200]; extern u8 gActiveBank; @@ -433,6 +425,7 @@ void LinkPartnerHandleGetAttributes(void) LinkPartnerBufferExecCompleted(); } +// Duplicate of dp01_getattr_by_ch1_for_player_pokemon_ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; @@ -765,6 +758,7 @@ void LinkPartnerHandleSetAttributes(void) LinkPartnerBufferExecCompleted(); } +// Duplicate of dp01_setattr_by_ch1_for_player_pokemon void sub_811EC68(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; |
