Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-24 11:24:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANIM_BANK -> ANIM_BATTLER and some newlines

Browse Source
This commit is contained in:
garak
2018-11-13 13:49:27 -05:00
parent c31185bdbf
commit 32c7ec313d
15 changed files with 2844 additions and 2844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5606
data/battle_anim_scripts.s vendored
View File

File diff suppressed because it is too large Load Diff

8
include/constants/battle_anim.h
View File

@@ -301,10 +301,10 @@
#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288)
// battlers
#define ANIM_BANK_ATTACKER 0
#define ANIM_BANK_TARGET 1
#define ANIM_BANK_ATK_PARTNER 2
#define ANIM_BANK_DEF_PARTNER 3
#define ANIM_BATTLER_ATTACKER 0
#define ANIM_BATTLER_TARGET 1
#define ANIM_BATTLER_ATK_PARTNER 2
#define ANIM_BATTLER_DEF_PARTNER 3
// stereo panning constants [0-255]
//

2
include/macros/battle_anim.inc
View File

@@ -11,7 +11,7 @@
.macro createsprite template, anim_battler, subpriority_offset, argv:vararg
.byte 0x02
.4byte \template
.if \anim_battler == ANIM_BANK_TARGET
.if \anim_battler == ANIM_BATTLER_TARGET
.byte 0x80 | (\subpriority_offset & 0x7F)
.else
.byte (\subpriority_offset & 0x7F)

2
src/battle/anim/fire.c
View File

@@ -305,4 +305,4 @@ static void sub_80D50E8(struct Sprite *sprite)
{
move_anim_8074EE0(sprite);
}
}
}

2
src/battle/anim/flying.c
View File

@@ -2673,4 +2673,4 @@ void unref_sub_80DB6E4(u8 taskId)
}
DestroyAnimVisualTask(taskId);
}
}

2
src/battle/anim/poison.c
View File

@@ -323,4 +323,4 @@ static void AnimBubbleEffectStep(struct Sprite *sprite)
if (sprite->affineAnimEnded)
DestroyAnimSprite(sprite);
}
}

2
src/battle/anim/sfx.c
View File

@@ -277,4 +277,4 @@ static void sub_812B404(u8 taskId)
{
DestroyAnimVisualTask(taskId);
}
}
}

2
src/battle/anim/tendrils.c
View File

@@ -119,4 +119,4 @@ static void sub_80CB2D4(struct Sprite* sprite)
DestroyAnimSprite(sprite);
}
}
}
}

2
src/battle/anim/wisp_fire.c
View File

@@ -229,4 +229,4 @@ void sub_80D60B4(u8 taskId)
gSprites[spriteId].pos2.y = 0;
DestroyAnimVisualTask(taskId);
}
}
}

44
src/battle/battle_anim.c
View File

