Skip to content

Commit e8b149e

Browse files
huderlemhuderlem
authored
Merge pull request #708 from garakmon/createsprite
Change createsprite macro
2 parents 5f202c7 + 2fb6c5b commit e8b149e

15 files changed

+2858
-2854
lines changed

‎data/battle_anim_scripts.s

+2,808-2,808
Large diffs are not rendered by default.

‎include/constants/battle_anim.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,10 @@
301301
#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288)
302302

303303
// battlers
304-
#define ANIM_BANK_ATTACKER 0
305-
#define ANIM_BANK_TARGET 1
306-
#define ANIM_BANK_ATK_PARTNER 2
307-
#define ANIM_BANK_DEF_PARTNER 3
304+
#define ANIM_BATTLER_ATTACKER 0
305+
#define ANIM_BATTLER_TARGET 1
306+
#define ANIM_BATTLER_ATK_PARTNER 2
307+
#define ANIM_BATTLER_DEF_PARTNER 3
308308

309309
// stereo panning constants [0-255]
310310
//

‎include/macros/battle_anim.inc

+10-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@
88
.2byte \id
99
.endm
1010

11-
.macro createsprite template, priority, argv:vararg
12-
.byte 0x02
13-
.4byte \template
14-
.byte \priority
15-
.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
11+
.macro createsprite template, anim_battler, subpriority_offset, argv:vararg
12+
.byte 0x02
13+
.4byte \template
14+
.if \anim_battler == ANIM_BATTLER_TARGET
15+
.byte 0x80 | (\subpriority_offset & 0x7F)
16+
.else
17+
.byte (\subpriority_offset & 0x7F)
18+
.endif
19+
.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
1620
.Lsprite_\@_1:
17-
.2byte \argv
21+
.2byte \argv
1822
.Lsprite_\@_2:
1923
.endm
2024

‎src/battle/anim/fire.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,4 +305,4 @@ static void sub_80D50E8(struct Sprite *sprite)
305305
{
306306
move_anim_8074EE0(sprite);
307307
}
308-
}
308+
}

‎src/battle/anim/flying.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2673,4 +2673,4 @@ void unref_sub_80DB6E4(u8 taskId)
26732673
}
26742674

26752675
DestroyAnimVisualTask(taskId);
2676-
}
2676+
}

‎src/battle/anim/poison.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,4 @@ static void AnimBubbleEffectStep(struct Sprite *sprite)
323323

324324
if (sprite->affineAnimEnded)
325325
DestroyAnimSprite(sprite);
326-
}
326+
}

‎src/battle/anim/sfx.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,4 @@ static void sub_812B404(u8 taskId)
277277
{
278278
DestroyAnimVisualTask(taskId);
279279
}
280-
}
280+
}

‎src/battle/anim/tendrils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,4 @@ static void sub_80CB2D4(struct Sprite* sprite)
119119
DestroyAnimSprite(sprite);
120120
}
121121
}
122-
}
122+
}

‎src/battle/anim/wisp_fire.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,4 @@ void sub_80D60B4(u8 taskId)
229229
gSprites[spriteId].pos2.y = 0;
230230
DestroyAnimVisualTask(taskId);
231231
}
232-
}
232+
}

‎src/battle/battle_anim.c

+22-22
Original file line numberDiff line numberDiff line change
@@ -1824,12 +1824,12 @@ static void ScriptCmd_monbg(void)
18241824

18251825
sBattleAnimScriptPtr++;
18261826
animBank = T1_READ_8(sBattleAnimScriptPtr);
1827-
if (animBank == ANIM_BANK_ATTACKER)
1828-
animBank = ANIM_BANK_ATK_PARTNER;
1829-
else if (animBank == ANIM_BANK_TARGET)
1830-
animBank = ANIM_BANK_DEF_PARTNER;
1827+
if (animBank == ANIM_BATTLER_ATTACKER)
1828+
animBank = ANIM_BATTLER_ATK_PARTNER;
1829+
else if (animBank == ANIM_BATTLER_TARGET)
1830+
animBank = ANIM_BATTLER_DEF_PARTNER;
18311831

1832-
if (animBank == ANIM_BANK_ATTACKER || animBank == ANIM_BANK_ATK_PARTNER)
1832+
if (animBank == ANIM_BATTLER_ATTACKER || animBank == ANIM_BATTLER_ATK_PARTNER)
18331833
bank = gBattleAnimAttacker;
18341834
else
18351835
bank = gBattleAnimTarget;
@@ -1866,7 +1866,7 @@ static void ScriptCmd_monbg(void)
18661866
}
18671867

