diff options
| author | YamaArashi <shadow962@live.com> | 2016-12-04 03:32:44 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-12-04 03:32:44 -0800 |
| commit | 4ceea5913e430464ccde4ac17b050a8faff5f97c (patch) | |
| tree | 47de1b37fce6e29fdfe3047151d1628cf53c80e4 | |
| parent | ffdc442444897fcc0d65301d8630c504e80d4c6f (diff) | |
formatting
| -rw-r--r-- | asm/battle_records.s | 2 | ||||
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | include/rom4.h | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/asm/battle_records.s b/asm/battle_records.s index 6de48aea2..b58a6506c 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -452,7 +452,7 @@ sub_8110290: @ 8110290 lsls r2, r4, 3 subs r2, r4 lsls r2, 3 - ldr r3, _081102D8 @ =gUnknown_0202FFF0 + 0x30 + ldr r3, _081102D8 @ =gTrainerCards + 0x30 adds r1, r2, r3 subs r3, 0x30 adds r2, r3 diff --git a/include/global.h b/include/global.h index 3ee1610e6..ce2267642 100644 --- a/include/global.h +++ b/include/global.h @@ -229,8 +229,8 @@ struct SaveBlock1 /*0x2B0C*/ u8 unk2B0C; /*0x2B0D*/ u8 outbreakPokemonProbability; /*0x2B0E*/ u8 filler_2B0E[0xE]; - /*0x2B1C*/ u16 unk2B1C[4]; - /*0x2B24*/ u8 filler_2B24[0x2B0]; + /*0x2B1C*/ u16 unk2B1C[4]; + /*0x2B24*/ u8 filler_2B24[0x2B0]; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2DFC*/ u8 filler_2DFC[0x100]; /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[5]; diff --git a/include/rom4.h b/include/rom4.h index afa489770..b12bbf4bc 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -5,15 +5,15 @@ struct UnkPlayerStruct { - u8 player_field_0; - u8 player_field_1; + u8 player_field_0; + u8 player_field_1; }; struct LinkPlayerMapObject { - u8 active; - u8 linkPlayerId; - u8 mapObjId; - u8 mode; + u8 active; + u8 linkPlayerId; + u8 mapObjId; + u8 mode; }; // sub_8052F5C |