ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into decompile_battle_controllers

Browse Source
This commit is contained in:
DizzyEggg 2017-10-26 23:13:09 +02:00
commit 5e285c3bca
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pokemon.h
View File

@ -87,7 +87,7 @@
#define MON_DATA_RIBBONS 83
#define MON_DATA_ATK2 84
#define MON_DATA_DEF2 85
#define MON_DATA_SPD2 86
#define MON_DATA_SPEED2 86
#define MON_DATA_SPATK2 87
#define MON_DATA_SPDEF2 88

2
src/pokemon_2.c
View File

@ -352,7 +352,7 @@ u32 GetMonData(struct Pokemon *mon, s32 field, u8* data)
case MON_DATA_DEF2:
ret = mon->defense;
break;
case MON_DATA_SPD2:
case MON_DATA_SPEED2:
ret = mon->speed;
break;
case MON_DATA_SPATK2:

2
src/pokemon_summary_screen.c
View File

@ -720,7 +720,7 @@ bool8 sub_81C00F0(struct Pokemon *a)
sum->def = GetMonData(a, MON_DATA_DEF2);
sum->spatk = GetMonData(a, MON_DATA_SPATK2);
sum->spdef = GetMonData(a, MON_DATA_SPDEF2);
sum->speed = GetMonData(a, MON_DATA_SPD2);
sum->speed = GetMonData(a, MON_DATA_SPEED2);
}
break;
case 3: