diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:54:20 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:54:20 -0400 |
| commit | 0882b456934e87b3b5fa1415ca6ab34087c68a4a (patch) | |
| tree | faeb206b7d5bc7445ed2cf3c6bbd03cb7996da05 | |
| parent | 0dccfbbd447e6c3764c123a048e75e3085e58771 (diff) | |
Clean up some ewram refs inside gBattleStruct
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/ewram.h | 4 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 6 | ||||
| -rw-r--r-- | src/pokemon_1.c | 6 | ||||
| -rw-r--r-- | src/pokemon_item_effect.c | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/include/battle.h b/include/battle.h index af0a9a43e..263bb3b0d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -405,7 +405,7 @@ struct BattleStruct /* 0x2000000 */ /*0x160F0*/ u16 changedItems[4]; /*0x160F8*/ u8 unk160F8; /*0x160F9*/ u8 unk160F9; - /*0x160FA*/ u8 unk160FA; + /*0x160FA*/ u8 levelUpHP; /*0x160FB*/ u8 unk160FB; /*0x160FC*/ u8 turnSideTracker; /*0x160FD*/ u8 unk160FD; diff --git a/include/ewram.h b/include/ewram.h index 0a66c15d9..6e3ba6751 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -126,18 +126,14 @@ extern u8 gSharedMem[]; #define ewram160DD (gSharedMem[0x160DD]) #define ewram160E0(i) (gSharedMem[0x160E0 + i]) #define CHOICED_MOVE(battler) (((u16*)(&gSharedMem[0x160E8 + battler * 2]))) -#define ewram160E8 ((u8 *)(gSharedMem + 0x160E8)) #define ewram160E8arr(i) (gSharedMem[0x160E8 + i]) #define ewram160E8arr2(i, battler) (gSharedMem[0x160E8 + i + battler * 2]) #define ewram160F0 ((u8 *)(gSharedMem + 0x160F0)) #define ewram160F0arr(i) (gSharedMem[0x160F0 + i]) -#define ewram160F8 (gSharedMem[0x160F8]) -#define eStatHp (gSharedMem[0x160FA]) #define ewram160FB (gSharedMem[0x160FB]) #define ewram16100 ((u8 *)(gSharedMem + 0x16100)) #define ewram16100arr(i) (gSharedMem[0x16100 + i]) #define ewram16100arr2(i, battler) (gSharedMem[0x16100 + i + battler * 4]) -#define ewram16108 ((u8 *)(gSharedMem + 0x16108)) #define ewram16108arr(i) (gSharedMem[0x16108 + i]) #define ewram16400 (gSharedMem + 0x16400) #define AI_ARRAY_160CC(i) (gSharedMem[0x160CC + i * 2]) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d1143d764..a98a0eae0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5181,7 +5181,7 @@ static void atk1E_jumpifability(void) gLastUsedAbility = ability; gBattlescriptCurrInstr = jumpPtr; RecordAbilityBattle(battlerId -1, gLastUsedAbility); - ewram160F8 = battlerId - 1; + gBattleStruct->unk160F8 = battlerId - 1; } else gBattlescriptCurrInstr += 7; @@ -5194,7 +5194,7 @@ static void atk1E_jumpifability(void) gLastUsedAbility = ability; gBattlescriptCurrInstr = jumpPtr; RecordAbilityBattle(battlerId - 1, gLastUsedAbility); - ewram160F8 = battlerId - 1; + gBattleStruct->unk160F8 = battlerId - 1; } else gBattlescriptCurrInstr += 7; @@ -5207,7 +5207,7 @@ static void atk1E_jumpifability(void) gLastUsedAbility = ability; gBattlescriptCurrInstr = jumpPtr; RecordAbilityBattle(battlerId, gLastUsedAbility); - ewram160F8 = battlerId; + gBattleStruct->unk160F8 = battlerId; } else gBattlescriptCurrInstr += 7; diff --git a/src/pokemon_1.c b/src/pokemon_1.c index aeeb6080d..4670f188f 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -1731,9 +1731,9 @@ void CalculateMonStats(struct Pokemon *mon) newMaxHP = (((n + hpEV / 4) * level) / 100) + level + 10; } - eStatHp = newMaxHP - oldMaxHP; - if (eStatHp == 0) - eStatHp = 1; + gBattleStruct->levelUpHP = newMaxHP - oldMaxHP; + if (gBattleStruct->levelUpHP == 0) + gBattleStruct->levelUpHP = 1; SetMonData(mon, MON_DATA_MAX_HP, &newMaxHP); diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c index 3ab351367..b84f69878 100644 --- a/src/pokemon_item_effect.c +++ b/src/pokemon_item_effect.c @@ -311,7 +311,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo data = 1; break; case 0xFD: - data = eStatHp; + data = gBattleStruct->levelUpHP; break; } if (GetMonData(pkmn, MON_DATA_MAX_HP, NULL) != GetMonData(pkmn, MON_DATA_HP, NULL)) |