From 1f358fbb07d7476822dfd49e2647ebb62428a8ed Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 16 Oct 2018 22:34:53 +0200 Subject: Use constants --- src/battle_script_commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_script_commands.c') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 685f0db7a..781922f5b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3382,17 +3382,17 @@ static void atk23_getexp(void) // check if the pokemon doesn't belong to the player if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gBattleStruct->expGetterMonId >= 3) { - i = 0x149; + i = STRINGID_EMPTYSTRING4; } else { gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; - i = 0x14A; + i = STRINGID_ABOOSTED; } } else { - i = 0x149; + i = STRINGID_EMPTYSTRING4; } // get exp getter battlerId -- cgit v1.2.3 From e75f0b4f80670bd3b6a28257f10770911869ea08 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 16 Oct 2018 21:47:08 -0500 Subject: Port/decompile field_control_avatar --- src/battle_script_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_script_commands.c') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 685f0db7a..cdc996a4d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3347,7 +3347,7 @@ static void atk23_getexp(void) gBattleScripting.atk23_state = 5; gBattleMoveDamage = 0; // used for exp } - else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_MON_LEVEL) + else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL) { *(&gBattleStruct->sentInPokes) >>= 1; gBattleScripting.atk23_state = 5; @@ -3430,7 +3430,7 @@ static void atk23_getexp(void) if (gBattleControllerExecFlags == 0) { gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0; - if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_MON_LEVEL) + if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_LEVEL) { gBattleResources->statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP); gBattleResources->statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK); -- cgit v1.2.3