mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 11:44:17 +01:00
Make battle tower compile
This commit is contained in:
parent
52be8eeaf1
commit
0e6fbbfe09
@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong::
|
|||||||
waitanimation
|
waitanimation
|
||||||
printstring STRINGID_FAINTINTHREE
|
printstring STRINGID_FAINTINTHREE
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
setbyte sBANK, 0x0
|
setbyte sBATTLER, 0x0
|
||||||
BattleScript_PerishSongLoop::
|
BattleScript_PerishSongLoop::
|
||||||
jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
|
jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
|
||||||
BattleScript_PerishSongLoopIncrement::
|
BattleScript_PerishSongLoopIncrement::
|
||||||
addbyte sBANK, 0x1
|
addbyte sBATTLER, 0x1
|
||||||
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
|
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop
|
||||||
goto BattleScript_MoveEnd
|
goto BattleScript_MoveEnd
|
||||||
|
|
||||||
BattleScript_PerishSongNotAffected::
|
BattleScript_PerishSongNotAffected::
|
||||||
@ -2493,7 +2493,7 @@ BattleScript_EffectYawn::
|
|||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
goto BattleScript_MoveEnd
|
goto BattleScript_MoveEnd
|
||||||
BattleScript_PrintBankAbilityMadeIneffective::
|
BattleScript_PrintBankAbilityMadeIneffective::
|
||||||
copybyte sBANK, sBANK_WITH_ABILITY
|
copybyte sBATTLER, sBATTLER_WITH_ABILITY
|
||||||
BattleScript_PrintAbilityMadeIneffective::
|
BattleScript_PrintAbilityMadeIneffective::
|
||||||
pause 0x20
|
pause 0x20
|
||||||
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
|
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
|
||||||
@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway::
|
|||||||
BattleScript_WrapFree::
|
BattleScript_WrapFree::
|
||||||
printstring STRINGID_PKMNGOTFREE
|
printstring STRINGID_PKMNGOTFREE
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
copybyte gBattlerTarget, sBANK
|
copybyte gBattlerTarget, sBATTLER
|
||||||
return
|
return
|
||||||
|
|
||||||
BattleScript_LeechSeedFree::
|
BattleScript_LeechSeedFree::
|
||||||
@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates::
|
|||||||
end3
|
end3
|
||||||
|
|
||||||
BattleScript_WeatherFormChanges::
|
BattleScript_WeatherFormChanges::
|
||||||
setbyte sBANK, 0x0
|
setbyte sBATTLER, 0x0
|
||||||
BattleScript_WeatherFormChangesLoop::
|
BattleScript_WeatherFormChangesLoop::
|
||||||
trycastformdatachange
|
trycastformdatachange
|
||||||
addbyte sBANK, 0x1
|
addbyte sBATTLER, 0x1
|
||||||
jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
|
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
|
||||||
return
|
return
|
||||||
|
|
||||||
BattleScript_CastformChange::
|
BattleScript_CastformChange::
|
||||||
|
@ -57,18 +57,12 @@ struct UnkStruct_860DD10
|
|||||||
|
|
||||||
extern void sub_81B8558(void);
|
extern void sub_81B8558(void);
|
||||||
extern u32 sub_81A39C4(void);
|
extern u32 sub_81A39C4(void);
|
||||||
extern u16 sub_8162548(u8, u8);
|
|
||||||
extern u16 RandomizeFacilityTrainerMonId(u16);
|
|
||||||
extern u8 SetFacilityPtrsGetLevel(void);
|
|
||||||
extern u16 sub_81A5060(u8 monId, u8 moveSlotId);
|
extern u16 sub_81A5060(u8 monId, u8 moveSlotId);
|
||||||
extern u8 sub_81A50F0(u8, u8);
|
extern u8 sub_81A50F0(u8, u8);
|
||||||
extern u8 sub_81A50B0(u8);
|
extern u8 sub_81A50B0(u8);
|
||||||
extern void SetBattleFacilityTrainerGfxId(u16, u8);
|
|
||||||
extern void sub_81A4C30(void);
|
extern void sub_81A4C30(void);
|
||||||
extern bool8 sub_81A3610(void);
|
extern bool8 sub_81A3610(void);
|
||||||
extern u16 sub_81A4FF0(u8);
|
extern u16 sub_81A4FF0(u8);
|
||||||
extern u8 GetFrontierTrainerFrontSpriteId(u16);
|
|
||||||
extern u8 GetFrontierOpponentClass(u16);
|
|
||||||
extern void ReducePlayerPartyToThree(void);
|
extern void ReducePlayerPartyToThree(void);
|
||||||
|
|
||||||
extern u8 gUnknown_0203CEF8[];
|
extern u8 gUnknown_0203CEF8[];
|
||||||
@ -5561,7 +5555,7 @@ static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roun
|
|||||||
u16 bestScore = 0;
|
u16 bestScore = 0;
|
||||||
u16 bestId = 0;
|
u16 bestId = 0;
|
||||||
s32 movePower = 0;
|
s32 movePower = 0;
|
||||||
SetFacilityPtrsGetLevel(); // Unused return variable.
|
SetFacilityPtrsGetLevel();
|
||||||
|
|
||||||
// Calc move points of all 4 moves for all 3 pokemon hitting all 3 target mons.
|
// Calc move points of all 4 moves for all 3 pokemon hitting all 3 target mons.
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
@ -6425,7 +6419,7 @@ static void DecideRoundWinners(u8 roundId)
|
|||||||
static void CopyDomeTrainerName(u8 *dst, u16 trainerId)
|
static void CopyDomeTrainerName(u8 *dst, u16 trainerId)
|
||||||
{
|
{
|
||||||
s32 i = 0;
|
s32 i = 0;
|
||||||
SetFacilityPtrsGetLevel(); // Unused return value.
|
SetFacilityPtrsGetLevel();
|
||||||
|
|
||||||
if (trainerId == TRAINER_FRONTIER_BRAIN)
|
if (trainerId == TRAINER_FRONTIER_BRAIN)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user