summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_message.c1
-rw-r--r--src/battle_pike.c2
-rw-r--r--src/battle_util.c7
-rw-r--r--src/berry.c1
-rw-r--r--src/berry_blender.c1
-rw-r--r--src/berry_tag_screen.c1
-rw-r--r--src/crt0.s48
-rwxr-xr-xsrc/data/object_events/movement_type_func_tables.h4
-rw-r--r--src/data/pokemon/item_effects.h24
-rw-r--r--src/daycare.c16
-rw-r--r--src/egg_hatch.c6
-rw-r--r--src/event_object_movement.c22
-rw-r--r--src/evolution_graphics.c443
-rw-r--r--src/evolution_scene.c1039
-rw-r--r--src/field_effect.c4
-rw-r--r--src/field_weather.c8
-rwxr-xr-xsrc/item_menu.c10
-rw-r--r--src/menu_specialized.c1
-rwxr-xr-xsrc/party_menu.c8
-rw-r--r--src/pokeblock.c1
-rw-r--r--src/pokemon.c114
-rw-r--r--src/pokemon_size_record.c6
-rw-r--r--src/pokemon_storage_system.c24
-rw-r--r--src/scrcmd.c12
-rw-r--r--src/trade.c16
-rw-r--r--src/trainer_see.c60
-rw-r--r--src/tv.c28
-rw-r--r--src/util.c7
28 files changed, 1059 insertions, 855 deletions
diff --git a/src/battle_message.c b/src/battle_message.c
index 3920f94cf..46444a8fa 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -21,7 +21,6 @@
#include "window.h"
#include "constants/battle_dome.h"
#include "constants/battle_string_ids.h"
-#include "constants/berry.h"
#include "constants/frontier_util.h"
#include "constants/items.h"
#include "constants/moves.h"
diff --git a/src/battle_pike.c b/src/battle_pike.c
index a161b88b8..ed18b2f71 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -1326,7 +1326,7 @@ bool8 InBattlePike(void)
return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS
- || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC;
+ || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED;
}
static void SetHintedRoom(void)
diff --git a/src/battle_util.c b/src/battle_util.c
index b7919f904..2bf06f331 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -29,7 +29,6 @@
#include "constants/battle_move_effects.h"
#include "constants/battle_script_commands.h"
#include "constants/battle_string_ids.h"
-#include "constants/berry.h"
#include "constants/hold_effects.h"
#include "constants/items.h"
#include "constants/moves.h"
@@ -3950,14 +3949,14 @@ u8 GetMoveTarget(u16 move, u8 setTarget)
return targetBattler;
}
-static bool32 HasObedientBitSet(u8 battlerId)
+static bool32 IsNotEventLegalMewOrDeoxys(u8 battlerId)
{
if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT)
return TRUE;
if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
&& GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
return TRUE;
- return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_OBEDIENCE, NULL);
+ return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_EVENT_LEGAL, NULL);
}
u8 IsMonDisobedient(void)
@@ -3971,7 +3970,7 @@ u8 IsMonDisobedient(void)
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)
return 0;
- if (HasObedientBitSet(gBattlerAttacker)) // only if species is Mew or Deoxys
+ if (IsNotEventLegalMewOrDeoxys(gBattlerAttacker)) // only if species is Mew or Deoxys
{
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gBattlerAttacker) == 2)
return 0;
diff --git a/src/berry.c b/src/berry.c
index 022fdc934..ea62deabf 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -11,7 +11,6 @@
#include "random.h"
#include "string_util.h"
#include "text.h"
-#include "constants/berry.h"
#include "constants/event_object_movement.h"
#include "constants/items.h"
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 08a25c58a..252407562 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -34,7 +34,6 @@
#include "new_game.h"
#include "save.h"
#include "strings.h"
-#include "constants/berry.h"
#include "constants/game_stat.h"
#include "constants/items.h"
#include "constants/rgb.h"
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 089228b17..5be149b0f 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -26,7 +26,6 @@
#include "item_menu_icons.h"
#include "decompress.h"
#include "international_string_util.h"
-#include "constants/berry.h"
#include "constants/items.h"
#include "constants/rgb.h"
#include "constants/songs.h"
diff --git a/src/crt0.s b/src/crt0.s
index 49f214f80..385e340a5 100644
--- a/src/crt0.s
+++ b/src/crt0.s
@@ -1,3 +1,4 @@
+#include "constants/global.h"
.include "constants/gba_constants.inc"
.syntax unified
@@ -34,8 +35,8 @@ GPIOPortReadEnable: @ 80000C8
@ 80000CC
.space 0x34
- .4byte 3
- .4byte 2
+ .4byte GAME_VERSION
+ .4byte GAME_LANGUAGE
.ascii "pokemon emerald version"
.space 9
@@ -51,17 +52,33 @@ GPIOPortReadEnable: @ 80000C8
.4byte gMoveNames
.4byte gDecorations
- .4byte 0x00001270, 0x0000139c, 0x00000018, 0x00000988
- .4byte 0x00003b24, 0x00000046, 0x000008e4, 0x000008ac
- .4byte 0x00000182
+ .4byte 0x00001270 @ offsetof(struct SaveBlock1, flags)
+ .4byte 0x0000139c @ offsetof(struct SaveBlock1, vars)
+ .4byte 0x00000018 @ offsetof(struct SaveBlock2, pokedex)
+ .4byte 0x00000988 @ offsetof(struct SaveBlock1, seen1)
+ .4byte 0x00003b24 @ offsetof(struct SaveBlock1, seen2)
+ .4byte 0x00000046 @ ?
+ .4byte 0x000008e4 @ ?
+ .4byte 0x000008ac @ ?
+ .4byte 0x00000182 @ NATIONAL_DEX_COUNT?
.byte 0x07, 0x0a, 0x0a, 0x0a, 0x0c, 0x0c, 0x06, 0x0c
.byte 0x06, 0x10, 0x12, 0x0c, 0x0f, 0x0b, 0x01, 0x08
- .4byte 0x0000000c, 0x00000f2c, 0x00003d88, 0x00000234
- .4byte 0x00000238, 0x00000009, 0x0000000a, 0x00000000
- .4byte 0x00000008, 0x00000ca8, 0x00000ca8, 0x000031c7
- .4byte 0x000031b3, 0x00000000
+ .4byte 0x0000000c @ ?
+ .4byte 0x00000f2c @ sizeof(struct SaveBlock2)
+ .4byte 0x00003d88 @ sizeof(struct SaveBlock1)
+ .4byte 0x00000234 @ offsetof(struct SaveBlock1, playerPartyCount)
+ .4byte 0x00000238 @ offsetof(struct SaveBlock1, playerParty)
+ .4byte 0x00000009 @ offsetof(struct SaveBlock2, specialSaveWarpFlags)
+ .4byte 0x0000000a @ offsetof(struct SaveBlock2, playerTrainerId)
+ .4byte 0x00000000 @ offsetof(struct SaveBlock2, playerName)
+ .4byte 0x00000008 @ offsetof(struct SaveBlock2, playerGender)
+ .4byte 0x00000ca8 @ offsetof(struct SaveBlock2, frontier.challengeStatus)
+ .4byte 0x00000ca8 @ offsetof(struct SaveBlock2, frontier.challengeStatus)
+ .4byte 0x000031c7 @ offsetof(struct SaveBlock1, externalEventFlags)
+ .4byte 0x000031b3 @ offsetof(struct SaveBlock1, externalEventData)
+ .4byte 0x00000000
.4byte gBaseStats
.4byte gAbilityNames
@@ -71,12 +88,19 @@ GPIOPortReadEnable: @ 80000C8
.4byte gBallSpriteSheets
.4byte gBallSpritePalettes
- .4byte 0x000000a8, 0x00000864, 0x0000089b
+ .4byte 0x000000a8 @ offsetof(struct SaveBlock2, gcnLinkFlags)
+ .4byte 0x00000864 @ ?
+ .4byte 0x0000089b @ ?
.byte 0x1e, 0x1e, 0x10, 0x40
- .4byte 0x0000322e, 0x00000498, 0x000031a8, 0x000031f8
- .4byte 0x00000034, 0x00000000, 0x00000000
+ .4byte 0x0000322e @ offsetof(struct SaveBlock1, ? part-way into unk_322C)
+ .4byte 0x00000498 @ offsetof(struct SaveBlock1, pcItems)
+ .4byte 0x000031a8 @ offsetof(struct SaveBlock1, giftRibbons)
+ .4byte 0x000031f8 @ offsetof(struct SaveBlock1, enigmaBerry)
+ .4byte 0x00000034 @ offsetof(struct SaveBlock1, mapView)
+ .4byte 0x00000000
+ .4byte 0x00000000
.arm
.align 2, 0
diff --git a/src/data/object_events/movement_type_func_tables.h b/src/data/object_events/movement_type_func_tables.h
index 68dfeb730..f4890d684 100755
--- a/src/data/object_events/movement_type_func_tables.h
+++ b/src/data/object_events/movement_type_func_tables.h
@@ -407,8 +407,8 @@ u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct ObjectEvent *, struct
MovementType_CopyPlayer_Step2,
};
-u8 (*const gMovementTypeFuncs_Hidden[])(struct ObjectEvent *, struct Sprite *) = {
- MovementType_Hidden_Step0,
+u8 (*const gMovementTypeFuncs_Buried[])(struct ObjectEvent *, struct Sprite *) = {
+ MovementType_Buried_Step0,
};
u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct ObjectEvent *, struct Sprite *) = {
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index 1ed721e44..1d7f16b90 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -163,7 +163,7 @@ const u8 gItemEffect_SacredAsh[7] = {
const u8 gItemEffect_HPUp[10] = {
[4] = ITEM4_EV_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = 10,
+ [6] = ITEM6_ADD_EV,
[7] = 5,
[8] = 3,
[9] = 2,
@@ -172,7 +172,7 @@ const u8 gItemEffect_HPUp[10] = {
const u8 gItemEffect_Protein[10] = {
[4] = ITEM4_EV_ATK,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = 10,
+ [6] = ITEM6_ADD_EV,
[7] = 5,
[8] = 3,
[9] = 2,
@@ -180,7 +180,7 @@ const u8 gItemEffect_Protein[10] = {
const u8 gItemEffect_Iron[10] = {
[5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
- [6] = 10,
+ [6] = ITEM6_ADD_EV,
[7] = 5,
[8] = 3,
[9] = 2,
@@ -188,7 +188,7 @@ const u8 gItemEffect_Iron[10] = {
const u8 gItemEffect_Carbos[10] = {
[5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
- [6] = 10,
+ [6] = ITEM6_ADD_EV,
[7] = 5,
[8] = 3,
[9] = 2,
@@ -196,7 +196,7 @@ const u8 gItemEffect_Carbos[10] = {
const u8 gItemEffect_Calcium[10] = {
[5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
- [6] = 10,
+ [6] = ITEM6_ADD_EV,
[7] = 5,
[8] = 3,
[9] = 2,
@@ -222,7 +222,7 @@ const u8 gItemEffect_PPUp[9] = {
const u8 gItemEffect_Zinc[10] = {
[5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
- [6] = 10,
+ [6] = ITEM6_ADD_EV,
[7] = 5,
[8] = 3,
[9] = 2,
@@ -354,7 +354,7 @@ const u8 gItemEffect_SitrusBerry[7] = {
const u8 gItemEffect_PomegBerry[10] = {
[4] = ITEM4_EV_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = -10,
+ [6] = ITEM6_SUBTRACT_EV,
[7] = 10,
[8] = 5,
[9] = 2,
@@ -363,7 +363,7 @@ const u8 gItemEffect_PomegBerry[10] = {
const u8 gItemEffect_KelpsyBerry[10] = {
[4] = ITEM4_EV_ATK,
[5] = ITEM5_FRIENDSHIP_ALL,
- [6] = -10,
+ [6] = ITEM6_SUBTRACT_EV,
[7] = 10,
[8] = 5,
[9] = 2,
@@ -371,7 +371,7 @@ const u8 gItemEffect_KelpsyBerry[10] = {
const u8 gItemEffect_QualotBerry[10] = {
[5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
- [6] = -10,
+ [6] = ITEM6_SUBTRACT_EV,
[7] = 10,
[8] = 5,
[9] = 2,
@@ -379,7 +379,7 @@ const u8 gItemEffect_QualotBerry[10] = {
const u8 gItemEffect_HondewBerry[10] = {
[5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
- [6] = -10,
+ [6] = ITEM6_SUBTRACT_EV,
[7] = 10,
[8] = 5,
[9] = 2,
@@ -387,7 +387,7 @@ const u8 gItemEffect_HondewBerry[10] = {
const u8 gItemEffect_GrepaBerry[10] = {
[5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
- [6] = -10,
+ [6] = ITEM6_SUBTRACT_EV,
[7] = 10,
[8] = 5,
[9] = 2,
@@ -395,7 +395,7 @@ const u8 gItemEffect_GrepaBerry[10] = {
const u8 gItemEffect_TamatoBerry[10] = {
[5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
- [6] = -10,
+ [6] = ITEM6_SUBTRACT_EV,
[7] = 10,
[8] = 5,
[9] = 2,
diff --git a/src/daycare.c b/src/daycare.c
index e2b5d2deb..14cf57806 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -894,8 +894,8 @@ static bool8 TryProduceOrHatchEgg(struct DayCare *daycare)
// Check if an egg should be produced
if (daycare->offspringPersonality == 0 && validEggs == DAYCARE_MON_COUNT && (daycare->mons[1].steps & 0xFF) == 0xFF)
{
- u8 compatability = GetDaycareCompatibilityScore(daycare);
- if (compatability > (Random() * 100u) / USHRT_MAX)
+ u8 compatibility = GetDaycareCompatibilityScore(daycare);
+ if (compatibility > (Random() * 100u) / USHRT_MAX)
TriggerPendingDaycareEgg();
}
@@ -1050,7 +1050,7 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
if (trainerIds[0] == trainerIds[1])
return PARENTS_LOW_COMPATIBILITY;
- return PARENTS_MED_COMPATABILITY;
+ return PARENTS_MED_COMPATIBILITY;
}
// neither parent is Ditto
else
@@ -1065,14 +1065,14 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
if (species[0] == species[1])
{
if (trainerIds[0] == trainerIds[1])
- return PARENTS_MED_COMPATABILITY; // same species, same trainer
+ return PARENTS_MED_COMPATIBILITY; // same species, same trainer
- return PARENTS_MAX_COMPATABILITY; // same species, different trainers
+ return PARENTS_MAX_COMPATIBILITY; // same species, different trainers
}
else
{
if (trainerIds[0] != trainerIds[1])
- return PARENTS_MED_COMPATABILITY; // different species, different trainers
+ return PARENTS_MED_COMPATIBILITY; // different species, different trainers
return PARENTS_LOW_COMPATIBILITY; // different species, same trainer
}
@@ -1095,9 +1095,9 @@ void SetDaycareCompatibilityString(void)
whichString = 3;
if (relationshipScore == PARENTS_LOW_COMPATIBILITY)
whichString = 2;
- if (relationshipScore == PARENTS_MED_COMPATABILITY)
+ if (relationshipScore == PARENTS_MED_COMPATIBILITY)
whichString = 1;
- if (relationshipScore == PARENTS_MAX_COMPATABILITY)
+ if (relationshipScore == PARENTS_MAX_COMPATIBILITY)
whichString = 0;
StringCopy(gStringVar4, sCompatibilityMessages[whichString]);
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 4e050ce62..5b80bfb6c 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -297,7 +297,7 @@ static void CreateHatchedMon(struct Pokemon *egg, struct Pokemon *temp)
{
u16 species;
u32 personality, pokerus;
- u8 i, friendship, language, gameMet, markings, obedience;
+ u8 i, friendship, language, gameMet, markings, isEventLegal;
u16 moves[MAX_MON_MOVES];
u32 ivs[NUM_STATS];
@@ -320,7 +320,7 @@ static void CreateHatchedMon(struct Pokemon *egg, struct Pokemon *temp)
gameMet = GetMonData(egg, MON_DATA_MET_GAME);
markings = GetMonData(egg, MON_DATA_MARKINGS);
pokerus = GetMonData(egg, MON_DATA_POKERUS);
- obedience = GetMonData(egg, MON_DATA_OBEDIENCE);
+ isEventLegal = GetMonData(egg, MON_DATA_EVENT_LEGAL);
CreateMon(temp, species, EGG_HATCH_LEVEL, USE_RANDOM_IVS, TRUE, personality, OT_ID_PLAYER_ID, 0);
@@ -342,7 +342,7 @@ static void CreateHatchedMon(struct Pokemon *egg, struct Pokemon *temp)
friendship = 120;
SetMonData(temp, MON_DATA_FRIENDSHIP, &friendship);
SetMonData(temp, MON_DATA_POKERUS, &pokerus);
- SetMonData(temp, MON_DATA_OBEDIENCE, &obedience);
+ SetMonData(temp, MON_DATA_EVENT_LEGAL, &isEventLegal);
*egg = *temp;
}
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index f6e638f31..1a7d08db2 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -101,7 +101,7 @@ static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*);
static void UpdateObjectEventSpritePosition(struct Sprite*);
static void ApplyLevitateMovement(u8);
static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *);
-static bool8 MovementType_Hidden_Callback(struct ObjectEvent *, struct Sprite *);
+static bool8 MovementType_Buried_Callback(struct ObjectEvent *, struct Sprite *);
static void CreateReflectionEffectSprites(void);
static u8 GetObjectEventIdByLocalId(u8);
static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8);
@@ -212,7 +212,7 @@ static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
[MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = MovementType_CopyPlayerInGrass,
[MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
[MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
- [MOVEMENT_TYPE_HIDDEN] = MovementType_Hidden,
+ [MOVEMENT_TYPE_BURIED] = MovementType_Buried,
[MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace,
[MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace,
[MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace,
@@ -296,7 +296,7 @@ const u8 gRangedMovementTypes[] = {
[MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = 1,
[MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = 1,
[MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = 1,
- [MOVEMENT_TYPE_HIDDEN] = 0,
+ [MOVEMENT_TYPE_BURIED] = 0,
[MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = 0,
[MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0,
[MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0,
@@ -380,7 +380,7 @@ const u8 gInitialMovementTypeFacingDirections[] = {
[MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH,
[MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST,
[MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST,
- [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH,
+ [MOVEMENT_TYPE_BURIED] = DIR_SOUTH,
[MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH,
[MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH,
[MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST,
@@ -4467,7 +4467,7 @@ void MovementType_MountainDisguise(struct Sprite *sprite)
UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback);
}
-void MovementType_Hidden(struct Sprite *sprite)
+void MovementType_Buried(struct Sprite *sprite)
{
if (!sprite->data[7])
{
@@ -4476,15 +4476,15 @@ void MovementType_Hidden(struct Sprite *sprite)
sprite->oam.priority = 3;
sprite->data[7]++;
}
- UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Hidden_Callback);
+ UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Buried_Callback);
}
-static bool8 MovementType_Hidden_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static bool8 MovementType_Buried_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- return gMovementTypeFuncs_Hidden[sprite->data[1]](objectEvent, sprite);
+ return gMovementTypeFuncs_Buried[sprite->data[1]](objectEvent, sprite);
}
-bool8 MovementType_Hidden_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+bool8 MovementType_Buried_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
ClearObjectEventMovement(objectEvent, sprite);
return FALSE;
@@ -6600,9 +6600,9 @@ bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, struct Sp
bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN)
+ if (objectEvent->movementType == MOVEMENT_TYPE_BURIED)
{
- SetHiddenTrainerMovement(objectEvent);
+ SetBuriedTrainerMovement(objectEvent);
return FALSE;
}
if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 28bbd4ef7..a66a7a28d 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -10,40 +10,46 @@
#include "palette.h"
#include "constants/rgb.h"
-// this file's functions
-static void EvoSparkle_DummySpriteCb(struct Sprite* sprite);
-static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID);
-static void EvoTask_CreatePreEvoSparkleSet1(u8 taskID);
-static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskID);
-static void EvoTask_BeginPreSparklesSet2(u8 taskID);
-static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID);
-static void EvoTask_DestroyPreSet2Task(u8 taskID);
-static void EvoTask_BeginPostSparklesSet1(u8 taskID);
-static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID);
-static void EvoTask_DestroyPostSet1Task(u8 taskID);
-static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID);
-static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID);
-static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID);
-static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID);
-static void EvoTask_DestroyPostSet2AndFlashTask(u8 taskID);
-static void sub_817C4EC(u8 taskID);
-static void sub_817C510(u8 taskID);
-static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID);
-static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskID);
-static void sub_817C560(u8 taskID);
-
-static const u16 sEvoSparklePalette[] = INCBIN_U16("graphics/misc/evo_sparkle.gbapal");
-static const u32 sEvoSparkleTiles[] = INCBIN_U32("graphics/misc/evo_sparkle.4bpp.lz");
+static void SpriteCB_Sparkle_Dummy(struct Sprite* sprite);
+
+static void Task_Sparkles_SpiralUpward_Init(u8 taskId);
+static void Task_Sparkles_SpiralUpward(u8 taskId);
+static void Task_Sparkles_SpiralUpward_End(u8 taskId);
+
+static void Task_Sparkles_ArcDown_Init(u8 taskId);
+static void Task_Sparkles_ArcDown(u8 taskId);
+static void Task_Sparkles_ArcDown_End(u8 taskId);
+
+static void Task_Sparkles_CircleInward_Init(u8 taskId);
+static void Task_Sparkles_CircleInward(u8 taskId);
+static void Task_Sparkles_CircleInward_End(u8 taskId);
+
+static void Task_Sparkles_SprayAndFlash_Init(u8 taskId);
+static void Task_Sparkles_SprayAndFlash(u8 taskId);
+static void Task_Sparkles_SprayAndFlashTrade_Init(u8 taskId);
+static void Task_Sparkles_SprayAndFlashTrade(u8 taskId);
+static void Task_Sparkles_SprayAndFlash_End(u8 taskId);
+
+static void Task_CycleEvolutionMonSprite_Init(u8 taskId);
+static void Task_CycleEvolutionMonSprite_TryEnd(u8 taskId);
+static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId);
+static void EndOnPreEvoMon(u8 taskId);
+static void EndOnPostEvoMon(u8 taskId);
+
+#define TAG_SPARKLE 1001
+
+static const u16 sEvoSparkle_Pal[] = INCBIN_U16("graphics/misc/evo_sparkle.gbapal");
+static const u32 sEvoSparkle_Gfx[] = INCBIN_U32("graphics/misc/evo_sparkle.4bpp.lz");
static const struct CompressedSpriteSheet sEvoSparkleSpriteSheets[] =
{
- {sEvoSparkleTiles, 0x20, 1001},
+ {sEvoSparkle_Gfx, 0x20, TAG_SPARKLE},
{NULL, 0, 0}
};
static const struct SpritePalette sEvoSparkleSpritePals[] =
{
- {sEvoSparklePalette, 1001},
+ {sEvoSparkle_Pal, TAG_SPARKLE},
{NULL, 0}
};
@@ -77,13 +83,13 @@ static const union AnimCmd *const sSpriteAnimTable_EvoSparkle[] =
static const struct SpriteTemplate sEvoSparkleSpriteTemplate =
{
- .tileTag = 1001,
- .paletteTag = 1001,
+ .tileTag = TAG_SPARKLE,
+ .paletteTag = TAG_SPARKLE,
.oam = &sOamData_EvoSparkle,
.anims = sSpriteAnimTable_EvoSparkle,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
- .callback = EvoSparkle_DummySpriteCb
+ .callback = SpriteCB_Sparkle_Dummy
};
static const s16 sEvoSparkleMatrices[] =
@@ -93,7 +99,7 @@ static const s16 sEvoSparkleMatrices[] =
-1, 0x70, 0x1, 0x70, 0x2, 0x50, 0x3, 0x30, 0x4, 0x10
};
-static void EvoSparkle_DummySpriteCb(struct Sprite *sprite)
+static void SpriteCB_Sparkle_Dummy(struct Sprite *sprite)
{
}
@@ -107,7 +113,7 @@ static void SetEvoSparklesMatrices(void)
}
}
-static void SpriteCB_PreEvoSparkleSet1(struct Sprite* sprite)
+static void SpriteCB_Sparkle_SpiralUpward(struct Sprite* sprite)
{
if (sprite->pos1.y > 8)
{
@@ -133,7 +139,7 @@ static void SpriteCB_PreEvoSparkleSet1(struct Sprite* sprite)
DestroySprite(sprite);
}
-static void CreatePreEvoSparkleSet1(u8 arg0)
+static void CreateSparkle_SpiralUpward(u8 arg0)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 88, 0);
if (spriteID != MAX_SPRITES)
@@ -143,11 +149,11 @@ static void CreatePreEvoSparkleSet1(u8 arg0)
gSprites[spriteID].data[7] = 0;
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 31;
- gSprites[spriteID].callback = SpriteCB_PreEvoSparkleSet1;
+ gSprites[spriteID].callback = SpriteCB_Sparkle_SpiralUpward;
}
}
-static void SpriteCB_PreEvoSparkleSet2(struct Sprite* sprite)
+static void SpriteCB_Sparkle_ArcDown(struct Sprite* sprite)
{
if (sprite->pos1.y < 88)
{
@@ -161,7 +167,7 @@ static void SpriteCB_PreEvoSparkleSet2(struct Sprite* sprite)
DestroySprite(sprite);
}
-static void CreatePreEvoSparkleSet2(u8 arg0)
+static void CreateSparkle_ArcDown(u8 arg0)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 8, 0);
if (spriteID != MAX_SPRITES)
@@ -172,11 +178,11 @@ static void CreatePreEvoSparkleSet2(u8 arg0)
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 25;
gSprites[spriteID].subpriority = 1;
- gSprites[spriteID].callback = SpriteCB_PreEvoSparkleSet2;
+ gSprites[spriteID].callback = SpriteCB_Sparkle_ArcDown;
}
}
-static void SpriteCB_PostEvoSparkleSet1(struct Sprite* sprite)
+static void SpriteCB_Sparkle_CircleInward(struct Sprite* sprite)
{
if (sprite->data[5] > 8)
{
@@ -189,7 +195,7 @@ static void SpriteCB_PostEvoSparkleSet1(struct Sprite* sprite)
DestroySprite(sprite);
}
-static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1)
+static void CreateSparkle_CircleInward(u8 arg0, u8 arg1)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
if (spriteID != MAX_SPRITES)
@@ -201,11 +207,11 @@ static void CreatePostEvoSparkleSet1(u8 arg0, u8 arg1)
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 31;
gSprites[spriteID].subpriority = 1;
- gSprites[spriteID].callback = SpriteCB_PostEvoSparkleSet1;
+ gSprites[spriteID].callback = SpriteCB_Sparkle_CircleInward;
}
}
-static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite)
+static void SpriteCB_Sparkle_Spray(struct Sprite* sprite)
{
if (!(sprite->data[7] & 3))
sprite->pos1.y++;
@@ -235,7 +241,7 @@ static void SpriteCB_PostEvoSparkleSet2(struct Sprite* sprite)
DestroySprite(sprite);
}
-static void CreatePostEvoSparkleSet2(u8 arg0)
+static void CreateSparkle_Spray(u8 id)
{
u8 spriteID = CreateSprite(&sEvoSparkleSpriteTemplate, 120, 56, 0);
if (spriteID != MAX_SPRITES)
@@ -246,7 +252,7 @@ static void CreatePostEvoSparkleSet2(u8 arg0)
gSprites[spriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteID].oam.matrixNum = 31;
gSprites[spriteID].subpriority = 20;
- gSprites[spriteID].callback = SpriteCB_PostEvoSparkleSet2;
+ gSprites[spriteID].callback = SpriteCB_Sparkle_Spray;
}
}
@@ -256,357 +262,386 @@ void LoadEvoSparkleSpriteAndPal(void)
LoadSpritePalettes(sEvoSparkleSpritePals);
}
-#define tFrameCounter data[15]
+#define tPalNum data[1]
+#define tTimer data[15]
-u8 LaunchTask_PreEvoSparklesSet1(u16 arg0)
+u8 EvolutionSparkles_SpiralUpward(u16 palNum)
{
- u8 taskID = CreateTask(EvoTask_BeginPreSet1_FadeAndPlaySE, 0);
- gTasks[taskID].data[1] = arg0;
- return taskID;
+ u8 taskId = CreateTask(Task_Sparkles_SpiralUpward_Init, 0);
+ gTasks[taskId].tPalNum = palNum;
+ return taskId;
}
-static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID)
+static void Task_Sparkles_SpiralUpward_Init(u8 taskId)
{
SetEvoSparklesMatrices();
- gTasks[taskID].tFrameCounter = 0;
- BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, RGB_WHITE);
- gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1;
- PlaySE(SE_M_MEGA_KICK);
+ gTasks[taskId].tTimer = 0;
+ BeginNormalPaletteFade(3 << gTasks[taskId].tPalNum, 0xA, 0, 0x10, RGB_WHITE);
+ gTasks[taskId].func = Task_Sparkles_SpiralUpward;
+ PlaySE(SE_M_MEGA_KICK); // 'Charging up' sound for the sparkles as they spiral upwards
}
-static void EvoTask_CreatePreEvoSparkleSet1(u8 taskID)
+static void Task_Sparkles_SpiralUpward(u8 taskId)
{
- if (gTasks[taskID].tFrameCounter < 64)
+ if (gTasks[taskId].tTimer < 64)
{
- if (!(gTasks[taskID].tFrameCounter & 7))
+ if (!(gTasks[taskId].tTimer & 7))
{
u8 i;
for (i = 0; i < 4; i++)
- CreatePreEvoSparkleSet1((0x78 & gTasks[taskID].tFrameCounter) * 2 + i * 64);
+ CreateSparkle_SpiralUpward((0x78 & gTasks[taskId].tTimer) * 2 + i * 64);
}
- gTasks[taskID].tFrameCounter++;
+ gTasks[taskId].tTimer++;
}
else
{
- gTasks[taskID].tFrameCounter = 96;
- gTasks[taskID].func = EvoTask_WaitForPre1SparklesToGoUp;
+ gTasks[taskId].tTimer = 96;
+ gTasks[taskId].func = Task_Sparkles_SpiralUpward_End;
}
}
-static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskID)
+static void Task_Sparkles_SpiralUpward_End(u8 taskId)
{
- if (gTasks[taskID].tFrameCounter != 0)
- gTasks[taskID].tFrameCounter--;
+ if (gTasks[taskId].tTimer != 0)
+ gTasks[taskId].tTimer--;
else
- DestroyTask(taskID);
+ DestroyTask(taskId);
}
-u8 LaunchTask_PreEvoSparklesSet2(void)
+u8 EvolutionSparkles_ArcDown(void)
{
- return CreateTask(EvoTask_BeginPreSparklesSet2, 0);
+ return CreateTask(Task_Sparkles_ArcDown_Init, 0);
}
-static void EvoTask_BeginPreSparklesSet2(u8 taskID)
+static void Task_Sparkles_ArcDown_Init(u8 taskId)
{
SetEvoSparklesMatrices();
- gTasks[taskID].tFrameCounter = 0;
- gTasks[taskID].func = EvoTask_CreatePreEvoSparklesSet2;
+ gTasks[taskId].tTimer = 0;
+ gTasks[taskId].func = Task_Sparkles_ArcDown;
PlaySE(SE_M_BUBBLE_BEAM2);
}
-static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID)
+static void Task_Sparkles_ArcDown(u8 taskId)
{
- if (gTasks[taskID].tFrameCounter < 96)
+ if (gTasks[taskId].tTimer < 96)
{
- if (gTasks[taskID].tFrameCounter < 6)
+ if (gTasks[taskId].tTimer < 6)
{
u8 i;
for (i = 0; i < 9; i++)
- CreatePreEvoSparkleSet2(i * 16);
+ CreateSparkle_ArcDown(i * 16);
}
- gTasks[taskID].tFrameCounter++;
+ gTasks[taskId].tTimer++;
}
else
- gTasks[taskID].func = EvoTask_DestroyPreSet2Task;
+ gTasks[taskId].func = Task_Sparkles_ArcDown_End;
}
-static void EvoTask_DestroyPreSet2Task(u8 taskID)
+static void Task_Sparkles_ArcDown_End(u8 taskId)
{
- DestroyTask(taskID);
+ DestroyTask(taskId);
}
-u8 LaunchTask_PostEvoSparklesSet1(void)
+u8 EvolutionSparkles_CircleInward(void)
{
- return CreateTask(EvoTask_BeginPostSparklesSet1, 0);
+ return CreateTask(Task_Sparkles_CircleInward_Init, 0);
}
-static void EvoTask_BeginPostSparklesSet1(u8 taskID)
+static void Task_Sparkles_CircleInward_Init(u8 taskId)
{
SetEvoSparklesMatrices();
- gTasks[taskID].tFrameCounter = 0;
- gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet1;
+ gTasks[taskId].tTimer = 0;
+ gTasks[taskId].func = Task_Sparkles_CircleInward;
PlaySE(SE_SHINY);
}
-static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID)
+static void Task_Sparkles_CircleInward(u8 taskId)
{
- if (gTasks[taskID].tFrameCounter < 48)
+ if (gTasks[taskId].tTimer < 48)
{
- if (gTasks[taskID].tFrameCounter == 0)
+ if (gTasks[taskId].tTimer == 0)
{
u8 i;
for (i = 0; i < 16; i++)
- CreatePostEvoSparkleSet1(i * 16, 4);
+ CreateSparkle_CircleInward(i * 16, 4);
}
- if (gTasks[taskID].tFrameCounter == 32)
+ if (gTasks[taskId].tTimer == 32)
{
u8 i;
for (i = 0; i < 16; i++)
- CreatePostEvoSparkleSet1(i * 16, 8);
+ CreateSparkle_CircleInward(i * 16, 8);
}
- gTasks[taskID].tFrameCounter++;
+ gTasks[taskId].tTimer++;
}
else
- gTasks[taskID].func = EvoTask_DestroyPostSet1Task;
+ gTasks[taskId].func = Task_Sparkles_CircleInward_End;
}
-static void EvoTask_DestroyPostSet1Task(u8 taskID)
+static void Task_Sparkles_CircleInward_End(u8 taskId)
{
- DestroyTask(taskID);
+ DestroyTask(taskId);
}
-u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species)
+#define tSpecies data[2] // Never read
+
+u8 EvolutionSparkles_SprayAndFlash(u16 species)
{
- u8 taskID = CreateTask(EvoTask_BeginPostSparklesSet2_AndFlash, 0);
- gTasks[taskID].data[2] = species;
- return taskID;
+ u8 taskId = CreateTask(Task_Sparkles_SprayAndFlash_Init, 0);
+ gTasks[taskId].tSpecies = species;
+ return taskId;
}
-static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID)
+static void Task_Sparkles_SprayAndFlash_Init(u8 taskId)
{
SetEvoSparklesMatrices();
- gTasks[taskID].tFrameCounter = 0;
+ gTasks[taskId].tTimer = 0;
CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, RGB_WHITE); // was 0xFFF9001C in R/S
- gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash;
+ gTasks[taskId].func = Task_Sparkles_SprayAndFlash;
PlaySE(SE_M_PETAL_DANCE);
}
-static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID)
+static void Task_Sparkles_SprayAndFlash(u8 taskId)
{
- if (gTasks[taskID].tFrameCounter < 128)
+ if (gTasks[taskId].tTimer < 128)
{
u8 i;
- switch (gTasks[taskID].tFrameCounter)
+ switch (gTasks[taskId].tTimer)
{
default:
- if (gTasks[taskID].tFrameCounter < 50)
- CreatePostEvoSparkleSet2(Random() & 7);
+ if (gTasks[taskId].tTimer < 50)
+ CreateSparkle_Spray(Random() & 7);
break;
case 0:
for (i = 0; i < 8; i++)
- CreatePostEvoSparkleSet2(i);
+ CreateSparkle_Spray(i);
break;
case 32:
BeginNormalPaletteFade(0xFFFF041C, 0x10, 0x10, 0, RGB_WHITE); // was 0xFFF9001C in R/S
break;
}
- gTasks[taskID].tFrameCounter++;
+ gTasks[taskId].tTimer++;
}
else
- gTasks[taskID].func = EvoTask_DestroyPostSet2AndFlashTask;
+ gTasks[taskId].func = Task_Sparkles_SprayAndFlash_End;
}
-static void EvoTask_DestroyPostSet2AndFlashTask(u8 taskID)
+static void Task_Sparkles_SprayAndFlash_End(u8 taskId)
{
if (!gPaletteFade.active)
- DestroyTask(taskID);
+ DestroyTask(taskId);
}
-u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species)
+// Separate from EvolutionSparkles_SprayAndFlash for difference in fade color
+u8 EvolutionSparkles_SprayAndFlash_Trade(u16 species)
{
- u8 taskID = CreateTask(EvoTask_BeginPostSparklesSet2_AndFlash_Trade, 0);
- gTasks[taskID].data[2] = species;
- return taskID;
+ u8 taskId = CreateTask(Task_Sparkles_SprayAndFlashTrade_Init, 0);
+ gTasks[taskId].tSpecies = species;
+ return taskId;
}
-static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID)
+static void Task_Sparkles_SprayAndFlashTrade_Init(u8 taskId)
{
SetEvoSparklesMatrices();
- gTasks[taskID].tFrameCounter = 0;
+ gTasks[taskId].tTimer = 0;
CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, RGB_WHITE); // was 0xFFFF0001 in R/S
- gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade;
+ gTasks[taskId].func = Task_Sparkles_SprayAndFlashTrade;
PlaySE(SE_M_PETAL_DANCE);
}
-static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID)
+static void Task_Sparkles_SprayAndFlashTrade(u8 taskId)
{
- if (gTasks[taskID].tFrameCounter < 128)
+ if (gTasks[taskId].tTimer < 128)
{
u8 i;
- switch (gTasks[taskID].tFrameCounter)
+ switch (gTasks[taskId].tTimer)
{
default:
- if (gTasks[taskID].tFrameCounter < 50)
- CreatePostEvoSparkleSet2(Random() & 7);
+ if (gTasks[taskId].tTimer < 50)
+ CreateSparkle_Spray(Random() & 7);
break;
case 0:
for (i = 0; i < 8; i++)
- CreatePostEvoSparkleSet2(i);
+ CreateSparkle_Spray(i);
break;
case 32:
BeginNormalPaletteFade(0xFFFF0400, 0x10, 0x10, 0, RGB_WHITE); // was 0xFFFF0001 in R/S
break;
}
- gTasks[taskID].tFrameCounter++;
+ gTasks[taskId].tTimer++;
}
else
- gTasks[taskID].func = EvoTask_DestroyPostSet2AndFlashTask;
+ gTasks[taskId].func = Task_Sparkles_SprayAndFlash_End;
}
-#undef tFrameCounter
+#undef tTimer
+#undef tSpecies
-static void PokeEvoSprite_DummySpriteCB(struct Sprite* sprite)
+static void SpriteCB_EvolutionMonSprite(struct Sprite* sprite)
{
}
-#define tPreEvoSpriteID data[1]
-#define tPostEvoSpriteID data[2]
+#define tPreEvoSpriteId data[1]
+#define tPostEvoSpriteId data[2]
+#define tPreEvoScale data[3]
+#define tPostEvoScale data[4]
+#define tShowingPostEvo data[5]
+#define tScaleSpeed data[6]
#define tEvoStopped data[8]
-u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID)
+#define MATRIX_PRE_EVO 30
+#define MATRIX_POST_EVO 31
+
+#define MON_MAX_SCALE 256
+#define MON_MIN_SCALE 16
+
+// Alternately grow/shrink the pre-evolution and post-evolution mon sprites
+u8 CycleEvolutionMonSprite(u8 preEvoSpriteId, u8 postEvoSpriteId)
{
u16 i;
u16 stack[16];
- u8 taskID;
+ u8 taskId;
s32 toDiv;
- for (i = 0; i < 16; i++)
+ for (i = 0; i < ARRAY_COUNT(stack); i++)
stack[i] = 0x7FFF;
- taskID = CreateTask(sub_817C4EC, 0);
- gTasks[taskID].tPreEvoSpriteID = preEvoSpriteID;
- gTasks[taskID].tPostEvoSpriteID = postEvoSpriteID;
- gTasks[taskID].data[3] = 256;
- gTasks[taskID].data[4] = 16;
+ taskId = CreateTask(Task_CycleEvolutionMonSprite_Init, 0);
+ gTasks[taskId].tPreEvoSpriteId = preEvoSpriteId;
+ gTasks[taskId].tPostEvoSpriteId = postEvoSpriteId;
+ gTasks[taskId].tPreEvoScale = MON_MAX_SCALE;
+ gTasks[taskId].tPostEvoScale = MON_MIN_SCALE;
toDiv = 65536;
- SetOamMatrix(30, 256, 0, 0, 256);
- SetOamMatrix(31, toDiv / gTasks[taskID].data[4], 0, 0, toDiv / gTasks[taskID].data[4]);
+ SetOamMatrix(MATRIX_PRE_EVO, MON_MAX_SCALE, 0, 0, MON_MAX_SCALE);
+ SetOamMatrix(MATRIX_POST_EVO, toDiv / gTasks[taskId].tPostEvoScale, 0, 0, toDiv / gTasks[taskId].tPostEvoScale);
- gSprites[preEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
- gSprites[preEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
- gSprites[preEvoSpriteID].oam.matrixNum = 30;
- gSprites[preEvoSpriteID].invisible = FALSE;
- CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteID].oam.paletteNum * 16)], 16);
+ gSprites[preEvoSpriteId].callback = SpriteCB_EvolutionMonSprite;
+ gSprites[preEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+ gSprites[preEvoSpriteId].oam.matrixNum = MATRIX_PRE_EVO;
+ gSprites[preEvoSpriteId].invisible = FALSE;
+ CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[preEvoSpriteId].oam.paletteNum * 16)], 16);
- gSprites[postEvoSpriteID].callback = PokeEvoSprite_DummySpriteCB;
- gSprites[postEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_NORMAL;
- gSprites[postEvoSpriteID].oam.matrixNum = 31;
- gSprites[postEvoSpriteID].invisible = FALSE;
- CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteID].oam.paletteNum * 16)], 16);
+ gSprites[postEvoSpriteId].callback = SpriteCB_EvolutionMonSprite;
+ gSprites[postEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+ gSprites[postEvoSpriteId].oam.matrixNum = MATRIX_POST_EVO;
+ gSprites[postEvoSpriteId].invisible = FALSE;
+ CpuSet(stack, &gPlttBufferFaded[0x100 + (gSprites[postEvoSpriteId].oam.paletteNum * 16)], 16);
- gTasks[taskID].tEvoStopped = FALSE;
- return taskID;
+ gTasks[taskId].tEvoStopped = FALSE;
+ return taskId;
}
-static void sub_817C4EC(u8 taskID)
+static void Task_CycleEvolutionMonSprite_Init(u8 taskId)
{
- gTasks[taskID].data[5] = 0;
- gTasks[taskID].data[6] = 8;
- gTasks[taskID].func = sub_817C510;
+ gTasks[taskId].tShowingPostEvo = FALSE;
+ gTasks[taskId].tScaleSpeed = 8;
+ gTasks[taskId].func = Task_CycleEvolutionMonSprite_TryEnd;
}
-static void sub_817C510(u8 taskID)
+// Try to end sprite cycling
+// If evo hasn't stopped or growth/shrink speed hasn't been maxed out, start another cycle
+static void Task_CycleEvolutionMonSprite_TryEnd(u8 taskId)
{
- if (gTasks[taskID].tEvoStopped)
- PreEvoVisible_PostEvoInvisible_KillTask(taskID);
- else if (gTasks[taskID].data[6] == 128)
- PreEvoInvisible_PostEvoVisible_KillTask(taskID);
+ if (gTasks[taskId].tEvoStopped)
+ EndOnPreEvoMon(taskId);
+ else if (gTasks[taskId].tScaleSpeed == 128)
+ EndOnPostEvoMon(taskId);
else
{
- gTasks[taskID].data[6] += 2;
- gTasks[taskID].data[5] ^= 1;
- gTasks[taskID].func = sub_817C560;
+ gTasks[taskId].tScaleSpeed += 2;
+ gTasks[taskId].tShowingPostEvo ^= 1;
+ gTasks[taskId].func = Task_CycleEvolutionMonSprite_UpdateSize;
}
}
-static void sub_817C560(u8 taskID)
+static void Task_CycleEvolutionMonSprite_UpdateSize(u8 taskId)
{
- if (gTasks[taskID].tEvoStopped)
- gTasks[taskID].func = PreEvoVisible_PostEvoInvisible_KillTask;
+ if (gTasks[taskId].tEvoStopped)
+ gTasks[taskId].func = EndOnPreEvoMon;
else
{
u16 oamMatrixArg;
- u8 r6 = 0;
- if (gTasks[taskID].data[5] == 0)
+ u8 numSpritesFinished = 0;
+ if (!gTasks[taskId].tShowingPostEvo)
{
- if (gTasks[taskID].data[3] < 256 - gTasks[taskID].data[6])
- gTasks[taskID].data[3] += gTasks[taskID].data[6];
+ // Set pre-evo sprite growth
+ if (gTasks[taskId].tPreEvoScale < MON_MAX_SCALE - gTasks[taskId].tScaleSpeed)
+ gTasks[taskId].tPreEvoScale += gTasks[taskId].tScaleSpeed;
else
{
- gTasks[taskID].data[3] = 256;
- r6++;
+ gTasks[taskId].tPreEvoScale = MON_MAX_SCALE;
+ numSpritesFinished++;
}
- if (gTasks[taskID].data[4] > 16 + gTasks[taskID].data[6])
- gTasks[taskID].data[4] -= gTasks[taskID].data[6];
+
+ // Set post-evo sprite shrink
+ if (gTasks[taskId].tPostEvoScale > MON_MIN_SCALE + gTasks[taskId].tScaleSpeed)
+ gTasks[taskId].tPostEvoScale -= gTasks[taskId].tScaleSpeed;
else
{
- gTasks[taskID].data[4] = 16;
- r6++;
+ gTasks[taskId].tPostEvoScale = MON_MIN_SCALE;
+ numSpritesFinished++;
}
}
else
{
- if (gTasks[taskID].data[4] < 256 - gTasks[taskID].data[6])
- gTasks[taskID].data[4] += gTasks[taskID].data[6];
+ // Set post-evo sprite growth
+ if (gTasks[taskId].tPostEvoScale < MON_MAX_SCALE - gTasks[taskId].tScaleSpeed)
+ gTasks[taskId].tPostEvoScale += gTasks[taskId].tScaleSpeed;
else
{
- gTasks[taskID].data[4] = 256;
- r6++;
+ gTasks[taskId].tPostEvoScale = MON_MAX_SCALE;
+ numSpritesFinished++;
}
- if (gTasks[taskID].data[3] > 16 + gTasks[taskID].data[6])
- gTasks[taskID].data[3] -= gTasks[taskID].data[6];
+
+ // Set pre-evo sprite shrink
+ if (gTasks[taskId].tPreEvoScale > MON_MIN_SCALE + gTasks[taskId].tScaleSpeed)
+ gTasks[taskId].tPreEvoScale -= gTasks[taskId].tScaleSpeed;
else
{
- gTasks[taskID].data[3] = 16;
- r6++;
+ gTasks[taskId].tPreEvoScale = MON_MIN_SCALE;
+ numSpritesFinished++;
}
}
- oamMatrixArg = 65536 / gTasks[taskID].data[3];
- SetOamMatrix(30, oamMatrixArg, 0, 0, oamMatrixArg);
- oamMatrixArg = 65536 / gTasks[taskID].data[4];
- SetOamMatrix(31, oamMatrixArg, 0, 0, oamMatrixArg);
- if (r6 == 2)
- gTasks[taskID].func = sub_817C510;
+ // Grow/shrink pre-evo sprite
+ oamMatrixArg = 65536 / gTasks[taskId].tPreEvoScale;
+ SetOamMatrix(MATRIX_PRE_EVO, oamMatrixArg, 0, 0, oamMatrixArg);
+
+ // Grow/shrink post-evo sprite
+ oamMatrixArg = 65536 / gTasks[taskId].tPostEvoScale;
+ SetOamMatrix(MATRIX_POST_EVO, oamMatrixArg, 0, 0, oamMatrixArg);
+
+ // Both sprites have reached their size extreme
+ if (numSpritesFinished == 2)
+ gTasks[taskId].func = Task_CycleEvolutionMonSprite_TryEnd;
}
}
-static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskID)
+static void EndOnPostEvoMon(u8 taskId)
{
- gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
- gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0;
- gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = TRUE;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].invisible = TRUE;
- gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
- gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
- gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = FALSE;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].invisible = FALSE;
- DestroyTask(taskID);
+ DestroyTask(taskId);
}
-static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskID)
+static void EndOnPreEvoMon(u8 taskId)
{
- gSprites[gTasks[taskID].tPreEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
- gSprites[gTasks[taskID].tPreEvoSpriteID].oam.matrixNum = 0;
- gSprites[gTasks[taskID].tPreEvoSpriteID].invisible = FALSE;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPreEvoSpriteId].invisible = FALSE;
- gSprites[gTasks[taskID].tPostEvoSpriteID].oam.affineMode = ST_OAM_AFFINE_OFF;
- gSprites[gTasks[taskID].tPostEvoSpriteID].oam.matrixNum = 0;
- gSprites[gTasks[taskID].tPostEvoSpriteID].invisible = TRUE;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].oam.matrixNum = 0;
+ gSprites[gTasks[taskId].tPostEvoSpriteId].invisible = TRUE;
- DestroyTask(taskID);
+ DestroyTask(taskId);
}
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index c8f910261..6f5a4dce7 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -35,110 +35,113 @@
struct EvoInfo
{
- u8 preEvoSpriteID;
- u8 postEvoSpriteID;
- u8 evoTaskID;
- u8 field_3;
+ u8 preEvoSpriteId;
+ u8 postEvoSpriteId;
+ u8 evoTaskId;
+ u8 delayTimer;
u16 savedPalette[48];
};
-// EWRAM vars
static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL;
-static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL;
+static EWRAM_DATA u16 *sBgAnimPal = NULL;
-// IWRAM common
void (*gCB2_AfterEvolution)(void);
#define sEvoCursorPos gBattleCommunication[1] // when learning a new move
-#define sEvoGraphicsTaskID gBattleCommunication[2]
+#define sEvoGraphicsTaskId gBattleCommunication[2]
-// this file's functions
-static void Task_EvolutionScene(u8 taskID);
-static void Task_TradeEvolutionScene(u8 taskID);
+static void Task_EvolutionScene(u8 taskId);
+static void Task_TradeEvolutionScene(u8 taskId);
static void CB2_EvolutionSceneUpdate(void);
static void CB2_TradeEvolutionSceneUpdate(void);
static void EvoDummyFunc(void);
static void VBlankCB_EvolutionScene(void);
static void VBlankCB_TradeEvolutionScene(void);
-static void sub_8140134(void);
-static void EvoScene_DoMonAnimation(u8 monSpriteId, u16 speciesId);
+static void EvoScene_DoMonAnimAndCry(u8 monSpriteId, u16 speciesId);
static bool32 EvoScene_IsMonAnimFinished(u8 monSpriteId);
-static void InitMovingBackgroundTask(bool8 isLink);
-static void sub_813FEE8(u8 taskId);
-static void sub_8140174(void);
-
-// const data
-static const u16 sUnknown_085B4114[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal");
-static const u32 sUnknown_085B4134[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz");
-static const u32 sUnknown_085B482C[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz");
-static const u32 sUnknown_085B4D10[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz");
-static const u16 sUnknown_085B51E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal");
-static const u16 sUnknown_085B53E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_lighten.gbapal");
-static const u16 sUnknown_085B5544[] = INCBIN_U16("graphics/evolution_scene/gray_transition_darken.gbapal");
-static const u16 sUnknown_085B56E4[] = INCBIN_U16("graphics/evolution_scene/gray_transition_outro.gbapal");
-static const u16 sUnknown_085B5884[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal");
-
-static const u8 Text_ShedinjaJapaneseName[] = _("ヌケニン");
-
-static const u8 sUnknown_085B58C9[][4] =
+static void StartBgAnimation(bool8 isLink);
+static void StopBgAnimation(void);
+static void Task_AnimateBg(u8 taskId);
+static void RestoreBgAfterAnim(void);
+
+static const u16 sUnusedPal1[] = INCBIN_U16("graphics/evolution_scene/unused_1.gbapal");
+static const u32 sBgAnim_Gfx[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz");
+static const u32 sBgAnim_Inner_Tilemap[] = INCBIN_U32("graphics/evolution_scene/bg_inner.bin.lz");
+static const u32 sBgAnim_Outer_Tilemap[] = INCBIN_U32("graphics/evolution_scene/bg_outer.bin.lz");
+static const u16 sBgAnim_Intro_Pal[] = INCBIN_U16("graphics/evolution_scene/bg_anim_intro.gbapal");
+static const u16 sUnusedPal2[] = INCBIN_U16("graphics/evolution_scene/unused_2.gbapal");
+static const u16 sUnusedPal3[] = INCBIN_U16("graphics/evolution_scene/unused_3.gbapal");
+static const u16 sUnusedPal4[] = INCBIN_U16("graphics/evolution_scene/unused_4.gbapal");
+static const u16 sBgAnim_Pal[] = INCBIN_U16("graphics/evolution_scene/bg_anim.gbapal");
+
+static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン");
+
+// The below table is used by Task_UpdateBgPalette to control the speed at which the bg color updates.
+// The first two values are indexes into sBgAnim_PalIndexes (indirectly, via sBgAnimPal), and are
+// the start and end of the range of colors in sBgAnim_PalIndexes it will move through incrementally
+// before starting over. It will repeat this cycle x number of times, where x = the 3rd value,
+// delaying each increment by y, where y = the 4th value.
+// Once it has cycled x number of times, it will move to the next array in this table.
+static const u8 sBgAnim_PaletteControl[][4] =
{
- { 0x00, 0x0C, 0x01, 0x06 },
- { 0x0D, 0x24, 0x05, 0x02 },
- { 0x0D, 0x18, 0x01, 0x02 },
- { 0x25, 0x31, 0x01, 0x06 },
+ { 0, 12, 1, 6 },
+ { 13, 36, 5, 2 },
+ { 13, 24, 1, 2 },
+ { 37, 49, 1, 6 },
};
-static const u8 sUnknown_085B58D9[][16] = {
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x0B, 0x00, 0x00 },
- { 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 },
- { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 },
- { 0x00, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x00, 0x00 },
- { 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x00, 0x00 },
- { 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x00, 0x00 },
- { 0x00, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x00, 0x00 },
- { 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x00, 0x00 },
- { 0x00, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x00, 0x00 },
- { 0x00, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x00, 0x00 },
- { 0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x00, 0x00 },
- { 0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x00, 0x00 },
- { 0x00, 0x0B, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x00, 0x00 },
- { 0x00, 0x0C, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x00, 0x00 },
- { 0x00, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00 },
- { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x00, 0x00 },
- { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00 },
- { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00 },
- { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00 },
- { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00 },
- { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00 },
- { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00, 0x00 },
- { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 },
- { 0x00, 0x04, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x00, 0x00 },
- { 0x00, 0x03, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x00, 0x00 },
- { 0x00, 0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00 },
- { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x00 },
- { 0x00, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00 },
- { 0x00, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
- { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+// Indexes into sBgAnim_Pal, 0 is black, transitioning to a bright light blue (172, 213, 255) at 13
+static const u8 sBgAnim_PalIndexes[][16] = {
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0 },
+ { 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0 },
+ { 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 0 },
+ { 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 11, 0, 0 },
+ { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0 },
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0 },
+ { 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 12, 0, 0 },
+ { 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 12, 11, 0, 0 },
+ { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 12, 11, 10, 0, 0 },
+ { 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 12, 11, 10, 9, 0, 0 },
+ { 0, 6, 7, 8, 9, 10, 11, 12, 13, 12, 11, 10, 9, 8, 0, 0 },
+ { 0, 7, 8, 9, 10, 11, 12, 13, 12, 11, 10, 9, 8, 7, 0, 0 },
+ { 0, 8, 9, 10, 11, 12, 13, 12, 11, 10, 9, 8, 7, 6, 0, 0 },
+ { 0, 9, 10, 11, 12, 13, 12, 11, 10, 9, 8, 7, 6, 5, 0, 0 },
+ { 0, 10, 11, 12, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 0, 0 },
+ { 0, 11, 12, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 0, 0 },
+ { 0, 12, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 0, 0 },
+ { 0, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0 },
+ { 0, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 2, 0, 0 },
+ { 0, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 2, 3, 0, 0 },
+ { 0, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 2, 3, 4, 0, 0 },
+ { 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 2, 3, 4, 5, 0, 0 },
+ { 0, 8, 7, 6, 5, 4, 3, 2, 1, 2, 3, 4, 5, 6, 0, 0 },
+ { 0, 7, 6, 5, 4, 3, 2, 1, 2, 3, 4, 5, 6, 7, 0, 0 },
+ { 0, 6, 5, 4, 3, 2, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0 },
+ { 0, 5, 4, 3, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0 },
+ { 0, 4, 3, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 0 },
+ { 0, 3, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 0 },
+ { 0, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 0 },
+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0 },
+ { 0, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0 },
+ { 0, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0 },
+ { 0, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0 },
+ { 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0 },
+ { 0, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
static void CB2_BeginEvolutionScene(void)
@@ -154,53 +157,53 @@ static void CB2_BeginEvolutionScene(void)
#define tBits data[3]
#define tLearnsFirstMove data[4]
#define tLearnMoveState data[6]
-#define tData7 data[7]
-#define tData8 data[8]
+#define tLearnMoveYesState data[7]
+#define tLearnMoveNoState data[8]
#define tEvoWasStopped data[9]
-#define tPartyID data[10]
+#define tPartyId data[10]
-#define TASK_BIT_CAN_STOP 0x1
-#define TASK_BIT_LEARN_MOVE 0x80
+#define TASK_BIT_CAN_STOP (1 << 0)
+#define TASK_BIT_LEARN_MOVE (1 << 7)
-static void Task_BeginEvolutionScene(u8 taskID)
+static void Task_BeginEvolutionScene(u8 taskId)
{
struct Pokemon* mon = NULL;
- switch (gTasks[taskID].tState)
+ switch (gTasks[taskId].tState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
break;
case 1:
if (!gPaletteFade.active)
{
- u16 speciesToEvolve;
+ u16 postEvoSpecies;
bool8 canStopEvo;
- u8 partyID;
+ u8 partyId;
- mon = &gPlayerParty[gTasks[taskID].tPartyID];
- speciesToEvolve = gTasks[taskID].tPostEvoSpecies;
- canStopEvo = gTasks[taskID].tCanStop;
- partyID = gTasks[taskID].tPartyID;
+ mon = &gPlayerParty[gTasks[taskId].tPartyId];
+ postEvoSpecies = gTasks[taskId].tPostEvoSpecies;
+ canStopEvo = gTasks[taskId].tCanStop;
+ partyId = gTasks[taskId].tPartyId;
- DestroyTask(taskID);
- EvolutionScene(mon, speciesToEvolve, canStopEvo, partyID);
+ DestroyTask(taskId);
+ EvolutionScene(mon, postEvoSpecies, canStopEvo, partyId);
}
break;
}
}
-void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
+void BeginEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId)
{
- u8 taskID = CreateTask(Task_BeginEvolutionScene, 0);
- gTasks[taskID].tState = 0;
- gTasks[taskID].tPostEvoSpecies = speciesToEvolve;
- gTasks[taskID].tCanStop = canStopEvo;
- gTasks[taskID].tPartyID = partyID;
+ u8 taskId = CreateTask(Task_BeginEvolutionScene, 0);
+ gTasks[taskId].tState = 0;
+ gTasks[taskId].tPostEvoSpecies = postEvoSpecies;
+ gTasks[taskId].tCanStop = canStopEvo;
+ gTasks[taskId].tPartyId = partyId;
SetMainCallback2(CB2_BeginEvolutionScene);
}
-void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
+void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId)
{
u8 name[20];
u16 currSpecies;
@@ -247,7 +250,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
GetMonData(mon, MON_DATA_NICKNAME, name);
StringCopy10(gStringVar1, name);
- StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
+ StringCopy(gStringVar2, gSpeciesNames[postEvoSpecies]);
// preEvo sprite
currSpecies = GetMonData(mon, MON_DATA_SPECIES);
@@ -261,38 +264,38 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
SetMultiuseSpriteTemplateToPokemon(currSpecies, 1);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->preEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->preEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 1;
gSprites[ID].invisible = TRUE;
// postEvo sprite
- DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
+ DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[3],
- speciesToEvolve);
- pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality);
+ postEvoSpecies);
+ pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x120, 0x20);
- SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 3);
+ SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2;
gSprites[ID].invisible = TRUE;
LoadEvoSparkleSpriteAndPal();
- sEvoStructPtr->evoTaskID = ID = CreateTask(Task_EvolutionScene, 0);
+ sEvoStructPtr->evoTaskId = ID = CreateTask(Task_EvolutionScene, 0);
gTasks[ID].tState = 0;
gTasks[ID].tPreEvoSpecies = currSpecies;
- gTasks[ID].tPostEvoSpecies = speciesToEvolve;
+ gTasks[ID].tPostEvoSpecies = postEvoSpecies;
gTasks[ID].tCanStop = canStopEvo;
gTasks[ID].tLearnsFirstMove = TRUE;
gTasks[ID].tEvoWasStopped = FALSE;
- gTasks[ID].tPartyID = partyID;
+ gTasks[ID].tPartyId = partyId;
- memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], 0x60);
+ memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], sizeof(sEvoStructPtr->savedPalette));
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP);
@@ -308,11 +311,11 @@ static void CB2_EvolutionSceneLoadGraphics(void)
const struct CompressedSpritePalette* pokePal;
u16 postEvoSpecies;
u32 trainerId, personality;
- struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskID].tPartyID];
+ struct Pokemon* mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId];
- postEvoSpecies = gTasks[sEvoStructPtr->evoTaskID].tPostEvoSpecies;
- trainerId = GetMonData(Mon, MON_DATA_OT_ID);
- personality = GetMonData(Mon, MON_DATA_PERSONALITY);
+ postEvoSpecies = gTasks[sEvoStructPtr->evoTaskId].tPostEvoSpecies;
+ trainerId = GetMonData(mon, MON_DATA_OT_ID);
+ personality = GetMonData(mon, MON_DATA_PERSONALITY);
SetHBlankCallback(NULL);
SetVBlankCallback(NULL);
@@ -354,7 +357,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2;
@@ -375,8 +378,8 @@ static void CB2_EvolutionSceneLoadGraphics(void)
static void CB2_TradeEvolutionSceneLoadGraphics(void)
{
- struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskID].tPartyID];
- u16 postEvoSpecies = gTasks[sEvoStructPtr->evoTaskID].tPostEvoSpecies;
+ struct Pokemon* mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId];
+ u16 postEvoSpecies = gTasks[sEvoStructPtr->evoTaskId].tPostEvoSpecies;
switch (gMain.state)
{
@@ -415,8 +418,8 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
case 4:
{
const struct CompressedSpritePalette* pokePal;
- u32 trainerId = GetMonData(Mon, MON_DATA_OT_ID);
- u32 personality = GetMonData(Mon, MON_DATA_PERSONALITY);
+ u32 trainerId = GetMonData(mon, MON_DATA_OT_ID);
+ u32 personality = GetMonData(mon, MON_DATA_PERSONALITY);
DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[3],
postEvoSpecies);
@@ -431,7 +434,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2;
@@ -459,7 +462,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
}
}
-void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID)
+void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSpriteId, u8 partyId)
{
u8 name[20];
u16 currSpecies;
@@ -469,7 +472,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri
GetMonData(mon, MON_DATA_NICKNAME, name);
StringCopy10(gStringVar1, name);
- StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
+ StringCopy(gStringVar2, gSpeciesNames[postEvoSpecies]);
gAffineAnimsDisabled = TRUE;
@@ -479,18 +482,18 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri
trainerId = GetMonData(mon, MON_DATA_OT_ID);
sEvoStructPtr = AllocZeroed(sizeof(struct EvoInfo));
- sEvoStructPtr->preEvoSpriteID = preEvoSpriteID;
+ sEvoStructPtr->preEvoSpriteId = preEvoSpriteId;
- DecompressPicFromTable_2(&gMonFrontPicTable[speciesToEvolve],
+ DecompressPicFromTable_2(&gMonFrontPicTable[postEvoSpecies],
gMonSpritesGfxPtr->sprites.ptr[1],
- speciesToEvolve);
+ postEvoSpecies);
- pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality);
+ pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
LoadCompressedPalette(pokePal->data, 0x120, 0x20);
- SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 1);
+ SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1);
gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
- sEvoStructPtr->postEvoSpriteID = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
+ sEvoStructPtr->postEvoSpriteId = ID = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30);
gSprites[ID].callback = SpriteCallbackDummy_2;
gSprites[ID].oam.paletteNum = 2;
@@ -498,13 +501,13 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri
LoadEvoSparkleSpriteAndPal();
- sEvoStructPtr->evoTaskID = ID = CreateTask(Task_TradeEvolutionScene, 0);
+ sEvoStructPtr->evoTaskId = ID = CreateTask(Task_TradeEvolutionScene, 0);
gTasks[ID].tState = 0;
gTasks[ID].tPreEvoSpecies = currSpecies;
- gTasks[ID].tPostEvoSpecies = speciesToEvolve;
+ gTasks[ID].tPostEvoSpecies = postEvoSpecies;
gTasks[ID].tLearnsFirstMove = TRUE;
gTasks[ID].tEvoWasStopped = FALSE;
- gTasks[ID].tPartyID = partyID;
+ gTasks[ID].tPartyId = partyId;
gBattle_BG0_X = 0;
gBattle_BG0_Y = 0;
@@ -542,7 +545,7 @@ static void CB2_TradeEvolutionSceneUpdate(void)
static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
{
u32 data = 0;
- if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6)
+ if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < PARTY_SIZE)
{
s32 i;
struct Pokemon* shedinja = &gPlayerParty[gPlayerPartyCount];
@@ -556,9 +559,9 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, (&data));
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_ENCRYPT_SEPARATOR, (&data));
- for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++)
+ for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + CONTEST_CATEGORIES_COUNT; i++)
SetMonData(&gPlayerParty[gPlayerPartyCount], i, (&data));
- for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FATEFUL_ENCOUNTER; i++)
+ for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FILLER; i++)
SetMonData(&gPlayerParty[gPlayerPartyCount], i, (&data));
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_STATUS, (&data));
@@ -578,195 +581,243 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
if (GetMonData(shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
&& GetMonData(shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
&& GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK)
- SetMonData(shedinja, MON_DATA_NICKNAME, Text_ShedinjaJapaneseName);
+ SetMonData(shedinja, MON_DATA_NICKNAME, sText_ShedinjaJapaneseName);
}
}
-static void Task_EvolutionScene(u8 taskID)
+// States for the main switch in Task_EvolutionScene
+enum {
+ EVOSTATE_FADE_IN,
+ EVOSTATE_INTRO_MSG,
+ EVOSTATE_INTRO_MON_ANIM,
+ EVOSTATE_INTRO_SOUND,
+ EVOSTATE_START_MUSIC,
+ EVOSTATE_START_BG_AND_SPARKLE_SPIRAL,
+ EVOSTATE_SPARKLE_ARC,
+ EVOSTATE_CYCLE_MON_SPRITE,
+ EVOSTATE_WAIT_CYCLE_MON_SPRITE,
+ EVOSTATE_SPARKLE_CIRCLE,
+ EVOSTATE_SPARKLE_SPRAY,
+ EVOSTATE_EVO_SOUND,
+ EVOSTATE_RESTORE_SCREEN,
+ EVOSTATE_EVO_MON_ANIM,
+ EVOSTATE_SET_MON_EVOLVED,
+ EVOSTATE_TRY_LEARN_MOVE,
+ EVOSTATE_END,
+ EVOSTATE_CANCEL,
+ EVOSTATE_CANCEL_MON_ANIM,
+ EVOSTATE_CANCEL_MSG,
+ EVOSTATE_LEARNED_MOVE,
+ EVOSTATE_TRY_LEARN_ANOTHER_MOVE,
+ EVOSTATE_REPLACE_MOVE,
+};
+
+// States for the switch in EVOSTATE_REPLACE_MOVE
+enum {
+ MVSTATE_INTRO_MSG_1,
+ MVSTATE_INTRO_MSG_2,
+ MVSTATE_INTRO_MSG_3,
+ MVSTATE_PRINT_YES_NO,
+ MVSTATE_HANDLE_YES_NO,
+ MVSTATE_SHOW_MOVE_SELECT,
+ MVSTATE_HANDLE_MOVE_SELECT,
+ MVSTATE_FORGET_MSG_1,
+ MVSTATE_FORGET_MSG_2,
+ MVSTATE_LEARNED_MOVE,
+ MVSTATE_ASK_CANCEL,
+ MVSTATE_CANCEL,
+ MVSTATE_RETRY_AFTER_HM,
+};
+
+// Task data from CycleEvolutionMonSprite
+#define tEvoStopped data[8]
+
+static void Task_EvolutionScene(u8 taskId)
{
u32 var;
- struct Pokemon* mon = &gPlayerParty[gTasks[taskID].tPartyID];
+ struct Pokemon* mon = &gPlayerParty[gTasks[taskId].tPartyId];
// check if B Button was held, so the evolution gets stopped
if (gMain.heldKeys == B_BUTTON
- && gTasks[taskID].tState == 8
- && gTasks[sEvoGraphicsTaskID].isActive
- && gTasks[taskID].tBits & TASK_BIT_CAN_STOP)
+ && gTasks[taskId].tState == EVOSTATE_WAIT_CYCLE_MON_SPRITE
+ && gTasks[sEvoGraphicsTaskId].isActive
+ && gTasks[taskId].tBits & TASK_BIT_CAN_STOP)
{
- gTasks[taskID].tState = 17;
- gTasks[sEvoGraphicsTaskID].EvoGraphicsTaskEvoStop = TRUE;
- sub_8140134();
+ gTasks[taskId].tState = EVOSTATE_CANCEL;
+ gTasks[sEvoGraphicsTaskId].tEvoStopped = TRUE;
+ StopBgAnimation();
return;
}
- switch (gTasks[taskID].tState)
+ switch (gTasks[taskId].tState)
{
- case 0:
+ case EVOSTATE_FADE_IN:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
- gSprites[sEvoStructPtr->preEvoSpriteID].invisible = FALSE;
- gTasks[taskID].tState++;
+ gSprites[sEvoStructPtr->preEvoSpriteId].invisible = FALSE;
+ gTasks[taskId].tState++;
ShowBg(0);
ShowBg(1);
ShowBg(2);
ShowBg(3);
break;
- case 1: // print 'whoa, poke is evolving!!!' msg
+ case EVOSTATE_INTRO_MSG:
if (!gPaletteFade.active)
{
StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving);
BattlePutTextOnWindow(gStringVar4, 0);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 2: // wait for string, animate mon(and play its cry)
+ case EVOSTATE_INTRO_MON_ANIM:
if (!IsTextPrinterActive(0))
{
- EvoScene_DoMonAnimation(sEvoStructPtr->preEvoSpriteID, gTasks[taskID].tPreEvoSpecies);
- gTasks[taskID].tState++;
+ EvoScene_DoMonAnimAndCry(sEvoStructPtr->preEvoSpriteId, gTasks[taskId].tPreEvoSpecies);
+ gTasks[taskId].tState++;
}
break;
- case 3:
- if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID)) // wait for animation, play tu du SE
+ case EVOSTATE_INTRO_SOUND:
+ if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId))
{
PlaySE(MUS_EVOLUTION_INTRO);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 4: // play evolution music and fade screen black
+ case EVOSTATE_START_MUSIC:
if (!IsSEPlaying())
{
+ // Start music, fade background to black
PlayNewMapMusic(MUS_EVOLUTION);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
}
break;
- case 5: // launch moving bg task, preapre evo sparkles
+ case EVOSTATE_START_BG_AND_SPARKLE_SPIRAL:
if (!gPaletteFade.active)
{
- InitMovingBackgroundTask(FALSE);
- sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet1(17);
- gTasks[taskID].tState++;
+ StartBgAnimation(FALSE);
+ sEvoGraphicsTaskId = EvolutionSparkles_SpiralUpward(17);
+ gTasks[taskId].tState++;
}
break;
- case 6: // another set of evo sparkles
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case EVOSTATE_SPARKLE_ARC:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
- gTasks[taskID].tState++;
- sEvoStructPtr->field_3 = 1;
- sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet2();
+ gTasks[taskId].tState++;
+ sEvoStructPtr->delayTimer = 1;
+ sEvoGraphicsTaskId = EvolutionSparkles_ArcDown();
}
break;
- case 7: // launch task that flashes pre evo with post evo sprites
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case EVOSTATE_CYCLE_MON_SPRITE: // launch task that flashes pre evo with post evo sprites
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
- sEvoGraphicsTaskID = sub_817C3A0(sEvoStructPtr->preEvoSpriteID, sEvoStructPtr->postEvoSpriteID);
- gTasks[taskID].tState++;
+ sEvoGraphicsTaskId = CycleEvolutionMonSprite(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId);
+ gTasks[taskId].tState++;
}
break;
- case 8: // wait for the above task to finish
- if (--sEvoStructPtr->field_3 == 0)
+ case EVOSTATE_WAIT_CYCLE_MON_SPRITE:
+ if (--sEvoStructPtr->delayTimer == 0)
{
- sEvoStructPtr->field_3 = 3;
- if (!gTasks[sEvoGraphicsTaskID].isActive)
- gTasks[taskID].tState++;
+ sEvoStructPtr->delayTimer = 3;
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
+ gTasks[taskId].tState++;
}
break;
- case 9: // post evo sparkles
- sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet1();
- gTasks[taskID].tState++;
+ case EVOSTATE_SPARKLE_CIRCLE:
+ sEvoGraphicsTaskId = EvolutionSparkles_CircleInward();
+ gTasks[taskId].tState++;
break;
- case 10:
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case EVOSTATE_SPARKLE_SPRAY:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
- sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet2AndFlash(gTasks[taskID].tPostEvoSpecies);
- gTasks[taskID].tState++;
+ sEvoGraphicsTaskId = EvolutionSparkles_SprayAndFlash(gTasks[taskId].tPostEvoSpecies);
+ gTasks[taskId].tState++;
}
break;
- case 11: // play tu du sound after evolution
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case EVOSTATE_EVO_SOUND:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
PlaySE(SE_EXP);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 12: // stop music, return screen to pre-fade state
+ case EVOSTATE_RESTORE_SCREEN: // stop music, return screen to pre-fade state
if (IsSEPlaying())
{
m4aMPlayAllStop();
- memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60);
- sub_8140174();
+ memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette));
+ RestoreBgAfterAnim();
BeginNormalPaletteFade(0x1C, 0, 0x10, 0, RGB_BLACK);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 13: // animate mon
+ case EVOSTATE_EVO_MON_ANIM:
if (!gPaletteFade.active)
{
- EvoScene_DoMonAnimation(sEvoStructPtr->postEvoSpriteID, gTasks[taskID].tPostEvoSpecies);
- gTasks[taskID].tState++;
+ EvoScene_DoMonAnimAndCry(sEvoStructPtr->postEvoSpriteId, gTasks[taskId].tPostEvoSpecies);
+ gTasks[taskId].tState++;
}
break;
- case 14: // congratulations string and rename prompt
+ case EVOSTATE_SET_MON_EVOLVED:
if (IsCryFinished())
{
StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
BattlePutTextOnWindow(gStringVar4, 0);
PlayBGM(MUS_EVOLVED);
- gTasks[taskID].tState++;
- SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
+ gTasks[taskId].tState++;
+ SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskId].tPostEvoSpecies));
CalculateMonStats(mon);
- EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
- GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), FLAG_SET_SEEN);
- GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), FLAG_SET_CAUGHT);
+ EvolutionRenameMon(mon, gTasks[taskId].tPreEvoSpecies, gTasks[taskId].tPostEvoSpecies);
+ GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskId].tPostEvoSpecies), FLAG_SET_SEEN);
+ GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskId].tPostEvoSpecies), FLAG_SET_CAUGHT);
IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
}
break;
- case 15: // check if it wants to learn a new move
+ case EVOSTATE_TRY_LEARN_MOVE:
if (!IsTextPrinterActive(0))
{
- var = MonTryLearningNewMove(mon, gTasks[taskID].tLearnsFirstMove);
- if (var != 0 && !gTasks[taskID].tEvoWasStopped)
+ var = MonTryLearningNewMove(mon, gTasks[taskId].tLearnsFirstMove);
+ if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped)
{
u8 text[20];
- if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
+ if (!(gTasks[taskId].tBits & TASK_BIT_LEARN_MOVE))
{
StopMapMusic();
Overworld_PlaySpecialMapMusic();
}
- gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
- gTasks[taskID].tLearnsFirstMove = FALSE;
- gTasks[taskID].tLearnMoveState = 0;
+ gTasks[taskId].tBits |= TASK_BIT_LEARN_MOVE;
+ gTasks[taskId].tLearnsFirstMove = FALSE;
+ gTasks[taskId].tLearnMoveState = MVSTATE_INTRO_MSG_1;
GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text);
if (var == MON_HAS_MAX_MOVES)
- gTasks[taskID].tState = 22;
+ gTasks[taskId].tState = EVOSTATE_REPLACE_MOVE;
else if (var == MON_ALREADY_KNOWS_MOVE)
break;
else
- gTasks[taskID].tState = 20; // move has been learned
+ gTasks[taskId].tState = EVOSTATE_LEARNED_MOVE;
}
- else // no move to learn
+ else // no move to learn, or evolution was canceled
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
}
break;
- case 16: // task has finished, return
+ case EVOSTATE_END:
if (!gPaletteFade.active)
{
- if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
+ if (!(gTasks[taskId].tBits & TASK_BIT_LEARN_MOVE))
{
StopMapMusic();
Overworld_PlaySpecialMapMusic();
}
- if (!gTasks[taskID].tEvoWasStopped)
- CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon);
+ if (!gTasks[taskId].tEvoWasStopped)
+ CreateShedinja(gTasks[taskId].tPreEvoSpecies, mon);
- DestroyTask(taskID);
+ DestroyTask(taskId);
FreeMonSpritesGfx();
Free(sEvoStructPtr);
sEvoStructPtr = NULL;
@@ -774,91 +825,98 @@ static void Task_EvolutionScene(u8 taskID)
SetMainCallback2(gCB2_AfterEvolution);
}
break;
- case 17: // evolution has been canceled, stop music and re-fade palette
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case EVOSTATE_CANCEL:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
m4aMPlayAllStop();
BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, RGB_WHITE);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 18: // animate pokemon trying to evolve again, evolution has been stopped
+ case EVOSTATE_CANCEL_MON_ANIM:
if (!gPaletteFade.active)
{
- EvoScene_DoMonAnimation(sEvoStructPtr->preEvoSpriteID, gTasks[taskID].tPreEvoSpecies);
- gTasks[taskID].tState++;
+ EvoScene_DoMonAnimAndCry(sEvoStructPtr->preEvoSpriteId, gTasks[taskId].tPreEvoSpecies);
+ gTasks[taskId].tState++;
}
break;
- case 19: // after the animation, print the string 'WHOA IT DID NOT EVOLVE!!!'
- if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID))
+ case EVOSTATE_CANCEL_MSG:
+ if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId))
{
- if (gTasks[taskID].tEvoWasStopped)
+ if (gTasks[taskId].tEvoWasStopped)
StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark);
else // Fire Red leftover probably
StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving);
BattlePutTextOnWindow(gStringVar4, 0);
- gTasks[taskID].tEvoWasStopped = TRUE;
- gTasks[taskID].tState = 15;
+ gTasks[taskId].tEvoWasStopped = TRUE;
+ gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE;
}
break;
- case 20: // pokemon learned a new move, print string and play a fanfare
+ case EVOSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_LEVEL_UP);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
- gTasks[taskID].tState++;
+ gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter
+ gTasks[taskId].tState++;
}
break;
- case 21: // wait a bit and check if can learn another move
- if (!IsTextPrinterActive(0) && !IsSEPlaying() && --gTasks[taskID].tLearnsFirstMove == 0)
- gTasks[taskID].tState = 15;
+ case EVOSTATE_TRY_LEARN_ANOTHER_MOVE:
+ if (!IsTextPrinterActive(0) && !IsSEPlaying() && --gTasks[taskId].tLearnsFirstMove == 0)
+ gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE;
break;
- case 22: // try to learn a new move
- switch (gTasks[taskID].tLearnMoveState)
+ case EVOSTATE_REPLACE_MOVE:
+ switch (gTasks[taskId].tLearnMoveState)
{
- case 0:
+ case MVSTATE_INTRO_MSG_1:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
+ // "{mon} is trying to learn {move}"
BufferMoveToLearnIntoBattleTextBuff2();
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 1:
+ case MVSTATE_INTRO_MSG_2:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
+ // "But, {mon} can't learn more than four moves"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 2:
+ case MVSTATE_INTRO_MSG_3:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
+ // "Delete a move to make room for {move}?"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tData7 = 5;
- gTasks[taskID].tData8 = 10;
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveYesState = MVSTATE_SHOW_MOVE_SELECT;
+ gTasks[taskId].tLearnMoveNoState = MVSTATE_ASK_CANCEL;
+ gTasks[taskId].tLearnMoveState++;
}
- case 3:
+ case MVSTATE_PRINT_YES_NO:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xC);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
sEvoCursorPos = 0;
BattleCreateYesNoCursorAt(0);
}
break;
- case 4:
+ case MVSTATE_HANDLE_YES_NO:
+ // This Yes/No is used for both the initial "delete move?" prompt
+ // and for the "stop learning move?" prompt
+ // What Yes/No do next is determined by tLearnMoveYesState / tLearnMoveNoState
if (JOY_NEW(DPAD_UP) && sEvoCursorPos != 0)
{
+ // Moved onto YES
PlaySE(SE_SELECT);
BattleDestroyYesNoCursorAt(sEvoCursorPos);
sEvoCursorPos = 0;
@@ -866,6 +924,7 @@ static void Task_EvolutionScene(u8 taskID)
}
if (JOY_NEW(DPAD_DOWN) && sEvoCursorPos == 0)
{
+ // Moved onto NO
PlaySE(SE_SELECT);
BattleDestroyYesNoCursorAt(sEvoCursorPos);
sEvoCursorPos = 1;
@@ -878,350 +937,403 @@ static void Task_EvolutionScene(u8 taskID)
if (sEvoCursorPos != 0)
{
- gTasks[taskID].tLearnMoveState = gTasks[taskID].tData8;
+ // NO
+ gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
}
else
{
- gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
- if (gTasks[taskID].tLearnMoveState == 5)
+ // YES
+ gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState;
+ if (gTasks[taskId].tLearnMoveState == MVSTATE_SHOW_MOVE_SELECT)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
}
}
if (JOY_NEW(B_BUTTON))
{
+ // Equivalent to selecting NO
HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
PlaySE(SE_SELECT);
- gTasks[taskID].tLearnMoveState = gTasks[taskID].tData8;
+ gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
}
break;
- case 5:
+ case MVSTATE_SHOW_MOVE_SELECT:
if (!gPaletteFade.active)
{
FreeAllWindowBuffers();
- ShowSelectMovePokemonSummaryScreen(gPlayerParty, gTasks[taskID].tPartyID,
+ ShowSelectMovePokemonSummaryScreen(gPlayerParty, gTasks[taskId].tPartyId,
gPlayerPartyCount - 1, CB2_EvolutionSceneLoadGraphics,
gMoveToLearn);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 6:
+ case MVSTATE_HANDLE_MOVE_SELECT:
if (!gPaletteFade.active && gMain.callback2 == CB2_EvolutionSceneUpdate)
{
var = GetMoveSlotToReplace();
if (var == MAX_MON_MOVES)
{
- gTasks[taskID].tLearnMoveState = 10;
+ // Didn't select move slot
+ gTasks[taskId].tLearnMoveState = MVSTATE_ASK_CANCEL;
}
else
{
+ // Selected move to forget
u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
if (IsHMMove2(move))
{
+ // Can't forget HMs
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tLearnMoveState = 12;
+ gTasks[taskId].tLearnMoveState = MVSTATE_RETRY_AFTER_HM;
}
else
{
+ // Forget move
PREPARE_MOVE_BUFFER(gBattleTextBuff2, move)
RemoveMonPPBonus(mon, var);
SetMonMoveSlot(mon, gMoveToLearn, var);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
}
}
break;
- case 7:
+ case MVSTATE_FORGET_MSG_1:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
break;
- case 8:
+ case MVSTATE_FORGET_MSG_2:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 9:
+ case MVSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tState = 20;
+ gTasks[taskId].tState = EVOSTATE_LEARNED_MOVE;
}
break;
- case 10:
+ case MVSTATE_ASK_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tData7 = 11;
- gTasks[taskID].tData8 = 0;
- gTasks[taskID].tLearnMoveState = 3;
+ gTasks[taskId].tLearnMoveYesState = MVSTATE_CANCEL;
+ gTasks[taskId].tLearnMoveNoState = MVSTATE_INTRO_MSG_1;
+ gTasks[taskId].tLearnMoveState = MVSTATE_PRINT_YES_NO;
break;
- case 11:
+ case MVSTATE_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]);
BattlePutTextOnWindow(gDisplayedStringBattle, 0);
- gTasks[taskID].tState = 15;
+ gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE;
break;
- case 12:
+ case MVSTATE_RETRY_AFTER_HM:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
- gTasks[taskID].tLearnMoveState = 5;
+ gTasks[taskId].tLearnMoveState = MVSTATE_SHOW_MOVE_SELECT;
break;
}
break;
}
}
-static void Task_TradeEvolutionScene(u8 taskID)
+// States for the main switch in Task_TradeEvolutionScene
+enum {
+ T_EVOSTATE_INTRO_MSG,
+ T_EVOSTATE_INTRO_CRY,
+ T_EVOSTATE_INTRO_SOUND,
+ T_EVOSTATE_START_MUSIC,
+ T_EVOSTATE_START_BG_AND_SPARKLE_SPIRAL,
+ T_EVOSTATE_SPARKLE_ARC,
+ T_EVOSTATE_CYCLE_MON_SPRITE,
+ T_EVOSTATE_WAIT_CYCLE_MON_SPRITE,
+ T_EVOSTATE_SPARKLE_CIRCLE,
+ T_EVOSTATE_SPARKLE_SPRAY,
+ T_EVOSTATE_EVO_SOUND,
+ T_EVOSTATE_EVO_MON_ANIM,
+ T_EVOSTATE_SET_MON_EVOLVED,
+ T_EVOSTATE_TRY_LEARN_MOVE,
+ T_EVOSTATE_END,
+ T_EVOSTATE_CANCEL,
+ T_EVOSTATE_CANCEL_MON_ANIM,
+ T_EVOSTATE_CANCEL_MSG,
+ T_EVOSTATE_LEARNED_MOVE,
+ T_EVOSTATE_TRY_LEARN_ANOTHER_MOVE,
+ T_EVOSTATE_REPLACE_MOVE,
+};
+
+// States for the switch in T_EVOSTATE_REPLACE_MOVE
+enum {
+ T_MVSTATE_INTRO_MSG_1,
+ T_MVSTATE_INTRO_MSG_2,
+ T_MVSTATE_INTRO_MSG_3,
+ T_MVSTATE_PRINT_YES_NO,
+ T_MVSTATE_HANDLE_YES_NO,
+ T_MVSTATE_SHOW_MOVE_SELECT,
+ T_MVSTATE_HANDLE_MOVE_SELECT,
+ T_MVSTATE_FORGET_MSG,
+ T_MVSTATE_LEARNED_MOVE,
+ T_MVSTATE_ASK_CANCEL,
+ T_MVSTATE_CANCEL,
+ T_MVSTATE_RETRY_AFTER_HM,
+};
+
+// Compare to Task_EvolutionScene, very similar
+static void Task_TradeEvolutionScene(u8 taskId)
{
u32 var = 0;
- struct Pokemon* mon = &gPlayerParty[gTasks[taskID].tPartyID];
+ struct Pokemon* mon = &gPlayerParty[gTasks[taskId].tPartyId];
- switch (gTasks[taskID].tState)
+ switch (gTasks[taskId].tState)
{
- case 0:
+ case T_EVOSTATE_INTRO_MSG:
StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving);
DrawTextOnTradeWindow(0, gStringVar4, 1);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
break;
- case 1:
+ case T_EVOSTATE_INTRO_CRY:
if (!IsTextPrinterActive(0))
{
- PlayCry1(gTasks[taskID].tPreEvoSpecies, 0);
- gTasks[taskID].tState++;
+ PlayCry1(gTasks[taskId].tPreEvoSpecies, 0);
+ gTasks[taskId].tState++;
}
break;
- case 2:
+ case T_EVOSTATE_INTRO_SOUND:
if (IsCryFinished())
{
m4aSongNumStop(MUS_EVOLUTION);
PlaySE(MUS_EVOLUTION_INTRO);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 3:
+ case T_EVOSTATE_START_MUSIC:
if (!IsSEPlaying())
{
PlayBGM(MUS_EVOLUTION);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
}
break;
- case 4:
+ case T_EVOSTATE_START_BG_AND_SPARKLE_SPIRAL:
if (!gPaletteFade.active)
{
- InitMovingBackgroundTask(TRUE);
- var = gSprites[sEvoStructPtr->preEvoSpriteID].oam.paletteNum + 16;
- sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet1(var);
- gTasks[taskID].tState++;
+ StartBgAnimation(TRUE);
+ var = gSprites[sEvoStructPtr->preEvoSpriteId].oam.paletteNum + 16;
+ sEvoGraphicsTaskId = EvolutionSparkles_SpiralUpward(var);
+ gTasks[taskId].tState++;
SetGpuReg(REG_OFFSET_BG3CNT, 0x603);
}
break;
- case 5:
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case T_EVOSTATE_SPARKLE_ARC:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
- gTasks[taskID].tState++;
- sEvoStructPtr->field_3 = 1;
- sEvoGraphicsTaskID = LaunchTask_PreEvoSparklesSet2();
+ gTasks[taskId].tState++;
+ sEvoStructPtr->delayTimer = 1;
+ sEvoGraphicsTaskId = EvolutionSparkles_ArcDown();
}
break;
- case 6:
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case T_EVOSTATE_CYCLE_MON_SPRITE:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
- sEvoGraphicsTaskID = sub_817C3A0(sEvoStructPtr->preEvoSpriteID, sEvoStructPtr->postEvoSpriteID);
- gTasks[taskID].tState++;
+ sEvoGraphicsTaskId = CycleEvolutionMonSprite(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId);
+ gTasks[taskId].tState++;
}
break;
- case 7:
- if (--sEvoStructPtr->field_3 == 0)
+ case T_EVOSTATE_WAIT_CYCLE_MON_SPRITE:
+ if (--sEvoStructPtr->delayTimer == 0)
{
- sEvoStructPtr->field_3 = 3;
- if (!gTasks[sEvoGraphicsTaskID].isActive)
- gTasks[taskID].tState++;
+ sEvoStructPtr->delayTimer = 3;
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
+ gTasks[taskId].tState++;
}
break;
- case 8:
- sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet1();
- gTasks[taskID].tState++;
+ case T_EVOSTATE_SPARKLE_CIRCLE:
+ sEvoGraphicsTaskId = EvolutionSparkles_CircleInward();
+ gTasks[taskId].tState++;
break;
- case 9:
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case T_EVOSTATE_SPARKLE_SPRAY:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
- sEvoGraphicsTaskID = LaunchTask_PostEvoSparklesSet2AndFlash_Trade(gTasks[taskID].tPostEvoSpecies);
- gTasks[taskID].tState++;
+ sEvoGraphicsTaskId = EvolutionSparkles_SprayAndFlash_Trade(gTasks[taskId].tPostEvoSpecies);
+ gTasks[taskId].tState++;
}
break;
- case 10:
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case T_EVOSTATE_EVO_SOUND:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
PlaySE(SE_EXP);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
break;
- case 11:
+ case T_EVOSTATE_EVO_MON_ANIM:
if (IsSEPlaying())
{
- Free(sEvoMovingBgPtr);
- EvoScene_DoMonAnimation(sEvoStructPtr->postEvoSpriteID, gTasks[taskID].tPostEvoSpecies);
- memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60);
- gTasks[taskID].tState++;
+ // Restore bg, do mon anim/cry
+ Free(sBgAnimPal);
+ EvoScene_DoMonAnimAndCry(sEvoStructPtr->postEvoSpriteId, gTasks[taskId].tPostEvoSpecies);
+ memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette));
+ gTasks[taskId].tState++;
}
break;
- case 12:
+ case T_EVOSTATE_SET_MON_EVOLVED:
if (IsCryFinished())
{
StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
DrawTextOnTradeWindow(0, gStringVar4, 1);
PlayFanfare(MUS_EVOLVED);
- gTasks[taskID].tState++;
- SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskID].tPostEvoSpecies));
+ gTasks[taskId].tState++;
+ SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskId].tPostEvoSpecies));
CalculateMonStats(mon);
- EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies);
- GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), FLAG_SET_SEEN);
- GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), FLAG_SET_CAUGHT);
+ EvolutionRenameMon(mon, gTasks[taskId].tPreEvoSpecies, gTasks[taskId].tPostEvoSpecies);
+ GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskId].tPostEvoSpecies), FLAG_SET_SEEN);
+ GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskId].tPostEvoSpecies), FLAG_SET_CAUGHT);
IncrementGameStat(GAME_STAT_EVOLVED_POKEMON);
}
break;
- case 13:
+ case T_EVOSTATE_TRY_LEARN_MOVE:
if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE)
{
- var = MonTryLearningNewMove(mon, gTasks[taskID].tLearnsFirstMove);
- if (var != 0 && !gTasks[taskID].tEvoWasStopped)
+ var = MonTryLearningNewMove(mon, gTasks[taskId].tLearnsFirstMove);
+ if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped)
{
u8 text[20];
- gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
- gTasks[taskID].tLearnsFirstMove = FALSE;
- gTasks[taskID].tLearnMoveState = 0;
+ gTasks[taskId].tBits |= TASK_BIT_LEARN_MOVE;
+ gTasks[taskId].tLearnsFirstMove = FALSE;
+ gTasks[taskId].tLearnMoveState = 0;
GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text);
if (var == MON_HAS_MAX_MOVES)
- gTasks[taskID].tState = 20;
+ gTasks[taskId].tState = T_EVOSTATE_REPLACE_MOVE;
else if (var == MON_ALREADY_KNOWS_MOVE)
break;
else
- gTasks[taskID].tState = 18;
+ gTasks[taskId].tState = T_EVOSTATE_LEARNED_MOVE;
}
else
{
PlayBGM(MUS_EVOLUTION);
DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1);
- gTasks[taskID].tState++;
+ gTasks[taskId].tState++;
}
}
break;
- case 14:
+ case T_EVOSTATE_END:
if (!IsTextPrinterActive(0))
{
- DestroyTask(taskID);
+ DestroyTask(taskId);
Free(sEvoStructPtr);
sEvoStructPtr = NULL;
gTextFlags.useAlternateDownArrow = 0;
SetMainCallback2(gCB2_AfterEvolution);
}
break;
- case 15:
- if (!gTasks[sEvoGraphicsTaskID].isActive)
+ case T_EVOSTATE_CANCEL:
+ if (!gTasks[sEvoGraphicsTaskId].isActive)
{
m4aMPlayAllStop();
- BeginNormalPaletteFade((1 << (gSprites[sEvoStructPtr->preEvoSpriteID].oam.paletteNum + 16)) | (0x4001C), 0, 0x10, 0, RGB_WHITE);
- gTasks[taskID].tState++;
+ BeginNormalPaletteFade((1 << (gSprites[sEvoStructPtr->preEvoSpriteId].oam.paletteNum + 16)) | (0x4001C), 0, 0x10, 0, RGB_WHITE);
+ gTasks[taskId].tState++;
}
break;
- case 16:
+ case T_EVOSTATE_CANCEL_MON_ANIM:
if (!gPaletteFade.active)
{
- EvoScene_DoMonAnimation(sEvoStructPtr->preEvoSpriteID, gTasks[taskID].tPreEvoSpecies);
- gTasks[taskID].tState++;
+ EvoScene_DoMonAnimAndCry(sEvoStructPtr->preEvoSpriteId, gTasks[taskId].tPreEvoSpecies);
+ gTasks[taskId].tState++;
}
break;
- case 17:
- if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID))
+ case T_EVOSTATE_CANCEL_MSG:
+ if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteId))
{
StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark);
DrawTextOnTradeWindow(0, gStringVar4, 1);
- gTasks[taskID].tEvoWasStopped = 1;
- gTasks[taskID].tState = 13;
+ gTasks[taskId].tEvoWasStopped = TRUE;
+ gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE;
}
break;
- case 18:
+ case T_EVOSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BufferMoveToLearnIntoBattleTextBuff2();
PlayFanfare(MUS_LEVEL_UP);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
- gTasks[taskID].tState++;
+ gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter
+ gTasks[taskId].tState++;
}
break;
- case 19:
- if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE && --gTasks[taskID].tLearnsFirstMove == 0)
- gTasks[taskID].tState = 13;
+ case T_EVOSTATE_TRY_LEARN_ANOTHER_MOVE:
+ if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE && --gTasks[taskId].tLearnsFirstMove == 0)
+ gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE;
break;
- case 20:
- switch (gTasks[taskID].tLearnMoveState)
+ case T_EVOSTATE_REPLACE_MOVE:
+ switch (gTasks[taskId].tLearnMoveState)
{
- case 0:
+ case T_MVSTATE_INTRO_MSG_1:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
+ // "{mon} is trying to learn {move}"
BufferMoveToLearnIntoBattleTextBuff2();
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 1:
+ case T_MVSTATE_INTRO_MSG_2:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
+ // "But, {mon} can't learn more than four moves"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 2:
+ case T_MVSTATE_INTRO_MSG_3:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
+ // "Delete a move to make room for {move}?"
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tData7 = 5;
- gTasks[taskID].tData8 = 9;
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveYesState = T_MVSTATE_SHOW_MOVE_SELECT;
+ gTasks[taskId].tLearnMoveNoState = T_MVSTATE_ASK_CANCEL;
+ gTasks[taskId].tLearnMoveState++;
}
- case 3:
+ case T_MVSTATE_PRINT_YES_NO:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
LoadUserWindowBorderGfx(0, 0xA8, 0xE0);
CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, 0xA8, 0xE, 0);
sEvoCursorPos = 0;
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
sEvoCursorPos = 0;
}
break;
- case 4:
+ case T_MVSTATE_HANDLE_YES_NO:
switch (Menu_ProcessInputNoWrapClearOnChoose())
{
- case 0:
+ case 0: // YES
sEvoCursorPos = 0;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
- if (gTasks[taskID].tLearnMoveState == 5)
+ gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState;
+ if (gTasks[taskId].tLearnMoveState == T_MVSTATE_SHOW_MOVE_SELECT)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
break;
- case 1:
- case -1:
+ case 1: // NO
+ case MENU_B_PRESSED:
sEvoCursorPos = 1;
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState = gTasks[taskID].tData8;
+ gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState;
break;
}
break;
- case 5:
+ case T_MVSTATE_SHOW_MOVE_SELECT:
if (!gPaletteFade.active)
{
if (gWirelessCommType)
@@ -1232,73 +1344,77 @@ static void Task_TradeEvolutionScene(u8 taskID)
Free(GetBgTilemapBuffer(0));
FreeAllWindowBuffers();
- ShowSelectMovePokemonSummaryScreen(gPlayerParty, gTasks[taskID].tPartyID,
+ ShowSelectMovePokemonSummaryScreen(gPlayerParty, gTasks[taskId].tPartyId,
gPlayerPartyCount - 1, CB2_TradeEvolutionSceneLoadGraphics,
gMoveToLearn);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 6:
+ case T_MVSTATE_HANDLE_MOVE_SELECT:
if (!gPaletteFade.active && gMain.callback2 == CB2_TradeEvolutionSceneUpdate)
{
var = GetMoveSlotToReplace();
if (var == MAX_MON_MOVES)
{
- gTasks[taskID].tLearnMoveState = 9;
+ // Didn't select move slot
+ gTasks[taskId].tLearnMoveState = T_MVSTATE_ASK_CANCEL;
}
else
{
+ // Selected move to forget
u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
if (IsHMMove2(move))
{
+ // Can't forget HMs
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState = 11;
+ gTasks[taskId].tLearnMoveState = T_MVSTATE_RETRY_AFTER_HM;
}
else
{
+ // Forget move
PREPARE_MOVE_BUFFER(gBattleTextBuff2, move)
RemoveMonPPBonus(mon, var);
SetMonMoveSlot(mon, gMoveToLearn, var);
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
}
}
break;
- case 7:
+ case T_MVSTATE_FORGET_MSG:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tLearnMoveState++;
+ gTasks[taskId].tLearnMoveState++;
}
break;
- case 8:
+ case T_MVSTATE_LEARNED_MOVE:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tState = 18;
+ gTasks[taskId].tState = T_EVOSTATE_LEARNED_MOVE;
}
break;
- case 9:
+ case T_MVSTATE_ASK_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tData7 = 10;
- gTasks[taskID].tData8 = 0;
- gTasks[taskID].tLearnMoveState = 3;
+ gTasks[taskId].tLearnMoveYesState = T_MVSTATE_CANCEL;
+ gTasks[taskId].tLearnMoveNoState = T_MVSTATE_INTRO_MSG_1;
+ gTasks[taskId].tLearnMoveState = T_MVSTATE_PRINT_YES_NO;
break;
- case 10:
+ case T_MVSTATE_CANCEL:
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]);
DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
- gTasks[taskID].tState = 13;
+ gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE;
break;
- case 11:
+ case T_MVSTATE_RETRY_AFTER_HM:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
- gTasks[taskID].tLearnMoveState = 5;
+ gTasks[taskId].tLearnMoveState = T_MVSTATE_SHOW_MOVE_SELECT;
break;
}
break;
@@ -1312,10 +1428,10 @@ static void Task_TradeEvolutionScene(u8 taskID)
#undef tBits
#undef tLearnsFirstMove
#undef tLearnMoveState
-#undef tData7
-#undef tData8
+#undef tLearnMoveYesState
+#undef tLearnMoveNoState
#undef tEvoWasStopped
-#undef tPartyID
+#undef tPartyId
static void EvoDummyFunc(void)
{
@@ -1355,57 +1471,87 @@ static void VBlankCB_TradeEvolutionScene(void)
ScanlineEffect_InitHBlankDmaTransfer();
}
-static void sub_813FDEC(u8 taskId)
+#define tCycleTimer data[0]
+#define tPalStage data[1]
+#define tControlStage data[2]
+#define tNumCycles data[3]
+#define tStartTimer data[5]
+#define tPaused data[6]
+
+// See comments above sBgAnim_PaletteControl
+#define START_PAL sBgAnim_PaletteControl[tControlStage][0]
+#define END_PAL sBgAnim_PaletteControl[tControlStage][1]
+#define CYCLES sBgAnim_PaletteControl[tControlStage][2]
+#define DELAY sBgAnim_PaletteControl[tControlStage][3]
+
+// Cycles the background through a set range of palettes in a series
+// of stages, each stage having a different palette range and timing
+static void Task_UpdateBgPalette(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- if (data[6] != 0)
+ if (tPaused)
return;
- if (data[5]++ < 20)
+ if (tStartTimer++ < 20)
return;
- if (data[0]++ > sUnknown_085B58C9[data[2]][3])
+ if (tCycleTimer++ > DELAY)
{
- if (sUnknown_085B58C9[data[2]][1] == data[1])
+ if (END_PAL == tPalStage)
{
- data[3]++;
- if (data[3] == sUnknown_085B58C9[data[2]][2])
+ // Reached final palette in current stage, completed a 'cycle'
+ // If this is the final cycle for this stage, move to the next stage
+ tNumCycles++;
+ if (tNumCycles == CYCLES)
{
- data[3] = 0;
- data[2]++;
+ tNumCycles = 0;
+ tControlStage++;
}
- data[1] = sUnknown_085B58C9[data[2]][0];
+ tPalStage = START_PAL;
}
else
{
- LoadPalette(&sEvoMovingBgPtr[data[1] * 16], 0xA0, 0x20);
- data[0] = 0;
- data[1]++;
+ // Haven't reached final palette in current stage, load the current palette
+ LoadPalette(&sBgAnimPal[tPalStage * 16], 0xA0, 0x20);
+ tCycleTimer = 0;
+ tPalStage++;
}
}
- if (data[2] == 4)
+ if (tControlStage == (int)ARRAY_COUNT(sBgAnim_PaletteControl[0]))
DestroyTask(taskId);
}
-static void sub_813FEA4(bool8 isLink)
+#undef tCycleTimer
+#undef tPalStage
+#undef tControlStage
+#undef tNumCycles
+#undef tStartTimer
+#undef START_PAL
+#undef END_PAL
+#undef CYCLES
+#undef DELAY
+
+#define tIsLink data[2]
+
+static void CreateBgAnimTask(bool8 isLink)
{
- u8 taskId = CreateTask(sub_813FEE8, 7);
+ u8 taskId = CreateTask(Task_AnimateBg, 7);
if (!isLink)
- gTasks[taskId].data[2] = 0;
+ gTasks[taskId].tIsLink = FALSE;
else
- gTasks[taskId].data[2] = 1;
+ gTasks[taskId].tIsLink = TRUE;
}
-static void sub_813FEE8(u8 taskId)
+static void Task_AnimateBg(u8 taskId)
{
u16 *outer_X, *outer_Y;
u16 *inner_X = &gBattle_BG1_X;
u16 *inner_Y = &gBattle_BG1_Y;
- if (!gTasks[taskId].data[2])
+ if (!gTasks[taskId].tIsLink)
{
outer_X = &gBattle_BG2_X;
outer_Y = &gBattle_BG2_Y;
@@ -1425,7 +1571,7 @@ static void sub_813FEE8(u8 taskId)
*outer_X = Cos(gTasks[taskId].data[1], 4) + 8;
*outer_Y = Sin(gTasks[taskId].data[1], 4) + 16;
- if (!FuncIsActiveTask(sub_813FDEC))
+ if (!FuncIsActiveTask(Task_UpdateBgPalette))
{
DestroyTask(taskId);
@@ -1437,37 +1583,39 @@ static void sub_813FEE8(u8 taskId)
}
}
-static void InitMovingBgValues(u16 *movingBgs)
+#undef tIsLink
+
+static void InitMovingBgPalette(u16 *palette)
{
s32 i, j;
- for (i = 0; i < 50; i++)
+ for (i = 0; i < (int)ARRAY_COUNT(sBgAnim_PalIndexes); i++)
{
for (j = 0; j < 16; j++)
{
- movingBgs[i * 16 + j] = sUnknown_085B5884[sUnknown_085B58D9[i][j]];
+ palette[i * 16 + j] = sBgAnim_Pal[sBgAnim_PalIndexes[i][j]];
}
}
}
-static void InitMovingBackgroundTask(bool8 isLink)
+static void StartBgAnimation(bool8 isLink)
{
u8 innerBgId, outerBgId;
- sEvoMovingBgPtr = AllocZeroed(0x640);
- InitMovingBgValues(sEvoMovingBgPtr);
+ sBgAnimPal = AllocZeroed(0x640);
+ InitMovingBgPalette(sBgAnimPal);
if (!isLink)
innerBgId = 1, outerBgId = 2;
else
innerBgId = 1, outerBgId = 3;
- LoadPalette(sUnknown_085B51E4, 0xA0, 0x20);
+ LoadPalette(sBgAnim_Intro_Pal, 0xA0, 0x20);
- DecompressAndLoadBgGfxUsingHeap(1, sUnknown_085B4134, FALSE, 0, 0);
- CopyToBgTilemapBuffer(1, sUnknown_085B482C, 0, 0);
- CopyToBgTilemapBuffer(outerBgId, sUnknown_085B4D10, 0, 0);
- CopyBgTilemapBufferToVram(1);
+ DecompressAndLoadBgGfxUsingHeap(1, sBgAnim_Gfx, FALSE, 0, 0);
+ CopyToBgTilemapBuffer(innerBgId, sBgAnim_Inner_Tilemap, 0, 0);
+ CopyToBgTilemapBuffer(outerBgId, sBgAnim_Outer_Tilemap, 0, 0);
+ CopyBgTilemapBufferToVram(innerBgId);
CopyBgTilemapBufferToVram(outerBgId);
if (!isLink)
@@ -1489,34 +1637,37 @@ static void InitMovingBackgroundTask(bool8 isLink)
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP);
}
- CreateTask(sub_813FDEC, 5);
- sub_813FEA4(isLink);
+ CreateTask(Task_UpdateBgPalette, 5);
+ CreateBgAnimTask(isLink);
}
-static void sub_8140100(void) // unused
+// Unused
+static void PauseBgPaletteAnim(void)
{
- u8 taskId = FindTaskIdByFunc(sub_813FDEC);
+ u8 taskId = FindTaskIdByFunc(Task_UpdateBgPalette);
if (taskId != 0xFF)
- gTasks[taskId].data[6] = 1;
+ gTasks[taskId].tPaused = TRUE;
FillPalette(0, 0xA0, 0x20);
}
-static void sub_8140134(void)
+#undef tPaused
+
+static void StopBgAnimation(void)
{
u8 taskId;
- if ((taskId = FindTaskIdByFunc(sub_813FDEC)) != 0xFF)
+ if ((taskId = FindTaskIdByFunc(Task_UpdateBgPalette)) != 0xFF)
DestroyTask(taskId);
- if ((taskId = FindTaskIdByFunc(sub_813FEE8)) != 0xFF)
+ if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != 0xFF)
DestroyTask(taskId);
FillPalette(0, 0xA0, 0x20);
- sub_8140174();
+ RestoreBgAfterAnim();
}
-static void sub_8140174(void)
+static void RestoreBgAfterAnim(void)
{
SetGpuReg(REG_OFFSET_BLDCNT, 0);
gBattle_BG1_X = 0;
@@ -1525,10 +1676,10 @@ static void sub_8140174(void)
SetBgAttribute(1, BG_ATTR_PRIORITY, GetBattleBgTemplateData(1, 5));
SetBgAttribute(2, BG_ATTR_PRIORITY, GetBattleBgTemplateData(2, 5));
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP);
- Free(sEvoMovingBgPtr);
+ Free(sBgAnimPal);
}
-static void EvoScene_DoMonAnimation(u8 monSpriteId, u16 speciesId)
+static void EvoScene_DoMonAnimAndCry(u8 monSpriteId, u16 speciesId)
{
DoMonFrontSpriteAnimation(&gSprites[monSpriteId], speciesId, FALSE, 0);
}
diff --git a/src/field_effect.c b/src/field_effect.c
index b1837c514..467a0f656 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -967,8 +967,8 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
curBlue -= ((curBlue * b) >> 4);
color = curRed;
- color |= curGreen << 5;
- color |= curBlue << 10;
+ color |= (curGreen << 5);
+ color |= (curBlue << 10);
gPlttBufferFaded[i] = color;
}
diff --git a/src/field_weather.c b/src/field_weather.c
index 25ee0582a..02e3a0cb0 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -494,7 +494,7 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
r = gammaTable[baseColor.r];
g = gammaTable[baseColor.g];
b = gammaTable[baseColor.b];
- gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r;
+ gPlttBufferFaded[palOffset++] = RGB2(r, g, b);
}
}
@@ -579,7 +579,7 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI
r += ((rBlend - r) * blendCoeff) >> 4;
g += ((gBlend - g) * blendCoeff) >> 4;
b += ((bBlend - b) * blendCoeff) >> 4;
- gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r;
+ gPlttBufferFaded[palOffset++] = RGB2(r, g, b);
}
}
@@ -636,7 +636,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
g2 += ((gBlend - g2) * blendCoeff) >> 4;
b2 += ((bBlend - b2) * blendCoeff) >> 4;
- gPlttBufferFaded[palOffset++] = (b2 << 10) | (g2 << 5) | r2;
+ gPlttBufferFaded[palOffset++] = RGB2(r2, g2, b2);
}
}
}
@@ -678,7 +678,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
g += ((gBlend - g) * blendCoeff) >> 4;
b += ((bBlend - b) * blendCoeff) >> 4;
- gPlttBufferFaded[palOffset] = (b << 10) | (g << 5) | r;
+ gPlttBufferFaded[palOffset] = RGB2(r, g, b);
palOffset++;
}
}
diff --git a/src/item_menu.c b/src/item_menu.c
index c63342041..375e15cab 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -86,7 +86,7 @@ u16 BagGetQuantityByPocketPosition(u8, u16);
void BagDestroyPocketSwitchArrowPair(void);
void TaskCloseBagMenu_2(u8);
u8 AddItemMessageWindow(u8);
-void BagMenu_RemoveBagItemMessageindow(u8);
+void BagMenu_RemoveBagItemMessageWindow(u8);
void set_callback3_to_bag(u8);
void PrintItemDepositAmount(u8, s16);
static u8 BagMenu_AddWindow(u8);
@@ -1115,7 +1115,7 @@ void BagMenu_InitListsMenu(u8 taskId)
s16* data = gTasks[taskId].data;
u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
- BagMenu_RemoveBagItemMessageindow(4);
+ BagMenu_RemoveBagItemMessageWindow(4);
DestroyListMenuTask(data[0], scrollPos, cursorPos);
UpdatePocketItemList(gBagPositionStruct.pocket);
SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
@@ -2035,7 +2035,7 @@ void BagMenu_CancelSell(u8 taskId)
s16* data = gTasks[taskId].data;
RemoveMoneyWindow();
- BagMenu_RemoveBagItemMessageindow(4);
+ BagMenu_RemoveBagItemMessageWindow(4);
BagMenu_PrintCursor_(data[0], 0);
set_callback3_to_bag(taskId);
}
@@ -2070,7 +2070,7 @@ static void Task_SellHowManyDialogueHandleInput(u8 taskId)
BagMenu_PrintCursor_(data[0], 0);
RemoveMoneyWindow();
BagMenu_RemoveWindow(8);
- BagMenu_RemoveBagItemMessageindow(4);
+ BagMenu_RemoveBagItemMessageWindow(4);
set_callback3_to_bag(taskId);
}
}
@@ -2420,7 +2420,7 @@ u8 AddItemMessageWindow(u8 which)
return *ptr;
}
-void BagMenu_RemoveBagItemMessageindow(u8 which)
+void BagMenu_RemoveBagItemMessageWindow(u8 which)
{
u8 *ptr = &gBagMenu->windowPointers[which];
if (*ptr != 0xFF)
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 7de963893..74e3455c3 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -23,7 +23,6 @@
#include "text_window.h"
#include "trig.h"
#include "window.h"
-#include "constants/berry.h"
#include "constants/songs.h"
#include "gba/io_reg.h"
diff --git a/src/party_menu.c b/src/party_menu.c
index 096f87dd2..b2fd358ca 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3520,9 +3520,9 @@ static void CursorCb_Register(u8 taskId)
{
u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
- u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE);
+ u8 isEventLegal = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_EVENT_LEGAL);
- switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), species2, species, obedience))
+ switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), species2, species, isEventLegal))
{
case CANT_REGISTER_MON:
StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow);
@@ -3547,8 +3547,8 @@ static void CursorCb_Trade1(u8 taskId)
{
u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
- u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE);
- u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience);
+ u8 isEventLegal = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_EVENT_LEGAL);
+ u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, isEventLegal);
if (stringId != UR_TRADE_MSG_NONE)
{
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 0bfb10632..4485fe1ef 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -29,7 +29,6 @@
#include "task.h"
#include "text.h"
#include "text_window.h"
-#include "constants/berry.h"
#include "constants/items.h"
#include "constants/songs.h"
#include "constants/rgb.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index 064e206a4..5812e987a 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2615,12 +2615,12 @@ void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerP
GetMonData(mon, MON_DATA_NICKNAME, dest->nickname);
}
-void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
+void CreateEventLegalMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
{
- bool32 obedient = TRUE;
+ bool32 isEventLegal = TRUE;
CreateMon(mon, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId);
- SetMonData(mon, MON_DATA_OBEDIENCE, &obedient);
+ SetMonData(mon, MON_DATA_EVENT_LEGAL, &isEventLegal);
}
// If FALSE, should load this game's Deoxys form. If TRUE, should load normal Deoxys form
@@ -2755,14 +2755,14 @@ u16 GetUnionRoomTrainerClass(void)
return gFacilityClassToTrainerClass[gLinkPlayerFacilityClasses[arrId]];
}
-void CreateObedientEnemyMon(void)
+void CreateEventLegalEnemyMon(void)
{
s32 species = gSpecialVar_0x8004;
s32 level = gSpecialVar_0x8005;
s32 itemId = gSpecialVar_0x8006;
ZeroEnemyPartyMons();
- CreateObedientMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, 0, 0, 0, 0);
+ CreateEventLegalMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, 0, 0, 0, 0);
if (itemId)
{
u8 heldItem[2];
@@ -2993,7 +2993,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove)
{
- u32 retVal = 0;
+ u32 retVal = MOVE_NONE;
u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
u8 level = GetMonData(mon, MON_DATA_LEVEL, NULL);
@@ -3009,7 +3009,7 @@ u16 MonTryLearningNewMove(struct Pokemon *mon, bool8 firstMove)
{
sLearningMoveTableID++;
if (gLevelUpLearnsets[species][sLearningMoveTableID] == LEVEL_UP_END)
- return 0;
+ return MOVE_NONE;
}
}
@@ -3907,32 +3907,32 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
case MON_DATA_EFFORT_RIBBON:
retVal = substruct3->effortRibbon;
break;
- case MON_DATA_GIFT_RIBBON_1:
- retVal = substruct3->giftRibbon1;
+ case MON_DATA_MARINE_RIBBON:
+ retVal = substruct3->marineRibbon;
break;
- case MON_DATA_GIFT_RIBBON_2:
- retVal = substruct3->giftRibbon2;
+ case MON_DATA_LAND_RIBBON:
+ retVal = substruct3->landRibbon;
break;
- case MON_DATA_GIFT_RIBBON_3:
- retVal = substruct3->giftRibbon3;
+ case MON_DATA_SKY_RIBBON:
+ retVal = substruct3->skyRibbon;
break;
- case MON_DATA_GIFT_RIBBON_4:
- retVal = substruct3->giftRibbon4;
+ case MON_DATA_COUNTRY_RIBBON:
+ retVal = substruct3->countryRibbon;
break;
- case MON_DATA_GIFT_RIBBON_5:
- retVal = substruct3->giftRibbon5;
+ case MON_DATA_NATIONAL_RIBBON:
+ retVal = substruct3->nationalRibbon;
break;
- case MON_DATA_GIFT_RIBBON_6:
- retVal = substruct3->giftRibbon6;
+ case MON_DATA_EARTH_RIBBON:
+ retVal = substruct3->earthRibbon;
break;
- case MON_DATA_GIFT_RIBBON_7:
- retVal = substruct3->giftRibbon7;
+ case MON_DATA_WORLD_RIBBON:
+ retVal = substruct3->worldRibbon;
break;
- case MON_DATA_FATEFUL_ENCOUNTER:
- retVal = substruct3->fatefulEncounter;
+ case MON_DATA_FILLER:
+ retVal = substruct3->filler;
break;
- case MON_DATA_OBEDIENCE:
- retVal = substruct3->obedient;
+ case MON_DATA_EVENT_LEGAL:
+ retVal = substruct3->eventLegal;
break;
case MON_DATA_SPECIES2:
retVal = substruct0->species;
@@ -3974,13 +3974,13 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
retVal += substruct3->victoryRibbon;
retVal += substruct3->artistRibbon;
retVal += substruct3->effortRibbon;
- retVal += substruct3->giftRibbon1;
- retVal += substruct3->giftRibbon2;
- retVal += substruct3->giftRibbon3;
- retVal += substruct3->giftRibbon4;
- retVal += substruct3->giftRibbon5;
- retVal += substruct3->giftRibbon6;
- retVal += substruct3->giftRibbon7;
+ retVal += substruct3->marineRibbon;
+ retVal += substruct3->landRibbon;
+ retVal += substruct3->skyRibbon;
+ retVal += substruct3->countryRibbon;
+ retVal += substruct3->nationalRibbon;
+ retVal += substruct3->earthRibbon;
+ retVal += substruct3->worldRibbon;
}
break;
case MON_DATA_RIBBONS:
@@ -3997,13 +3997,13 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
| (substruct3->victoryRibbon << 17)
| (substruct3->artistRibbon << 18)
| (substruct3->effortRibbon << 19)
- | (substruct3->giftRibbon1 << 20)
- | (substruct3->giftRibbon2 << 21)
- | (substruct3->giftRibbon3 << 22)
- | (substruct3->giftRibbon4 << 23)
- | (substruct3->giftRibbon5 << 24)
- | (substruct3->giftRibbon6 << 25)
- | (substruct3->giftRibbon7 << 26);
+ | (substruct3->marineRibbon << 20)
+ | (substruct3->landRibbon << 21)
+ | (substruct3->skyRibbon << 22)
+ | (substruct3->countryRibbon << 23)
+ | (substruct3->nationalRibbon << 24)
+ | (substruct3->earthRibbon << 25)
+ | (substruct3->worldRibbon << 26);
}
break;
default:
@@ -4286,32 +4286,32 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
case MON_DATA_EFFORT_RIBBON:
SET8(substruct3->effortRibbon);
break;
- case MON_DATA_GIFT_RIBBON_1:
- SET8(substruct3->giftRibbon1);
+ case MON_DATA_MARINE_RIBBON:
+ SET8(substruct3->marineRibbon);
break;
- case MON_DATA_GIFT_RIBBON_2:
- SET8(substruct3->giftRibbon2);
+ case MON_DATA_LAND_RIBBON:
+ SET8(substruct3->landRibbon);
break;
- case MON_DATA_GIFT_RIBBON_3:
- SET8(substruct3->giftRibbon3);
+ case MON_DATA_SKY_RIBBON:
+ SET8(substruct3->skyRibbon);
break;
- case MON_DATA_GIFT_RIBBON_4:
- SET8(substruct3->giftRibbon4);
+ case MON_DATA_COUNTRY_RIBBON:
+ SET8(substruct3->countryRibbon);
break;
- case MON_DATA_GIFT_RIBBON_5:
- SET8(substruct3->giftRibbon5);
+ case MON_DATA_NATIONAL_RIBBON:
+ SET8(substruct3->nationalRibbon);
break;
- case MON_DATA_GIFT_RIBBON_6:
- SET8(substruct3->giftRibbon6);
+ case MON_DATA_EARTH_RIBBON:
+ SET8(substruct3->earthRibbon);
break;
- case MON_DATA_GIFT_RIBBON_7:
- SET8(substruct3->giftRibbon7);
+ case MON_DATA_WORLD_RIBBON:
+ SET8(substruct3->worldRibbon);
break;
- case MON_DATA_FATEFUL_ENCOUNTER:
- SET8(substruct3->fatefulEncounter);
+ case MON_DATA_FILLER:
+ SET8(substruct3->filler);
break;
- case MON_DATA_OBEDIENCE:
- SET8(substruct3->obedient);
+ case MON_DATA_EVENT_LEGAL:
+ SET8(substruct3->eventLegal);
break;
case MON_DATA_IVS:
{
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index f8b361912..5b80fd428 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -38,9 +38,9 @@ static const struct UnknownStruct sBigMonSizeTable[] =
static const u8 sGiftRibbonsMonDataIds[] =
{
- MON_DATA_GIFT_RIBBON_1, MON_DATA_GIFT_RIBBON_2, MON_DATA_GIFT_RIBBON_3,
- MON_DATA_GIFT_RIBBON_4, MON_DATA_GIFT_RIBBON_5, MON_DATA_GIFT_RIBBON_6,
- MON_DATA_GIFT_RIBBON_7
+ MON_DATA_MARINE_RIBBON, MON_DATA_LAND_RIBBON, MON_DATA_SKY_RIBBON,
+ MON_DATA_COUNTRY_RIBBON, MON_DATA_NATIONAL_RIBBON, MON_DATA_EARTH_RIBBON,
+ MON_DATA_WORLD_RIBBON
};
extern const u8 gText_DecimalPoint[];
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 50fc04372..eaa9416cf 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -5898,12 +5898,12 @@ static bool8 sub_80CD554(void)
return TRUE;
}
-static void sub_80CD6AC(u8 newCurosrArea, u8 newCursorPosition)
+static void sub_80CD6AC(u8 newCursorArea, u8 newCursorPosition)
{
u16 x, y;
- sub_80CD444(newCurosrArea, newCursorPosition, &x, &y);
- sPSSData->field_CD4 = newCurosrArea;
+ sub_80CD444(newCursorArea, newCursorPosition, &x, &y);
+ sPSSData->field_CD4 = newCursorArea;
sPSSData->field_CD5 = newCursorPosition;
sPSSData->field_CCC = x;
sPSSData->field_CCE = y;
@@ -5955,9 +5955,9 @@ static void sub_80CD70C(void)
sPSSData->field_CC0 = sPSSData->field_CB4->pos1.y << 8;
}
-static void sub_80CD894(u8 newCurosrArea, u8 newCursorPosition)
+static void sub_80CD894(u8 newCursorArea, u8 newCursorPosition)
{
- sub_80CD6AC(newCurosrArea, newCursorPosition);
+ sub_80CD6AC(newCursorArea, newCursorPosition);
sub_80CD70C();
if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
@@ -5977,19 +5977,19 @@ static void sub_80CD894(u8 newCurosrArea, u8 newCursorPosition)
else if (sBoxCursorArea == CURSOR_AREA_IN_PARTY)
sub_80D0E50(CURSOR_AREA_IN_PARTY, sBoxCursorPosition);
- if (newCurosrArea == CURSOR_AREA_IN_BOX)
- sub_80D0D8C(newCurosrArea, newCursorPosition);
- else if (newCurosrArea == CURSOR_AREA_IN_PARTY)
- sub_80D0D8C(newCurosrArea, newCursorPosition);
+ if (newCursorArea == CURSOR_AREA_IN_BOX)
+ sub_80D0D8C(newCursorArea, newCursorPosition);
+ else if (newCursorArea == CURSOR_AREA_IN_PARTY)
+ sub_80D0D8C(newCursorArea, newCursorPosition);
}
- if (newCurosrArea == CURSOR_AREA_IN_PARTY && sBoxCursorArea != CURSOR_AREA_IN_PARTY)
+ if (newCursorArea == CURSOR_AREA_IN_PARTY && sBoxCursorArea != CURSOR_AREA_IN_PARTY)
{
- sPSSData->field_CD6 = newCurosrArea;
+ sPSSData->field_CD6 = newCursorArea;
sPSSData->field_CB8->invisible = TRUE;
}
- switch (newCurosrArea)
+ switch (newCursorArea)
{
case CURSOR_AREA_IN_PARTY:
case CURSOR_AREA_BOX:
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f599a0004..7caaa194b 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2207,21 +2207,21 @@ bool8 ScrCmd_lockfortrainer(struct ScriptContext *ctx)
}
}
-// This command will force the Pokémon to be obedient, you don't get to make it disobedient.
-bool8 ScrCmd_setmonobedient(struct ScriptContext *ctx)
+// This command will set a Pokémon's eventLegal bit; there is no similar command to clear it.
+bool8 ScrCmd_setmoneventlegal(struct ScriptContext *ctx)
{
- bool8 obedient = TRUE;
+ bool8 isEventLegal = TRUE;
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
- SetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, &obedient);
+ SetMonData(&gPlayerParty[partyIndex], MON_DATA_EVENT_LEGAL, &isEventLegal);
return FALSE;
}
-bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
+bool8 ScrCmd_checkmoneventlegal(struct ScriptContext *ctx)
{
u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
- gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_OBEDIENCE, NULL);
+ gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_EVENT_LEGAL, NULL);
return FALSE;
}
diff --git a/src/trade.c b/src/trade.c
index 05c64cb82..afefce93c 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1489,7 +1489,7 @@ static u8 CheckValidityOfTradeMons(u8 *aliveMons, u8 playerPartyCount, u8 player
// Partner cant trade illegitimate Deoxys or Mew
if (partnerSpecies == SPECIES_DEOXYS || partnerSpecies == SPECIES_MEW)
{
- if (!GetMonData(&gEnemyParty[partnerMonIdx], MON_DATA_OBEDIENCE))
+ if (!GetMonData(&gEnemyParty[partnerMonIdx], MON_DATA_EVENT_LEGAL))
return PARTNER_MON_INVALID;
}
@@ -2329,7 +2329,7 @@ static u32 CanTradeSelectedMon(struct Pokemon *playerParty, int partyCount, int
if (species[monIdx] == SPECIES_DEOXYS || species[monIdx] == SPECIES_MEW)
{
- if (!GetMonData(&playerParty[monIdx], MON_DATA_OBEDIENCE))
+ if (!GetMonData(&playerParty[monIdx], MON_DATA_EVENT_LEGAL))
return CANT_TRADE_INVALID_MON;
}
@@ -2394,17 +2394,17 @@ s32 GetGameProgressForLinkTrade(void)
return TRADE_BOTH_PLAYERS_READY;
}
-static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isObedientBitSet)
+static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isEventLegal)
{
if (species == SPECIES_DEOXYS || species == SPECIES_MEW)
{
- if (!isObedientBitSet)
+ if (!isEventLegal)
return TRUE;
}
return FALSE;
}
-int GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet)
+int GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGnameSub rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isEventLegal)
{
bool8 playerHasNationalDex = rfuPlayer.hasNationalDex;
bool8 playerIsChampion = rfuPlayer.isChampion;
@@ -2424,7 +2424,7 @@ int GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGname
}
}
- if (IsDeoxysOrMewUntradable(playerSpecies, isObedientBitSet))
+ if (IsDeoxysOrMewUntradable(playerSpecies, isEventLegal))
{
return UR_TRADE_MSG_MON_CANT_BE_TRADED_2;
}
@@ -2475,11 +2475,11 @@ int GetUnionRoomTradeMessageId(struct GFtgtGnameSub rfuPlayer, struct GFtgtGname
return UR_TRADE_MSG_NONE;
}
-int CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet)
+int CanRegisterMonForTradingBoard(struct GFtgtGnameSub rfuPlayer, u16 species2, u16 species, u8 isEventLegal)
{
bool8 hasNationalDex = rfuPlayer.hasNationalDex;
- if (IsDeoxysOrMewUntradable(species, isObedientBitSet))
+ if (IsDeoxysOrMewUntradable(species, isEventLegal))
return CANT_REGISTER_MON;
if (hasNationalDex)
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 8a7d2a5f9..9833f14bd 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -41,10 +41,10 @@ static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct O
static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
-static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
-static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
-static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
-static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
+static bool8 RevealBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
+static bool8 PopOutOfAshBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
+static bool8 JumpInPlaceBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
+static bool8 WaitRevealBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static void SpriteCB_TrainerIcons(struct Sprite *sprite);
@@ -80,10 +80,10 @@ enum {
TRSEE_PLAYER_FACE_WAIT,
TRSEE_REVEAL_DISGUISE,
TRSEE_REVEAL_DISGUISE_WAIT,
- TRSEE_REVEAL_HIDDEN,
- TRSEE_HIDDEN_POP_OUT,
- TRSEE_HIDDEN_JUMP,
- TRSEE_REVEAL_HIDDEN_WAIT,
+ TRSEE_REVEAL_BURIED,
+ TRSEE_BURIED_POP_OUT,
+ TRSEE_BURIED_JUMP,
+ TRSEE_REVEAL_BURIED_WAIT,
};
static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) =
@@ -96,18 +96,18 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct
[TRSEE_PLAYER_FACE_WAIT] = WaitPlayerFaceApproachingTrainer,
[TRSEE_REVEAL_DISGUISE] = RevealDisguisedTrainer,
[TRSEE_REVEAL_DISGUISE_WAIT] = WaitRevealDisguisedTrainer,
- [TRSEE_REVEAL_HIDDEN] = RevealHiddenTrainer,
- [TRSEE_HIDDEN_POP_OUT] = PopOutOfAshHiddenTrainer,
- [TRSEE_HIDDEN_JUMP] = JumpInPlaceHiddenTrainer,
- [TRSEE_REVEAL_HIDDEN_WAIT] = WaitRevealHiddenTrainer,
+ [TRSEE_REVEAL_BURIED] = RevealBuriedTrainer,
+ [TRSEE_BURIED_POP_OUT] = PopOutOfAshBuriedTrainer,
+ [TRSEE_BURIED_JUMP] = JumpInPlaceBuriedTrainer,
+ [TRSEE_REVEAL_BURIED_WAIT] = WaitRevealBuriedTrainer,
};
static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) =
{
- RevealHiddenTrainer,
- PopOutOfAshHiddenTrainer,
- JumpInPlaceHiddenTrainer,
- WaitRevealHiddenTrainer,
+ RevealBuriedTrainer,
+ PopOutOfAshBuriedTrainer,
+ JumpInPlaceBuriedTrainer,
+ WaitRevealBuriedTrainer,
};
static const struct OamData sOamData_Icons =
@@ -481,8 +481,8 @@ static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct Obj
task->tFuncId++; // TRSEE_MOVE_TO_PLAYER
if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
task->tFuncId = TRSEE_REVEAL_DISGUISE;
- if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN)
- task->tFuncId = TRSEE_REVEAL_HIDDEN;
+ if (trainerObj->movementType == MOVEMENT_TYPE_BURIED)
+ task->tFuncId = TRSEE_REVEAL_BURIED;
return TRUE;
}
}
@@ -561,8 +561,8 @@ static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct Obj
return FALSE;
}
-// TRSEE_REVEAL_HIDDEN
-static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+// TRSEE_REVEAL_BURIED
+static bool8 RevealBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (!ObjectEventIsMovementOverridden(trainerObj)
|| ObjectEventClearHeldMovementIfFinished(trainerObj))
@@ -573,8 +573,8 @@ static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEven
return FALSE;
}
-// TRSEE_HIDDEN_POP_OUT
-static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+// TRSEE_BURIED_POP_OUT
+static bool8 PopOutOfAshBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (ObjectEventCheckHeldMovementStatus(trainerObj))
{
@@ -588,8 +588,8 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Objec
return FALSE;
}
-// TRSEE_HIDDEN_JUMP
-static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+// TRSEE_BURIED_JUMP
+static bool8 JumpInPlaceBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
struct Sprite *sprite;
@@ -608,8 +608,8 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Objec
return FALSE;
}
-// TRSEE_REVEAL_HIDDEN_WAIT
-static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+// TRSEE_REVEAL_BURIED_WAIT
+static bool8 WaitRevealBuriedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (!FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
task->tFuncId = TRSEE_MOVE_TO_PLAYER;
@@ -623,7 +623,7 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct Object
#define tObjEvent data[1]
-static void Task_SetHiddenTrainerMovement(u8 taskId)
+static void Task_SetBuriedTrainerMovement(u8 taskId)
{
struct Task *task = &gTasks[taskId];
struct ObjectEvent *objEvent;
@@ -647,10 +647,10 @@ static void Task_SetHiddenTrainerMovement(u8 taskId)
}
}
-// Called when a "buried" trainer has the reveal_trainer movement applied, from direct interaction
-void SetHiddenTrainerMovement(struct ObjectEvent *objEvent)
+// Called when a buried Trainer has the reveal_trainer movement applied, from direct interaction
+void SetBuriedTrainerMovement(struct ObjectEvent *objEvent)
{
- StoreWordInTwoHalfwords(&gTasks[CreateTask(Task_SetHiddenTrainerMovement, 0)].tObjEvent, (u32)objEvent);
+ StoreWordInTwoHalfwords(&gTasks[CreateTask(Task_SetBuriedTrainerMovement, 0)].tObjEvent, (u32)objEvent);
}
void DoTrainerApproach(void)
diff --git a/src/tv.c b/src/tv.c
index 990dd6673..99bd609e4 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2398,13 +2398,13 @@ u8 GetRibbonCount(struct Pokemon *pokemon)
nRibbons += GetMonData(pokemon, MON_DATA_VICTORY_RIBBON);
nRibbons += GetMonData(pokemon, MON_DATA_ARTIST_RIBBON);
nRibbons += GetMonData(pokemon, MON_DATA_EFFORT_RIBBON);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_1);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_2);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_3);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_4);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_5);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_6);
- nRibbons += GetMonData(pokemon, MON_DATA_GIFT_RIBBON_7);
+ nRibbons += GetMonData(pokemon, MON_DATA_MARINE_RIBBON);
+ nRibbons += GetMonData(pokemon, MON_DATA_LAND_RIBBON);
+ nRibbons += GetMonData(pokemon, MON_DATA_SKY_RIBBON);
+ nRibbons += GetMonData(pokemon, MON_DATA_COUNTRY_RIBBON);
+ nRibbons += GetMonData(pokemon, MON_DATA_NATIONAL_RIBBON);
+ nRibbons += GetMonData(pokemon, MON_DATA_EARTH_RIBBON);
+ nRibbons += GetMonData(pokemon, MON_DATA_WORLD_RIBBON);
return nRibbons;
}
@@ -2420,13 +2420,13 @@ u8 TV_MonDataIdxToRibbon(u8 monDataIdx)
if (monDataIdx == MON_DATA_VICTORY_RIBBON) return 22;
if (monDataIdx == MON_DATA_ARTIST_RIBBON) return 23;
if (monDataIdx == MON_DATA_EFFORT_RIBBON) return 24;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_1) return 25;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_2) return 26;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_3) return 27;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_4) return 28;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_5) return 29;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_6) return 30;
- if (monDataIdx == MON_DATA_GIFT_RIBBON_7) return 31;
+ if (monDataIdx == MON_DATA_MARINE_RIBBON) return 25;
+ if (monDataIdx == MON_DATA_LAND_RIBBON) return 26;
+ if (monDataIdx == MON_DATA_SKY_RIBBON) return 27;
+ if (monDataIdx == MON_DATA_COUNTRY_RIBBON) return 28;
+ if (monDataIdx == MON_DATA_NATIONAL_RIBBON) return 29;
+ if (monDataIdx == MON_DATA_EARTH_RIBBON) return 30;
+ if (monDataIdx == MON_DATA_WORLD_RIBBON) return 31;
return 0;
}
diff --git a/src/util.c b/src/util.c
index 8aa54857a..a4e3fa4cf 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2,6 +2,7 @@
#include "util.h"
#include "sprite.h"
#include "palette.h"
+#include "constants/rgb.h"
const u32 gBitTable[] =
{
@@ -271,8 +272,8 @@ void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor)
s8 g = data1->g;
s8 b = data1->b;
struct PlttData *data2 = (struct PlttData *)&blendColor;
- gPlttBufferFaded[index] = ((r + (((data2->r - r) * coeff) >> 4)) << 0)
- | ((g + (((data2->g - g) * coeff) >> 4)) << 5)
- | ((b + (((data2->b - b) * coeff) >> 4)) << 10);
+ gPlttBufferFaded[index] = RGB(r + (((data2->r - r) * coeff) >> 4),
+ g + (((data2->g - g) * coeff) >> 4),
+ b + (((data2->b - b) * coeff) >> 4));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 17:12:46 +0000