@@ -1824,12 +1824,12 @@ static void ScriptCmd_monbg(void)
sBattleAnimScriptPtr++;
animBank = T1_READ_8(sBattleAnimScriptPtr);
if (animBank == ANIM_BANK_ATTACKER)
animBank = ANIM_BANK_ATK_PARTNER;
else if (animBank == ANIM_BANK_TARGET)
animBank = ANIM_BANK_DEF_PARTNER;
if (animBank == ANIM_BATTLER_ATTACKER)
animBank = ANIM_BATTLER_ATK_PARTNER;
else if (animBank == ANIM_BATTLER_TARGET)
animBank = ANIM_BATTLER_DEF_PARTNER;
if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER)
if (animBank == ANIM_BATTLER_ATTACKER || animBank == ANIM_BATTLER_ATK_PARTNER)
bank = gAnimBankAttacker;
else
bank = gAnimBankTarget;
@@ -1866,7 +1866,7 @@ static void ScriptCmd_monbg(void)
}
bank ^= 2;
if (animBank >= ANIM_BANK_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
if (animBank >= ANIM_BATTLER_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
{
identity = GetBattlerPosition(bank);
identity += 0xFF;
@@ -2095,12 +2095,12 @@ static void ScriptCmd_clearmonbg(void)
sBattleAnimScriptPtr++;
animBankId = T1_READ_8(sBattleAnimScriptPtr);
if (animBankId == ANIM_BANK_ATTACKER)
animBankId = ANIM_BANK_ATK_PARTNER;
else if (animBankId == ANIM_BANK_TARGET)
animBankId = ANIM_BANK_DEF_PARTNER;
if (animBankId == ANIM_BATTLER_ATTACKER)
animBankId = ANIM_BATTLER_ATK_PARTNER;
else if (animBankId == ANIM_BATTLER_TARGET)
animBankId = ANIM_BATTLER_DEF_PARTNER;
if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
bank = gAnimBankAttacker;
else
bank = gAnimBankTarget;
@@ -2158,12 +2158,12 @@ static void ScriptCmd_monbg_22(void)
sBattleAnimScriptPtr++;
animBankId = T1_READ_8(sBattleAnimScriptPtr);
if (animBankId == ANIM_BANK_ATTACKER)
animBankId = ANIM_BANK_ATK_PARTNER;
else if (animBankId == ANIM_BANK_TARGET)
animBankId = ANIM_BANK_DEF_PARTNER;
if (animBankId == ANIM_BATTLER_ATTACKER)
animBankId = ANIM_BATTLER_ATK_PARTNER;
else if (animBankId == ANIM_BATTLER_TARGET)
animBankId = ANIM_BATTLER_DEF_PARTNER;
if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
bank = gAnimBankAttacker;
else
bank = gAnimBankTarget;
@@ -2181,7 +2181,7 @@ static void ScriptCmd_monbg_22(void)
}
bank ^= 2;
if (animBankId > ANIM_BANK_TARGET && IsAnimBankSpriteVisible(bank))
if (animBankId > ANIM_BATTLER_TARGET && IsAnimBankSpriteVisible(bank))
{
identity = GetBattlerPosition(bank);
identity += 0xFF;
@@ -2204,12 +2204,12 @@ static void ScriptCmd_clearmonbg_23(void)
sBattleAnimScriptPtr++;
animBankId = T1_READ_8(sBattleAnimScriptPtr);
if (animBankId == ANIM_BANK_ATTACKER)
animBankId = ANIM_BANK_ATK_PARTNER;
else if (animBankId == ANIM_BANK_TARGET)
animBankId = ANIM_BANK_DEF_PARTNER;
if (animBankId == ANIM_BATTLER_ATTACKER)
animBankId = ANIM_BATTLER_ATK_PARTNER;
else if (animBankId == ANIM_BATTLER_TARGET)
animBankId = ANIM_BATTLER_DEF_PARTNER;
if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
bank = gAnimBankAttacker;
else
bank = gAnimBankTarget;

2
src/diploma.c
View File

@@ -136,4 +136,4 @@ static void DisplayDiplomaText(void)
StringCopy(gStringVar1, gOtherText_HoennDex);
}
Menu_PrintText(gOtherText_DiplomaCertificationGameFreak, 6, 2);
}
}

2
src/party_menu.c
View File

@@ -5272,4 +5272,4 @@ void unref_sub_8070F90(void)
FlagSet(FLAG_SYS_POKEMON_GET);
FlagSet(FLAG_SYS_POKENAV_GET);
}
#endif
#endif

2
src/reset_rtc_screen.c
View File

@@ -689,4 +689,4 @@ void debug_sub_806F9E4(u8 taskId)
break;
}
}
#endif
#endif

8
src/rom_8077ABC.c
View File

@@ -410,7 +410,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
{
u8 *sprites;
if (whichBank == ANIM_BANK_ATTACKER)
if (whichBank == ANIM_BATTLER_ATTACKER)
{
if (IsBankSpritePresent(gAnimBankAttacker))
{
@@ -422,7 +422,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
return 0xff;
}
}
else if (whichBank == ANIM_BANK_TARGET)
else if (whichBank == ANIM_BATTLER_TARGET)
{
if (IsBankSpritePresent(gAnimBankTarget))
{
@@ -434,7 +434,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
return 0xff;
}
}
else if (whichBank == ANIM_BANK_ATK_PARTNER)
else if (whichBank == ANIM_BATTLER_ATK_PARTNER)
{
if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2))
return 0xff;
@@ -1883,7 +1883,7 @@ u8 GetBattlerSubpriority(u8 bank)
if (IsContest())
{
if (bank == ANIM_BANK_ATK_PARTNER)
if (bank == ANIM_BATTLER_ATK_PARTNER)
return 30;
else
return 40;

2
src/unused_81258BC.c
View File

@@ -33,4 +33,4 @@ void sub_812AF10(void)
{
Menu_DrawStdWindowFrame(2, 14, 27, 19);
Menu_PrintText(gStringVar4, 3, 15);
}
}