18681868
bank ^= 2;
1869-
if (animBank >= ANIM_BANK_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
1869+
if (animBank >= ANIM_BATTLER_ATK_PARTNER && IsAnimBankSpriteVisible(bank))
18701870
{
18711871
identity = GetBattlerPosition(bank);
18721872
identity += 0xFF;
@@ -2095,12 +2095,12 @@ static void ScriptCmd_clearmonbg(void)
20952095
sBattleAnimScriptPtr++;
20962096
animBankId = T1_READ_8(sBattleAnimScriptPtr);
20972097

2098-
if (animBankId == ANIM_BANK_ATTACKER)
2099-
animBankId = ANIM_BANK_ATK_PARTNER;
2100-
else if (animBankId == ANIM_BANK_TARGET)
2101-
animBankId = ANIM_BANK_DEF_PARTNER;
2098+
if (animBankId == ANIM_BATTLER_ATTACKER)
2099+
animBankId = ANIM_BATTLER_ATK_PARTNER;
2100+
else if (animBankId == ANIM_BATTLER_TARGET)
2101+
animBankId = ANIM_BATTLER_DEF_PARTNER;
21022102

2103-
if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
2103+
if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
21042104
bank = gBattleAnimAttacker;
21052105
else
21062106
bank = gBattleAnimTarget;
@@ -2158,12 +2158,12 @@ static void ScriptCmd_monbg_22(void)
21582158
sBattleAnimScriptPtr++;
21592159
animBankId = T1_READ_8(sBattleAnimScriptPtr);
21602160

2161-
if (animBankId == ANIM_BANK_ATTACKER)
2162-
animBankId = ANIM_BANK_ATK_PARTNER;
2163-
else if (animBankId == ANIM_BANK_TARGET)
2164-
animBankId = ANIM_BANK_DEF_PARTNER;
2161+
if (animBankId == ANIM_BATTLER_ATTACKER)
2162+
animBankId = ANIM_BATTLER_ATK_PARTNER;
2163+
else if (animBankId == ANIM_BATTLER_TARGET)
2164+
animBankId = ANIM_BATTLER_DEF_PARTNER;
21652165

2166-
if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
2166+
if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
21672167
bank = gBattleAnimAttacker;
21682168
else
21692169
bank = gBattleAnimTarget;
@@ -2181,7 +2181,7 @@ static void ScriptCmd_monbg_22(void)
21812181
}
21822182

21832183
bank ^= 2;
2184-
if (animBankId > ANIM_BANK_TARGET && IsAnimBankSpriteVisible(bank))
2184+
if (animBankId > ANIM_BATTLER_TARGET && IsAnimBankSpriteVisible(bank))
21852185
{
21862186
identity = GetBattlerPosition(bank);
21872187
identity += 0xFF;
@@ -2204,12 +2204,12 @@ static void ScriptCmd_clearmonbg_23(void)
22042204
sBattleAnimScriptPtr++;
22052205
animBankId = T1_READ_8(sBattleAnimScriptPtr);
22062206

2207-
if (animBankId == ANIM_BANK_ATTACKER)
2208-
animBankId = ANIM_BANK_ATK_PARTNER;
2209-
else if (animBankId == ANIM_BANK_TARGET)
2210-
animBankId = ANIM_BANK_DEF_PARTNER;
2207+
if (animBankId == ANIM_BATTLER_ATTACKER)
2208+
animBankId = ANIM_BATTLER_ATK_PARTNER;
2209+
else if (animBankId == ANIM_BATTLER_TARGET)
2210+
animBankId = ANIM_BATTLER_DEF_PARTNER;
22112211

2212-
if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER)
2212+
if (animBankId == ANIM_BATTLER_ATTACKER || animBankId == ANIM_BATTLER_ATK_PARTNER)
22132213
bank = gBattleAnimAttacker;
22142214
else
22152215
bank = gBattleAnimTarget;

‎src/diploma.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ static void DisplayDiplomaText(void)
136136
StringCopy(gStringVar1, gOtherText_HoennDex);
137137
}
138138
Menu_PrintText(gOtherText_DiplomaCertificationGameFreak, 6, 2);
139-
}
139+
}

‎src/party_menu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5272,4 +5272,4 @@ void unref_sub_8070F90(void)
52725272
FlagSet(FLAG_SYS_POKEMON_GET);
52735273
FlagSet(FLAG_SYS_POKENAV_GET);
52745274
}
5275-
#endif
5275+
#endif

‎src/reset_rtc_screen.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -689,4 +689,4 @@ void debug_sub_806F9E4(u8 taskId)
689689
break;
690690
}
691691
}
692-
#endif
692+
#endif

‎src/rom_8077ABC.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
410410
{
411411
u8 *sprites;
412412

413-
if (whichBank == ANIM_BANK_ATTACKER)
413+
if (whichBank == ANIM_BATTLER_ATTACKER)
414414
{
415415
if (IsBankSpritePresent(gBattleAnimAttacker))
416416
{
@@ -422,7 +422,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
422422
return 0xff;
423423
}
424424
}
425-
else if (whichBank == ANIM_BANK_TARGET)
425+
else if (whichBank == ANIM_BATTLER_TARGET)
426426
{
427427
if (IsBankSpritePresent(gBattleAnimTarget))
428428
{
@@ -434,7 +434,7 @@ u8 GetAnimBattlerSpriteId(u8 whichBank)
434434
return 0xff;
435435
}
436436
}
437-
else if (whichBank == ANIM_BANK_ATK_PARTNER)
437+
else if (whichBank == ANIM_BATTLER_ATK_PARTNER)
438438
{
439439
if (!IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2))
440440
return 0xff;
@@ -1883,7 +1883,7 @@ u8 GetBattlerSubpriority(u8 bank)
18831883

18841884
if (IsContest())
18851885
{
1886-
if (bank == ANIM_BANK_ATK_PARTNER)
1886+
if (bank == ANIM_BATTLER_ATK_PARTNER)
18871887
return 30;
18881888
else
18891889
return 40;

‎src/unused_81258BC.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ void sub_812AF10(void)
3333
{
3434
Menu_DrawStdWindowFrame(2, 14, 27, 19);
3535
Menu_PrintText(gStringVar4, 3, 15);
36-
}
36+
}

0 commit comments

Comments
 (0)