diff options
Diffstat (limited to 'src')
110 files changed, 10558 insertions, 10937 deletions
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 8d045c42d..450844453 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -12,7 +12,7 @@ extern u8 gBattlerAttacker; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern u8 gBattlerSpriteIds[]; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; @@ -516,7 +516,7 @@ void sub_80D90F4(struct Sprite *sprite) if (Random() & 1) y *= -1; - if ((gBanksBySide[bank] & 1) == 0) + if ((gBattlerPositions[bank] & 1) == 0) y += 0xFFF0; sprite->pos1.x += x; diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 1f36c933a..407c9a08f 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -12,7 +12,7 @@ extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern u8 gAnimVisualTaskCount; extern struct OamMatrix gOamMatrices[]; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538; void sub_80785E4(struct Sprite *sprite); @@ -1899,7 +1899,7 @@ void sub_80DAD84(struct Sprite * sprite) if (gMain.inBattle) { - if (gBanksBySide[gBattleAnimTarget] & 1) + if (gBattlerPositions[gBattleAnimTarget] & 1) { sprite->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; } diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index 4002ceec1..e41057d72 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -14,7 +14,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern u8 gAnimVisualTaskCount; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u8 gBattlerSpriteIds[]; extern u16 gBattle_BG1_X; @@ -1419,12 +1419,12 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite) if (GetBattlerSpriteCoord(gBattleAnimAttacker, 2) < GetBattlerSpriteCoord(gBattleAnimTarget, 2)) sprite->data[7] = 0x8000; - if (!(gBanksBySide[gBattleAnimTarget] & 1)) + if (!(gBattlerPositions[gBattleAnimTarget] & 1)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; - if ((sprite->data[7] & 0x8000) && !(gBanksBySide[gBattleAnimAttacker] & 1)) + if ((sprite->data[7] & 0x8000) && !(gBattlerPositions[gBattleAnimAttacker] & 1)) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(1)].subpriority + 1; sprite->data[6] = 1; @@ -1490,7 +1490,7 @@ static void sub_80D8874(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = sprite->pos1.y + 29; sprite->data[7]++; - if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1) + if (gMain.inBattle && gBattlerPositions[gBattleAnimTarget] & 1) sprite->data[5] = 204; else sprite->data[5] = value2; @@ -1535,7 +1535,7 @@ static void sub_80D8874(struct Sprite *sprite) sprite->data[1] = sprite->pos1.x += sprite->pos2.x; sprite->data[3] = sprite->pos1.y += sprite->pos2.y; sprite->data[4] = sprite->pos1.y + 4; - if (gMain.inBattle && gBanksBySide[gBattleAnimTarget] & 1) + if (gMain.inBattle && gBattlerPositions[gBattleAnimTarget] & 1) sprite->data[2] = 0x100; else sprite->data[2] = -0x10; @@ -1646,7 +1646,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "\tands r0, r1\n" "\tcmp r0, 0\n" "\tbeq _080D8938\n" - "\tldr r1, _080D8934 @ =gBanksBySide\n" + "\tldr r1, _080D8934 @ =gBattlerPositions\n" "\tldrb r0, [r6]\n" "\tadds r0, r1\n" "\tldrb r1, [r0]\n" @@ -1661,7 +1661,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "_080D8928: .4byte gBattleAnimTarget\n" "_080D892C: .4byte gMain\n" "_080D8930: .4byte 0x0000043d\n" - "_080D8934: .4byte gBanksBySide\n" + "_080D8934: .4byte gBattlerPositions\n" "_080D8938:\n" "\tstrh r5, [r4, 0x38]\n" "_080D893A:\n" @@ -1806,7 +1806,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "\tands r0, r1\n" "\tcmp r0, 0\n" "\tbeq _080D8A78\n" - "\tldr r1, _080D8A70 @ =gBanksBySide\n" + "\tldr r1, _080D8A70 @ =gBattlerPositions\n" "\tldr r0, _080D8A74 @ =gBattleAnimTarget\n" "\tldrb r0, [r0]\n" "\tadds r0, r1\n" @@ -1821,7 +1821,7 @@ NAKED static void sub_80D8874(struct Sprite *sprite) "\t.align 2, 0\n" "_080D8A68: .4byte gMain\n" "_080D8A6C: .4byte 0x0000043d\n" - "_080D8A70: .4byte gBanksBySide\n" + "_080D8A70: .4byte gBattlerPositions\n" "_080D8A74: .4byte gBattleAnimTarget\n" "_080D8A78:\n" "\tldr r0, _080D8A90 @ =0x0000fff0\n" diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 9cdda992f..cef255eda 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u16 gBattleTypeFlags; extern void sub_80D4CA4(struct Sprite *sprite); @@ -296,7 +296,7 @@ void sub_80CFB04(u8 taskId) } else { - if ((gBanksBySide[gBattleAnimTarget] & 1) == 0) + if ((gBattlerPositions[gBattleAnimTarget] & 1) == 0) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 0c8b8fb1b..405776db6 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -26,9 +26,9 @@ extern u8 gBattlerTarget; extern u8 gAbsentBattlerFlags; extern u8 gMoveResultFlags; extern u16 gDynamicBasePower; -extern u16 gLastUsedMove[MAX_BATTLERS_COUNT]; +extern u16 gLastMoves[MAX_BATTLERS_COUNT]; extern u32 gStatuses3[MAX_BATTLERS_COUNT]; -extern u16 gSideAffecting[2]; +extern u16 gSideStatuses[2]; extern struct BattlePokemon gBattleMons[MAX_BATTLERS_COUNT]; extern u8 gCritMultiplier; extern u16 gTrainerBattleOpponent; @@ -448,7 +448,7 @@ void sub_810745C(void) { if (AI_BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] == 0) { - AI_BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] = gLastUsedMove[gBattlerTarget]; + AI_BATTLE_HISTORY->usedMoves[gBattlerTarget >> 1][i] = gLastMoves[gBattlerTarget]; return; } } @@ -468,7 +468,7 @@ void RecordAbilityBattle(u8 a, u8 b) AI_BATTLE_HISTORY->abilities[GetBattlerPosition(a) & 1] = b; } -void RecordItemBattle(u8 a, u8 b) +void RecordItemEffectBattle(u8 a, u8 b) { if (GetBattlerSide(a) == 0) AI_BATTLE_HISTORY->itemEffects[GetBattlerPosition(a) & 1] = b; @@ -697,7 +697,7 @@ static void BattleAICmd_if_status4(void) arg1 = GetBattlerPosition(index) & 1; arg2 = T1_READ_32(gAIScriptPtr + 2); - if ((gSideAffecting[arg1] & arg2) != 0) + if ((gSideStatuses[arg1] & arg2) != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -716,7 +716,7 @@ static void BattleAICmd_if_not_status4(void) arg1 = GetBattlerPosition(index) & 1; arg2 = T1_READ_32(gAIScriptPtr + 2); - if ((gSideAffecting[arg1] & arg2) == 0) + if ((gSideStatuses[arg1] & arg2) == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -1256,9 +1256,9 @@ _081083D0: .4byte gAIScriptPtr\n\ static void BattleAICmd_get_move(void) { if (gAIScriptPtr[1] == USER) - AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerAttacker]; + AI_THINKING_STRUCT->funcResult = gLastMoves[gBattlerAttacker]; else - AI_THINKING_STRUCT->funcResult = gLastUsedMove[gBattlerTarget]; + AI_THINKING_STRUCT->funcResult = gLastMoves[gBattlerTarget]; gAIScriptPtr += 2; } diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 9da56a220..b4b2841e0 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -1,13 +1,13 @@ #include "global.h" #include "battle.h" #include "battle_ai_switch_items.h" +#include "battle_controllers.h" #include "battle_script_commands.h" #include "data2.h" #include "ewram.h" #include "pokemon.h" #include "random.h" #include "rom_8077ABC.h" -#include "rom3.h" #include "util.h" #include "constants/abilities.h" #include "constants/items.h" @@ -386,7 +386,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) static bool8 ShouldSwitchIfNaturalCure(void) { - if (!(gBattleMons[gActiveBattler].status1 & STATUS_SLEEP)) + if (!(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP)) return FALSE; if (gBattleMons[gActiveBattler].ability != ABILITY_NATURAL_CURE) return FALSE; @@ -936,27 +936,27 @@ static bool8 ShouldUseItem(void) break; case AI_ITEM_CURE_CONDITION: ewram160DA(gActiveBattler) = 0; - if (itemEffects[3] & 0x20 && gBattleMons[gActiveBattler].status1 & STATUS_SLEEP) + if (itemEffects[3] & 0x20 && gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) { ewram160DA(gActiveBattler) |= 0x20; shouldUse = TRUE; } - if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBattler].status1 & STATUS_POISON || gBattleMons[gActiveBattler].status1 & STATUS_TOXIC_POISON)) + if (itemEffects[3] & 0x10 && (gBattleMons[gActiveBattler].status1 & STATUS1_POISON || gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON)) { ewram160DA(gActiveBattler) |= 0x10; shouldUse = TRUE; } - if (itemEffects[3] & 0x8 && gBattleMons[gActiveBattler].status1 & STATUS_BURN) + if (itemEffects[3] & 0x8 && gBattleMons[gActiveBattler].status1 & STATUS1_BURN) { ewram160DA(gActiveBattler) |= 0x8; shouldUse = TRUE; } - if (itemEffects[3] & 0x4 && gBattleMons[gActiveBattler].status1 & STATUS_FREEZE) + if (itemEffects[3] & 0x4 && gBattleMons[gActiveBattler].status1 & STATUS1_FREEZE) { ewram160DA(gActiveBattler) |= 0x4; shouldUse = TRUE; } - if (itemEffects[3] & 0x2 && gBattleMons[gActiveBattler].status1 & STATUS_PARALYSIS) + if (itemEffects[3] & 0x2 && gBattleMons[gActiveBattler].status1 & STATUS1_PARALYSIS) { ewram160DA(gActiveBattler) |= 0x2; shouldUse = TRUE; diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 2d187f8d3..56e348f20 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -6062,4 +6062,4 @@ static void AnimTask_SlackOffSquishStep(u8 taskId) if (!RunAffineAnimFromTaskData(&gTasks[taskId])) DestroyAnimVisualTask(taskId); -}
\ No newline at end of file +} diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index d99b4fe27..a1d07eb50 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -2,6 +2,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_anim_special.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "data2.h" #include "link.h" @@ -9,7 +10,6 @@ #include "main.h" #include "palette.h" #include "rom_8077ABC.h" -#include "rom3.h" #include "constants/songs.h" #include "sound.h" #include "sprite.h" diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index a5b24815f..3ea5bd624 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -2,6 +2,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_anim_special.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" @@ -12,7 +13,6 @@ #include "palette.h" #include "pokeball.h" #include "pokemon.h" -#include "rom3.h" #include "rom_8077ABC.h" #include "sound.h" #include "constants/songs.h" diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 2faaf5fea..da11c3aa9 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -3,6 +3,7 @@ #include "battle_ai_script_commands.h" #include "battle_ai_switch_items.h" #include "battle_anim.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "data2.h" #include "battle_811DA74.h" @@ -15,7 +16,6 @@ #include "pokeball.h" #include "pokemon.h" #include "random.h" -#include "rom3.h" #include "rom_8077ABC.h" #include "sound.h" #include "constants/songs.h" diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 7de3ada41..361eb8ef8 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -3,6 +3,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_anim_special.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" #include "item.h" @@ -14,7 +15,6 @@ #include "constants/moves.h" #include "palette.h" #include "pokemon.h" -#include "rom3.h" #include "constants/songs.h" #include "sound.h" #include "string_util.h" @@ -819,10 +819,10 @@ void sub_802CA60(void) r9->unkC[gMoveSelectionCursor[gActiveBattler]] = r9->unkC[gUnknown_03004344]; r9->unkC[gUnknown_03004344] = i; - if (gDisableStructs[gActiveBattler].unk18_b & gBitTable[gMoveSelectionCursor[gActiveBattler]]) + if (gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[gMoveSelectionCursor[gActiveBattler]]) { - gDisableStructs[gActiveBattler].unk18_b &= ~gBitTable[gMoveSelectionCursor[gActiveBattler]]; - gDisableStructs[gActiveBattler].unk18_b |= gBitTable[gUnknown_03004344]; + gDisableStructs[gActiveBattler].mimickedMoves &= ~gBitTable[gMoveSelectionCursor[gActiveBattler]]; + gDisableStructs[gActiveBattler].mimickedMoves |= gBitTable[gUnknown_03004344]; } sub_802E1B0(); diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 28418531f..5cf06796f 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle_anim_81258BC.h" #include "battle.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" @@ -8,7 +9,6 @@ #include "main.h" #include "menu_cursor.h" #include "palette.h" -#include "rom3.h" #include "constants/songs.h" #include "sound.h" #include "text.h" diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index a16fe26cc..ac71aabaf 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -2,6 +2,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_anim_special.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" @@ -10,7 +11,6 @@ #include "menu_cursor.h" #include "palette.h" #include "pokemon.h" -#include "rom3.h" #include "constants/songs.h" #include "sound.h" #include "sprite.h" @@ -58,7 +58,6 @@ extern u8 gUnknown_0300434C[]; extern const u8 BattleText_WallyMenu[]; extern const u8 BattleText_MenuOptions[]; -// TODO: include rom3.h when my other PR gets merged extern void BtlController_EmitTwoReturnValues(u8, u8, u16); extern void BtlController_EmitOneReturnValue(u8, u16); diff --git a/src/rom3.c b/src/battle_controllers.c index c4a6ffec0..02cb59cc4 100644 --- a/src/rom3.c +++ b/src/battle_controllers.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_controllers.h" #include "battle_811DA74.h" #include "battle_ai_script_commands.h" #include "battle_anim.h" @@ -10,7 +11,6 @@ #include "constants/items.h" #include "link.h" #include "pokemon.h" -#include "rom3.h" #include "rom_8094928.h" #include "constants/species.h" #include "task.h" @@ -18,6 +18,7 @@ #include "battle_message.h" #include "data2.h" #include "ewram.h" +#include "constants/abilities.h" extern u16 gBattleTypeFlags; extern u16 gBattleWeather; @@ -34,7 +35,7 @@ extern u8 gActiveBattler; extern u32 gBattleControllerExecFlags; extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[]; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u16 gCurrentMove; extern u16 gChosenMove; extern u16 gLastUsedItem; @@ -57,7 +58,14 @@ extern void (*gBattlerControllerFuncs[])(void); u8 gBattleBuffersTransferData[0x170]; -void sub_800B858(void) +// this file's funcionts +static void CreateTasksForSendRecvLinkBuffers(void); +static void InitSinglePlayerBtlControllers(void); +static void SetBattlePartyIds(void); +static void Task_HandleSendLinkBuffersData(u8 taskId); +static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId); + +void HandleLinkBattleSetup(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -76,14 +84,16 @@ void SetUpBattleVarsAndBirchPoochyena(void) s32 i; gBattleMainFunc = nullsub_41; - for (i = 0; i < 4; i++) + + for (i = 0; i < MAX_BATTLERS_COUNT; i++) { gBattlerControllerFuncs[i] = nullsub_91; - gBanksBySide[i] = 0xFF; + gBattlerPositions[i] = 0xFF; gActionSelectionCursor[i] = 0; gMoveSelectionCursor[i] = 0; } - sub_800B858(); + + HandleLinkBattleSetup(); gBattleControllerExecFlags = 0; ClearBattleAnimationVars(); ClearBattleMonForms(); @@ -114,10 +124,12 @@ void sub_800B950(void) s32 i; if (gBattleTypeFlags & BATTLE_TYPE_LINK) - sub_800BA78(); + InitLinkBtlControllers(); else - sub_800B9A8(); - sub_800BD54(); + InitSinglePlayerBtlControllers(); + + SetBattlePartyIds(); + if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { for (i = 0; i < gBattlersCount; i++) @@ -125,7 +137,7 @@ void sub_800B950(void) } } -void sub_800B9A8(void) +static void InitSinglePlayerBtlControllers(void) { if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { @@ -136,27 +148,27 @@ void sub_800B9A8(void) gBattlerControllerFuncs[0] = SetBankFuncToWallyBufferRunCommand; else gBattlerControllerFuncs[0] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[0] = 0; + gBattlerPositions[0] = 0; gBattlerControllerFuncs[1] = SetBankFuncToOpponentBufferRunCommand; - gBanksBySide[1] = 1; + gBattlerPositions[1] = 1; gBattlersCount = 2; } else { gBattleMainFunc = sub_8010800; gBattlerControllerFuncs[0] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[0] = 0; + gBattlerPositions[0] = 0; gBattlerControllerFuncs[1] = SetBankFuncToOpponentBufferRunCommand; - gBanksBySide[1] = 1; + gBattlerPositions[1] = 1; gBattlerControllerFuncs[2] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[2] = 2; + gBattlerPositions[2] = 2; gBattlerControllerFuncs[3] = SetBankFuncToOpponentBufferRunCommand; - gBanksBySide[3] = 3; + gBattlerPositions[3] = 3; gBattlersCount = 4; } } -void sub_800BA78(void) +void InitLinkBtlControllers(void) { u8 multiplayerId; int i; @@ -167,17 +179,17 @@ void sub_800BA78(void) { gBattleMainFunc = sub_8010800; gBattlerControllerFuncs[0] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[0] = 0; + gBattlerPositions[0] = 0; gBattlerControllerFuncs[1] = SetBankFuncToLinkOpponentBufferRunCommand; - gBanksBySide[1] = 1; + gBattlerPositions[1] = 1; gBattlersCount = 2; } else { gBattlerControllerFuncs[1] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[1] = 0; + gBattlerPositions[1] = 0; gBattlerControllerFuncs[0] = SetBankFuncToLinkOpponentBufferRunCommand; - gBanksBySide[0] = 1; + gBattlerPositions[0] = 1; gBattlersCount = 2; } return; @@ -188,25 +200,25 @@ void sub_800BA78(void) { gBattleMainFunc = sub_8010800; gBattlerControllerFuncs[0] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[0] = 0; + gBattlerPositions[0] = 0; gBattlerControllerFuncs[1] = SetBankFuncToLinkOpponentBufferRunCommand; - gBanksBySide[1] = 1; + gBattlerPositions[1] = 1; gBattlerControllerFuncs[2] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[2] = 2; + gBattlerPositions[2] = 2; gBattlerControllerFuncs[3] = SetBankFuncToLinkOpponentBufferRunCommand; - gBanksBySide[3] = 3; + gBattlerPositions[3] = 3; gBattlersCount = 4; } else { gBattlerControllerFuncs[1] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[1] = 0; + gBattlerPositions[1] = 0; gBattlerControllerFuncs[0] = SetBankFuncToLinkOpponentBufferRunCommand; - gBanksBySide[0] = 1; + gBattlerPositions[0] = 1; gBattlerControllerFuncs[3] = SetBankFuncToPlayerBufferRunCommand; - gBanksBySide[3] = 2; + gBattlerPositions[3] = 2; gBattlerControllerFuncs[2] = SetBankFuncToLinkOpponentBufferRunCommand; - gBanksBySide[2] = 3; + gBattlerPositions[2] = 3; gBattlersCount = 4; } @@ -236,12 +248,12 @@ void sub_800BA78(void) { case 0: case 3: - gBanksBySide[gLinkPlayers[i].id] = 0; + gBattlerPositions[gLinkPlayers[i].id] = 0; gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBanksBySide[gLinkPlayers[i].id] = 2; + gBattlerPositions[gLinkPlayers[i].id] = 2; gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } @@ -256,12 +268,12 @@ void sub_800BA78(void) { case 0: case 3: - gBanksBySide[gLinkPlayers[i].id] = 0; + gBattlerPositions[gLinkPlayers[i].id] = 0; gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBanksBySide[gLinkPlayers[i].id] = 2; + gBattlerPositions[gLinkPlayers[i].id] = 2; gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } @@ -273,12 +285,12 @@ void sub_800BA78(void) { case 0: case 3: - gBanksBySide[gLinkPlayers[i].id] = 1; + gBattlerPositions[gLinkPlayers[i].id] = 1; gBattlerPartyIndexes[gLinkPlayers[i].id] = 0; break; case 1: case 2: - gBanksBySide[gLinkPlayers[i].id] = 3; + gBattlerPositions[gLinkPlayers[i].id] = 3; gBattlerPartyIndexes[gLinkPlayers[i].id] = 3; break; } @@ -288,23 +300,22 @@ void sub_800BA78(void) gBattlersCount = 4; } -void sub_800BD54(void) +static void SetBattlePartyIds(void) { - int i; - int j; + s32 i, j; if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { for (i = 0; i < gBattlersCount; i++) { - for (j = 0; j < 6; j++) + for (j = 0; j < PARTY_SIZE; j++) { if (i < 2) { - if (!(gBanksBySide[i] & 1)) + if (GET_BATTLER_SIDE2(i) == B_SIDE_PLAYER) { if (GetMonData(&gPlayerParty[j], MON_DATA_HP) != 0 - && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != 0 + && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gPlayerParty[j], MON_DATA_IS_EGG) == 0) { @@ -315,7 +326,7 @@ void sub_800BD54(void) else { if (GetMonData(&gEnemyParty[j], MON_DATA_HP) != 0 - && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != 0 + && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gEnemyParty[j], MON_DATA_IS_EGG) == 0) { @@ -326,10 +337,10 @@ void sub_800BD54(void) } else { - if (!(gBanksBySide[i] & 1)) + if (GET_BATTLER_SIDE2(i) == B_SIDE_PLAYER) { if (GetMonData(&gPlayerParty[j], MON_DATA_HP) != 0 - && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES) != 0 //Probably a typo by Game Freak. The rest use SPECIES2 + && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES) != SPECIES_NONE // Probably a typo by Game Freak. The rest use SPECIES2 && GetMonData(&gPlayerParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gPlayerParty[j], MON_DATA_IS_EGG) == 0 && gBattlerPartyIndexes[i - 2] != j) @@ -341,7 +352,7 @@ void sub_800BD54(void) else { if (GetMonData(&gEnemyParty[j], MON_DATA_HP) != 0 - && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != 0 + && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&gEnemyParty[j], MON_DATA_SPECIES2) != SPECIES_EGG && GetMonData(&gEnemyParty[j], MON_DATA_IS_EGG) == 0 && gBattlerPartyIndexes[i - 2] != j) @@ -356,17 +367,17 @@ void sub_800BD54(void) } } -void PrepareBufferDataTransfer(u8 a, u8 *data, u16 size) +static void PrepareBufferDataTransfer(u8 bufferId, u8 *data, u16 size) { - int i; + s32 i; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - PrepareBufferDataTransferLink(a, size, data); + PrepareBufferDataTransferLink(bufferId, size, data); } else { - switch (a) + switch (bufferId) { case 0: for (i = 0; i < size; i++) @@ -386,7 +397,7 @@ void PrepareBufferDataTransfer(u8 a, u8 *data, u16 size) } } -void CreateTasksForSendRecvLinkBuffers(void) +static void CreateTasksForSendRecvLinkBuffers(void) { sLinkSendTaskId = CreateTask(Task_HandleSendLinkBuffersData, 0); gTasks[sLinkSendTaskId].data[11] = 0; @@ -538,10 +549,10 @@ void sub_800C35C(void) } } -void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) +static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) { - u16 r7; - u8 r4; + u16 blockSize; + u8 battlerId; u8 r2; if (gTasks[taskId].data[15] != gTasks[taskId].data[14]) @@ -552,15 +563,15 @@ void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) gTasks[taskId].data[12] = 0; gTasks[taskId].data[15] = 0; } - r4 = ewram15000arr(1, gTasks[taskId].data[15]); - r7 = ewram15000arr(4, gTasks[taskId].data[15]) | (ewram15000arr(5, gTasks[taskId].data[15]) << 8); + battlerId = ewram15000arr(1, gTasks[taskId].data[15]); + blockSize = ewram15000arr(4, gTasks[taskId].data[15]) | (ewram15000arr(5, gTasks[taskId].data[15]) << 8); switch (ewram15000arr(0, gTasks[taskId].data[15])) { case 0: - if (gBattleControllerExecFlags & gBitTable[r4]) + if (gBattleControllerExecFlags & gBitTable[battlerId]) return; - memcpy(gBattleBufferA[r4], &ewram15000arr(8, gTasks[taskId].data[15]), r7); - sub_80155A4(r4); + memcpy(gBattleBufferA[battlerId], &ewram15000arr(8, gTasks[taskId].data[15]), blockSize); + sub_80155A4(battlerId); if (!(gBattleTypeFlags & BATTLE_TYPE_WILD)) { gBattlerAttacker = ewram15000arr(2, gTasks[taskId].data[15]); @@ -570,172 +581,172 @@ void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) } break; case 1: - memcpy(gBattleBufferB[r4], &ewram15000arr(8, gTasks[taskId].data[15]), r7); + memcpy(gBattleBufferB[battlerId], &ewram15000arr(8, gTasks[taskId].data[15]), blockSize); break; case 2: r2 = ewram15000arr(8, gTasks[taskId].data[15]); - gBattleControllerExecFlags &= ~(gBitTable[r4] << (r2 * 4)); + gBattleControllerExecFlags &= ~(gBitTable[battlerId] << (r2 * 4)); break; } - gTasks[taskId].data[15] = gTasks[taskId].data[15] + r7 + 8; + gTasks[taskId].data[15] = gTasks[taskId].data[15] + blockSize + 8; } } -void BtlController_EmitGetMonData(u8 bufferId, u8 b, u8 c) +void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck) { - gBattleBuffersTransferData[0] = 0; - gBattleBuffersTransferData[1] = b; - gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[0] = CONTROLLER_GETMONDATA; + gBattleBuffersTransferData[1] = requestId; + gBattleBuffersTransferData[2] = monToCheck; gBattleBuffersTransferData[3] = 0; PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitGetRawMonData(u8 bufferId, u8 b, u8 c) +void BtlController_EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes) { - gBattleBuffersTransferData[0] = 1; - gBattleBuffersTransferData[1] = b; - gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[0] = CONTROLLER_GETRAWMONDATA; + gBattleBuffersTransferData[1] = monId; + gBattleBuffersTransferData[2] = bytes; gBattleBuffersTransferData[3] = 0; PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitSetMonData(u8 bufferId, u8 b, u8 c, u8 d, void *e) +void BtlController_EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data) { - int i; + s32 i; - gBattleBuffersTransferData[0] = 2; - gBattleBuffersTransferData[1] = b; - gBattleBuffersTransferData[2] = c; - for (i = 0; i < d; i++) - gBattleBuffersTransferData[3 + i] = *(u8*)(e++); - PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, d + 3); + gBattleBuffersTransferData[0] = CONTROLLER_SETMONDATA; + gBattleBuffersTransferData[1] = requestId; + gBattleBuffersTransferData[2] = monToCheck; + for (i = 0; i < bytes; i++) + gBattleBuffersTransferData[3 + i] = *(u8*)(data++); + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 3 + bytes); } -void BtlController_EmitSetRawMonData(u8 bufferId, u8 b, u8 c, u8 *d) +void BtlController_EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data) { - int i; + s32 i; - gBattleBuffersTransferData[0] = 3; - gBattleBuffersTransferData[1] = b; - gBattleBuffersTransferData[2] = c; - for (i = 0; i < c; i++) - gBattleBuffersTransferData[3 + i] = *(d++); - PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, c + 3); + gBattleBuffersTransferData[0] = CONTROLLER_SETRAWMONDATA; + gBattleBuffersTransferData[1] = monId; + gBattleBuffersTransferData[2] = bytes; + for (i = 0; i < bytes; i++) + gBattleBuffersTransferData[3 + i] = *(u8*)(data++); + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, bytes + 3); } void BtlController_EmitLoadMonSprite(u8 bufferId) { - gBattleBuffersTransferData[0] = 4; - gBattleBuffersTransferData[1] = 4; - gBattleBuffersTransferData[2] = 4; - gBattleBuffersTransferData[3] = 4; + gBattleBuffersTransferData[0] = CONTROLLER_LOADMONSPRITE; + gBattleBuffersTransferData[1] = CONTROLLER_LOADMONSPRITE; + gBattleBuffersTransferData[2] = CONTROLLER_LOADMONSPRITE; + gBattleBuffersTransferData[3] = CONTROLLER_LOADMONSPRITE; PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitSwitchInAnim(u8 bufferId, u8 b, u8 c) +void BtlController_EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit) { - gBattleBuffersTransferData[0] = 5; - gBattleBuffersTransferData[1] = b; - gBattleBuffersTransferData[2] = c; + gBattleBuffersTransferData[0] = CONTROLLER_SWITCHINANIM; + gBattleBuffersTransferData[1] = partyId; + gBattleBuffersTransferData[2] = dontClearSubstituteBit; gBattleBuffersTransferData[3] = 5; PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitReturnMonToBall(u8 bufferId, u8 b) +void BtlController_EmitReturnMonToBall(u8 bufferId, u8 arg1) { - gBattleBuffersTransferData[0] = 6; - gBattleBuffersTransferData[1] = b; + gBattleBuffersTransferData[0] = CONTROLLER_RETURNMONTOBALL; + gBattleBuffersTransferData[1] = arg1; PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2); } -void BtlController_EmitDrawTrainerPic(u8 a) +void BtlController_EmitDrawTrainerPic(u8 bufferId) { - gBattleBuffersTransferData[0] = 7; - gBattleBuffersTransferData[1] = 7; - gBattleBuffersTransferData[2] = 7; - gBattleBuffersTransferData[3] = 7; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); + gBattleBuffersTransferData[0] = CONTROLLER_DRAWTRAINERPIC; + gBattleBuffersTransferData[1] = CONTROLLER_DRAWTRAINERPIC; + gBattleBuffersTransferData[2] = CONTROLLER_DRAWTRAINERPIC; + gBattleBuffersTransferData[3] = CONTROLLER_DRAWTRAINERPIC; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitTrainerSlide(u8 a) +void BtlController_EmitTrainerSlide(u8 bufferId) { - gBattleBuffersTransferData[0] = 8; - gBattleBuffersTransferData[1] = 8; - gBattleBuffersTransferData[2] = 8; - gBattleBuffersTransferData[3] = 8; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); + gBattleBuffersTransferData[0] = CONTROLLER_TRAINERSLIDE; + gBattleBuffersTransferData[1] = CONTROLLER_TRAINERSLIDE; + gBattleBuffersTransferData[2] = CONTROLLER_TRAINERSLIDE; + gBattleBuffersTransferData[3] = CONTROLLER_TRAINERSLIDE; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitTrainerSlideBack(u8 a) +void BtlController_EmitTrainerSlideBack(u8 bufferId) { - gBattleBuffersTransferData[0] = 9; - gBattleBuffersTransferData[1] = 9; - gBattleBuffersTransferData[2] = 9; - gBattleBuffersTransferData[3] = 9; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); + gBattleBuffersTransferData[0] = CONTROLLER_TRAINERSLIDEBACK; + gBattleBuffersTransferData[1] = CONTROLLER_TRAINERSLIDEBACK; + gBattleBuffersTransferData[2] = CONTROLLER_TRAINERSLIDEBACK; + gBattleBuffersTransferData[3] = CONTROLLER_TRAINERSLIDEBACK; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitFaintAnimation(u8 a) +void BtlController_EmitFaintAnimation(u8 bufferId) { - gBattleBuffersTransferData[0] = 10; - gBattleBuffersTransferData[1] = 10; - gBattleBuffersTransferData[2] = 10; - gBattleBuffersTransferData[3] = 10; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); + gBattleBuffersTransferData[0] = CONTROLLER_FAINTANIMATION; + gBattleBuffersTransferData[1] = CONTROLLER_FAINTANIMATION; + gBattleBuffersTransferData[2] = CONTROLLER_FAINTANIMATION; + gBattleBuffersTransferData[3] = CONTROLLER_FAINTANIMATION; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitPaletteFade(u8 a) +void BtlController_EmitPaletteFade(u8 bufferId) { - gBattleBuffersTransferData[0] = 11; - gBattleBuffersTransferData[1] = 11; - gBattleBuffersTransferData[2] = 11; - gBattleBuffersTransferData[3] = 11; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); + gBattleBuffersTransferData[0] = CONTROLLER_PALETTEFADE; + gBattleBuffersTransferData[1] = CONTROLLER_PALETTEFADE; + gBattleBuffersTransferData[2] = CONTROLLER_PALETTEFADE; + gBattleBuffersTransferData[3] = CONTROLLER_PALETTEFADE; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitSuccessBallThrowAnim(u8 a) +void BtlController_EmitSuccessBallThrowAnim(u8 bufferId) { - gBattleBuffersTransferData[0] = 12; - gBattleBuffersTransferData[1] = 12; - gBattleBuffersTransferData[2] = 12; - gBattleBuffersTransferData[3] = 12; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); + gBattleBuffersTransferData[0] = CONTROLLER_SUCCESSBALLTHROWANIM; + gBattleBuffersTransferData[1] = CONTROLLER_SUCCESSBALLTHROWANIM; + gBattleBuffersTransferData[2] = CONTROLLER_SUCCESSBALLTHROWANIM; + gBattleBuffersTransferData[3] = CONTROLLER_SUCCESSBALLTHROWANIM; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4); } -void BtlController_EmitBallThrowAnim(u8 a, u8 b) +void BtlController_EmitBallThrowAnim(u8 bufferId, u8 caseId) { - gBattleBuffersTransferData[0] = 13; - gBattleBuffersTransferData[1] = b; - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 2); + gBattleBuffersTransferData[0] = CONTROLLER_BALLTHROWANIM; + gBattleBuffersTransferData[1] = caseId; + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 2); } -void BtlController_EmitPause(u8 a, u8 b, u8 *c) +void BtlController_EmitPause(u8 bufferId, u8 toWait, void *data) { - int i; - - gBattleBuffersTransferData[0] = 14; - gBattleBuffersTransferData[1] = b; - for (i = 0; i < b * 3; i++) - gBattleBuffersTransferData[2 + i] = *(c++); - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, b * 3 + 2); -} + s32 i; -void BtlController_EmitMoveAnimation(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, struct DisableStruct *g) -{ - gBattleBuffersTransferData[0] = 15; - gBattleBuffersTransferData[1] = b; - gBattleBuffersTransferData[2] = (b & 0xFF00) >> 8; - gBattleBuffersTransferData[3] = c; - gBattleBuffersTransferData[4] = d; - gBattleBuffersTransferData[5] = (d & 0xFF00) >> 8; - gBattleBuffersTransferData[6] = e; - gBattleBuffersTransferData[7] = (e & 0x0000FF00) >> 8; - gBattleBuffersTransferData[8] = (e & 0x00FF0000) >> 16; - gBattleBuffersTransferData[9] = (e & 0xFF000000) >> 24; - gBattleBuffersTransferData[10] = f; + gBattleBuffersTransferData[0] = CONTROLLER_PAUSE; + gBattleBuffersTransferData[1] = toWait; + for (i = 0; i < toWait * 3; i++) + gBattleBuffersTransferData[2 + i] = *(u8*)(data++); + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, toWait * 3 + 2); +} + +void BtlController_EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr) +{ + gBattleBuffersTransferData[0] = CONTROLLER_MOVEANIMATION; + gBattleBuffersTransferData[1] = move; + gBattleBuffersTransferData[2] = (move & 0xFF00) >> 8; + gBattleBuffersTransferData[3] = turnOfMove; + gBattleBuffersTransferData[4] = movePower; + gBattleBuffersTransferData[5] = (movePower & 0xFF00) >> 8; + gBattleBuffersTransferData[6] = dmg; + gBattleBuffersTransferData[7] = (dmg & 0x0000FF00) >> 8; + gBattleBuffersTransferData[8] = (dmg & 0x00FF0000) >> 16; + gBattleBuffersTransferData[9] = (dmg & 0xFF000000) >> 24; + gBattleBuffersTransferData[10] = friendship; gBattleBuffersTransferData[11] = gMultiHitCounter; - if (AbilityBattleEffects(14, 0, 13, 0, 0) == 0 && AbilityBattleEffects(14, 0, 0x4D, 0, 0) == 0) + if (WEATHER_HAS_EFFECT2) { gBattleBuffersTransferData[12] = gBattleWeather; gBattleBuffersTransferData[13] = (gBattleWeather & 0xFF00) >> 8; @@ -747,8 +758,8 @@ void BtlController_EmitMoveAnimation(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, stru } gBattleBuffersTransferData[14] = 0; gBattleBuffersTransferData[15] = 0; - memcpy(&gBattleBuffersTransferData[16], g, sizeof(*g)); - PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 0x2C); + memcpy(&gBattleBuffersTransferData[16], disableStructPtr, sizeof(struct DisableStruct)); + PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 16 + sizeof(struct DisableStruct)); } void BtlController_EmitPrintString(u8 a, u16 stringID) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 45f2c30c0..ee4b4b100 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -27,7 +27,7 @@ extern u8 gBattleBufferA[][0x200]; extern u8 gActiveBattler; extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[]; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u8 gBattlerSpriteIds[]; extern u16 gUnknown_02024DE8; extern u8 gDoingBattleAnim; @@ -466,7 +466,7 @@ void unref_sub_8031BA0(void) count = 4; } for (i = 0; i < count; i++) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[i]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[i]]); } bool8 sub_8031C30(u8 a) @@ -492,9 +492,9 @@ bool8 sub_8031C30(u8 a) else if (a == 3) LoadCompressedObjectPic(&gUnknown_0820A484); else if (a == 4) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[0]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[0]]); else if (a == 5) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[1]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[1]]); else retVal = TRUE; } @@ -509,13 +509,13 @@ bool8 sub_8031C30(u8 a) else if (a == 5) LoadCompressedObjectPic(&gUnknown_0820A49C[1]); else if (a == 6) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[0]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[0]]); else if (a == 7) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[1]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[1]]); else if (a == 8) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[2]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[2]]); else if (a == 9) - LoadCompressedObjectPic(&gUnknown_0820A4B4[gBanksBySide[3]]); + LoadCompressedObjectPic(&gUnknown_0820A4B4[gBattlerPositions[3]]); else retVal = TRUE; } @@ -566,7 +566,7 @@ u8 battle_load_something(u8 *pState, u8 *b) break; case 4: sub_8043F44(*b); - if (gBanksBySide[*b] <= 1) + if (gBattlerPositions[*b] <= 1) nullsub_11(gHealthboxSpriteIds[*b], 0); else nullsub_11(gHealthboxSpriteIds[*b], 1); diff --git a/src/battle_interface.c b/src/battle_interface.c index 992fcd7ae..7ab3580f0 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -423,7 +423,7 @@ u8 *const gUnknown_0820A904[10] = extern u8 gDisplayedStringBattle[]; extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[]; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u8 gHealthboxSpriteIds[]; extern u16 gBattleTypeFlags; @@ -461,308 +461,77 @@ static int do_nothing(s16 unused1, s16 unused2, int unused3) return 9; } -#ifdef NONMATCHING -void sub_8043740(s16 a, u16 *b, u8 c) +void sub_8043740(s16 number, u16 *dest, bool8 unk) { - u8 sp0[4]; - s8 i; - s8 j; - s32 r9; + s8 i, j; + u8 buff[4]; for (i = 0; i < 4; i++) - sp0[i] = 0; + { + buff[i] = 0; + } - //_0804377C - //i = 3; - //r9 = -1; - for (i = 3, r9 = -1;;) + for (i = 3; ; i--) { - if (a > 0) + if (number > 0) { - sp0[i] = a % 10; - a /= 10; - i--; + buff[i] = number % 10; + number /= 10; } else + { + for (; i > -1; i--) + { + buff[i] = 0xFF; + } + if (buff[3] == 0xFF) + buff[3] = 0; break; - asm(""::"r"(r9)); - } - - //_080437AA - for (; i > r9; i--) - { - //asm("":"=r"(r9)); - sp0[i] = -1; + } } - //_080437CE - if (sp0[3] == 0xFF) - sp0[3] = 0; - //_080437DA - if (c == 0) + if (!unk) { for (i = 0, j = 0; i < 4; i++) { - if (sp0[j] == 0xFF) + if (buff[j] == 0xFF) { - b[j] = (b[j] & 0xFC00) | 0x1E; - b[i + 0x20] = (b[i + 0x20] & 0xFC00) | 0x1E; + dest[j + 0x00] &= 0xFC00; + dest[j + 0x00] |= 0x1E; + dest[i + 0x20] &= 0xFC00; + dest[i + 0x20] |= 0x1E; } else { - b[j] = (b[j] & 0xFC00) | (sp0[j] + 0x14); - b[i + 0x20] = (b[i + 0x20] & 0xFC00) | (sp0[i] + 0x34); + dest[j + 0x00] &= 0xFC00; + dest[j + 0x00] |= 0x14 + buff[j]; + dest[i + 0x20] &= 0xFC00; + dest[i + 0x20] |= 0x34 + buff[i]; } j++; } - } - //_0804386A else { for (i = 0; i < 4; i++) { - if (sp0[i] == 0xFF) + if (buff[i] == 0xFF) { - b[i] = (b[i] & 0xFC00) | 0x1E; - b[i + 0x20] = (b[i + 0x20] & 0xFC00) | 0x1E; + dest[i + 0x00] &= 0xFC00; + dest[i + 0x00] |= 0x1E; + dest[i + 0x20] &= 0xFC00; + dest[i + 0x20] |= 0x1E; } else { - b[i] = (b[i] & 0xFC00) | (sp0[i] + 0x14); - b[i + 0x20] = (b[i + 0x20] & 0xFC00) | (sp0[i] + 0x34); + dest[i + 0x00] &= 0xFC00; + dest[i + 0x00] |= 0x14 + buff[i]; + dest[i + 0x20] &= 0xFC00; + dest[i + 0x20] |= 0x34 + buff[i]; } } } - asm(""::"r"(r9)); -} -#else -NAKED -void sub_8043740(s16 a, u16 *b, u8 c) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - adds r7, r1, 0\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - mov r10, r2\n\ - movs r3, 0\n\ - movs r2, 0\n\ -_0804375C:\n\ - lsls r0, r3, 24\n\ - asrs r0, 24\n\ - mov r3, sp\n\ - adds r1, r3, r0\n\ - strb r2, [r1]\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _0804375C\n\ - movs r3, 0x3\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - mov r9, r0\n\ - mov r8, sp\n\ -_0804377C:\n\ - lsls r0, r5, 16\n\ - asrs r6, r0, 16\n\ - cmp r6, 0\n\ - ble _080437AA\n\ - lsls r4, r3, 24\n\ - asrs r4, 24\n\ - mov r1, sp\n\ - adds r5, r1, r4\n\ - adds r0, r6, 0\n\ - movs r1, 0xA\n\ - bl __modsi3\n\ - strb r0, [r5]\n\ - adds r0, r6, 0\n\ - movs r1, 0xA\n\ - bl __divsi3\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - subs r4, 0x1\n\ - lsls r4, 24\n\ - lsrs r3, r4, 24\n\ - b _0804377C\n\ -_080437AA:\n\ - lsls r1, r3, 24\n\ - asrs r0, r1, 24\n\ - cmp r0, r9\n\ - ble _080437CE\n\ - movs r4, 0xFF\n\ - movs r3, 0x1\n\ - negs r3, r3\n\ -_080437B8:\n\ - asrs r2, r1, 24\n\ - mov r5, sp\n\ - adds r1, r5, r2\n\ - ldrb r0, [r1]\n\ - orrs r0, r4\n\ - strb r0, [r1]\n\ - subs r2, 0x1\n\ - lsls r1, r2, 24\n\ - asrs r0, r1, 24\n\ - cmp r0, r3\n\ - bgt _080437B8\n\ -_080437CE:\n\ - mov r1, r8\n\ - ldrb r0, [r1, 0x3]\n\ - cmp r0, 0xFF\n\ - bne _080437DA\n\ - movs r0, 0\n\ - strb r0, [r1, 0x3]\n\ -_080437DA:\n\ - mov r2, r10\n\ - cmp r2, 0\n\ - bne _0804386A\n\ - movs r3, 0\n\ - movs r1, 0\n\ - movs r6, 0xFC\n\ - lsls r6, 8\n\ - movs r5, 0x1E\n\ - mov r12, r5\n\ -_080437EC:\n\ - lsls r1, 24\n\ - asrs r2, r1, 24\n\ - mov r0, sp\n\ - adds r5, r0, r2\n\ - ldrb r0, [r5]\n\ - mov r8, r1\n\ - cmp r0, 0xFF\n\ - bne _08043822\n\ - lsls r1, r2, 1\n\ - adds r1, r7\n\ - ldrh r2, [r1]\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - mov r2, r12\n\ - orrs r0, r2\n\ - strh r0, [r1]\n\ - lsls r3, 24\n\ - asrs r1, r3, 23\n\ - adds r1, r7\n\ - adds r1, 0x40\n\ - ldrh r2, [r1]\n\ - adds r0, r6, 0\n\ - ands r0, r2\n\ - mov r5, r12\n\ - orrs r0, r5\n\ - strh r0, [r1]\n\ - b _08043852\n\ -_08043822:\n\ - lsls r2, 1\n\ - adds r2, r7\n\ - ldrh r0, [r2]\n\ - adds r1, r6, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x14\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - lsls r4, r3, 24\n\ - asrs r3, r4, 24\n\ - lsls r2, r3, 1\n\ - adds r2, r7\n\ - adds r2, 0x40\n\ - ldrh r0, [r2]\n\ - adds r1, r6, 0\n\ - ands r1, r0\n\ - mov r5, sp\n\ - adds r0, r5, r3\n\ - ldrb r0, [r0]\n\ - adds r0, 0x34\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - adds r3, r4, 0\n\ -_08043852:\n\ - movs r0, 0x80\n\ - lsls r0, 17\n\ - add r0, r8\n\ - lsrs r1, r0, 24\n\ - movs r2, 0x80\n\ - lsls r2, 17\n\ - adds r0, r3, r2\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _080437EC\n\ - b _080438CE\n\ -_0804386A:\n\ - movs r3, 0\n\ - movs r4, 0xFC\n\ - lsls r4, 8\n\ - movs r6, 0x1E\n\ -_08043872:\n\ - lsls r1, r3, 24\n\ - asrs r2, r1, 24\n\ - mov r3, sp\n\ - adds r5, r3, r2\n\ - ldrb r0, [r5]\n\ - adds r3, r1, 0\n\ - cmp r0, 0xFF\n\ - bne _0804389E\n\ - lsls r1, r2, 1\n\ - adds r1, r7\n\ - ldrh r2, [r1]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strh r0, [r1]\n\ - adds r1, 0x40\n\ - ldrh r2, [r1]\n\ - adds r0, r4, 0\n\ - ands r0, r2\n\ - orrs r0, r6\n\ - strh r0, [r1]\n\ - b _080438C0\n\ -_0804389E:\n\ - lsls r2, 1\n\ - adds r2, r7\n\ - ldrh r0, [r2]\n\ - adds r1, r4, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x14\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ - adds r2, 0x40\n\ - ldrh r0, [r2]\n\ - adds r1, r4, 0\n\ - ands r1, r0\n\ - ldrb r0, [r5]\n\ - adds r0, 0x34\n\ - orrs r1, r0\n\ - strh r1, [r2]\n\ -_080438C0:\n\ - movs r5, 0x80\n\ - lsls r5, 17\n\ - adds r0, r3, r5\n\ - lsrs r3, r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0x3\n\ - ble _08043872\n\ -_080438CE:\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); } -#endif void unref_sub_80438E0(s16 a, s16 b, u16 *c) { @@ -834,7 +603,7 @@ u8 battle_make_oam_normal_battle(u8 a) } //_08043B50 - spriteId3 = CreateSpriteAtEnd(&gSpriteTemplates_820A56C[gBanksBySide[a]], 140, 60, 0); + spriteId3 = CreateSpriteAtEnd(&gSpriteTemplates_820A56C[gBattlerPositions[a]], 140, 60, 0); sprite = &gSprites[spriteId3]; SetSubspriteTables(sprite, &gSubspriteTables_820A684[GetBattlerSide(a)]); sprite->subspriteMode = 2; diff --git a/src/battle_main.c b/src/battle_main.c index 56eabd515..721aa7f9f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -9,6 +9,7 @@ #include "gba/flash_internal.h" #include "battle.h" #include "battle_ai_script_commands.h" +#include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" #include "battle_setup.h" @@ -32,7 +33,6 @@ #include "pokemon.h" #include "random.h" #include "roamer.h" -#include "rom3.h" #include "rom_8077ABC.h" #include "rom_8094928.h" #include "safari_zone.h" @@ -83,7 +83,7 @@ extern u32 gBattleControllerExecFlags; extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[]; extern u8 gCurrentActionFuncId; -extern u8 gBanksByTurnOrder[]; +extern u8 gBattlerByTurnOrder[]; extern u8 gBattlerSpriteIds[]; extern u16 gCurrentMove; // This is mis-named. It is a species, not a move ID. extern u8 gLastUsedAbility; @@ -92,7 +92,7 @@ extern u8 gAbsentBattlerFlags; extern u8 gMultiHitCounter; extern u8 gActionForBanks[]; extern u16 gUnknown_02024C2C[]; -extern u16 gLastUsedMove[]; +extern u16 gLastMoves[]; extern u16 gLastLandedMoves[]; extern u16 gLastHitByType[]; extern u16 gUnknown_02024C4C[]; @@ -100,7 +100,7 @@ extern u16 gLockedMoves[]; extern u16 gChosenMovesByBanks[]; extern u32 gHitMarker; extern u8 gUnknown_02024C70[]; -extern u16 gSideAffecting[]; +extern u16 gSideStatuses[]; extern u32 gStatuses3[]; //extern u8 gDisableStructs[][0x1C]; extern u16 gPauseCounterBattle; @@ -208,7 +208,7 @@ void CB2_InitBattle(void) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - sub_800B858(); + HandleLinkBattleSetup(); SetMainCallback2(sub_800F104); gBattleCommunication[0] = 0; } @@ -1402,9 +1402,9 @@ extern const u16 gUnknown_Debug_821F424[][5]; extern const u16 gUnknown_Debug_821F56C[][5]; extern const u32 gUnknown_Debug_821F798[][4]; -extern const u8 gUnusedOldCharmap_Gfx_lz[]; -extern const u8 gUnusedOldCharmap_Tilemap_lz[]; -extern const u8 gUnusedOldCharmap_Pal_lz[]; +extern const u8 gDebugBattleCharmap_Gfx_lz[]; +extern const u8 gDebugBattleCharmap_Tilemap_lz[]; +extern const u8 gDebugBattleCharmap_Pal_lz[]; void debug_sub_8010800(void) { @@ -1457,10 +1457,10 @@ void debug_sub_80108B8(void) REG_BG1CNT = 0x4801; REG_BLDCNT = 0; REG_BLDY = 0; - LZDecompressVram(gUnusedOldCharmap_Gfx_lz, (void *)VRAM); - LZDecompressWram(gUnusedOldCharmap_Tilemap_lz, gSharedMem); - LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)PLTT); - LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)(PLTT + 0x1E0)); + LZDecompressVram(gDebugBattleCharmap_Gfx_lz, (void *)VRAM); + LZDecompressWram(gDebugBattleCharmap_Tilemap_lz, gSharedMem); + LZDecompressVram(gDebugBattleCharmap_Pal_lz, (void *)PLTT); + LZDecompressVram(gDebugBattleCharmap_Pal_lz, (void *)(PLTT + 0x1E0)); m4aSoundVSyncOn(); SetVBlankCallback(debug_sub_8011D40); SetMainCallback2(debug_sub_8010CAC); @@ -2475,11 +2475,13 @@ void debug_nullsub_3(void) extern const u32 gUnknown_Debug_821F680[][0x23]; +// Shows a cursor void debug_sub_80125A0(void) { gSharedMem[gUnknown_Debug_821F680[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]] = 0x6D; } +// Hides a cursor void debug_sub_80125E4(void) { gSharedMem[gUnknown_Debug_821F680[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]] = 0x81; @@ -3329,7 +3331,7 @@ void sub_8010874(void) MEMSET_ALT(&gDisableStructs[i], 0, 0x1C, j, r4); gDisableStructs[i].isFirstTurn= 2; gUnknown_02024C70[i] = 0; - gLastUsedMove[i] = 0; + gLastMoves[i] = 0; gLastLandedMoves[i] = 0; gLastHitByType[i] = 0; gUnknown_02024C4C[i] = 0; @@ -3341,7 +3343,7 @@ void sub_8010874(void) for (i = 0; i < 2; i++) { - gSideAffecting[i] = 0; + gSideStatuses[i] = 0; MEMSET_ALT(&gSideTimers[i], 0, 12, j, r4); } @@ -3399,7 +3401,7 @@ void sub_8010874(void) gBattleResults.unk2 = 0; gBattleResults.unk3 = 0; gBattleResults.unk4 = 0; - gBattleResults.unk5_0 = 0; + gBattleResults.playerMonWasDamaged = 0; gBattleResults.unk5_1 = 0; gBattleResults.lastOpponentSpecies = 0; gBattleResults.lastUsedMove = 0; @@ -3433,23 +3435,23 @@ void SwitchInClearSetData(void) { if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].bankPreventingEscape == gActiveBattler) gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION; - if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].bankWithSureHit == gActiveBattler) + if ((gStatuses3[i] & STATUS3_ALWAYS_HITS) && gDisableStructs[i].battlerWithSureHit == gActiveBattler) { gStatuses3[i] &= ~STATUS3_ALWAYS_HITS; - gDisableStructs[i].bankWithSureHit = 0; + gDisableStructs[i].battlerWithSureHit = 0; } } } if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) { gBattleMons[gActiveBattler].status2 &= (STATUS2_CONFUSION | STATUS2_FOCUS_ENERGY | STATUS2_SUBSTITUTE | STATUS2_ESCAPE_PREVENTION | STATUS2_CURSED); - gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BANK | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT); + gStatuses3[gActiveBattler] &= (STATUS3_LEECHSEED_BATTLER | STATUS3_LEECHSEED | STATUS3_ALWAYS_HITS | STATUS3_PERISH_SONG | STATUS3_ROOTED | STATUS3_MUDSPORT | STATUS3_WATERSPORT); for (i = 0; i < gBattlersCount; i++) { if (GetBattlerSide(gActiveBattler) != GetBattlerSide(i) && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0 - && (gDisableStructs[i].bankWithSureHit == gActiveBattler)) + && (gDisableStructs[i].battlerWithSureHit == gActiveBattler)) { gStatuses3[i] &= ~STATUS3_ALWAYS_HITS; gStatuses3[i] |= 0x10; @@ -3478,13 +3480,13 @@ void SwitchInClearSetData(void) if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) { gDisableStructs[gActiveBattler].substituteHP = sp0.substituteHP; - gDisableStructs[gActiveBattler].bankWithSureHit = sp0.bankWithSureHit; + gDisableStructs[gActiveBattler].battlerWithSureHit = sp0.battlerWithSureHit; gDisableStructs[gActiveBattler].perishSongTimer1 = sp0.perishSongTimer1; gDisableStructs[gActiveBattler].perishSongTimer2 = sp0.perishSongTimer2; } gDisableStructs[gActiveBattler].isFirstTurn= 2; - gLastUsedMove[gActiveBattler] = 0; + gLastMoves[gActiveBattler] = 0; gLastLandedMoves[gActiveBattler] = 0; gLastHitByType[gActiveBattler] = 0; gUnknown_02024C4C[gActiveBattler] = 0; @@ -3548,7 +3550,7 @@ void UndoEffectsAfterFainting(void) gProtectStructs[gActiveBattler].notFirstStrike = 0; gDisableStructs[gActiveBattler].isFirstTurn= 2; - gLastUsedMove[gActiveBattler] = 0; + gLastMoves[gActiveBattler] = 0; gLastLandedMoves[gActiveBattler] = 0; gLastHitByType[gActiveBattler] = 0; gUnknown_02024C4C[gActiveBattler] = 0; @@ -3885,12 +3887,12 @@ void BattleBeginFirstTurn(void) if (ewram16058 == 0) { for (i = 0; i < gBattlersCount; i++) - gBanksByTurnOrder[i] = i; + gBattlerByTurnOrder[i] = i; for (i = 0; i < gBattlersCount - 1; i++) { for (j = i + 1; j < gBattlersCount; j++) { - if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 1) != 0) + if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], 1) != 0) SwapTurnOrder(i, j); } } @@ -3902,7 +3904,7 @@ void BattleBeginFirstTurn(void) } while (ewram16058 < gBattlersCount) { - if (AbilityBattleEffects(0, gBanksByTurnOrder[ewram16058], 0, 0, 0) != 0) + if (AbilityBattleEffects(0, gBattlerByTurnOrder[ewram16058], 0, 0, 0) != 0) r9++; ewram16058++; if (r9 != 0) @@ -3914,7 +3916,7 @@ void BattleBeginFirstTurn(void) return; while (ewram160F9 < gBattlersCount) { - if (ItemBattleEffects(0, gBanksByTurnOrder[ewram160F9], 0) != 0) + if (ItemBattleEffects(0, gBattlerByTurnOrder[ewram160F9], 0) != 0) r9++; ewram160F9++; if (r9 != 0) @@ -3981,7 +3983,7 @@ void BattleTurnPassed(void) TurnValuesCleanUp(1); if (gBattleOutcome == 0) { - if (UpdateTurnCounters() != 0) + if (DoFieldEndTurnEffects() != 0) return; if (TurnBasedEffects() != 0) return; @@ -4482,9 +4484,9 @@ void SwapTurnOrder(u8 a, u8 b) gActionsByTurnOrder[a] = gActionsByTurnOrder[b]; gActionsByTurnOrder[b] = temp; - temp = gBanksByTurnOrder[a]; - gBanksByTurnOrder[a] = gBanksByTurnOrder[b]; - gBanksByTurnOrder[b] = temp; + temp = gBattlerByTurnOrder[a]; + gBattlerByTurnOrder[a] = gBattlerByTurnOrder[b]; + gBattlerByTurnOrder[b] = temp; } // Determines which of the two given mons will strike first in a battle. @@ -4545,7 +4547,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities) if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE) bank1AdjustedSpeed /= 2; - if (gBattleMons[bank1].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank1].status1 & STATUS1_PARALYSIS) bank1AdjustedSpeed /= 4; if (heldItemEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (heldItemEffectParam * 0xFFFF) / 100) @@ -4575,7 +4577,7 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities) if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE) bank2AdjustedSpeed /= 2; - if (gBattleMons[bank2].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank2].status1 & STATUS1_PARALYSIS) bank2AdjustedSpeed /= 4; if (heldItemEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (heldItemEffectParam * 0xFFFF) / 100) @@ -4642,7 +4644,7 @@ void SetActionsAndBanksTurnOrder(void) for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler]; - gBanksByTurnOrder[var] = gActiveBattler; + gBattlerByTurnOrder[var] = gActiveBattler; var++; } } @@ -4671,14 +4673,14 @@ void SetActionsAndBanksTurnOrder(void) if (var == 5) { gActionsByTurnOrder[0] = gActionForBanks[gActiveBattler]; - gBanksByTurnOrder[0] = gActiveBattler; + gBattlerByTurnOrder[0] = gActiveBattler; var = 1; for (i = 0; i < gBattlersCount; i++) { if (i != gActiveBattler) { gActionsByTurnOrder[var] = gActionForBanks[i]; - gBanksByTurnOrder[var] = i; + gBattlerByTurnOrder[var] = i; var++; } } @@ -4693,7 +4695,7 @@ void SetActionsAndBanksTurnOrder(void) if (gActionForBanks[gActiveBattler] == B_ACTION_USE_ITEM || gActionForBanks[gActiveBattler] == B_ACTION_SWITCH) { gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler]; - gBanksByTurnOrder[var] = gActiveBattler; + gBattlerByTurnOrder[var] = gActiveBattler; var++; } } @@ -4702,7 +4704,7 @@ void SetActionsAndBanksTurnOrder(void) if (gActionForBanks[gActiveBattler] != B_ACTION_USE_ITEM && gActionForBanks[gActiveBattler] != B_ACTION_SWITCH) { gActionsByTurnOrder[var] = gActionForBanks[gActiveBattler]; - gBanksByTurnOrder[var] = gActiveBattler; + gBattlerByTurnOrder[var] = gActiveBattler; var++; } } @@ -4710,8 +4712,8 @@ void SetActionsAndBanksTurnOrder(void) { for (j = i + 1; j < gBattlersCount; j++) { - u8 bank1 = gBanksByTurnOrder[i]; - u8 bank2 = gBanksByTurnOrder[j]; + u8 bank1 = gBattlerByTurnOrder[i]; + u8 bank2 = gBattlerByTurnOrder[j]; if (gActionsByTurnOrder[i] != B_ACTION_USE_ITEM && gActionsByTurnOrder[j] != B_ACTION_USE_ITEM && gActionsByTurnOrder[i] != B_ACTION_SWITCH @@ -4787,7 +4789,7 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) gActiveBattler = gBattlerAttacker = eFocusPunchBattler; eFocusPunchBattler++; if (gChosenMovesByBanks[gActiveBattler] == MOVE_FOCUS_PUNCH - && !(gBattleMons[gActiveBattler].status1 & STATUS_SLEEP) + && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP) && !(gDisableStructs[gBattlerAttacker].truantCounter) && !(gProtectStructs[gActiveBattler].noValidMoves)) { @@ -4846,7 +4848,7 @@ void HandleEndTurn_BattleWon(void) gBattleTextBuff1[0] = gBattleOutcome; gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost; - gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN); + gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); } else if (gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) { @@ -4896,7 +4898,7 @@ void HandleEndTurn_BattleLost(void) gBattleTextBuff1[0] = gBattleOutcome; gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost; - gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN); + gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); } else { @@ -4983,7 +4985,7 @@ static void FreeResetData_ReturnToOvOrDoEvolutions(void) if (!gPaletteFade.active) { ResetSpriteData(); - if (gLeveledUpInBattle == 0 || gBattleOutcome != BATTLE_WON) + if (gLeveledUpInBattle == 0 || gBattleOutcome != B_OUTCOME_WON) { gBattleMainFunc = ReturnFromBattleToOverworld; return; @@ -5049,7 +5051,7 @@ static void ReturnFromBattleToOverworld(void) if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) { UpdateRoamerHPStatus(&gEnemyParty[0]); - if (gBattleOutcome == BATTLE_WON || gBattleOutcome == BATTLE_CAUGHT) + if (gBattleOutcome == B_OUTCOME_WON || gBattleOutcome == B_OUTCOME_CAUGHT) SetRoamerInactive(); } @@ -5083,7 +5085,7 @@ void HandleAction_UseMove(void) u8 side; u8 var = 4; - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; if (ewram160A6 & gBitTable[gBattlerAttacker]) { @@ -5167,9 +5169,9 @@ void HandleAction_UseMove(void) if (side != GetBattlerSide(gActiveBattler) && ewram16010arr(gBattlerAttacker) != gActiveBattler && gBattleMons[gActiveBattler].ability == ABILITY_LIGHTNING_ROD - && BankGetTurnOrder(gActiveBattler) < var) + && GetBattlerTurnOrderNum(gActiveBattler) < var) { - var = BankGetTurnOrder(gActiveBattler); + var = GetBattlerTurnOrderNum(gActiveBattler); } } if (var == 4) @@ -5212,7 +5214,7 @@ void HandleAction_UseMove(void) } else { - gActiveBattler = gBanksByTurnOrder[var]; + gActiveBattler = gBattlerByTurnOrder[var]; RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability); gSpecialStatuses[gActiveBattler].lightningRodRedirected = 1; gBattlerTarget = gActiveBattler; @@ -5266,7 +5268,7 @@ void HandleAction_UseMove(void) void HandleAction_Switch(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gActionSelectionCursor[gBattlerAttacker] = 0; @@ -5284,7 +5286,7 @@ void HandleAction_Switch(void) void HandleAction_UseItem(void) { - gBattlerAttacker = gBattlerTarget = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerTarget = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gDisableStructs[gBattlerAttacker].furyCutterCounter = 0; @@ -5407,7 +5409,7 @@ bool8 TryRunFromBattle(u8 bank) if (effect) { gCurrentTurnActionNumber = gBattlersCount; - gBattleOutcome = BATTLE_RAN; + gBattleOutcome = B_OUTCOME_RAN; } return effect; @@ -5415,7 +5417,7 @@ bool8 TryRunFromBattle(u8 bank) void HandleAction_Run(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -5426,16 +5428,16 @@ void HandleAction_Run(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { if (gActionForBanks[gActiveBattler] == B_ACTION_RUN) - gBattleOutcome |= BATTLE_LOST; + gBattleOutcome |= B_OUTCOME_LOST; } else { if (gActionForBanks[gActiveBattler] == B_ACTION_RUN) - gBattleOutcome |= BATTLE_WON; + gBattleOutcome |= B_OUTCOME_WON; } } - gBattleOutcome |= OUTCOME_LINK_BATTLE_RUN; + gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN; } else { @@ -5460,7 +5462,7 @@ void HandleAction_Run(void) else { gCurrentTurnActionNumber = gBattlersCount; - gBattleOutcome = BATTLE_POKE_FLED; + gBattleOutcome = B_OUTCOME_MON_FLED; } } } @@ -5468,7 +5470,7 @@ void HandleAction_Run(void) void HandleAction_WatchesCarefully(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0]; @@ -5477,7 +5479,7 @@ void HandleAction_WatchesCarefully(void) void HandleAction_SafariZoneBallThrow(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gNumSafariBalls--; @@ -5488,7 +5490,7 @@ void HandleAction_SafariZoneBallThrow(void) void HandleAction_ThrowPokeblock(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1; @@ -5510,7 +5512,7 @@ void HandleAction_ThrowPokeblock(void) void HandleAction_GoNear(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -5537,15 +5539,15 @@ void HandleAction_GoNear(void) void HandleAction_SafriZoneRun(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; PlaySE(SE_NIGERU); gCurrentTurnActionNumber = gBattlersCount; - gBattleOutcome = BATTLE_RAN; + gBattleOutcome = B_OUTCOME_RAN; } void HandleAction_Action9(void) { - gBattlerAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -5573,7 +5575,7 @@ void HandleAction_NothingIsFainted(void) | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000 | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT - | HITMARKER_x8000000 | HITMARKER_x4000000); + | HITMARKER_CHARGING | HITMARKER_x4000000); } void HandleAction_ActionFinished(void) @@ -5585,7 +5587,7 @@ void HandleAction_ActionFinished(void) | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000 | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT - | HITMARKER_x8000000 | HITMARKER_x4000000); + | HITMARKER_CHARGING | HITMARKER_x4000000); gBattleMoveDamage = 0; ewram16002 = 0; diff --git a/src/battle_message.c b/src/battle_message.c index b218c2b8d..ce1e63edd 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -379,7 +379,7 @@ void BufferStringBattle(u16 stringID) gBattleTextBuff1[0] &= ~(0x80); if (GetBattlerSide(gActiveBattler) == 1 && gBattleTextBuff1[0] != 3) gBattleTextBuff1[0] ^= 3; - if (gBattleTextBuff1[0] == BATTLE_LOST || gBattleTextBuff1[0] == BATTLE_DREW) + if (gBattleTextBuff1[0] == B_OUTCOME_LOST || gBattleTextBuff1[0] == B_OUTCOME_DREW) stringPtr = BattleText_GotAwaySafely; else { @@ -397,13 +397,13 @@ void BufferStringBattle(u16 stringID) { switch (gBattleTextBuff1[0]) { - case BATTLE_WON: + case B_OUTCOME_WON: stringPtr = BattleText_PlayerDefeatedTrainers; break; - case BATTLE_LOST: + case B_OUTCOME_LOST: stringPtr = BattleText_PlayerLostTrainers; break; - case BATTLE_DREW: + case B_OUTCOME_DREW: stringPtr = BattleText_PlayerTiedTrainers; break; } @@ -412,13 +412,13 @@ void BufferStringBattle(u16 stringID) { switch (gBattleTextBuff1[0]) { - case BATTLE_WON: + case B_OUTCOME_WON: stringPtr = BattleText_PlayerDefeatedTrainer; break; - case BATTLE_LOST: + case B_OUTCOME_LOST: stringPtr = BattleText_PlayerLostTrainer; break; - case BATTLE_DREW: + case B_OUTCOME_DREW: stringPtr = BattleText_PlayerTiedTrainer; break; } diff --git a/src/battle_records.c b/src/battle_records.c index d94d88032..307b977d5 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -14,19 +14,19 @@ struct DebugStruct1 u8 var1[10]; }; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern u8 gBattleOutcome; #if DEBUG const struct DebugStruct1 gUnknown_Debug_4245CC[] = { { 1, _("NUMBER1") }, - { 2, _("ナンバー2") }, - { 3, _("ナンバー3") }, - { 4, _("ナンバー4") }, - { 5, _("ナンバー5") }, - { 6, _("ナンバー6") }, - { 7, _("ナンバー7") }, + { 2, DTR("ナンバー2", "NUMBER2") }, + { 3, DTR("ナンバー3", "NUMBER3") }, + { 4, DTR("ナンバー4", "NUMBER4") }, + { 5, DTR("ナンバー5", "NUMBER5") }, + { 6, DTR("ナンバー6", "NUMBER6") }, + { 7, DTR("ナンバー7", "NUMBER7") }, }; const struct {u8 unk0; u8 unk1;} gUnknown_Debug_8424620[] = @@ -220,7 +220,7 @@ void UpdateLinkBattleRecords(int id) gTrainerCards[id].playerName, gTrainerCards[id].trainerId, gBattleOutcome, - gLinkPlayers[gLinkPlayerEventObjects[id].linkPlayerId].language); + gLinkPlayers[gLinkPlayerObjectEvents[id].linkPlayerId].language); } #if DEBUG @@ -238,7 +238,7 @@ void debug_sub_81257E0(void) gUnknown_Debug_4245CC[id].var1, gUnknown_Debug_4245CC[id].var0, gUnknown_Debug_8424620[i].unk1, - gLinkPlayers[gLinkPlayerEventObjects[id].linkPlayerId].language); + gLinkPlayers[gLinkPlayerObjectEvents[id].linkPlayerId].language); } } #endif diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 577a8149a..32887efc1 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -12,7 +12,7 @@ #include "data2.h" #include "constants/hold_effects.h" #include "random.h" -#include "rom3.h" +#include "battle_controllers.h" #include "constants/species.h" #include "pokemon.h" #include "text.h" @@ -32,69 +32,6 @@ #define RET_VALUE_LEVELLED_UP 11 -enum -{ - CONTROLLER_GETMONDATA, - CONTROLLER_GETRAWMONDATA, - CONTROLLER_SETMONDATA, - CONTROLLER_SETRAWMONDATA, - CONTROLLER_LOADMONSPRITE, - CONTROLLER_SWITCHINANIM, - CONTROLLER_RETURNMONTOBALL, - CONTROLLER_DRAWTRAINERPIC, - CONTROLLER_TRAINERSLIDE, - CONTROLLER_TRAINERSLIDEBACK, - CONTROLLER_FAINTANIMATION, - CONTROLLER_PALETTEFADE, - CONTROLLER_SUCCESSBALLTHROWANIM, - CONTROLLER_BALLTHROWANIM, - CONTROLLER_PAUSE, - CONTROLLER_MOVEANIMATION, - CONTROLLER_PRINTSTRING, - CONTROLLER_PRINTSTRINGPLAYERONLY, - CONTROLLER_CHOOSEACTION, - CONTROLLER_UNKNOWNYESNOBOX, - CONTROLLER_CHOOSEMOVE, - CONTROLLER_OPENBAG, - CONTROLLER_CHOOSEPOKEMON, - CONTROLLER_23, - CONTROLLER_HEALTHBARUPDATE, - CONTROLLER_EXPUPDATE, - CONTROLLER_STATUSICONUPDATE, - CONTROLLER_STATUSANIMATION, - CONTROLLER_STATUSXOR, - CONTROLLER_DATATRANSFER, - CONTROLLER_DMA3TRANSFER, - CONTROLLER_31, - CONTROLLER_32, - CONTROLLER_TWORETURNVALUES, - CONTROLLER_CHOSENMONRETURNVALUE, - CONTROLLER_ONERETURNVALUE, - CONTROLLER_ONERETURNVALUE_DUPLICATE, - CONTROLLER_37, - CONTROLLER_38, - CONTROLLER_39, - CONTROLLER_40, - CONTROLLER_HITANIMATION, - CONTROLLER_42, - CONTROLLER_EFFECTIVENESSSOUND, - CONTROLLER_PLAYFANFAREORBGM, - CONTROLLER_FAINTINGCRY, - CONTROLLER_INTROSLIDE, - CONTROLLER_INTROTRAINERBALLTHROW, - CONTROLLER_DRAWPARTYSTATUSSUMMARY, - CONTROLLER_49, - CONTROLLER_50, - CONTROLLER_SPRITEINVISIBILITY, - CONTROLLER_BATTLEANIMATION, - CONTROLLER_LINKSTANDBYMSG, - CONTROLLER_RESETACTIONMOVESELECTION, - CONTROLLER_55, - /*new controllers should go here*/ - CONTROLLER_TERMINATOR_NOP, - CONTROLLER_CMDS_COUNT -}; - //extern needed variables extern u8 gUnknown_02023A14_50; extern u8 gCritMultiplier; @@ -108,7 +45,7 @@ extern u8 gActiveBattler; extern u32 gBattleControllerExecFlags; extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; -extern u8 gBanksByTurnOrder[MAX_BATTLERS_COUNT]; +extern u8 gBattlerByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u16 gCurrentMove; extern u8 gLastUsedAbility; @@ -117,10 +54,10 @@ extern u8 gPotentialItemEffectBattler; extern u8 gEffectBattler; extern u8 gAbsentBattlerFlags; extern u8 gMultiHitCounter; -extern u16 gLastUsedMove[4]; +extern u16 gLastMoves[4]; extern u16 gLockedMoves[4]; extern u16 gChosenMovesByBanks[4]; -extern u16 gSideAffecting[2]; +extern u16 gSideStatuses[2]; extern u16 gPauseCounterBattle; extern u16 gPaydayMoney; extern u16 gRandomTurnNumber; @@ -144,7 +81,7 @@ extern u16 gLastUsedItem; extern u16 gBattleMovePower; extern s32 gHpDealt; extern s32 gTakenDmg[MAX_BATTLERS_COUNT]; -extern u8 gTakenDmgBanks[MAX_BATTLERS_COUNT]; +extern u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT]; extern const u16 gMissStringIds[]; extern u8 gSentPokesToOpponent[2]; extern u8 gBank1; @@ -188,13 +125,13 @@ void CancelMultiTurnMoves(u8 bank); void BattleScriptPush(const u8* BS_ptr); void BattleScriptPushCursor(void); void RecordAbilityBattle(u8 bank, u8 ability); -void RecordItemBattle(u8 bank, u8 holdEffect); +void RecordItemEffectBattle(u8 bank, u8 holdEffect); static bool8 IsTwoTurnsMove(u16 move); static void TrySetDestinyBondToHappen(void); static void CheckWonderGuardAndLevitate(void); u8 GetBattlerPosition(u8 bank); u8 GetBattlerSide(u8 bank); -u8 GetBattleBank(u8 bankValue); +u8 GetBattlerForBattleScript(u8 bankValue); s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 a4, u16 powerOverride, u8 typeOverride, u8 bank_atk, u8 bank_def); static u8 AttacksThisTurn(u8 bank, u16 move); //Note: returns 1 if it's a charging turn, otherwise 2 void UndoEffectsAfterFainting(void); @@ -294,7 +231,7 @@ extern u8 BattleScript_PrintPayDayMoneyString[]; //bs payday money give extern u8 BattleScript_FaintAttacker[]; extern u8 BattleScript_FaintTarget[]; extern u8 BattleScript_DestinyBondTakesLife[]; -extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; +extern u8 BattleScript_GrudgeTakesPp[]; // read via orr #define BSScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) @@ -306,7 +243,7 @@ extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr)) -#define TARGET_PROTECT_AFFECTED ((gProtectStructs[gBattlerTarget].protected && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_PROTECT)) +#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_PROTECT)) //array entries for battle communication #define MOVE_EFFECT_BYTE 0x3 @@ -315,9 +252,9 @@ extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; #define TARGET_SELECTED 0x0 #define TARGET_DEPENDS 0x1 -#define TARGET_BOTH 0x8 -#define TARGET_FOES_AND_ALLY 0x20 -#define TARGET_OPPONENTS_FIELD 0x40 +#define MOVE_TARGET_BOTH 0x8 +#define MOVE_TARGET_FOES_AND_ALLY 0x20 +#define MOVE_TARGET_OPPONENTS_FIELD 0x40 #define TYPE_FORESIGHT 0xFE #define TYPE_ENDTABLE 0xFF @@ -444,11 +381,11 @@ static void atk5A_yesnoboxlearnmove(void); static void atk5B_yesnoboxstoplearningmove(void); static void atk5C_hitanimation(void); static void atk5D_getmoneyreward(void); -static void atk5E_8025A70(void); -static void atk5F_8025B24(void); +static void atk5E(void); +static void atk5F_swapattackerwithtarget(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); -static void atk62_08025C6C(void); +static void atk62_hidepartystatussummary(void); static void atk63_jumptorandomattack(void); static void atk64_statusanimation(void); static void atk65_status2animation(void); @@ -570,10 +507,10 @@ static void atkD7_setyawn(void); static void atkD8_setdamagetohealthdifference(void); static void atkD9_scaledamagebyhealthratio(void); static void atkDA_tryswapabilities(void); -static void atkDB_tryimprision(void); +static void atkDB_tryimprison(void); static void atkDC_trysetgrudge(void); static void atkDD_weightdamagecalculation(void); -static void atkDE_asistattackselect(void); +static void atkDE_assistattackselect(void); static void atkDF_trysetmagiccoat(void); static void atkE0_trysetsnatch(void); static void atkE1_trygetintimidatetarget(void); @@ -588,7 +525,7 @@ static void atkE9_setweatherballtype(void); static void atkEA_tryrecycleitem(void); static void atkEB_settypetoterrain(void); static void atkEC_pursuitrelated(void); -static void atkED_snatchsetbanks(void); +static void atkEF_snatchsetbattlers(void); static void atkEE_removelightscreenreflect(void); void atkEF_handleballthrow(void); static void atkF0_givecaughtmon(void); @@ -696,11 +633,11 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk5B_yesnoboxstoplearningmove, atk5C_hitanimation, atk5D_getmoneyreward, - atk5E_8025A70, - atk5F_8025B24, + atk5E, + atk5F_swapattackerwithtarget, atk60_incrementgamestat, atk61_drawpartystatussummary, - atk62_08025C6C, + atk62_hidepartystatussummary, atk63_jumptorandomattack, atk64_statusanimation, atk65_status2animation, @@ -821,10 +758,10 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkD8_setdamagetohealthdifference, atkD9_scaledamagebyhealthratio, atkDA_tryswapabilities, - atkDB_tryimprision, + atkDB_tryimprison, atkDC_trysetgrudge, atkDD_weightdamagecalculation, - atkDE_asistattackselect, + atkDE_assistattackselect, atkDF_trysetmagiccoat, atkE0_trysetsnatch, atkE1_trygetintimidatetarget, @@ -839,7 +776,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atkEA_tryrecycleitem, atkEB_settypetoterrain, atkEC_pursuitrelated, - atkED_snatchsetbanks, + atkEF_snatchsetbattlers, atkEE_removelightscreenreflect, atkEF_handleballthrow, atkF0_givecaughtmon, @@ -881,12 +818,12 @@ static const u16 sCriticalHitChance[] = {16, 8, 4, 3, 2}; static const u32 sStatusFlagsForMoveEffects[] = { 0x00000000, - STATUS_SLEEP, - STATUS_POISON, - STATUS_BURN, - STATUS_FREEZE, - STATUS_PARALYSIS, - STATUS_TOXIC_POISON, + STATUS1_SLEEP, + STATUS1_POISON, + STATUS1_BURN, + STATUS1_FREEZE, + STATUS1_PARALYSIS, + STATUS1_TOXIC_POISON, STATUS2_CONFUSION, STATUS2_FLINCHED, 0x00000000, @@ -1001,26 +938,26 @@ static const u16 sProtectSuccessRates[] = {0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF}; static const u16 sMovesForbiddenToCopy[] = { - MOVE_METRONOME, - MOVE_STRUGGLE, - MOVE_SKETCH, - MOVE_MIMIC, - MIMIC_FORBIDDEN_END, - MOVE_COUNTER, - MOVE_MIRROR_COAT, - MOVE_PROTECT, - MOVE_DETECT, - MOVE_ENDURE, - MOVE_DESTINY_BOND, - MOVE_SLEEP_TALK, - MOVE_THIEF, - MOVE_FOLLOW_ME, - MOVE_SNATCH, - MOVE_HELPING_HAND, - MOVE_COVET, - MOVE_TRICK, - MOVE_FOCUS_PUNCH, - METRONOME_FORBIDDEN_END + MOVE_METRONOME, + MOVE_STRUGGLE, + MOVE_SKETCH, + MOVE_MIMIC, + MIMIC_FORBIDDEN_END, + MOVE_COUNTER, + MOVE_MIRROR_COAT, + MOVE_PROTECT, + MOVE_DETECT, + MOVE_ENDURE, + MOVE_DESTINY_BOND, + MOVE_SLEEP_TALK, + MOVE_THIEF, + MOVE_FOLLOW_ME, + MOVE_SNATCH, + MOVE_HELPING_HAND, + MOVE_COVET, + MOVE_TRICK, + MOVE_FOCUS_PUNCH, + METRONOME_FORBIDDEN_END }; static const u8 sFlailHpScaleToPowerTable[] = //reversal+flail HP thresholds to power @@ -1111,7 +1048,7 @@ static void atk00_attackcanceler(void) return; if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0)) return; - if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200) + if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING)) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) { gBattlescriptCurrInstr = BattleScript_NoPPForMove; @@ -1150,11 +1087,11 @@ static void atk00_attackcanceler(void) for (i = 0; i < gBattlersCount; i++) { - if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_SNATCH) + if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_SNATCH) { - PressurePPLose(gBattlerAttacker, gBanksByTurnOrder[i], MOVE_SNATCH); - gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0; - gBattleStruct->scriptingActive = gBanksByTurnOrder[i]; + PressurePPLose(gBattlerAttacker, gBattlerByTurnOrder[i], MOVE_SNATCH); + gProtectStructs[gBattlerByTurnOrder[i]].stealMove = 0; + gBattleStruct->scriptingActive = gBattlerByTurnOrder[i]; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SnatchedMove; return; @@ -1169,8 +1106,8 @@ static void atk00_attackcanceler(void) gBattlescriptCurrInstr = BattleScript_TookAttack; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } - else if (TARGET_PROTECT_AFFECTED - && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBattlerAttacker].type1 == TYPE_GHOST || gBattleMons[gBattlerAttacker].type2 == TYPE_GHOST)) + else if (DEFENDER_IS_PROTECTED + && (gCurrentMove != MOVE_CURSE || IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)))) { CancelMultiTurnMoves(gBattlerAttacker); @@ -1206,7 +1143,7 @@ static void JumpIfMoveFailed(u8 adder, u16 move) static void atk40_jumpifaffectedbyprotect(void) { - if (TARGET_PROTECT_AFFECTED) + if (DEFENDER_IS_PROTECTED) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(5, 0); @@ -1221,7 +1158,7 @@ static void atk40_jumpifaffectedbyprotect(void) static bool8 JumpIfMoveAffectedByProtect(u16 move) { bool8 affected = FALSE; - if (TARGET_PROTECT_AFFECTED) + if (DEFENDER_IS_PROTECTED) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(7, move); @@ -1233,7 +1170,7 @@ static bool8 JumpIfMoveAffectedByProtect(u16 move) static bool8 AccuracyCalcHelper(u16 move) { - if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattlerTarget].bankWithSureHit == gBattlerAttacker) + if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker) { JumpIfMoveFailed(7, move); return TRUE; @@ -1282,7 +1219,7 @@ static void atk01_accuracycheck(void) if (move == 0xFFFE || move == 0xFFFF) { - if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattlerTarget].bankWithSureHit == gBattlerAttacker) + if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker) gBattlescriptCurrInstr += 7; else if (gStatuses3[gBattlerTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -1391,11 +1328,11 @@ static void atk03_ppreduce(void) { switch (gBattleMoves[gCurrentMove].target) { - case TARGET_FOES_AND_ALLY: + case MOVE_TARGET_FOES_AND_ALLY: ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattlerAttacker, ABILITY_PRESSURE, 0, 0); break; - case TARGET_BOTH: - case TARGET_OPPONENTS_FIELD: + case MOVE_TARGET_BOTH: + case MOVE_TARGET_OPPONENTS_FIELD: ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBattlerAttacker, ABILITY_PRESSURE, 0, 0); break; default: @@ -1415,7 +1352,7 @@ static void atk03_ppreduce(void) gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 0; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) - && !((gDisableStructs[gBattlerAttacker].unk18_b) & gBitTable[gCurrMovePos])) + && !((gDisableStructs[gBattlerAttacker].mimickedMoves) & gBitTable[gCurrMovePos])) { gActiveBattler = gBattlerAttacker; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]); @@ -1450,8 +1387,8 @@ static void atk04_critcalc(void) + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattlerAttacker].species == SPECIES_CHANSEY) + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattlerAttacker].species == SPECIES_FARFETCHD); - if (critChance > 4) - critChance = 4; + if (critChance >= ARRAY_COUNT(sCriticalHitChance)) + critChance = ARRAY_COUNT(sCriticalHitChance) - 1; if ((gBattleMons[gBattlerTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattlerTarget].ability != ABILITY_SHELL_ARMOR) && !(gStatuses3[gBattlerAttacker] & STATUS3_CANT_SCORE_A_CRIT) @@ -1466,9 +1403,9 @@ static void atk04_critcalc(void) static void atk05_damagecalc(void) { - u16 side_hword = gSideAffecting[GetBattlerPosition(gBattlerTarget) & 1]; + u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)]; gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove, - side_hword, gDynamicBasePower, + sideStatus, gDynamicBasePower, gBattleStruct->dynamicMoveType, gBattlerAttacker, gBattlerTarget); gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleStruct->dmgMultiplier; @@ -1480,18 +1417,18 @@ static void atk05_damagecalc(void) gBattlescriptCurrInstr++; } -void AI_CalcDmg(u8 BankAtk, u8 BankDef) +void AI_CalcDmg(u8 attacker, u8 defender) { - u16 side_hword = gSideAffecting[GetBattlerPosition(BankDef) & 1]; - gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[BankAtk], &gBattleMons[BankDef], gCurrentMove, - side_hword, gDynamicBasePower, - gBattleStruct->dynamicMoveType, BankAtk, BankDef); + u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(defender)]; + gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[attacker], &gBattleMons[defender], gCurrentMove, + sideStatus, gDynamicBasePower, + gBattleStruct->dynamicMoveType, attacker, defender); gDynamicBasePower = 0; gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleStruct->dmgMultiplier; - if (gStatuses3[BankAtk] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) + if (gStatuses3[attacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) gBattleMoveDamage *= 2; - if (gProtectStructs[BankAtk].helpingHand) + if (gProtectStructs[attacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; } @@ -1503,12 +1440,12 @@ static void ModulateDmgByType(u8 multiplier) switch (multiplier) { - case 0: //no effect + case TYPE_MUL_NO_EFFECT: gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE; gMoveResultFlags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE; gMoveResultFlags &= ~MOVE_RESULT_SUPER_EFFECTIVE; break; - case 5: //not very effecting + case TYPE_MUL_NOT_EFFECTIVE: if (gBattleMoves[gCurrentMove].power && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) @@ -1517,7 +1454,7 @@ static void ModulateDmgByType(u8 multiplier) gMoveResultFlags |= MOVE_RESULT_NOT_VERY_EFFECTIVE; } break; - case 20: //super effective + case TYPE_MUL_SUPER_EFFECTIVE: if (gBattleMoves[gCurrentMove].power && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) @@ -1532,28 +1469,28 @@ static void ModulateDmgByType(u8 multiplier) static void atk06_typecalc(void) { int i = 0; - u8 move_type; + u8 moveType; if (gCurrentMove != MOVE_STRUGGLE) { if (gBattleStruct->dynamicMoveType) - move_type = gBattleStruct->dynamicMoveType & 0x3F; + moveType = gBattleStruct->dynamicMoveType & 0x3F; else - move_type = gBattleMoves[gCurrentMove].type; + moveType = gBattleMoves[gCurrentMove].type; //check stab - if (gBattleMons[gBattlerAttacker].type1 == move_type || gBattleMons[gBattlerAttacker].type2 == move_type) + if (gBattleMons[gBattlerAttacker].type1 == moveType || gBattleMons[gBattlerAttacker].type2 == moveType) { gBattleMoveDamage = gBattleMoveDamage * 15; gBattleMoveDamage = gBattleMoveDamage / 10; } - if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && move_type == TYPE_GROUND) + if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND) { gLastUsedAbility = gBattleMons[gBattlerTarget].ability; gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE); gLastLandedMoves[gBattlerTarget] = 0; gLastHitByType[gBattlerTarget] = 0; - gBattleCommunication[6] = move_type; + gBattleCommunication[6] = moveType; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } else @@ -1568,7 +1505,7 @@ static void atk06_typecalc(void) continue; } - else if (gTypeEffectiveness[i] == move_type) + else if (gTypeEffectiveness[i] == moveType) { //check type1 if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type1) @@ -1601,24 +1538,21 @@ static void atk06_typecalc(void) static void CheckWonderGuardAndLevitate(void) { u8 flags = 0; - int i = 0; - u8 move_type; + s32 i = 0; + u8 moveType; if (gCurrentMove == MOVE_STRUGGLE || !gBattleMoves[gCurrentMove].power) return; - if (gBattleStruct->dynamicMoveType) - move_type = gBattleStruct->dynamicMoveType & 0x3F; - else - move_type = gBattleMoves[gCurrentMove].type; + GET_MOVE_TYPE(gCurrentMove, moveType); - if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && move_type == TYPE_GROUND) + if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND) { - RecordAbilitySetField6(ABILITY_LEVITATE, move_type); + RecordAbilitySetField6(ABILITY_LEVITATE, moveType); return; } - while (gTypeEffectiveness[i]!= TYPE_ENDTABLE) + while (gTypeEffectiveness[i] != TYPE_ENDTABLE) { if (gTypeEffectiveness[i] == TYPE_FORESIGHT) { @@ -1628,9 +1562,9 @@ static void CheckWonderGuardAndLevitate(void) continue; } - if (gTypeEffectiveness[i] == move_type) + if (gTypeEffectiveness[i] == moveType) { - //check no effect + // check no effect if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type1 && gTypeEffectiveness[i + 2] == 0) { gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE; @@ -1644,7 +1578,7 @@ static void CheckWonderGuardAndLevitate(void) gProtectStructs[gBattlerAttacker].targetNotAffected = 1; } - //check super effective + // check super effective if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type1 && gTypeEffectiveness[i + 2] == 20) flags |= 1; if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type2 @@ -1652,7 +1586,7 @@ static void CheckWonderGuardAndLevitate(void) && gTypeEffectiveness[i + 2] == 20) flags |= 1; - //check not very effective + // check not very effective if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type1 && gTypeEffectiveness[i + 2] == 5) flags |= 2; if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type2 @@ -1672,7 +1606,7 @@ static void CheckWonderGuardAndLevitate(void) } } -static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) //a literal copy of the ModulateDmgbyType1 with different args... +static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) // same as ModulateDmgByType except different arguments { gBattleMoveDamage = gBattleMoveDamage * multiplier / 10; if (gBattleMoveDamage == 0 && multiplier != 0) @@ -1680,12 +1614,12 @@ static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) //a literal c switch (multiplier) { - case 0: //no effect + case TYPE_MUL_NO_EFFECT: *flags |= MOVE_RESULT_DOESNT_AFFECT_FOE; *flags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE; *flags &= ~MOVE_RESULT_SUPER_EFFECTIVE; break; - case 5: //not very effecting + case TYPE_MUL_NOT_EFFECTIVE: if (gBattleMoves[move].power && !(*flags & MOVE_RESULT_NO_EFFECT)) { if (*flags & MOVE_RESULT_SUPER_EFFECTIVE) @@ -1694,7 +1628,7 @@ static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) //a literal c *flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE; } break; - case 20: //super effective + case TYPE_MUL_SUPER_EFFECTIVE: if (gBattleMoves[move].power && !(*flags & MOVE_RESULT_NO_EFFECT)) { if (*flags & MOVE_RESULT_NOT_VERY_EFFECTIVE) @@ -1706,25 +1640,25 @@ static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) //a literal c } } -u8 TypeCalc(u16 move, u8 bank_atk, u8 bank_def) +u8 TypeCalc(u16 move, u8 attacker, u8 defender) { - int i = 0; + s32 i = 0; u8 flags = 0; - u8 move_type; + u8 moveType; if (move == MOVE_STRUGGLE) return 0; - move_type = gBattleMoves[move].type; + moveType = gBattleMoves[move].type; - //check stab - if (gBattleMons[bank_atk].type1 == move_type || gBattleMons[bank_atk].type2 == move_type) + // check stab + if (IS_BATTLER_OF_TYPE(attacker, moveType)) { gBattleMoveDamage = gBattleMoveDamage * 15; gBattleMoveDamage = gBattleMoveDamage / 10; } - if (gBattleMons[bank_def].ability == ABILITY_LEVITATE && move_type == TYPE_GROUND) + if (gBattleMons[defender].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND) { flags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE); } @@ -1734,28 +1668,28 @@ u8 TypeCalc(u16 move, u8 bank_atk, u8 bank_def) { if (gTypeEffectiveness[i] == TYPE_FORESIGHT) { - if (gBattleMons[bank_def].status2 & STATUS2_FORESIGHT) + if (gBattleMons[defender].status2 & STATUS2_FORESIGHT) break; i += 3; continue; } - else if (gTypeEffectiveness[i] == move_type) + else if (gTypeEffectiveness[i] == moveType) { - //check type1 - if (gTypeEffectiveness[i + 1] == gBattleMons[bank_def].type1) + // check type1 + if (gTypeEffectiveness[i + 1] == gBattleMons[defender].type1) ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags); - //check type2 - if (gTypeEffectiveness[i + 1] == gBattleMons[bank_def].type2 && - gBattleMons[gBattlerTarget /* what the christ */].type1 != gBattleMons[bank_def].type2) + // check type2 + if (gTypeEffectiveness[i + 1] == gBattleMons[defender].type2 && + gBattleMons[gBattlerTarget /* what the christ */].type1 != gBattleMons[defender].type2) ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags); } i += 3; } } - if (gBattleMons[bank_def].ability == ABILITY_WONDER_GUARD && !(flags & MOVE_RESULT_MISSED) && - AttacksThisTurn(bank_atk, move) == 2 && + if (gBattleMons[defender].ability == ABILITY_WONDER_GUARD && !(flags & MOVE_RESULT_MISSED) && + AttacksThisTurn(attacker, move) == 2 && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) && gBattleMoves[move].power) { @@ -1764,41 +1698,43 @@ u8 TypeCalc(u16 move, u8 bank_atk, u8 bank_def) return flags; } -u8 AI_TypeCalc(u16 move, u16 species, u8 ability) +u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility) { int i = 0; u8 flags = 0; - u8 type1 = gBaseStats[species].type1, type2 = gBaseStats[species].type2, move_type; + u8 type1 = gBaseStats[targetSpecies].type1, type2 = gBaseStats[targetSpecies].type2, moveType; if (move == MOVE_STRUGGLE) return 0; - move_type = gBattleMoves[move].type; + moveType = gBattleMoves[move].type; - if (ability == ABILITY_LEVITATE && move_type == TYPE_GROUND) + if (targetAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND) + { flags = MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE; + } else { - while (gTypeEffectiveness[i]!= TYPE_ENDTABLE) + while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE) { - if (gTypeEffectiveness[i] == TYPE_FORESIGHT) + if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT) { i += 3; continue; } - if (gTypeEffectiveness[i] == move_type) + if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { - //check type1 - if (gTypeEffectiveness[i + 1] == type1) - ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags); - //check type2 - if (gTypeEffectiveness[i + 1] == type2 && gBattleMons[gBattlerTarget].type1 != type2) //gf you morons, you should check if (type1 != type2)... - ModulateDmgByType2(gTypeEffectiveness[i + 2], move, &flags); + // check type1 + if (TYPE_EFFECT_DEF_TYPE(i) == type1) + ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags); + // check type2 + if (TYPE_EFFECT_DEF_TYPE(i) == type2 && gBattleMons[gBattlerTarget].type1 != type2) //gf you morons, you should check if (type1 != type2)... + ModulateDmgByType2(TYPE_EFFECT_MULTIPLIER(i), move, &flags); } i += 3; } } - if (ability == ABILITY_WONDER_GUARD + if (targetAbility == ABILITY_WONDER_GUARD && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) && gBattleMoves[move].power) flags |= MOVE_RESULT_DOESNT_AFFECT_FOE; @@ -1827,23 +1763,26 @@ void Unused_ApplyRandomDmgMultiplier(void) static void atk07_adjustnormaldamage(void) { - u8 hold_effect, quality; + u8 holdEffect, param; + ApplyRandomDmgMultiplier(); + if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) { - hold_effect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam; + holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect; + param = gEnigmaBerries[gBattlerTarget].holdEffectParam; } else { - hold_effect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); - quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); + holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); + param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } gPotentialItemEffectBattler = gBattlerTarget; - if (hold_effect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality) + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { - RecordItemBattle(gBattlerTarget, hold_effect); + RecordItemEffectBattle(gBattlerTarget, holdEffect); gSpecialStatuses[gBattlerTarget].focusBanded = 1; } if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE) @@ -1860,9 +1799,8 @@ static void atk07_adjustnormaldamage(void) if (gProtectStructs[gBattlerTarget].endured) { gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED; - goto END; } - if (gSpecialStatuses[gBattlerTarget].focusBanded) + else if (gSpecialStatuses[gBattlerTarget].focusBanded) { gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON; gLastUsedItem = gBattleMons[gBattlerTarget].item; @@ -1872,33 +1810,34 @@ static void atk07_adjustnormaldamage(void) gBattlescriptCurrInstr++; } -static void atk08_adjustnormaldamage2(void) //literally the same as 0x7 except it doesn't check for false swipe move effect... +static void atk08_adjustnormaldamage2(void) // The same as 0x7 except it doesn't check for false swipe move effect. { - u8 hold_effect, quality; + u8 holdEffect, param; + ApplyRandomDmgMultiplier(); + if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) { - hold_effect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam; + holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect; + param = gEnigmaBerries[gBattlerTarget].holdEffectParam; } else { - hold_effect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); - quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); + holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); + param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } gPotentialItemEffectBattler = gBattlerTarget; - if (hold_effect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality) + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { - RecordItemBattle(gBattlerTarget, hold_effect); + RecordItemEffectBattle(gBattlerTarget, holdEffect); gSpecialStatuses[gBattlerTarget].focusBanded = 1; } if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE) goto END; - if (!gProtectStructs[gBattlerTarget].endured - && !gSpecialStatuses[gBattlerTarget].focusBanded) + if (!gProtectStructs[gBattlerTarget].endured && !gSpecialStatuses[gBattlerTarget].focusBanded) goto END; - if (gBattleMons[gBattlerTarget].hp > gBattleMoveDamage) goto END; @@ -1907,9 +1846,8 @@ static void atk08_adjustnormaldamage2(void) //literally the same as 0x7 except i if (gProtectStructs[gBattlerTarget].endured) { gMoveResultFlags |= MOVE_RESULT_FOE_ENDURED; - goto END; } - if (gSpecialStatuses[gBattlerTarget].focusBanded) + else if (gSpecialStatuses[gBattlerTarget].focusBanded) { gMoveResultFlags |= MOVE_RESULT_FOE_HUNG_ON; gLastUsedItem = gBattleMons[gBattlerTarget].item; @@ -1928,12 +1866,12 @@ static void atk09_attackanimation(void) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_Pausex20; - gBattleStruct->animTurn += 1; - gBattleStruct->animTargetsHit += 1; + gBattleStruct->animTurn++; + gBattleStruct->animTargetsHit++; } else { - if ((gBattleMoves[gCurrentMove].target & TARGET_BOTH || gBattleMoves[gCurrentMove].target & TARGET_FOES_AND_ALLY || gBattleMoves[gCurrentMove].target & TARGET_DEPENDS) && gBattleStruct->animTargetsHit) + if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH || gBattleMoves[gCurrentMove].target & MOVE_TARGET_FOES_AND_ALLY || gBattleMoves[gCurrentMove].target & TARGET_DEPENDS) && gBattleStruct->animTargetsHit) { gBattlescriptCurrInstr++; return; @@ -1969,7 +1907,7 @@ static void atk0B_healthbarupdate(void) if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) { @@ -1996,7 +1934,7 @@ static void atk0B_healthbarupdate(void) MarkBattlerForControllerExec(gActiveBattler); if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0) - gBattleResults.unk5_0 = 1; + gBattleResults.playerMonWasDamaged = TRUE; } } @@ -2019,7 +1957,7 @@ static void atk0C_datahpupdate(void) if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) { if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage) @@ -2064,10 +2002,10 @@ static void atk0C_datahpupdate(void) else { gTakenDmg[gActiveBattler] += gBattleMoveDamage; - if (gBattlescriptCurrInstr[1] == BS_GET_TARGET) - gTakenDmgBanks[gActiveBattler] = gBattlerAttacker; + if (gBattlescriptCurrInstr[1] == BS_TARGET) + gTakenDmgByBattler[gActiveBattler] = gBattlerAttacker; else - gTakenDmgBanks[gActiveBattler] = gBattlerTarget; + gTakenDmgByBattler[gActiveBattler] = gBattlerTarget; } if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage) @@ -2084,11 +2022,11 @@ static void atk0C_datahpupdate(void) if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_x100000)) gSpecialStatuses[gActiveBattler].dmg = gHpDealt; - if (TYPE_IS_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) + if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) { gProtectStructs[gActiveBattler].physicalDmg = gHpDealt; gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt; - if (gBattlescriptCurrInstr[1] == BS_GET_TARGET) + if (gBattlescriptCurrInstr[1] == BS_TARGET) { gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerAttacker; gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerAttacker; @@ -2099,11 +2037,11 @@ static void atk0C_datahpupdate(void) gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget; } } - else if (!TYPE_IS_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) + else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000)) { gProtectStructs[gActiveBattler].specialDmg = gHpDealt; gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt; - if (gBattlescriptCurrInstr[1] == BS_GET_TARGET) + if (gBattlescriptCurrInstr[1] == BS_TARGET) { gProtectStructs[gActiveBattler].specialBattlerId = gBattlerAttacker; gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerAttacker; @@ -2122,7 +2060,7 @@ static void atk0C_datahpupdate(void) } else { - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gSpecialStatuses[gActiveBattler].dmg == 0) gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; } @@ -2150,19 +2088,19 @@ static void atk0E_effectivenesssound(void) gActiveBattler = gBattlerTarget; if (!(gMoveResultFlags & MOVE_RESULT_MISSED)) { - u8 flag = ~MOVE_RESULT_MISSED; - switch (gMoveResultFlags & flag) + switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) { case MOVE_RESULT_SUPER_EFFECTIVE: - BtlController_EmitPlaySE(0, 14); + BtlController_EmitPlaySE(0, SE_KOUKA_H); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_NOT_VERY_EFFECTIVE: - BtlController_EmitPlaySE(0, 12); + BtlController_EmitPlaySE(0, SE_KOUKA_L); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_DOESNT_AFFECT_FOE: case MOVE_RESULT_FAILED: + // no sound break; case MOVE_RESULT_FOE_ENDURED: case MOVE_RESULT_ONE_HIT_KO: @@ -2170,17 +2108,17 @@ static void atk0E_effectivenesssound(void) default: if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) { - BtlController_EmitPlaySE(0, 14); + BtlController_EmitPlaySE(0, SE_KOUKA_H); MarkBattlerForControllerExec(gActiveBattler); } else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) { - BtlController_EmitPlaySE(0, 12); + BtlController_EmitPlaySE(0, SE_KOUKA_L); MarkBattlerForControllerExec(gActiveBattler); } else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) { - BtlController_EmitPlaySE(0, 13); + BtlController_EmitPlaySE(0, SE_KOUKA_M); MarkBattlerForControllerExec(gActiveBattler); } break; @@ -2292,8 +2230,10 @@ static void atk10_printstring(void) static void atk11_printselectionstring(void) { gActiveBattler = gBattlerAttacker; + BtlController_EmitPrintSelectionString(0, T2_READ_16(gBattlescriptCurrInstr + 1)); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 3; gBattleCommunication[MSG_DISPLAY] = 1; } @@ -2308,8 +2248,8 @@ static void atk12_waitmessage(void) } else { - u16 to_wait = T2_READ_16(gBattlescriptCurrInstr + 1); - if (++gPauseCounterBattle >= to_wait) + u16 toWait = T2_READ_16(gBattlescriptCurrInstr + 1); + if (++gPauseCounterBattle >= toWait) { gPauseCounterBattle = 0; gBattlescriptCurrInstr += 3; @@ -2345,12 +2285,12 @@ static void atk14_printselectionstringfromtable(void) } } -u8 BankGetTurnOrder(u8 bank) +u8 GetBattlerTurnOrderNum(u8 battlerId) { int i; for (i = 0; i < gBattlersCount; i++) { - if (gBanksByTurnOrder[i] == bank) + if (gBattlerByTurnOrder[i] == battlerId) break; } return i; @@ -2383,7 +2323,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9) {gBattlescriptCurrInstr++; return;} - if (gSideAffecting[GetBattlerPosition(gEffectBattler) & 1] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && + if (gSideStatuses[GetBattlerPosition(gEffectBattler) & 1] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7) {gBattlescriptCurrInstr++; return;} @@ -2398,7 +2338,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) { - case STATUS_SLEEP: + case STATUS1_SLEEP: //check active uproar if (gBattleMons[gEffectBattler].ability != ABILITY_SOUNDPROOF) { @@ -2414,7 +2354,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) CancelMultiTurnMoves(gEffectBattler); StatusChanged = 1; break; - case STATUS_POISON: + case STATUS1_POISON: if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY && (primary == 1 || certain == 0x80)) { gLastUsedAbility = ABILITY_IMMUNITY; @@ -2448,7 +2388,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) StatusChanged = 1; break; - case STATUS_BURN: + case STATUS1_BURN: if (gBattleMons[gEffectBattler].ability == ABILITY_WATER_VEIL && (primary == 1 || certain == 0x80)) { gLastUsedAbility = ABILITY_WATER_VEIL; @@ -2479,7 +2419,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleMons[gEffectBattler].status1 == 0) {break;} StatusChanged = 1; break; - case STATUS_FREEZE: + case STATUS1_FREEZE: if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) {NoSunCanFreeze = 0;} if (gBattleMons[gEffectBattler].type1 == TYPE_ICE) {break;} if (gBattleMons[gEffectBattler].type2 == TYPE_ICE) {break;} @@ -2490,7 +2430,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) CancelMultiTurnMoves(gEffectBattler); StatusChanged = 1; break; - case STATUS_PARALYSIS: + case STATUS1_PARALYSIS: if (gBattleMons[gEffectBattler].ability == ABILITY_LIMBER) { if ((primary == 1 || certain == 0x80)) @@ -2514,7 +2454,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleMons[gEffectBattler].status1) {break;} StatusChanged = 1; break; - case STATUS_TOXIC_POISON: + case STATUS1_TOXIC_POISON: if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY && (primary == 1 || certain == 0x80)) { gLastUsedAbility = ABILITY_IMMUNITY; @@ -2557,7 +2497,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (StatusChanged == 1) { BattleScriptPush(gBattlescriptCurrInstr + 1); - if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS_SLEEP) + if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS1_SLEEP) gBattleMons[gEffectBattler].status1 |= ((Random() & 3) + 2); else gBattleMons[gEffectBattler].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; @@ -2615,7 +2555,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) } else { - if (BankGetTurnOrder(gEffectBattler) > gCurrentTurnActionNumber) + if (GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber) gBattleMons[gEffectBattler].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattlescriptCurrInstr++; return; } @@ -2781,9 +2721,9 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattlescriptCurrInstr = BattleScript_RapidSpinAway; return; case 36: //paralysis removal - if (gBattleMons[gBattlerTarget].status1 & STATUS_PARALYSIS) + if (gBattleMons[gBattlerTarget].status1 & STATUS1_PARALYSIS) { - gBattleMons[gBattlerTarget].status1 &= ~(STATUS_PARALYSIS); + gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_PARALYSIS); gActiveBattler = gBattlerTarget; BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattlerTarget].status1); MarkBattlerForControllerExec(gActiveBattler); @@ -2929,7 +2869,7 @@ _0801E48A:\n\ mov r1, r8\n\ ldrb r0, [r1]\n\ bl GetBattlerPosition\n\ - ldr r2, _0801E554 @ =gSideAffecting\n\ + ldr r2, _0801E554 @ =gSideStatuses\n\ movs r1, 0x1\n\ ands r1, r0\n\ lsls r1, 1\n\ @@ -3023,7 +2963,7 @@ _0801E544: .4byte gBattlerAttacker\n\ _0801E548: .4byte 0x00016003\n\ _0801E54C: .4byte gBattleMons\n\ _0801E550: .4byte gHitMarker\n\ -_0801E554: .4byte gSideAffecting\n\ +_0801E554: .4byte gSideStatuses\n\ _0801E558: .4byte gBattleCommunication\n\ _0801E55C: .4byte sStatusFlagsForMoveEffects\n\ _0801E560:\n\ @@ -3957,7 +3897,7 @@ _0801ED10: .4byte gBattlescriptCurrInstr\n\ _0801ED14: .4byte BattleScript_FlinchPrevention\n\ _0801ED18:\n\ adds r0, r2, 0\n\ - bl BankGetTurnOrder\n\ + bl GetBattlerTurnOrderNum\n\ ldr r1, _0801ED54 @ =gCurrentTurnActionNumber\n\ lsls r0, 24\n\ lsrs r0, 24\n\ @@ -5017,27 +4957,31 @@ _0801F610: .4byte BattleScript_SAtkDown2\n\ static void atk15_seteffectwithchance(void) { - u32 PercentChance; + u32 percentChance; if (gBattleMons[gBattlerAttacker].ability == ABILITY_SERENE_GRACE) - PercentChance = gBattleMoves[gCurrentMove].secondaryEffectChance * 2; + percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance * 2; else - PercentChance = gBattleMoves[gCurrentMove].secondaryEffectChance; + percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance; if (DEBUG && (gUnknown_02023A14_50 & 4) - && !(gBattleCommunication[MOVE_EFFECT_BYTE] & 0x80) && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + && !(gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_CERTAIN) + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { SetMoveEffect(0, 0); } - else if ((gBattleCommunication[MOVE_EFFECT_BYTE] & 0x80) && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + else if ((gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_CERTAIN) + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - gBattleCommunication[MOVE_EFFECT_BYTE] &= 0x7F; - SetMoveEffect(0, 0x80); + gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_CERTAIN); + SetMoveEffect(0, MOVE_EFFECT_CERTAIN); } - else if (Random() % 100 <= PercentChance && gBattleCommunication[MOVE_EFFECT_BYTE] != 0 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + else if (Random() % 100 <= percentChance // Random() % 100 < percentChance in Emerald + && gBattleCommunication[MOVE_EFFECT_BYTE] + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (PercentChance >= 100) - SetMoveEffect(0, 0x80); + if (percentChance >= 100) + SetMoveEffect(0, MOVE_EFFECT_CERTAIN); else SetMoveEffect(0, 0); } @@ -5062,8 +5006,9 @@ static void atk17_seteffectsecondary(void) static void atk18_clearstatusfromeffect(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); - if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + + if (gBattleCommunication[MOVE_EFFECT_BYTE] <= MOVE_EFFECT_TOXIC) gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); else gBattleMons[gActiveBattler].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); @@ -5075,18 +5020,18 @@ static void atk18_clearstatusfromeffect(void) static void atk19_tryfaintmon(void) { - u8 *r4; + const u8 *BS_ptr; if (gBattlescriptCurrInstr[2] != 0) { - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) { - r4 = T1_READ_PTR(gBattlescriptCurrInstr + 3); + BS_ptr = T1_READ_PTR(gBattlescriptCurrInstr + 3); BattleScriptPop(); - gBattlescriptCurrInstr = r4; - gSideAffecting[GetBattlerSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED; + gBattlescriptCurrInstr = BS_ptr; + gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); } else { @@ -5095,41 +5040,41 @@ static void atk19_tryfaintmon(void) } else { - u8 bank; + u8 battlerId; if (gBattlescriptCurrInstr[1] == 1) { gActiveBattler = gBattlerAttacker; - bank = gBattlerTarget; - r4 = BattleScript_FaintAttacker; + battlerId = gBattlerTarget; + BS_ptr = BattleScript_FaintAttacker; } else { gActiveBattler = gBattlerTarget; - bank = gBattlerAttacker; - r4 = BattleScript_FaintTarget; + battlerId = gBattlerAttacker; + BS_ptr = BattleScript_FaintTarget; } if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler]) && gBattleMons[gActiveBattler].hp == 0) { - ewram160ACarr2(0, bank) = 0; - ewram160ACarr2(1, bank) = 0; - ewram16100arr2(0, bank) = 0; - ewram16100arr2(1, bank) = 0; - ewram16100arr2(2, bank) = 0; - ewram16100arr2(3, bank) = 0; + ewram160ACarr2(0, battlerId) = 0; + ewram160ACarr2(1, battlerId) = 0; + ewram16100arr2(0, battlerId) = 0; + ewram16100arr2(1, battlerId) = 0; + ewram16100arr2(2, battlerId) = 0; + ewram16100arr2(3, battlerId) = 0; gHitMarker |= HITMARKER_FAINTED(gActiveBattler); BattleScriptPush(gBattlescriptCurrInstr + 7); - gBattlescriptCurrInstr = r4; - if (GetBattlerSide(gActiveBattler) == 0) + gBattlescriptCurrInstr = BS_ptr; + if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { gHitMarker |= HITMARKER_x400000; if (gBattleResults.playerFaintCounter < 0xFF) gBattleResults.playerFaintCounter++; - if (gBattleMons[bank].level > gBattleMons[gActiveBattler].level) + if (gBattleMons[battlerId].level > gBattleMons[gActiveBattler].level) { - if (gBattleMons[bank].level - gBattleMons[gActiveBattler].level > 29) + if (gBattleMons[battlerId].level - gBattleMons[gActiveBattler].level > 29) AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], FRIENDSHIP_EVENT_FAINT_LARGE); else AdjustFriendship(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], FRIENDSHIP_EVENT_FAINT_SMALL); @@ -5144,7 +5089,7 @@ static void atk19_tryfaintmon(void) if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattlerAttacker].hp != 0) { BattleScriptPush(gBattlescriptCurrInstr); - gBattleMoveDamage = gBattleMons[bank].hp; + gBattleMoveDamage = gBattleMons[battlerId].hp; gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife; } if ((gStatuses3[gBattlerTarget] & STATUS3_GRUDGE) @@ -5157,7 +5102,7 @@ static void atk19_tryfaintmon(void) gBattleMons[gBattlerAttacker].pp[moveIndex] = 0; BattleScriptPush(gBattlescriptCurrInstr); - gBattlescriptCurrInstr = BattleScript_SelectingImprisionedMoveInPalace; + gBattlescriptCurrInstr = BattleScript_GrudgeTakesPp; gActiveBattler = gBattlerAttacker; BtlController_EmitSetMonData(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]); MarkBattlerForControllerExec(gActiveBattler); @@ -5180,7 +5125,7 @@ static void atk1A_dofaintanimation(void) { if (gBattleControllerExecFlags == 0) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); BtlController_EmitFaintAnimation(0); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -5192,7 +5137,7 @@ static void atk1B_cleareffectsonfaint(void) //Clears things like attraction or trapping to other banks if (gBattleControllerExecFlags == 0) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); gBattleMons[gActiveBattler].status1 = 0; BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); @@ -5203,7 +5148,7 @@ static void atk1B_cleareffectsonfaint(void) static void atk1C_jumpifstatus(void) { - u8 bank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + u8 bank = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); void* jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 6); if (gBattleMons[bank].status1 & flags && gBattleMons[bank].hp) @@ -5214,10 +5159,10 @@ static void atk1C_jumpifstatus(void) static void atk1D_jumpifstatus2(void) { - u8 bank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + u8 battlerId = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); void* jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 6); - if (gBattleMons[bank].status2 & flags && gBattleMons[bank].hp) + if (gBattleMons[battlerId].status2 & flags && gBattleMons[battlerId].hp) gBattlescriptCurrInstr = jump_loc; else gBattlescriptCurrInstr += 10; @@ -5225,44 +5170,44 @@ static void atk1D_jumpifstatus2(void) static void atk1E_jumpifability(void) { - u8 bank; - u8 ability = T2_READ_8(gBattlescriptCurrInstr + 2); - void* jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 3); + u8 battlerId; + u8 ability = gBattlescriptCurrInstr[2]; + void* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); if (T2_READ_8(gBattlescriptCurrInstr + 1) == 8) { - bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0); - if (bank) + battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_BANK_SIDE, gBattlerAttacker, ability, 0, 0); + if (battlerId) { gLastUsedAbility = ability; - gBattlescriptCurrInstr = jump_loc; - RecordAbilityBattle(bank -1, gLastUsedAbility); - ewram160F8 = bank - 1; + gBattlescriptCurrInstr = jumpPtr; + RecordAbilityBattle(battlerId -1, gLastUsedAbility); + ewram160F8 = battlerId - 1; } else gBattlescriptCurrInstr += 7; } else if (T2_READ_8(gBattlescriptCurrInstr + 1) == 9) { - bank = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattlerAttacker, ability, 0, 0); - if (bank) + battlerId = AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, gBattlerAttacker, ability, 0, 0); + if (battlerId) { gLastUsedAbility = ability; - gBattlescriptCurrInstr = jump_loc; - RecordAbilityBattle(bank - 1, gLastUsedAbility); - ewram160F8 = bank - 1; + gBattlescriptCurrInstr = jumpPtr; + RecordAbilityBattle(battlerId - 1, gLastUsedAbility); + ewram160F8 = battlerId - 1; } else gBattlescriptCurrInstr += 7; } else { - bank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); - if (gBattleMons[bank].ability == ability) + battlerId = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); + if (gBattleMons[battlerId].ability == ability) { gLastUsedAbility = ability; - gBattlescriptCurrInstr = jump_loc; - RecordAbilityBattle(bank, gLastUsedAbility); - ewram160F8 = bank; + gBattlescriptCurrInstr = jumpPtr; + RecordAbilityBattle(battlerId, gLastUsedAbility); + ewram160F8 = battlerId; } else gBattlescriptCurrInstr += 7; @@ -5282,7 +5227,7 @@ static void atk1F_jumpifsideaffecting(void) flags = T2_READ_16(gBattlescriptCurrInstr + 2); jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 4); - if (gSideAffecting[side] & flags) + if (gSideStatuses[side] & flags) gBattlescriptCurrInstr = jump_loc; else gBattlescriptCurrInstr += 8; @@ -5291,8 +5236,8 @@ static void atk1F_jumpifsideaffecting(void) static void atk20_jumpifstat(void) { u8 ret = 0; - u8 bank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); - u8 value = gBattleMons[bank].statStages[T2_READ_8(gBattlescriptCurrInstr + 3)]; + u8 battlerId = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); + u8 value = gBattleMons[battlerId].statStages[T2_READ_8(gBattlescriptCurrInstr + 3)]; switch (T2_READ_8(gBattlescriptCurrInstr + 2)) { case CMP_EQUAL: @@ -5331,7 +5276,7 @@ static void atk21_jumpifstatus3condition(void) u32 flags; void* jump_loc; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); flags = T2_READ_32(gBattlescriptCurrInstr + 2); jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 7); if (T2_READ_8(gBattlescriptCurrInstr + 6)) @@ -5350,13 +5295,13 @@ static void atk21_jumpifstatus3condition(void) } } -static void atk22_jumpiftype(void) //u8 bank, u8 type, *ptr +static void atk22_jumpiftype(void) //u8 battlerId, u8 type, *ptr { - u8 bank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + u8 battlerId = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); u8 type = T2_READ_8(gBattlescriptCurrInstr + 2); void* jump_loc = T2_READ_PTR(gBattlescriptCurrInstr + 3); - if (gBattleMons[bank].type1 == type || gBattleMons[bank].type2 == type) + if (gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type) gBattlescriptCurrInstr = jump_loc; else gBattlescriptCurrInstr += 7; @@ -5372,7 +5317,7 @@ static void atk23_getexp(void) s32 viaExpShare = 0; u16* exp = &gBattleStruct->exp; - gBank1 = GetBattleBank(gBattlescriptCurrInstr[1]); + gBank1 = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); sentIn = gSentPokesToOpponent[(gBank1 & 2) >> 1]; switch (gBattleStruct->getexpStateTracker) @@ -5436,14 +5381,14 @@ static void atk23_getexp(void) } gBattleStruct->getexpStateTracker++; - gBattleStruct->expGetterID = 0; + gBattleStruct->expGetterMonId = 0; gBattleStruct->sentInPokes = sentIn; } // fall through case 2: // set exp value to the poke in expgetter_id and print message if (gBattleControllerExecFlags == 0) { - item = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HELD_ITEM); + item = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HELD_ITEM); if (item == ITEM_ENIGMA_BERRY) holdEffect = gSaveBlock1.enigmaBerry.holdEffect; @@ -5456,7 +5401,7 @@ static void atk23_getexp(void) gBattleStruct->getexpStateTracker = 5; gBattleMoveDamage = 0; // used for exp } - else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL) == 100) + else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == 100) { gBattleStruct->sentInPokes >>= 1; gBattleStruct->getexpStateTracker = 5; @@ -5468,11 +5413,11 @@ static void atk23_getexp(void) if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(0x161); + PlayBGM(MUS_KACHI2); gBattleStruct->wildVictorySong++; } - if (GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP)) + if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP)) { if (gBattleStruct->sentInPokes & 1) gBattleMoveDamage = *exp; @@ -5486,7 +5431,7 @@ static void atk23_getexp(void) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; - if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterID])) + if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterMonId])) { gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; i = 0x14A; @@ -5499,28 +5444,28 @@ static void atk23_getexp(void) // get exp getter bank if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterID) && !(gAbsentBattlerFlags & gBitTable[2])) - gBattleStruct->expGetterBank = 2; + if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterMonId) && !(gAbsentBattlerFlags & gBitTable[2])) + gBattleStruct->expGetterBattlerId = 2; else { if (!(gAbsentBattlerFlags & gBitTable[0])) - gBattleStruct->expGetterBank = 0; + gBattleStruct->expGetterBattlerId = 0; else - gBattleStruct->expGetterBank = 2; + gBattleStruct->expGetterBattlerId = 2; } } else - gBattleStruct->expGetterBank = 0; + gBattleStruct->expGetterBattlerId = 0; - PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBank, gBattleStruct->expGetterID) + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId) // buffer 'gained' or 'gained a boosted' PREPARE_STRING_BUFFER(gBattleTextBuff2, i) PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage) - PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBank); - MonGainEVs(&gPlayerParty[gBattleStruct->expGetterID], gBattleMons[gBank1].species); + PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBattlerId); + MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBank1].species); } gBattleStruct->sentInPokes >>= 1; gBattleStruct->getexpStateTracker++; @@ -5530,19 +5475,19 @@ static void atk23_getexp(void) case 3: // Set stats and give exp if (gBattleControllerExecFlags == 0) { - gBattleBufferB[gBattleStruct->expGetterBank][0] = 0; - if (GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL) != 100) + gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0; + if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != 100) { - gBattleResources_statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MAX_HP); - gBattleResources_statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_ATK); - gBattleResources_statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_DEF); - gBattleResources_statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); - gBattleResources_statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK); - gBattleResources_statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPDEF); + gBattleResources_statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP); + gBattleResources_statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK); + gBattleResources_statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF); + gBattleResources_statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); + gBattleResources_statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK); + gBattleResources_statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF); - gActiveBattler = gBattleStruct->expGetterBank; + gActiveBattler = gBattleStruct->expGetterBattlerId; - BtlController_EmitExpUpdate(0, gBattleStruct->expGetterID, gBattleMoveDamage); + BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage); MarkBattlerForControllerExec(gActiveBattler); } gBattleStruct->getexpStateTracker++; @@ -5551,49 +5496,49 @@ static void atk23_getexp(void) case 4: // lvl up if necessary if (gBattleControllerExecFlags == 0) { - gActiveBattler = gBattleStruct->expGetterBank; + gActiveBattler = gBattleStruct->expGetterBattlerId; if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELLED_UP) { - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterID) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId) HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterID) + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId) - PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL)) + PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL)) BattleScriptPushCursor(); - gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterID]; + gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterMonId]; gBattlescriptCurrInstr = BattleScript_LevelUp; gBattleMoveDamage = (gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)); - AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterID], FRIENDSHIP_EVENT_GROW_LEVEL); + AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterMonId], FRIENDSHIP_EVENT_GROW_LEVEL); // update battle mon structure after level up - if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterID && gBattleMons[0].hp) + if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId && gBattleMons[0].hp) { - gBattleMons[0].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL); - gBattleMons[0].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP); - gBattleMons[0].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MAX_HP); - gBattleMons[0].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_ATK); - gBattleMons[0].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_DEF); + gBattleMons[0].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL); + gBattleMons[0].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP); + gBattleMons[0].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP); + gBattleMons[0].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK); + gBattleMons[0].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF); // Why is this duplicated? - gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); - gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); - gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK); - gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPDEF); + gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); + gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); + gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK); + gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF); } // What is else if? - if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterID && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) + if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL); - gBattleMons[2].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP); - gBattleMons[2].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MAX_HP); - gBattleMons[2].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_ATK); - gBattleMons[2].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_DEF); + gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL); + gBattleMons[2].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP); + gBattleMons[2].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP); + gBattleMons[2].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK); + gBattleMons[2].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF); // Duplicated again, but this time there's no Sp Defense - gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); - gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); - gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK); + gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); + gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); + gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK); } } else @@ -5608,8 +5553,8 @@ static void atk23_getexp(void) gBattleStruct->getexpStateTracker = 3; else { - gBattleStruct->expGetterID++; - if (gBattleStruct->expGetterID <= 5) + gBattleStruct->expGetterMonId++; + if (gBattleStruct->expGetterMonId <= 5) gBattleStruct->getexpStateTracker = 2; // loop again else gBattleStruct->getexpStateTracker = 6; // we're done @@ -5641,7 +5586,7 @@ static void atk24(void) } if (HP_count == 0) - gBattleOutcome |= BATTLE_LOST; + gBattleOutcome |= B_OUTCOME_LOST; for (HP_count = 0, i = 0; i < 6; i++) { @@ -5650,7 +5595,7 @@ static void atk24(void) } if (!HP_count) - gBattleOutcome |= BATTLE_WON; + gBattleOutcome |= B_OUTCOME_WON; if (!gBattleOutcome && (gBattleTypeFlags & BATTLE_TYPE_LINK)) { @@ -6271,7 +6216,7 @@ static void atk41_call(void) static void atk42_jumpiftype2(void) //u8 bank, u8 type, *ptr { - u8 bank = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1)); + u8 bank = GetBattlerForBattleScript(T1_READ_8(gBattlescriptCurrInstr + 1)); if (T1_READ_8(gBattlescriptCurrInstr + 2) == gBattleMons[bank].type1 || T1_READ_8(gBattlescriptCurrInstr + 2) == gBattleMons[bank].type2) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); @@ -6296,7 +6241,7 @@ static void atk45_playanimation(void) { const u16* argumentPtr; - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 3); if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE @@ -6338,7 +6283,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po const u16* argumentPtr; const u8* animationIdPtr; - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); animationIdPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 2); argumentPtr = BS2ScriptReadPtr(gBattlescriptCurrInstr + 6); @@ -6407,7 +6352,7 @@ static void atk48_playstatchangeanimation(void) u32 stats_to_check; u8 arg3; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); stats_to_check = T2_READ_8(gBattlescriptCurrInstr + 2); arg3 = T2_READ_8(gBattlescriptCurrInstr + 3); if (arg3 & 1) @@ -6499,7 +6444,7 @@ push {r4-r7,lr}\n\ ldr r0, [r5]\n\ ldrb r0, [r0, 0x1]\n\ str r3, [sp]\n\ - bl GetBattleBank\n\ + bl GetBattlerForBattleScript\n\ ldr r2, _08021674 @ =gActiveBattler\n\ strb r0, [r2]\n\ ldr r0, [r5]\n\ @@ -6815,12 +6760,12 @@ void atk49_moveend(void) gBattleStruct->cmd49StateTracker++; break; case ATK49_DEFROST: // defrosting check - if (gBattleMons[gBattlerTarget].status1 & STATUS_FREEZE + if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE && gBattleMons[gBattlerTarget].hp && gBattlerAttacker != gBattlerTarget && gSpecialStatuses[gBattlerTarget].specialDmg && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE) { - gBattleMons[gBattlerTarget].status1 &= ~(STATUS_FREEZE); + gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_FREEZE); gActiveBattler = gBattlerTarget; BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattlerTarget].status1); MarkBattlerForControllerExec(gActiveBattler); @@ -6939,12 +6884,12 @@ void atk49_moveend(void) gBattleStruct->cmd49StateTracker++; break; case ATK49_UPDATE_LAST_MOVES: - if (gHitMarker & HITMARKER_PURSUIT_TRAP) + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; - gHitMarker &= ~(HITMARKER_PURSUIT_TRAP); + gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); } if (gBattleMoves[gChosenMove].effect != 0x7F || (gMoveResultFlags & 0x29)) @@ -6956,12 +6901,12 @@ void atk49_moveend(void) { if (gHitMarker & HITMARKER_OBEYS) { - gLastUsedMove[gBattlerAttacker] = gChosenMove; + gLastMoves[gBattlerAttacker] = gChosenMove; gUnknown_02024C4C[gBattlerAttacker] = gCurrentMove; } else { - gLastUsedMove[gBattlerAttacker] = 0xFFFF; + gLastMoves[gBattlerAttacker] = 0xFFFF; gUnknown_02024C4C[gBattlerAttacker] = 0xFFFF; } @@ -7053,14 +6998,14 @@ static void atk4A_typecalc2(void) { u8 flags = 0; int i = 0; - u8 move_type = gBattleMoves[gCurrentMove].type; + u8 moveType = gBattleMoves[gCurrentMove].type; - if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && move_type == TYPE_GROUND) + if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND) { gLastUsedAbility = gBattleMons[gBattlerTarget].ability; gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE); gLastLandedMoves[gBattlerTarget] = 0; - gBattleCommunication[6] = move_type; + gBattleCommunication[6] = moveType; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } else @@ -7073,7 +7018,7 @@ static void atk4A_typecalc2(void) else {i += 3; continue;} } - if (gTypeEffectiveness[i] == move_type) + if (gTypeEffectiveness[i] == moveType) { //check type1 if (gTypeEffectiveness[i + 1] == gBattleMons[gBattlerTarget].type1) @@ -7140,7 +7085,7 @@ static void atk4C_getswitchedmondata(void) if (gBattleControllerExecFlags) return; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); gBattlerPartyIndexes[gActiveBattler] = ewram16068arr(gActiveBattler); @@ -7158,7 +7103,7 @@ static void atk4D_switchindataupdate(void) if (gBattleControllerExecFlags) return; - gActiveBattler = GetBattleBank(gBattlescriptCurrInstr[1]); + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); oldData = gBattleMons[gActiveBattler]; monData = (u8*)(&gBattleMons[gActiveBattler]); @@ -7201,7 +7146,7 @@ static void atk4E_switchinanim(void) if (gBattleControllerExecFlags) return; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); if (GetBattlerSide(gActiveBattler) == 1 && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER))) { GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), 2); @@ -7218,7 +7163,7 @@ static void atk4F_jumpifcantswitch(void) register struct Pokemon *party; u8 r7; //0x80 byte is used as a way of telling the function whether to not check status2/status3 - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1) & 0x7F); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1) & 0x7F); if (!(T2_READ_8(gBattlescriptCurrInstr + 1) & 0x80) && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) || (gStatuses3[gActiveBattler] & STATUS3_ROOTED))) @@ -8170,7 +8115,7 @@ _08023170:\n\ _0802317C:\n\ movs r0, 0x7F\n\ ands r0, r2\n\ - bl GetBattleBank\n\ + bl GetBattlerForBattleScript\n\ lsls r0, 24\n\ lsrs r7, r0, 24\n\ ldr r1, _080231A4 @ =gSpecialStatuses\n\ @@ -8366,7 +8311,7 @@ static void atk51_switchhandleorder(void) if (gBattleControllerExecFlags) return; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); switch (T2_READ_8(gBattlescriptCurrInstr + 2)) { case 0: @@ -8415,17 +8360,17 @@ static void atk52_switchineffects(void) { int i; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); sub_80157C4(gActiveBattler); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); gSpecialStatuses[gActiveBattler].flag40 = 0; - if (!(gSideAffecting[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideAffecting[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES) + if (!(gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES) && gBattleMons[gActiveBattler].type1 != TYPE_FLYING && gBattleMons[gActiveBattler].type2 != TYPE_FLYING && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE) { u8 spikesDmg; - gSideAffecting[GetBattlerSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED; + gSideStatuses[GetBattlerSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED; spikesDmg = (5 - gSideTimers[GetBattlerSide(gActiveBattler)].spikesAmount) * 2; gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (spikesDmg); @@ -8451,11 +8396,11 @@ static void atk52_switchineffects(void) if (AbilityBattleEffects(0, gActiveBattler, 0, 0, 0) == 0 && ItemBattleEffects(0, gActiveBattler, 0) == 0) { - gSideAffecting[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); + gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); for (i = 0; i < gBattlersCount; i++) { - if (gBanksByTurnOrder[i] == gActiveBattler) + if (gBattlerByTurnOrder[i] == gActiveBattler) gActionsByTurnOrder[i] = 0xC; } @@ -8512,7 +8457,7 @@ static void atk55_fanfare(void) static void atk56_playfaintcry(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); BtlController_EmitFaintingCry(0); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -8528,7 +8473,7 @@ static void atk57(void) static void atk58_returntoball(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); BtlController_EmitReturnMonToBall(0, 1); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -8539,9 +8484,9 @@ void atk59_handlelearnnewmove(void) u8* loc1 = T1_READ_PTR(gBattlescriptCurrInstr + 1); u8* loc2 = T1_READ_PTR(gBattlescriptCurrInstr + 5); - u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterID], T2_READ_8(gBattlescriptCurrInstr + 9)); + u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], T2_READ_8(gBattlescriptCurrInstr + 9)); while (ret == 0xFFFE) - ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterID], 0); + ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], 0); if (ret == 0) { @@ -8554,12 +8499,12 @@ void atk59_handlelearnnewmove(void) else { gActiveBattler = GetBattlerAtPosition(0); - if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) + if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) //what is else if { gActiveBattler = GetBattlerAtPosition(2); - if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) + if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret); } gBattlescriptCurrInstr = loc1; @@ -8628,7 +8573,7 @@ static void atk5A_yesnoboxlearnmove(void) case 2: if (!gPaletteFade.active) { - ShowSelectMovePokemonSummaryScreen(gPlayerParty, gBattleStruct->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn); + ShowSelectMovePokemonSummaryScreen(gPlayerParty, gBattleStruct->expGetterMonId, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn); gBattleStruct->atk5A_StateTracker++; } break; @@ -8642,7 +8587,7 @@ static void atk5A_yesnoboxlearnmove(void) } else { - u16 move = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MOVE1 + move_pos); + u16 move = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MOVE1 + move_pos); if (IsHMMove2(move)) { PrepareStringBattle(0x13F, gActiveBattler); @@ -8662,16 +8607,16 @@ static void atk5A_yesnoboxlearnmove(void) ptr += 4; } ptr[0] = 0xFF; - RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterID], move_pos); - SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterID], gMoveToLearn, move_pos); - if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterID && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[0].unk18_b & gBitTable[move_pos])) + RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterMonId], move_pos); + SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterMonId], gMoveToLearn, move_pos); + if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED) + && !(gDisableStructs[0].mimickedMoves & gBitTable[move_pos])) { RemoveBattleMonPPBonus(&gBattleMons[0], move_pos); SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, move_pos); } - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterID && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[2].unk18_b & gBitTable[move_pos])) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED) + && !(gDisableStructs[2].mimickedMoves & gBitTable[move_pos])) { RemoveBattleMonPPBonus(&gBattleMons[2], move_pos); SetBattleMonMoveSlot(&gBattleMons[2], gMoveToLearn, move_pos); @@ -8738,7 +8683,7 @@ static void atk5B_yesnoboxstoplearningmove(void) static void atk5C_hitanimation(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) gBattlescriptCurrInstr += 2; else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBattler].substituteHP == 0) @@ -9076,9 +9021,9 @@ static void atk5D_getmoneyreward(void) } */ -static void atk5E_8025A70(void) +static void atk5E(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); switch (gBattleCommunication[0]) { case 0: @@ -9102,16 +9047,16 @@ static void atk5E_8025A70(void) } } -static void atk5F_8025B24(void) +static void atk5F_swapattackerwithtarget(void) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; //what is xor... - if (gHitMarker & HITMARKER_PURSUIT_TRAP) - gHitMarker &= ~(HITMARKER_PURSUIT_TRAP); + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) + gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); else - gHitMarker |= HITMARKER_PURSUIT_TRAP; + gHitMarker |= HITMARKER_SWAP_ATTACKER_TARGET; gBattlescriptCurrInstr++; } @@ -9132,7 +9077,7 @@ static void atk61_drawpartystatussummary(void) if (gBattleControllerExecFlags) return; - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); if (GetBattlerSide(gActiveBattler) == 0) party = gPlayerParty; else @@ -9156,9 +9101,9 @@ static void atk61_drawpartystatussummary(void) gBattlescriptCurrInstr += 2; } -static void atk62_08025C6C(void) +static void atk62_hidepartystatussummary(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); BtlController_EmitHidePartyStatusSummary(0); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -9177,7 +9122,7 @@ static void atk64_statusanimation(void) { if (gBattleControllerExecFlags == 0) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBattler].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) { BtlController_EmitStatusAnimation(0, 0, gBattleMons[gActiveBattler].status1); @@ -9192,7 +9137,7 @@ static void atk65_status2animation(void) if (gBattleControllerExecFlags == 0) { u32 possible_to_anim; - gActiveBattler = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T1_READ_8(gBattlescriptCurrInstr + 1)); possible_to_anim = T1_READ_32(gBattlescriptCurrInstr + 2); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBattler].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) { @@ -9208,7 +9153,7 @@ static void atk66_chosenstatusanimation(void) if (gBattleControllerExecFlags == 0) { u32 status; - gActiveBattler = GetBattleBank(T1_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T1_READ_8(gBattlescriptCurrInstr + 1)); status = T1_READ_32(gBattlescriptCurrInstr + 3); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) && gDisableStructs[gActiveBattler].substituteHP == 0 && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) { @@ -9273,20 +9218,20 @@ static void atk68_cancelallactions(void) static void atk69_adjustsetdamage(void) //literally a copy of atk07 except theres no rand dmg modifier... { - u8 hold_effect, quality; + u8 holdEffect, param; if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) - hold_effect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam; + holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, param = gEnigmaBerries[gBattlerTarget].holdEffectParam; else { - hold_effect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); - quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); + holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); + param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } gPotentialItemEffectBattler = gBattlerTarget; - if (hold_effect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality) + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { - RecordItemBattle(gBattlerTarget, hold_effect); + RecordItemEffectBattle(gBattlerTarget, holdEffect); gSpecialStatuses[gBattlerTarget].focusBanded = 1; } if (gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE) @@ -9316,7 +9261,7 @@ static void atk69_adjustsetdamage(void) //literally a copy of atk07 except there void atk6A_removeitem(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); USED_HELD_ITEMS(gActiveBattler) = gBattleMons[gActiveBattler].item; gBattleMons[gActiveBattler].item = 0; @@ -9778,7 +9723,7 @@ static void atk6E_setatktoplayer0(void) static void atk6F_makevisible(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); BtlController_EmitSpriteInvisibility(0, 0); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -9786,7 +9731,7 @@ static void atk6F_makevisible(void) static void atk70_recordlastability(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); RecordAbilityBattle(gActiveBattler, gLastUsedAbility); gBattlescriptCurrInstr += 1; //buggy, should be += 2, one byte for command, one byte for argument... } @@ -9820,7 +9765,7 @@ static void atk73_hpthresholds(void) s32 result; if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); opposing_bank = gActiveBattler ^ 1; result = gBattleMons[opposing_bank].hp * 100 / gBattleMons[opposing_bank].maxHP; @@ -9847,7 +9792,7 @@ static void atk74_hpthresholds2(void) s32 result; if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); opposing_bank = gActiveBattler ^ 1; hp_switchout = ewram160BCarr(GetBattlerSide(opposing_bank)); //gBattleStruct->HP_OnSwitchout[GetBattlerSide(opposing_bank)]; result = (hp_switchout - gBattleMons[opposing_bank].hp) * 100 / hp_switchout; @@ -9874,7 +9819,7 @@ static void atk75_useitemonopponent(void) static void atk76_various(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); switch (T2_READ_8(gBattlescriptCurrInstr + 2)) { case 0: @@ -9911,9 +9856,9 @@ static void atk76_various(void) { int i; u16* choiced_move; - if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterID) + if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId) goto ACTIVE_0; - if (gBattlerPartyIndexes[2] != gBattleStruct->expGetterID) + if (gBattlerPartyIndexes[2] != gBattleStruct->expGetterMonId) break; if (gBattlerPartyIndexes[0] == gBattlerPartyIndexes[2]) { @@ -10123,14 +10068,14 @@ static void atk7D_setrain(void) static void atk7E_setreflect(void) { - if (gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] & SIDE_STATUS_REFLECT) + if (gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] & SIDE_STATUS_REFLECT) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } else { - gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_REFLECT; + gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_REFLECT; gSideTimers[GetBattlerPosition(gBattlerAttacker) & 1].reflectTimer = 5; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMons(1) == 2) gBattleCommunication[MULTISTRING_CHOOSER] = 2; @@ -10193,7 +10138,7 @@ static void atk81_trysetrest(void) gBattlescriptCurrInstr = fail_loc; else { - if (gBattleMons[gBattlerTarget].status1 & ((u8)(~STATUS_SLEEP))) + if (gBattleMons[gBattlerTarget].status1 & ((u8)(~STATUS1_SLEEP))) gBattleCommunication[MULTISTRING_CHOOSER] = 1; else gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -10293,7 +10238,7 @@ static void atk86_stockpiletobasedamage(void) if (gBattleCommunication[6] != 1) { gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove, - gSideAffecting[GetBattlerPosition(gBattlerTarget) & 1], 0, + gSideStatuses[GetBattlerPosition(gBattlerTarget) & 1], 0, 0, gBattlerAttacker, gBattlerTarget) * gDisableStructs[gBattlerAttacker].stockpileCounter; gBattleStruct->animTurn = gDisableStructs[gBattlerAttacker].stockpileCounter; @@ -10688,7 +10633,7 @@ static void atk90_tryconversiontypechange(void) //randomly changes user's type to one of its moves' type u8 valid_moves = 0; u8 checked_move; - u8 move_type; + u8 moveType; while (valid_moves < 4) { if (gBattleMons[gBattlerAttacker].moves[valid_moves] == 0) @@ -10698,15 +10643,15 @@ static void atk90_tryconversiontypechange(void) for (checked_move = 0; checked_move < valid_moves; checked_move++) { - move_type = gBattleMoves[gBattleMons[gBattlerAttacker].moves[checked_move]].type; - if (move_type == TYPE_MYSTERY) + moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[checked_move]].type; + if (moveType == TYPE_MYSTERY) { if (gBattleMons[gBattlerAttacker].type1 == TYPE_GHOST || gBattleMons[gBattlerAttacker].type2 == TYPE_GHOST) - move_type = TYPE_GHOST; + moveType = TYPE_GHOST; else - move_type = TYPE_NORMAL; + moveType = TYPE_NORMAL; } - if (move_type != gBattleMons[gBattlerAttacker].type1 && move_type != gBattleMons[gBattlerAttacker].type2) + if (moveType != gBattleMons[gBattlerAttacker].type1 && moveType != gBattleMons[gBattlerAttacker].type2) break; } @@ -10721,22 +10666,22 @@ static void atk90_tryconversiontypechange(void) while ((checked_move = Random() & 3) >= valid_moves); - move_type = gBattleMoves[gBattleMons[gBattlerAttacker].moves[checked_move]].type; - if (move_type == TYPE_MYSTERY) + moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[checked_move]].type; + if (moveType == TYPE_MYSTERY) { if (gBattleMons[gBattlerAttacker].type1 == TYPE_GHOST || gBattleMons[gBattlerAttacker].type2 == TYPE_GHOST) - move_type = TYPE_GHOST; + moveType = TYPE_GHOST; else - move_type = TYPE_NORMAL; + moveType = TYPE_NORMAL; } - } while (move_type == gBattleMons[gBattlerAttacker].type1 || move_type == gBattleMons[gBattlerAttacker].type2); + } while (moveType == gBattleMons[gBattlerAttacker].type1 || moveType == gBattleMons[gBattlerAttacker].type2); - gBattleMons[gBattlerAttacker].type1 = move_type; - gBattleMons[gBattlerAttacker].type2 = move_type; + gBattleMons[gBattlerAttacker].type1 = moveType; + gBattleMons[gBattlerAttacker].type2 = moveType; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 3; - gBattleTextBuff1[2] = move_type; + gBattleTextBuff1[2] = moveType; gBattleTextBuff1[3] = 0xFF; gBattlescriptCurrInstr += 5; @@ -10764,14 +10709,14 @@ static void atk91_givepaydaymoney(void) static void atk92_setlightscreen(void) { - if (gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] & SIDE_STATUS_LIGHTSCREEN) + if (gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] & SIDE_STATUS_LIGHTSCREEN) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } else { - gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_LIGHTSCREEN; + gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_LIGHTSCREEN; gSideTimers[GetBattlerPosition(gBattlerAttacker) & 1].lightscreenTimer = 5; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMons(1) == 2) gBattleCommunication[MULTISTRING_CHOOSER] = 4; @@ -10785,18 +10730,18 @@ static void atk92_setlightscreen(void) static void atk93_tryKO(void) { if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) - hold_effect = gEnigmaBerries[gBattlerTarget].holdEffect, quality = gEnigmaBerries[gBattlerTarget].holdEffectParam; + holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect, param = gEnigmaBerries[gBattlerTarget].holdEffectParam; else { - hold_effect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); - quality = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); + holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); + param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } gPotentialItemEffectBattler = gBattlerTarget; - if (hold_effect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < quality) + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { - RecordItemBattle(gBattlerTarget, hold_effect); + RecordItemEffectBattle(gBattlerTarget, holdEffect); gSpecialStatuses[gBattlerTarget].focusBanded = 1; } @@ -10819,7 +10764,7 @@ static void atk93_tryKO(void) } else { - if (gDisableStructs[gBattlerTarget].bankWithSureHit != gBattlerAttacker || gBattleMons[gBattlerAttacker].level < gBattleMons[gBattlerTarget].level) + if (gDisableStructs[gBattlerTarget].battlerWithSureHit != gBattlerAttacker || gBattleMons[gBattlerAttacker].level < gBattleMons[gBattlerTarget].level) { } @@ -10896,7 +10841,7 @@ _08026BCE:\n\ bcs _08026C0C\n\ ldrb r0, [r5]\n\ movs r1, 0x27\n\ - bl RecordItemBattle\n\ + bl RecordItemEffectBattle\n\ ldr r2, _08026C54 @ =gSpecialStatuses\n\ ldrb r1, [r5]\n\ lsls r0, r1, 2\n\ @@ -11303,7 +11248,7 @@ static void atk98_updatestatusicon(void) if (T2_READ_8(gBattlescriptCurrInstr + 1) != 4) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; @@ -11339,7 +11284,7 @@ static void atk99_setmist(void) else { gSideTimers[GetBattlerPosition(gBattlerAttacker) & 1].mistTimer = 5; - gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_MIST; + gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_MIST; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } gBattlescriptCurrInstr++; @@ -11377,7 +11322,7 @@ static void atk9B_transformdataexecution(void) gDisableStructs[gBattlerAttacker].disabledMove = 0; gDisableStructs[gBattlerAttacker].disableTimer1 = 0; gDisableStructs[gBattlerAttacker].transformedMonPersonality = gBattleMons[gBattlerTarget].personality; - gDisableStructs[gBattlerAttacker].unk18_b = 0; + gDisableStructs[gBattlerAttacker].mimickedMoves = 0; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 6; @@ -11440,8 +11385,8 @@ static bool8 IsMoveUncopyable(u16 move) static void atk9D_mimicattackcopy(void) { gChosenMove = 0xFFFF; - if (IsMoveUncopyable(gLastUsedMove[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED - || gLastUsedMove[gBattlerTarget] == 0 || gLastUsedMove[gBattlerTarget] == 0xFFFF) + if (IsMoveUncopyable(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED + || gLastMoves[gBattlerTarget] == 0 || gLastMoves[gBattlerTarget] == 0xFFFF) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -11450,24 +11395,24 @@ static void atk9D_mimicattackcopy(void) int i; for (i = 0; i < 4; i++) { - if (gBattleMons[gBattlerAttacker].moves[i] == gLastUsedMove[gBattlerTarget]) + if (gBattleMons[gBattlerAttacker].moves[i] == gLastMoves[gBattlerTarget]) break; } if (i == 4) { - gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastUsedMove[gBattlerTarget]; - if (gBattleMoves[gLastUsedMove[gBattlerTarget]].pp < 5) - gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastUsedMove[gBattlerTarget]].pp; + gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastMoves[gBattlerTarget]; + if (gBattleMoves[gLastMoves[gBattlerTarget]].pp < 5) + gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattlerTarget]].pp; else gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 5; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = gLastUsedMove[gBattlerTarget]; - gBattleTextBuff1[3] = uBYTE1_16(gLastUsedMove[gBattlerTarget]); + gBattleTextBuff1[2] = gLastMoves[gBattlerTarget]; + gBattleTextBuff1[3] = uBYTE1_16(gLastMoves[gBattlerTarget]); gBattleTextBuff1[4] = 0xFF; - gDisableStructs[gBattlerAttacker].unk18_b |= gBitTable[gCurrMovePos]; + gDisableStructs[gBattlerAttacker].mimickedMoves |= gBitTable[gCurrMovePos]; gBattlescriptCurrInstr += 5; } else @@ -11825,7 +11770,7 @@ static void atkA3_disablelastusedattack(void) int i; for (i = 0; i < 4; i++) { - if (gBattleMons[gBattlerTarget].moves[i] == gLastUsedMove[gBattlerTarget]) + if (gBattleMons[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; } if (gDisableStructs[gBattlerTarget].disabledMove == 0 && i != 4 && gBattleMons[gBattlerTarget].pp[i] != 0) @@ -11852,10 +11797,10 @@ static void atkA4_trysetencore(void) int i; for (i = 0; i < 4; i++) { - if (gBattleMons[gBattlerTarget].moves[i] == gLastUsedMove[gBattlerTarget]) + if (gBattleMons[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; } - if (gLastUsedMove[gBattlerTarget] == MOVE_STRUGGLE || gLastUsedMove[gBattlerTarget] == MOVE_ENCORE || gLastUsedMove[gBattlerTarget] == MOVE_MIRROR_MOVE) + if (gLastMoves[gBattlerTarget] == MOVE_STRUGGLE || gLastMoves[gBattlerTarget] == MOVE_ENCORE || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE) i = 4; if (gDisableStructs[gBattlerTarget].encoredMove == 0 && i != 4 && gBattleMons[gBattlerTarget].pp[i] != 0) { @@ -12201,7 +12146,7 @@ static void atkA7_setalwayshitflag(void) { gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS); gStatuses3[gBattlerTarget] |= 0x10; - gDisableStructs[gBattlerTarget].bankWithSureHit = gBattlerAttacker; + gDisableStructs[gBattlerTarget].battlerWithSureHit = gBattlerAttacker; gBattlescriptCurrInstr++; } @@ -12279,7 +12224,7 @@ static u8 AttacksThisTurn(u8 bank, u16 move) //Note: returns 1 if it's a chargin effect = gBattleMoves[move].effect; if (effect == EFFECT_SKULL_BASH || effect == EFFECT_RAZOR_WIND || effect == EFFECT_SKY_ATTACK || effect == EFFECT_SOLARBEAM || effect == EFFECT_FLY || effect == EFFECT_BIDE) { - if ((gHitMarker & HITMARKER_x8000000)) + if ((gHitMarker & HITMARKER_CHARGING)) return 1; } return 2; @@ -12350,12 +12295,12 @@ static void atkAC_remaininghptopower(void) static void atkAD_tryspiteppreduce(void) { - if (gLastUsedMove[gBattlerTarget] != 0 && gLastUsedMove[gBattlerTarget] != 0xFFFF && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) + if (gLastMoves[gBattlerTarget] != 0 && gLastMoves[gBattlerTarget] != 0xFFFF && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) { int i; for (i = 0; i < 4; i++) { - if (gLastUsedMove[gBattlerTarget] == gBattleMons[gBattlerTarget].moves[i]) + if (gLastMoves[gBattlerTarget] == gBattleMons[gBattlerTarget].moves[i]) break; } if (i != 4 && gBattleMons[gBattlerTarget].pp[i] > 1) @@ -12366,8 +12311,8 @@ static void atkAD_tryspiteppreduce(void) gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = gLastUsedMove[gBattlerTarget]; - gBattleTextBuff1[3] = gLastUsedMove[gBattlerTarget] >> 8; + gBattleTextBuff1[2] = gLastMoves[gBattlerTarget]; + gBattleTextBuff1[3] = gLastMoves[gBattlerTarget] >> 8; gBattleTextBuff1[4] = 0xFF; ConvertIntToDecimalStringN(gBattleTextBuff2, lost_pp, 0, 1); gBattleTextBuff2[0] = 0xFD; @@ -12379,7 +12324,7 @@ static void atkAD_tryspiteppreduce(void) gBattleMons[gBattlerTarget].pp[i] -= lost_pp; gActiveBattler = gBattlerTarget; - if (!(gDisableStructs[gActiveBattler].unk18_b & gBitTable[i]) + if (!(gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[i]) && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); @@ -12497,7 +12442,7 @@ static void atkB0_trysetspikes(void) } else { - gSideAffecting[side] |= SIDE_STATUS_SPIKES; + gSideStatuses[side] |= SIDE_STATUS_SPIKES; gSideTimers[side].spikesAmount++; gBattlescriptCurrInstr += 5; } @@ -12631,14 +12576,14 @@ static void atkB7_presentdamagecalculation(void) static void atkB8_setsafeguard(void) { - if (gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] & SIDE_STATUS_SAFEGUARD) + if (gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] & SIDE_STATUS_SAFEGUARD) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } else { - gSideAffecting[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_SAFEGUARD; + gSideStatuses[GetBattlerPosition(gBattlerAttacker) & 1] |= SIDE_STATUS_SAFEGUARD; gSideTimers[GetBattlerPosition(gBattlerAttacker) & 1].safeguardTimer = 5; gBattleCommunication[MULTISTRING_CHOOSER] = 5; } @@ -12718,13 +12663,13 @@ static void atkBA_jumpifnopursuitswitchdmg(void) gBattlerTarget = GetBattlerAtPosition(2); } - if (gActionForBanks[gBattlerTarget] == 0 && gBattlerAttacker == ewram16010arr(gBattlerTarget) && !(gBattleMons[gBattlerTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE)) + if (gActionForBanks[gBattlerTarget] == 0 && gBattlerAttacker == ewram16010arr(gBattlerTarget) && !(gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) && gBattleMons[gBattlerAttacker].hp && !gDisableStructs[gBattlerTarget].truantCounter && gChosenMovesByBanks[gBattlerTarget] == MOVE_PURSUIT) { int i; for (i = 0; i < gBattlersCount; i++) { - if (gBanksByTurnOrder[i] == gBattlerTarget) + if (gBattlerByTurnOrder[i] == gBattlerTarget) gActionsByTurnOrder[i] = 11; } gCurrentMove = MOVE_PURSUIT; @@ -12799,13 +12744,13 @@ static void atkBE_rapidspinfree(void) //rapid spin else if (gStatuses3[gBattlerAttacker] & STATUS3_LEECHSEED) { gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED); - gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BANK); + gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BATTLER); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_LeechSeedFree; } - else if (gSideAffecting[GetBattlerSide(gBattlerAttacker)] & SIDE_STATUS_SPIKES) + else if (gSideStatuses[GetBattlerSide(gBattlerAttacker)] & SIDE_STATUS_SPIKES) { - gSideAffecting[GetBattlerSide(gBattlerAttacker)] &= ~(SIDE_STATUS_SPIKES); + gSideStatuses[GetBattlerSide(gBattlerAttacker)] &= ~(SIDE_STATUS_SPIKES); gSideTimers[GetBattlerSide(gBattlerAttacker)].spikesAmount = 0; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SpikesFree; @@ -12892,7 +12837,7 @@ static void atkC3_trysetfutureattack(void) gWishFutureKnock.futureSightAttacker[gBattlerTarget] = gBattlerAttacker; gWishFutureKnock.futureSightCounter[gBattlerTarget] = 3; gWishFutureKnock.futureSightDmg[gBattlerTarget] = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove, - gSideAffecting[GetBattlerPosition(gBattlerTarget) & 1], 0, + gSideStatuses[GetBattlerPosition(gBattlerTarget) & 1], 0, 0, gBattlerAttacker, gBattlerTarget); if (gProtectStructs[gBattlerAttacker].helpingHand) @@ -13308,7 +13253,7 @@ static void atkCC_callterrainattack(void) //nature power static void atkCD_cureifburnedparalysedorpoisoned(void) //refresh { - if (gBattleMons[gBattlerAttacker].status1 & (STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON)) + if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) { gBattleMons[gBattlerAttacker].status1 = 0; gBattlescriptCurrInstr += 5; @@ -13554,10 +13499,10 @@ static void atkDA_tryswapabilities(void) } } -static void atkDB_tryimprision(void) +static void atkDB_tryimprison(void) { u8 r8 = 0; - if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISIONED)) + if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS)) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -13583,7 +13528,7 @@ static void atkDB_tryimprision(void) } if (j != 4) { - gStatuses3[gBattlerAttacker] |= STATUS3_IMPRISIONED; + gStatuses3[gBattlerAttacker] |= STATUS3_IMPRISONED_OTHERS; gBattlescriptCurrInstr += 5; break; } @@ -13621,7 +13566,7 @@ static void atkDD_weightdamagecalculation(void) } #ifdef NONMATCHING -static void atkDE_asistattackselect(void) +static void atkDE_assistattackselect(void) { u32 chooseable_moves_no = 0; struct Pokemon* party; @@ -13676,7 +13621,7 @@ static void atkDE_asistattackselect(void) #else NAKED -static void atkDE_asistattackselect(void) +static void atkDE_assistattackselect(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -13914,7 +13859,7 @@ static void atkE1_trygetintimidatetarget(void) static void atkE2_switchoutabilities(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); switch (gBattleMons[gActiveBattler].ability) { case ABILITY_NATURAL_CURE: @@ -13928,7 +13873,7 @@ static void atkE2_switchoutabilities(void) static void atkE3_jumpifhasnohp(void) { - gActiveBattler = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBattler = GetBattlerForBattleScript(T2_READ_8(gBattlescriptCurrInstr + 1)); if (gBattleMons[gActiveBattler].hp == 0) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); else @@ -14117,7 +14062,7 @@ static void atkEC_pursuitrelated(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkED_snatchsetbanks(void) +static void atkEF_snatchsetbattlers(void) { gEffectBattler = gBattlerAttacker; if (gBattlerAttacker == gBattlerTarget) @@ -14133,8 +14078,8 @@ static void atkEE_removelightscreenreflect(void) //brick break u8 side = GetBattlerSide(gBattlerAttacker) ^ 1; if (gSideTimers[side].reflectTimer || gSideTimers[side].lightscreenTimer) { - gSideAffecting[side] &= ~(SIDE_STATUS_REFLECT); - gSideAffecting[side] &= ~(SIDE_STATUS_LIGHTSCREEN); + gSideStatuses[side] &= ~(SIDE_STATUS_REFLECT); + gSideStatuses[side] &= ~(SIDE_STATUS_LIGHTSCREEN); gSideTimers[side].reflectTimer = 0; gSideTimers[side].lightscreenTimer = 0; gBattleStruct->animTurn = 1; @@ -14223,9 +14168,9 @@ void atkEF_handleballthrow(void) ball_multiplier = sBallCatchBonuses[gLastUsedItem - 2]; odds = (catch_rate * ball_multiplier / 10) * (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2) / (3 * gBattleMons[gBattlerTarget].maxHP); - if (gBattleMons[gBattlerTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE)) + if (gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) odds *= 2; - if (gBattleMons[gBattlerTarget].status1 & (STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS /*| STATUS_TOXIC_POISON */)) //nice one gf + if (gBattleMons[gBattlerTarget].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS /*| STATUS1_TOXIC_POISON */)) //nice one gf odds = (odds * 15) / 10; if (gLastUsedItem != ITEM_SAFARI_BALL) diff --git a/src/battle_setup.c b/src/battle_setup.c index 2ad57e961..a7da9905a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -32,6 +32,7 @@ #include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/items.h" extern u16 gSpecialVar_Result; @@ -39,7 +40,7 @@ extern void (*gFieldCallback)(void); EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent = 0; -EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; +EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0; EWRAM_DATA static u8 *sTrainerIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerDefeatSpeech = NULL; EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL; @@ -51,7 +52,7 @@ extern u16 gBattleTypeFlags; extern u16 gSpecialVar_LastTalked; extern u8 gBattleOutcome; -extern struct EventObject gEventObjects[]; +extern struct ObjectEvent gObjectEvents[]; extern u8 gUnknown_0819F818[]; extern u8 gUnknown_0819F840[]; @@ -100,7 +101,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_0[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -112,7 +113,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_1[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -124,7 +125,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_2[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -136,7 +137,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_3[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -148,7 +149,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -515,7 +516,7 @@ void BattleSetup_StartWildBattle(void) static void DoStandardWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80597F4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; @@ -527,7 +528,7 @@ static void DoStandardWildBattle(void) void BattleSetup_StartRoamerBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80597F4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; @@ -539,7 +540,7 @@ void BattleSetup_StartRoamerBattle(void) static void DoSafariBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80597F4(); gMain.savedCallback = sub_80C824C; gBattleTypeFlags = BATTLE_TYPE_SAFARI; @@ -558,7 +559,7 @@ void ScrSpecial_StartWallyTutorialBattle(void) { CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5); ScriptContext2_Enable(); - gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music; + gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic; gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL; CreateBattleStartTask(B_TRANSITION_SLICE, 0); } @@ -640,7 +641,7 @@ void CB2_EndScriptedWildBattle(void) if (IsPlayerDefeated(gBattleOutcome) == TRUE) SetMainCallback2(CB2_WhiteOut); else - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } s8 BattleSetup_GetTerrain(void) @@ -871,7 +872,7 @@ static void CB2_GiveStarter(void) *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result; starterPoke = GetStarterPokemon(gSpecialVar_Result); - ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0); + ScriptGiveMon(starterPoke, 5, ITEM_NONE, 0, 0, 0); ResetTasks(); sub_80408BC(); SetMainCallback2(CB2_StartFirstBattle); @@ -898,7 +899,7 @@ static void CB2_StartFirstBattle(void) static void CB2_EndFirstBattle(void) { Overworld_ClearSavedMusic(); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } // why not just use the macros? maybe its because they didnt want to uncast const every time? @@ -926,14 +927,14 @@ static bool32 IsPlayerDefeated(u32 battleOutcome) { switch (battleOutcome) { - case BATTLE_LOST: - case BATTLE_DREW: + case B_OUTCOME_LOST: + case B_OUTCOME_DREW: return TRUE; - case BATTLE_WON: - case BATTLE_RAN: - case BATTLE_PLAYER_TELEPORTED: - case BATTLE_POKE_FLED: - case BATTLE_CAUGHT: + case B_OUTCOME_WON: + case B_OUTCOME_RAN: + case B_OUTCOME_PLAYER_TELEPORTED: + case B_OUTCOME_MON_FLED: + case B_OUTCOME_CAUGHT: return FALSE; default: return FALSE; @@ -944,7 +945,7 @@ static void ResetTrainerOpponentIds(void) { sTrainerBattleMode = 0; gTrainerBattleOpponent = 0; - sTrainerEventObjectLocalId = 0; + sTrainerObjectEventLocalId = 0; sTrainerIntroSpeech = 0; sTrainerDefeatSpeech = 0; sTrainerVictorySpeech = 0; @@ -990,10 +991,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co static void SetMapVarsToTrainer(void) { - if (sTrainerEventObjectLocalId) + if (sTrainerObjectEventLocalId) { - gSpecialVar_LastTalked = sTrainerEventObjectLocalId; - gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + gSpecialVar_LastTalked = sTrainerObjectEventLocalId; + gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } } @@ -1038,10 +1039,10 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void TrainerWantsBattle(u8 trainerEventObjId, const u8 *trainerScript) +void TrainerWantsBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(gUnknown_0819F80B); ScriptContext2_Enable(); @@ -1055,9 +1056,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void sub_8082524(void) { - struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; + struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; - SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); + SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection)); } u8 ScrSpecial_GetTrainerBattleMode(void) @@ -1107,7 +1108,7 @@ void CB2_EndTrainerBattle(void) { if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { @@ -1115,7 +1116,7 @@ void CB2_EndTrainerBattle(void) } else { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetCurrentTrainerBattledFlag(); } } @@ -1124,7 +1125,7 @@ void CB2_EndTrainerEyeRematchBattle(void) { if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT) { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } else if (IsPlayerDefeated(gBattleOutcome) == TRUE) { @@ -1132,7 +1133,7 @@ void CB2_EndTrainerEyeRematchBattle(void) } else { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); SetCurrentTrainerBattledFlag(); SetTrainerFlagsAfterTrainerEyeRematch(); } diff --git a/src/battle_tower.c b/src/battle_tower.c index 8449b7e42..5d3bc207d 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -163,60 +163,60 @@ static const u8 sFemaleTrainerClasses[] = static const u8 sMaleTrainerGfxIds[] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_TUBER_M, - EVENT_OBJ_GFX_MAN_4, - EVENT_OBJ_GFX_BOY_4, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_BLACK_BELT, - EVENT_OBJ_GFX_MAN_6, - EVENT_OBJ_GFX_MAN_6, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_PSYCHIC_M, - EVENT_OBJ_GFX_GENTLEMAN, - EVENT_OBJ_GFX_SCHOOL_KID_M, - EVENT_OBJ_GFX_MAN_3, - EVENT_OBJ_GFX_OLD_MAN_1, - EVENT_OBJ_GFX_YOUNGSTER, - EVENT_OBJ_GFX_FISHERMAN, - EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_MAN_4, - EVENT_OBJ_GFX_MAN_6, - EVENT_OBJ_GFX_LITTLE_BOY_1, - EVENT_OBJ_GFX_SAILOR, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_BUG_CATCHER, - EVENT_OBJ_GFX_HIKER, + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_TUBER_M, + OBJ_EVENT_GFX_MAN_4, + OBJ_EVENT_GFX_BOY_4, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_MAN_6, + OBJ_EVENT_GFX_MAN_6, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_PSYCHIC_M, + OBJ_EVENT_GFX_GENTLEMAN, + OBJ_EVENT_GFX_SCHOOL_KID_M, + OBJ_EVENT_GFX_MAN_3, + OBJ_EVENT_GFX_OLD_MAN_1, + OBJ_EVENT_GFX_YOUNGSTER, + OBJ_EVENT_GFX_FISHERMAN, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_MAN_4, + OBJ_EVENT_GFX_MAN_6, + OBJ_EVENT_GFX_LITTLE_BOY_1, + OBJ_EVENT_GFX_SAILOR, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_HIKER, }; static const u8 sFemaleTrainerGfxIds[] = { - EVENT_OBJ_GFX_WOMAN_3, - EVENT_OBJ_GFX_TUBER_F, - EVENT_OBJ_GFX_WOMAN_7, - EVENT_OBJ_GFX_WOMAN_1, - EVENT_OBJ_GFX_WOMAN_3, - EVENT_OBJ_GFX_BEAUTY, - EVENT_OBJ_GFX_LASS, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_OLD_WOMAN_1, - EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_7, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_WOMAN_3, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_LASS, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_TUBER_F, + OBJ_EVENT_GFX_WOMAN_7, + OBJ_EVENT_GFX_WOMAN_1, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_BEAUTY, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_OLD_WOMAN_1, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_7, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_LASS, }; const u16 gBattleTowerBannedSpecies[] = @@ -549,7 +549,7 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex) return; } - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1); } void SetEReaderTrainerGfxId(void) @@ -1282,7 +1282,7 @@ void sub_81354CC(void) break; } - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void sub_8135534(u8 taskId) @@ -1805,9 +1805,9 @@ void PrintEReaderTrainerGreeting(void) void PrintEReaderTrainerFarewellMessage(void) { - if (gBattleOutcome == BATTLE_DREW) + if (gBattleOutcome == B_OUTCOME_DREW) gStringVar4[0] = EOS; - else if (gBattleOutcome == BATTLE_WON) + else if (gBattleOutcome == B_OUTCOME_WON) PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerWon); else PrintBattleTowerTrainerMessage(gSaveBlock2.battleTower.ereaderTrainer.farewellPlayerLost); diff --git a/src/battle_util.c b/src/battle_util.c index 1825d7a2c..b1260cd4e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1,6 +1,8 @@ #include "global.h" #include "battle.h" #include "battle_util.h" +#include "battle_controllers.h" +#include "battle_message.h" #include "data2.h" #include "event_data.h" #include "ewram.h" @@ -28,7 +30,7 @@ extern const u8* gBattlescriptCurrInstr; extern u8 gActiveBattler; extern u8 gBattleBufferB[4][0x200]; extern u8* gSelectionBattleScripts[4]; //battlescript location when you try to choose a move you're not allowed to -extern u16 gLastUsedMove[4]; +extern u16 gLastMoves[4]; extern struct BattlePokemon gBattleMons[4]; extern struct BattleEnigmaBerry gEnigmaBerries[4]; extern u8 gPotentialItemEffectBattler; @@ -40,8 +42,8 @@ extern u8 gBattlersCount; extern u32 gStatuses3[4]; extern u8 gBattlerAttacker; extern u8 gBattlerTarget; -extern u8 gBanksByTurnOrder[4]; -extern u16 gSideAffecting[2]; +extern u8 gBattlerByTurnOrder[4]; +extern u16 gSideStatuses[2]; extern u16 gBattleWeather; extern void (*gBattleMainFunc)(void); extern u8 gAbsentBattlerFlags; @@ -53,7 +55,7 @@ extern s32 gBattleMoveDamage; extern u16 gBattlerPartyIndexes[4]; extern u16 gChosenMovesByBanks[4]; extern s32 gTakenDmg[4]; -extern u8 gTakenDmgBanks[4]; +extern u8 gTakenDmgByBattler[4]; extern u8 gMoveResultFlags; extern u8 gLastUsedAbility; extern u8 gBattleTextBuff2[]; @@ -89,7 +91,7 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 sub_803FC34(u8 bank); u16 sub_803FBFC(u8 a); void RecordAbilityBattle(u8 bank, u8 ability); -void RecordItemBattle(u8 bank, u8 holdEffect); +void RecordItemEffectBattle(u8 bank, u8 holdEffect); s8 GetPokeFlavourRelation(u32 pid, u8 flavor); extern u8 BattleScript_MoveSelectionDisabledMove[]; @@ -207,12 +209,12 @@ extern u8 gUnknown_081D99A0[]; //disobedient, hits itself #define MULTISTRING_CHOOSER 0x5 #define MSG_DISPLAY 0x7 -u8 GetBattleBank(u8 caseId) +u8 GetBattlerForBattleScript(u8 caseId) { u8 ret = 0; switch (caseId) { - case BS_GET_TARGET: + case BS_TARGET: ret = gBattlerTarget; break; case BS_GET_ATTACKER: @@ -257,7 +259,7 @@ void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move) gBattleMons[bankAtk].pp[i]--; if (!(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[bankAtk].unk18_b & gBitTable[i])) + && !(gDisableStructs[bankAtk].mimickedMoves & gBitTable[i])) { gActiveBattler = bankAtk; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); @@ -291,7 +293,7 @@ void PressurePPLoseOnUsingImprision(u8 bankAtk) if (imprisionPos != 4 && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[bankAtk].unk18_b & gBitTable[imprisionPos])) + && !(gDisableStructs[bankAtk].mimickedMoves & gBitTable[imprisionPos])) { gActiveBattler = bankAtk; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]); @@ -324,7 +326,7 @@ void PressurePPLoseOnUsingPerishSong(u8 bankAtk) if (perishSongPos != 4 && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[bankAtk].unk18_b & gBitTable[perishSongPos])) + && !(gDisableStructs[bankAtk].mimickedMoves & gBitTable[perishSongPos])) { gActiveBattler = bankAtk; BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBattler].pp[perishSongPos]); @@ -333,7 +335,7 @@ void PressurePPLoseOnUsingPerishSong(u8 bankAtk) } -void MarkAllBufferBanksForExecution(void) // unused +void MarkAllBattlersForControllerExec(void) // unused { s32 i; @@ -481,7 +483,7 @@ u8 TrySetCantSelectMoveBattleScript(void) //msg can't select a move gSelectionBattleScripts[gActiveBattler] = BattleScript_MoveSelectionDisabledMove; limitations++; } - if (move == gLastUsedMove[gActiveBattler] && move != MOVE_STRUGGLE && gBattleMons[gActiveBattler].status2 & STATUS2_TORMENT) + if (move == gLastMoves[gActiveBattler] && move != MOVE_STRUGGLE && gBattleMons[gActiveBattler].status2 & STATUS2_TORMENT) { CancelMultiTurnMoves(gActiveBattler); gSelectionBattleScripts[gActiveBattler] = BattleScript_MoveSelectionTormented; @@ -522,40 +524,36 @@ u8 TrySetCantSelectMoveBattleScript(void) //msg can't select a move return limitations; } -#define MOVE_LIMITATION_ZEROMOVE (1 << 0) -#define MOVE_LIMITATION_PP (1 << 1) -#define MOVE_LIMITATION_DISABLED (1 << 2) -#define MOVE_LIMITATION_TORMENTED (1 << 3) -#define MOVE_LIMITATION_TAUNT (1 << 4) -#define MOVE_LIMITATION_IMPRISION (1 << 5) - -u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check) +u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check) { u8 holdEffect; - u16* choicedMove = CHOICED_MOVE(bank); + u16* choicedMove = CHOICED_MOVE(battlerId); s32 i; - if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY) - holdEffect = gEnigmaBerries[bank].holdEffect; + + if (gBattleMons[battlerId].item == ITEM_ENIGMA_BERRY) + holdEffect = gEnigmaBerries[battlerId].holdEffect; else - holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item); - gPotentialItemEffectBattler = bank; - for (i = 0; i < 4; i++) + holdEffect = ItemId_GetHoldEffect(gBattleMons[battlerId].item); + + gPotentialItemEffectBattler = battlerId; + + for (i = 0; i < MAX_MON_MOVES; i++) { - if (gBattleMons[bank].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE) + if (gBattleMons[battlerId].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE) unusableMoves |= gBitTable[i]; - if (gBattleMons[bank].pp[i] == 0 && check & MOVE_LIMITATION_PP) + if (gBattleMons[battlerId].pp[i] == 0 && check & MOVE_LIMITATION_PP) unusableMoves |= gBitTable[i]; - if (gBattleMons[bank].moves[i] == gDisableStructs[bank].disabledMove && check & MOVE_LIMITATION_DISABLED) + if (gBattleMons[battlerId].moves[i] == gDisableStructs[battlerId].disabledMove && check & MOVE_LIMITATION_DISABLED) unusableMoves |= gBitTable[i]; - if (gBattleMons[bank].moves[i] == gLastUsedMove[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT) + if (gBattleMons[battlerId].moves[i] == gLastMoves[battlerId] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[battlerId].status2 & STATUS2_TORMENT) unusableMoves |= gBitTable[i]; - if (gDisableStructs[bank].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[bank].moves[i]].power == 0) + if (gDisableStructs[battlerId].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0) unusableMoves |= gBitTable[i]; - if (IsImprisoned(bank, gBattleMons[bank].moves[i]) && check & MOVE_LIMITATION_IMPRISION) + if (IsImprisoned(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISON) unusableMoves |= gBitTable[i]; - if (gDisableStructs[bank].encoreTimer1 && gDisableStructs[bank].encoredMove != gBattleMons[bank].moves[i]) + if (gDisableStructs[battlerId].encoreTimer1 && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[bank].moves[i]) + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i]) unusableMoves |= gBitTable[i]; } return unusableMoves; @@ -563,9 +561,9 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check) bool8 AreAllMovesUnusable(void) { - u8 unusable; - unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); - if (unusable == 0xF) //all moves are unusable + u8 unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF); + + if (unusable == 0xF) // All moves are unusable. { gProtectStructs[gActiveBattler].noValidMoves = 1; gSelectionBattleScripts[gActiveBattler] = BattleScript_NoMovesLeft; @@ -575,33 +573,53 @@ bool8 AreAllMovesUnusable(void) gBattleBufferB[gActiveBattler][3] = GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ 1); } else + { gProtectStructs[gActiveBattler].noValidMoves = 0; + } + return (unusable == 0xF); } -u8 IsImprisoned(u8 bank, u16 move) +u8 IsImprisoned(u8 battlerId, u16 move) { - u8 imprisionedMoves = 0; - u8 bankSide = GetBattlerSide(bank); s32 i; + u8 imprisonedMoves = 0; + u8 battlerSide = GetBattlerSide(battlerId); + for (i = 0; i < gBattlersCount; i++) { - if (bankSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISIONED) + if (battlerSide != GetBattlerSide(i) && gStatuses3[i] & STATUS3_IMPRISONED_OTHERS) { s32 j; - for (j = 0; j < 4; j++) + for (j = 0; j < MAX_MON_MOVES; j++) { if (move == gBattleMons[i].moves[j]) break; } - if (j < 4) - imprisionedMoves++; + if (j < MAX_MON_MOVES) + imprisonedMoves++; } } - return imprisionedMoves; + + return imprisonedMoves; } -u8 UpdateTurnCounters(void) +enum +{ + ENDTURN_ORDER, + ENDTURN_REFLECT, + ENDTURN_LIGHT_SCREEN, + ENDTURN_MIST, + ENDTURN_SAFEGUARD, + ENDTURN_WISH, + ENDTURN_RAIN, + ENDTURN_SANDSTORM, + ENDTURN_SUN, + ENDTURN_HAIL, + ENDTURN_FIELD_COUNT, +}; + +u8 DoFieldEndTurnEffects(void) { u8 effect = 0; s32 i; @@ -615,43 +633,39 @@ u8 UpdateTurnCounters(void) do { - u8 sideBank; + u8 side; - switch (gBattleStruct->turncountersTracker) + switch (gBattleStruct->turnCountersTracker) { - case 0: + case ENDTURN_ORDER: for (i = 0; i < gBattlersCount; i++) { - gBanksByTurnOrder[i] = i; + gBattlerByTurnOrder[i] = i; } for (i = 0; i < gBattlersCount - 1; i++) { s32 j; for (j = i + 1; j < gBattlersCount; j++) { - if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0)) + if (GetWhoStrikesFirst(gBattlerByTurnOrder[i], gBattlerByTurnOrder[j], 0)) SwapTurnOrder(i, j); } } - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; gBattleStruct->turnSideTracker = 0; - case 1: + // fall through + case ENDTURN_REFLECT: while (gBattleStruct->turnSideTracker < 2) { - gActiveBattler = gBattlerAttacker = sideBank = gBattleStruct->turnSideTracker; + gActiveBattler = gBattlerAttacker = side = gBattleStruct->turnSideTracker; - if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT) + if (gSideStatuses[side] & SIDE_STATUS_REFLECT) { - if (--gSideTimers[sideBank].reflectTimer == 0) + if (--gSideTimers[side].reflectTimer == 0) { - - gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT; + gSideStatuses[side] &= ~SIDE_STATUS_REFLECT; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = MOVE_REFLECT; - gBattleTextBuff1[3] = MOVE_REFLECT >> 8; - gBattleTextBuff1[4] = EOS; + PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_REFLECT); effect++; } } @@ -661,26 +675,22 @@ u8 UpdateTurnCounters(void) } if (!effect) { - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; gBattleStruct->turnSideTracker = 0; } break; - case 2: + case ENDTURN_LIGHT_SCREEN: while (gBattleStruct->turnSideTracker < 2) { - gActiveBattler = gBattlerAttacker = sideBank = gBattleStruct->turnSideTracker; - if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN) + gActiveBattler = gBattlerAttacker = side = gBattleStruct->turnSideTracker; + if (gSideStatuses[side] & SIDE_STATUS_LIGHTSCREEN) { - if (--gSideTimers[sideBank].lightscreenTimer == 0) + if (--gSideTimers[side].lightscreenTimer == 0) { - gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; + gSideStatuses[side] &= ~SIDE_STATUS_LIGHTSCREEN; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = MOVE_LIGHT_SCREEN; - gBattleTextBuff1[3] = MOVE_LIGHT_SCREEN >> 8; - gBattleTextBuff1[4] = EOS; + gBattleCommunication[MULTISTRING_CHOOSER] = side; + PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_LIGHT_SCREEN); effect++; } } @@ -690,24 +700,20 @@ u8 UpdateTurnCounters(void) } if (!effect) { - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; gBattleStruct->turnSideTracker = 0; } break; - case 3: + case ENDTURN_MIST: while (gBattleStruct->turnSideTracker < 2) { - gActiveBattler = gBattlerAttacker = sideBank = gBattleStruct->turnSideTracker; - if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0) + gActiveBattler = gBattlerAttacker = side = gBattleStruct->turnSideTracker; + if (gSideTimers[side].mistTimer && --gSideTimers[side].mistTimer == 0) { - gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST; + gSideStatuses[side] &= ~SIDE_STATUS_MIST; BattleScriptExecute(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = MOVE_MIST; - gBattleTextBuff1[3] = MOVE_MIST >> 8; - gBattleTextBuff1[4] = EOS; + gBattleCommunication[MULTISTRING_CHOOSER] = side; + PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_MIST); effect++; } gBattleStruct->turnSideTracker++; @@ -716,19 +722,19 @@ u8 UpdateTurnCounters(void) } if (!effect) { - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; gBattleStruct->turnSideTracker = 0; } break; - case 4: + case ENDTURN_SAFEGUARD: while (gBattleStruct->turnSideTracker < 2) { - gActiveBattler = gBattlerAttacker = sideBank = gBattleStruct->turnSideTracker; - if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD) + gActiveBattler = gBattlerAttacker = side = gBattleStruct->turnSideTracker; + if (gSideStatuses[side] & SIDE_STATUS_SAFEGUARD) { - if (--gSideTimers[sideBank].safeguardTimer == 0) + if (--gSideTimers[side].safeguardTimer == 0) { - gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD; + gSideStatuses[side] &= ~SIDE_STATUS_SAFEGUARD; BattleScriptExecute(BattleScript_SafeguardEnds); effect++; } @@ -739,14 +745,14 @@ u8 UpdateTurnCounters(void) } if (!effect) { - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; gBattleStruct->turnSideTracker = 0; } break; - case 5: + case ENDTURN_WISH: while (gBattleStruct->turnSideTracker < gBattlersCount) { - gActiveBattler = gBanksByTurnOrder[gBattleStruct->turnSideTracker]; + gActiveBattler = gBattlerByTurnOrder[gBattleStruct->turnSideTracker]; if (gWishFutureKnock.wishCounter[gActiveBattler] && --gWishFutureKnock.wishCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp) { gBattlerTarget = gActiveBattler; @@ -759,10 +765,10 @@ u8 UpdateTurnCounters(void) } if (!effect) { - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; } break; - case 6: + case ENDTURN_RAIN: if (gBattleWeather & WEATHER_RAIN_ANY) { if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) @@ -779,15 +785,20 @@ u8 UpdateTurnCounters(void) gBattleCommunication[MULTISTRING_CHOOSER] = 0; } else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) + { gBattleCommunication[MULTISTRING_CHOOSER] = 1; + } else + { gBattleCommunication[MULTISTRING_CHOOSER] = 0; + } + BattleScriptExecute(BattleScript_RainContinuesOrEnds); effect++; } - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; break; - case 7: + case ENDTURN_SANDSTORM: if (gBattleWeather & WEATHER_SANDSTORM_ANY) { if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) @@ -796,16 +807,18 @@ u8 UpdateTurnCounters(void) gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; } else + { gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; + } gBattleStruct->animArg1 = B_ANIM_SANDSTORM_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 0; BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; break; - case 8: + case ENDTURN_SUN: if (gBattleWeather & WEATHER_SUN_ANY) { if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) @@ -814,14 +827,16 @@ u8 UpdateTurnCounters(void) gBattlescriptCurrInstr = BattleScript_SunlightFaded; } else + { gBattlescriptCurrInstr = BattleScript_SunlightContinues; + } BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; break; - case 9: + case ENDTURN_HAIL: if (gBattleWeather & WEATHER_HAIL) { if (--gWishFutureKnock.weatherDuration == 0) @@ -830,16 +845,18 @@ u8 UpdateTurnCounters(void) gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; } else + { gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; + } gBattleStruct->animArg1 = B_ANIM_HAIL_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 1; BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - gBattleStruct->turncountersTracker++; + gBattleStruct->turnCountersTracker++; break; - case 10: + case ENDTURN_FIELD_COUNT: effect++; break; } @@ -849,23 +866,47 @@ u8 UpdateTurnCounters(void) #define TURNBASED_MAX_CASE 19 +enum +{ + ENDTURN_INGRAIN, + ENDTURN_ABILITIES, + ENDTURN_ITEMS1, + ENDTURN_LEECH_SEED, + ENDTURN_POISON, + ENDTURN_BAD_POISON, + ENDTURN_BURN, + ENDTURN_NIGHTMARES, + ENDTURN_CURSE, + ENDTURN_WRAP, + ENDTURN_UPROAR, + ENDTURN_THRASH, + ENDTURN_DISABLE, + ENDTURN_ENCORE, + ENDTURN_LOCK_ON, + ENDTURN_CHARGE, + ENDTURN_TAUNT, + ENDTURN_YAWN, + ENDTURN_ITEMS2, + ENDTURN_BATTLER_COUNT +}; + u8 TurnBasedEffects(void) { u8 effect = 0; gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); - while (gBattleStruct->turnEffectsBank < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE) + while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE) { - gActiveBattler = gBattlerAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank]; + gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->turnEffectsBattlerId]; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) { - gBattleStruct->turnEffectsBank++; + gBattleStruct->turnEffectsBattlerId++; } else { switch (gBattleStruct->turnEffectsTracker) { - case 0: // ingrain + case ENDTURN_INGRAIN: // ingrain if ((gStatuses3[gActiveBattler] & STATUS3_ROOTED) && gBattleMons[gActiveBattler].hp != gBattleMons[gActiveBattler].maxHP && gBattleMons[gActiveBattler].hp != 0) @@ -879,25 +920,27 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 1: // end turn abilities + case ENDTURN_ABILITIES: // end turn abilities if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBattler, 0, 0, 0)) effect++; gBattleStruct->turnEffectsTracker++; break; - case 2: // item effects - if (ItemBattleEffects(1, gActiveBattler, 0)) + case ENDTURN_ITEMS1: // item effects + if (ItemBattleEffects(1, gActiveBattler, FALSE)) effect++; gBattleStruct->turnEffectsTracker++; break; - case 18: // item effects again - if (ItemBattleEffects(1, gActiveBattler, 1)) + case ENDTURN_ITEMS2: // item effects again + if (ItemBattleEffects(1, gActiveBattler, TRUE)) effect++; gBattleStruct->turnEffectsTracker++; break; - case 3: // leech seed - if (gStatuses3[gActiveBattler] & STATUS3_LEECHSEED && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK].hp != 0 && gBattleMons[gActiveBattler].hp != 0) + case ENDTURN_LEECH_SEED: // leech seed + if ((gStatuses3[gActiveBattler] & STATUS3_LEECHSEED) + && gBattleMons[gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER].hp != 0 + && gBattleMons[gActiveBattler].hp != 0) { - gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP + gBattlerTarget = gStatuses3[gActiveBattler] & STATUS3_LEECHSEED_BATTLER; // Notice gBattlerTarget is actually the HP receiver. gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -908,8 +951,8 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 4: // poison - if ((gBattleMons[gActiveBattler].status1 & STATUS_POISON) && gBattleMons[gActiveBattler].hp != 0) + case ENDTURN_POISON: // poison + if ((gBattleMons[gActiveBattler].status1 & STATUS1_POISON) && gBattleMons[gActiveBattler].hp != 0) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8; if (gBattleMoveDamage == 0) @@ -919,13 +962,13 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 5: // toxic poison - if ((gBattleMons[gActiveBattler].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBattler].hp != 0) + case ENDTURN_BAD_POISON: // toxic poison + if ((gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON) && gBattleMons[gActiveBattler].hp != 0) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 16; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - if ((gBattleMons[gActiveBattler].status1 & 0xF00) != 0xF00) //not 16 turns + if ((gBattleMons[gActiveBattler].status1 & 0xF00) != 0xF00) // not 16 turns gBattleMons[gActiveBattler].status1 += 0x100; gBattleMoveDamage *= (gBattleMons[gActiveBattler].status1 & 0xF00) >> 8; BattleScriptExecute(BattleScript_PoisonTurnDmg); @@ -933,8 +976,8 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 6: // burn - if ((gBattleMons[gActiveBattler].status1 & STATUS_BURN) && gBattleMons[gActiveBattler].hp != 0) + case ENDTURN_BURN: // burn + if ((gBattleMons[gActiveBattler].status1 & STATUS1_BURN) && gBattleMons[gActiveBattler].hp != 0) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 8; if (gBattleMoveDamage == 0) @@ -944,7 +987,7 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 7: // spooky nightmares + case ENDTURN_NIGHTMARES: // spooky nightmares if ((gBattleMons[gActiveBattler].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBattler].hp != 0) { // missing sleep check @@ -956,7 +999,7 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 8: // curse + case ENDTURN_CURSE: // curse if ((gBattleMons[gActiveBattler].status2 & STATUS2_CURSED) && gBattleMons[gActiveBattler].hp != 0) { gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / 4; @@ -967,7 +1010,7 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 9: // wrap + case ENDTURN_WRAP: // wrap if ((gBattleMons[gActiveBattler].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBattler].hp != 0) { gBattleMons[gActiveBattler].status2 -= 0x2000; @@ -975,8 +1018,8 @@ u8 TurnBasedEffects(void) { gBattleStruct->animArg1 = ewram16004arr(0, gActiveBattler); gBattleStruct->animArg2 = ewram16004arr(1, gActiveBattler); - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; + gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN; + gBattleTextBuff1[1] = B_BUFF_MOVE; gBattleTextBuff1[2] = ewram16004arr(0, gActiveBattler); gBattleTextBuff1[3] = ewram16004arr(1, gActiveBattler); gBattleTextBuff1[4] = EOS; @@ -999,15 +1042,15 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 10: // uproar + case ENDTURN_UPROAR: // uproar if (gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR) { for (gBattlerAttacker = 0; gBattlerAttacker < gBattlersCount; gBattlerAttacker++) { - if ((gBattleMons[gBattlerAttacker].status1 & STATUS_SLEEP) + if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) && gBattleMons[gBattlerAttacker].ability != ABILITY_SOUNDPROOF) { - gBattleMons[gBattlerAttacker].status1 &= ~(STATUS_SLEEP); + gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP); gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE); gBattleCommunication[MULTISTRING_CHOOSER] = 1; BattleScriptExecute(BattleScript_MonWokeUpInUproar); @@ -1048,7 +1091,7 @@ u8 TurnBasedEffects(void) if (effect != 2) gBattleStruct->turnEffectsTracker++; break; - case 11: // thrash + case ENDTURN_THRASH: // thrash if (gBattleMons[gActiveBattler].status2 & STATUS2_LOCK_CONFUSE) { gBattleMons[gActiveBattler].status2 -= 0x400; @@ -1070,11 +1113,11 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 12: // disable + case ENDTURN_DISABLE: // disable if (gDisableStructs[gActiveBattler].disableTimer1 != 0) { - int i; - for (i = 0; i < 4; i++) + s32 i; + for (i = 0; i < MAX_MON_MOVES; i++) { if (gDisableStructs[gActiveBattler].disabledMove == gBattleMons[gActiveBattler].moves[i]) break; @@ -1093,7 +1136,7 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 13: // encore + case ENDTURN_ENCORE: // encore if (gDisableStructs[gActiveBattler].encoreTimer1 != 0) { if (gBattleMons[gActiveBattler].moves[gDisableStructs[gActiveBattler].encoredMovePos] != gDisableStructs[gActiveBattler].encoredMove) // pokemon does not have the encored move anymore @@ -1112,26 +1155,26 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 14: // lock-on decrement + case ENDTURN_LOCK_ON: // lock-on decrement if (gStatuses3[gActiveBattler] & STATUS3_ALWAYS_HITS) gStatuses3[gActiveBattler] -= 0x8; gBattleStruct->turnEffectsTracker++; break; - case 15: // charge + case ENDTURN_CHARGE: // charge if (gDisableStructs[gActiveBattler].chargeTimer1 && --gDisableStructs[gActiveBattler].chargeTimer1 == 0) gStatuses3[gActiveBattler] &= ~STATUS3_CHARGED_UP; gBattleStruct->turnEffectsTracker++; break; - case 16: // taunt + case ENDTURN_TAUNT: // taunt if (gDisableStructs[gActiveBattler].tauntTimer1) gDisableStructs[gActiveBattler].tauntTimer1--; gBattleStruct->turnEffectsTracker++; break; - case 17: // yawn + case ENDTURN_YAWN: // yawn if (gStatuses3[gActiveBattler] & STATUS3_YAWN) { gStatuses3[gActiveBattler] -= 0x800; - if (!(gStatuses3[gActiveBattler] & STATUS3_YAWN) && !(gBattleMons[gActiveBattler].status1 & STATUS_ANY) + if (!(gStatuses3[gActiveBattler] & STATUS3_YAWN) && !(gBattleMons[gActiveBattler].status1 & STATUS1_ANY) && gBattleMons[gActiveBattler].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gActiveBattler].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBattler)) { @@ -1146,9 +1189,9 @@ u8 TurnBasedEffects(void) } gBattleStruct->turnEffectsTracker++; break; - case 19: // done + case ENDTURN_BATTLER_COUNT: // done gBattleStruct->turnEffectsTracker = 0; - gBattleStruct->turnEffectsBank++; + gBattleStruct->turnEffectsBattlerId++; break; } if (effect != 0) @@ -1162,17 +1205,20 @@ u8 TurnBasedEffects(void) bool8 HandleWishPerishSongOnTurnEnd(void) { gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); - switch (gBattleStruct->sub80170DC_Tracker) + + switch (gBattleStruct->wishPerishSongState) { case 0: // future sight - while (gBattleStruct->sub80170DC_Bank < gBattlersCount) + while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount) { - gActiveBattler = gBattleStruct->sub80170DC_Bank; + gActiveBattler = gBattleStruct->wishPerishSongBattlerId; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) - gBattleStruct->sub80170DC_Bank++; + { + gBattleStruct->wishPerishSongBattlerId++; + } else { - gBattleStruct->sub80170DC_Bank++; + gBattleStruct->wishPerishSongBattlerId++; if (gWishFutureKnock.futureSightCounter[gActiveBattler] && --gWishFutureKnock.futureSightCounter[gActiveBattler] == 0 && gBattleMons[gActiveBattler].hp) { if (gWishFutureKnock.futureSightMove[gActiveBattler] == MOVE_FUTURE_SIGHT) @@ -1193,17 +1239,17 @@ bool8 HandleWishPerishSongOnTurnEnd(void) } } } - gBattleStruct->sub80170DC_Tracker = 1; - gBattleStruct->sub80170DC_Bank = 0; + gBattleStruct->wishPerishSongState = 1; + gBattleStruct->wishPerishSongBattlerId = 0; case 1: // perish song - while (gBattleStruct->sub80170DC_Bank < gBattlersCount) + while (gBattleStruct->wishPerishSongBattlerId < gBattlersCount) { - gActiveBattler = gBattlerAttacker = gBanksByTurnOrder[gBattleStruct->sub80170DC_Bank]; + gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->wishPerishSongBattlerId]; if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) - gBattleStruct->sub80170DC_Bank++; + gBattleStruct->wishPerishSongBattlerId++; else { - gBattleStruct->sub80170DC_Bank++; + gBattleStruct->wishPerishSongBattlerId++; if (gStatuses3[gActiveBattler] & STATUS3_PERISH_SONG) { gBattleTextBuff1[0] = 0xFD; @@ -1333,11 +1379,11 @@ u8 AtkCanceller_UnableToUseMove(void) gBattleStruct->atkCancellerTracker++; break; case 1: // check being asleep - if (gBattleMons[gBattlerAttacker].status1 & STATUS_SLEEP) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) { if (UproarWakeUpCheck(gBattlerAttacker)) { - gBattleMons[gBattlerAttacker].status1 &= ~(STATUS_SLEEP); + gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP); gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE); BattleScriptPushCursor(); gBattleCommunication[MULTISTRING_CHOOSER] = 1; @@ -1351,11 +1397,11 @@ u8 AtkCanceller_UnableToUseMove(void) toSub = 2; else toSub = 1; - if ((gBattleMons[gBattlerAttacker].status1 & STATUS_SLEEP) < toSub) - gBattleMons[gBattlerAttacker].status1 &= ~(STATUS_SLEEP); + if ((gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) < toSub) + gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_SLEEP); else gBattleMons[gBattlerAttacker].status1 -= toSub; - if (gBattleMons[gBattlerAttacker].status1 & STATUS_SLEEP) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP) { if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK) { @@ -1377,7 +1423,7 @@ u8 AtkCanceller_UnableToUseMove(void) gBattleStruct->atkCancellerTracker++; break; case 2: // check being frozen - if (gBattleMons[gBattlerAttacker].status1 & STATUS_FREEZE) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE) { if (Random() % 5) { @@ -1394,7 +1440,7 @@ u8 AtkCanceller_UnableToUseMove(void) } else // unfreeze { - gBattleMons[gBattlerAttacker].status1 &= ~(STATUS_FREEZE); + gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -1504,7 +1550,7 @@ u8 AtkCanceller_UnableToUseMove(void) gBattleStruct->atkCancellerTracker++; break; case 10: // paralysis - if (gBattleMons[gBattlerAttacker].status1 & STATUS_PARALYSIS && (Random() % 4) == 0) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_PARALYSIS && (Random() % 4) == 0) { gProtectStructs[gBattlerAttacker].prlzImmobility = 1; CancelMultiTurnMoves(gBattlerAttacker); @@ -1545,7 +1591,7 @@ u8 AtkCanceller_UnableToUseMove(void) { gCurrentMove = MOVE_BIDE; *bideDmg = gTakenDmg[gBattlerAttacker] * 2; - gBattlerTarget = gTakenDmgBanks[gBattlerAttacker]; + gBattlerTarget = gTakenDmgByBattler[gBattlerAttacker]; if (gAbsentBattlerFlags & gBitTable[gBattlerTarget]) gBattlerTarget = GetMoveTarget(MOVE_BIDE, 1); gBattlescriptCurrInstr = BattleScript_BideAttack; @@ -1558,11 +1604,11 @@ u8 AtkCanceller_UnableToUseMove(void) gBattleStruct->atkCancellerTracker++; break; case 13: // move thawing - if (gBattleMons[gBattlerAttacker].status1 & STATUS_FREEZE) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE) { if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT) { - gBattleMons[gBattlerAttacker].status1 &= ~(STATUS_FREEZE); + gBattleMons[gBattlerAttacker].status1 &= ~(STATUS1_FREEZE); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; gBattleCommunication[MULTISTRING_CHOOSER] = 1; @@ -1873,17 +1919,17 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_SHED_SKIN: - if ((gBattleMons[bank].status1 & STATUS_ANY) && (Random() % 3) == 0) + if ((gBattleMons[bank].status1 & STATUS1_ANY) && (Random() % 3) == 0) { - if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON)) + if (gBattleMons[bank].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON)) StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank].status1 & STATUS1_PARALYSIS) StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - if (gBattleMons[bank].status1 & STATUS_BURN) + if (gBattleMons[bank].status1 & STATUS1_BURN) StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); gBattleMons[bank].status1 = 0; // BUG: The nightmare status does not get cleared here. This was fixed in Emerald. @@ -1955,7 +2001,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_FLASH_FIRE: - if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS_FREEZE)) + if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS1_FREEZE)) { if (!(eFlashFireArr.arr[bank] & 1)) { @@ -2232,7 +2278,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) switch (gBattleMons[bank].ability) { case ABILITY_IMMUNITY: - if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON | 0xF00)) // TODO: what is 0xF00? + if (gBattleMons[bank].status1 & (STATUS1_POISON | STATUS1_TOXIC_POISON | 0xF00)) // TODO: what is 0xF00? { StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); effect = 1; @@ -2246,7 +2292,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_LIMBER: - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank].status1 & STATUS1_PARALYSIS) { StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); effect = 1; @@ -2254,7 +2300,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) break; case ABILITY_INSOMNIA: case ABILITY_VITAL_SPIRIT: - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); @@ -2262,14 +2308,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_WATER_VEIL: - if (gBattleMons[bank].status1 & STATUS_BURN) + if (gBattleMons[bank].status1 & STATUS1_BURN) { StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); effect = 1; } break; case ABILITY_MAGMA_ARMOR: - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) { StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); effect = 1; @@ -2751,7 +2797,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleMoveDamage *= -1; BattleScriptExecute(BattleScript_ItemHealHP_End2); effect = ITEM_HP_CHANGE; - RecordItemBattle(bank, bankHoldEffect); + RecordItemEffectBattle(bank, bankHoldEffect); } break; // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? @@ -2989,41 +3035,41 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } break; case HOLD_EFFECT_CURE_PAR: - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank].status1 & STATUS1_PARALYSIS) { - gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS); + gBattleMons[bank].status1 &= ~(STATUS1_PARALYSIS); BattleScriptExecute(BattleScript_BerryCurePrlzEnd2); effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_PSN: - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + if (gBattleMons[bank].status1 & STATUS1_PSN_ANY) { - gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER); + gBattleMons[bank].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER); BattleScriptExecute(BattleScript_BerryCurePsnEnd2); effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_BRN: - if (gBattleMons[bank].status1 & STATUS_BURN) + if (gBattleMons[bank].status1 & STATUS1_BURN) { - gBattleMons[bank].status1 &= ~(STATUS_BURN); + gBattleMons[bank].status1 &= ~(STATUS1_BURN); BattleScriptExecute(BattleScript_BerryCureBrnEnd2); effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_FRZ: - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) { - gBattleMons[bank].status1 &= ~(STATUS_FREEZE); + gBattleMons[bank].status1 &= ~(STATUS1_FREEZE); BattleScriptExecute(BattleScript_BerryCureFrzEnd2); effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_SLP: - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { - gBattleMons[bank].status1 &= ~(STATUS_SLEEP); + gBattleMons[bank].status1 &= ~(STATUS1_SLEEP); gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); BattleScriptExecute(BattleScript_BerryCureSlpEnd2); effect = ITEM_STATUS_CHANGE; @@ -3038,31 +3084,31 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } break; case HOLD_EFFECT_CURE_STATUS: - if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) + if (gBattleMons[bank].status1 & STATUS1_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) { i = 0; - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + if (gBattleMons[bank].status1 & STATUS1_PSN_ANY) { StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); i++; } - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); i++; } - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank].status1 & STATUS1_PARALYSIS) { StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); i++; } - if (gBattleMons[bank].status1 & STATUS_BURN) + if (gBattleMons[bank].status1 & STATUS1_BURN) { StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); i++; } - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) { StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); i++; @@ -3105,7 +3151,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) MarkBattlerForControllerExec(gActiveBattler); break; case ITEM_PP_CHANGE: - if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i])) + if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].mimickedMoves & gBitTable[i])) gBattleMons[bank].pp[i] = changedPP; break; } @@ -3131,45 +3177,45 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) switch (bankHoldEffect) { case HOLD_EFFECT_CURE_PAR: - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank].status1 & STATUS1_PARALYSIS) { - gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS); + gBattleMons[bank].status1 &= ~(STATUS1_PARALYSIS); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_BerryCureParRet; effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_PSN: - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + if (gBattleMons[bank].status1 & STATUS1_PSN_ANY) { - gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER); + gBattleMons[bank].status1 &= ~(STATUS1_PSN_ANY | STATUS1_TOXIC_COUNTER); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet; effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_BRN: - if (gBattleMons[bank].status1 & STATUS_BURN) + if (gBattleMons[bank].status1 & STATUS1_BURN) { - gBattleMons[bank].status1 &= ~(STATUS_BURN); + gBattleMons[bank].status1 &= ~(STATUS1_BURN); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet; effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_FRZ: - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) { - gBattleMons[bank].status1 &= ~(STATUS_FREEZE); + gBattleMons[bank].status1 &= ~(STATUS1_FREEZE); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet; effect = ITEM_STATUS_CHANGE; } break; case HOLD_EFFECT_CURE_SLP: - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { - gBattleMons[bank].status1 &= ~(STATUS_SLEEP); + gBattleMons[bank].status1 &= ~(STATUS1_SLEEP); gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet; @@ -3197,26 +3243,26 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } break; case HOLD_EFFECT_CURE_STATUS: - if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) + if (gBattleMons[bank].status1 & STATUS1_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) { - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + if (gBattleMons[bank].status1 & STATUS1_PSN_ANY) { StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); } - if (gBattleMons[bank].status1 & STATUS_SLEEP) + if (gBattleMons[bank].status1 & STATUS1_SLEEP) { gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); } - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + if (gBattleMons[bank].status1 & STATUS1_PARALYSIS) { StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); } - if (gBattleMons[bank].status1 & STATUS_BURN) + if (gBattleMons[bank].status1 & STATUS1_BURN) { StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); } - if (gBattleMons[bank].status1 & STATUS_FREEZE) + if (gBattleMons[bank].status1 & STATUS1_FREEZE) { StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); } @@ -3340,13 +3386,13 @@ void unref_sub_801B40C(void) { gSideTimers[GetBattlerPosition(bank) & 1].field3 = (bank) | ((bank + 2) << 4); gSideTimers[GetBattlerPosition(bank) & 1].field4 = sCombinedMoves[i].newMove; - gSideAffecting[GetBattlerPosition(bank) & 1] |= SIDE_STATUS_X4; + gSideStatuses[GetBattlerPosition(bank) & 1] |= SIDE_STATUS_X4; } if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank + 2] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank]) { gSideTimers[GetBattlerPosition(bank) & 1].field3 = (bank + 2) | ((bank) << 4); gSideTimers[GetBattlerPosition(bank) & 1].field4 = sCombinedMoves[i].newMove; - gSideAffecting[GetBattlerPosition(bank) & 1] |= SIDE_STATUS_X4; + gSideStatuses[GetBattlerPosition(bank) & 1] |= SIDE_STATUS_X4; } bank++; } @@ -3477,7 +3523,7 @@ u8 IsMonDisobedient(void) // is not obedient if (gCurrentMove == MOVE_RAGE) gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_RAGE); - if (gBattleMons[gBattlerAttacker].status1 & STATUS_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK)) + if (gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK)) { gBattlescriptCurrInstr = gUnknown_081D995F; return 1; @@ -3515,7 +3561,7 @@ u8 IsMonDisobedient(void) obedienceLevel = gBattleMons[gBattlerAttacker].level - obedienceLevel; calc = (Random() & 255); - if (calc < obedienceLevel && !(gBattleMons[gBattlerAttacker].status1 & STATUS_ANY) && gBattleMons[gBattlerAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattlerAttacker].ability != ABILITY_INSOMNIA) + if (calc < obedienceLevel && !(gBattleMons[gBattlerAttacker].status1 & STATUS1_ANY) && gBattleMons[gBattlerAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBattlerAttacker].ability != ABILITY_INSOMNIA) { // try putting asleep int i; diff --git a/src/berry.c b/src/berry.c index 162615086..f1bdb5235 100644 --- a/src/berry.c +++ b/src/berry.c @@ -11,7 +11,7 @@ #include "random.h" #include "task.h" #include "text.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/items.h" #ifdef ENGLISH @@ -1072,8 +1072,8 @@ extern const u8 gSpriteImage_UnusedCherry[]; extern const u16 gSpritePalette_UnusedCherry[]; extern u8 gUnknown_Debug_839B6CE[]; -static const u8 gUnknown_Debug_083F7F84[] = _("そとから きた きのみ"); -static const u8 gUnknown_Debug_083F7F90[] = _("ただいま かいはつちゅう"); +static const u8 gUnknown_Debug_083F7F84[] = DTR("そとから きた きのみ", "An exterior BERRY"); +static const u8 gUnknown_Debug_083F7F90[] = DTR("ただいま かいはつちゅう", "Currently under development"); void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam) { @@ -1151,11 +1151,11 @@ static struct BerryTree *GetBerryTreeInfo(u8 id) // this was called because the berry script was successful: meaning the player chose to // water the tree. We need to check for the current tree stage and set the appropriate // water flag to true. -bool32 EventObjectInteractionWaterBerryTree(void) +bool32 ObjectEventInteractionWaterBerryTree(void) { // GetBerryTreeInfo does not sanitize the tree retrieved, but there are no known // instances where this can cause problems. - struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); + struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); switch (tree->stage) { @@ -1179,8 +1179,8 @@ bool32 EventObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingUnplantedSoil(void) { - if (GetEventObjectScriptPointerPlayerFacing() == S_BerryTree - && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY) + if (GetObjectEventScriptPointerPlayerFacing() == S_BerryTree + && GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY) return TRUE; else return FALSE; @@ -1188,10 +1188,10 @@ bool8 IsPlayerFacingUnplantedSoil(void) bool8 TryToWaterBerryTree(void) { - if (GetEventObjectScriptPointerPlayerFacing() != S_BerryTree) + if (GetObjectEventScriptPointerPlayerFacing() != S_BerryTree) return FALSE; else - return EventObjectInteractionWaterBerryTree(); + return ObjectEventInteractionWaterBerryTree(); } void ClearBerryTrees(void) @@ -1414,7 +1414,7 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } -void EventObjectInteractionGetBerryTreeData(void) +void ObjectEventInteractionGetBerryTreeData(void) { u8 id; u8 berry; @@ -1422,7 +1422,7 @@ void EventObjectInteractionGetBerryTreeData(void) u8 group; u8 num; - id = EventObjectGetBerryTreeId(gSelectedEventObject); + id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); localId = gSpecialVar_LastTalked; @@ -1447,25 +1447,25 @@ void Berry_FadeAndGoToBerryBagMenu(void) SetMainCallback2(CB2_ChooseBerry); } -void EventObjectInteractionPlantBerryTree(void) +void ObjectEventInteractionPlantBerryTree(void) { u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); - PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE); - EventObjectInteractionGetBerryTreeData(); + PlantBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE); + ObjectEventInteractionGetBerryTreeData(); } -void EventObjectInteractionPickBerryTree(void) +void ObjectEventInteractionPickBerryTree(void) { - u8 id = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(id); gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } -void EventObjectInteractionRemoveBerryTree(void) +void ObjectEventInteractionRemoveBerryTree(void) { - RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject)); + RemoveBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); sub_8060288(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } @@ -1494,13 +1494,13 @@ static const u8 gUnknown_Debug_083F7FD3[] = _(""); u8* DebugOpenBerryInfo(void) { - if (GetEventObjectScriptPointerPlayerFacing() != S_BerryTree) + if (GetObjectEventScriptPointerPlayerFacing() != S_BerryTree) { return NULL; } else { - u32 berryTreeId = EventObjectGetBerryTreeId(gSelectedEventObject); + u32 berryTreeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent); struct BerryTree *berryTree = GetBerryTreeInfo(berryTreeId); s32 i; @@ -1542,14 +1542,14 @@ void ResetBerryTreeSparkleFlags(void) top = cam_top + 3; right = cam_left + 14; bottom = top + 8; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + if (gObjectEvents[i].active && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) { - cam_left = gEventObjects[i].currentCoords.x; - cam_top = gEventObjects[i].currentCoords.y; + cam_left = gObjectEvents[i].currentCoords.x; + cam_top = gObjectEvents[i].currentCoords.y; if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) - ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId); + ResetBerryTreeSparkleFlag(gObjectEvents[i].trainerRange_berryTreeId); } } } diff --git a/src/berry_blender.c b/src/berry_blender.c index 70cb34809..e55a391f5 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1258,7 +1258,7 @@ static void sub_804E9F8(void) break; case 102: if (!gPaletteFade.active) - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); break; } RunTasks(); @@ -2480,7 +2480,7 @@ static void sub_8050E30(void) break; case 12: if (gReceivedRemoteLinkPlayers == 0) - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); break; } @@ -2529,7 +2529,7 @@ static void sub_80510E8(void) if (gBerryBlenderData->field_7C == 0) SetMainCallback2(DoBerryBlending); else - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } break; } @@ -3271,6 +3271,13 @@ void debug_sub_80524BC(void) SetMainCallback2(sub_8052AF8); } +// Partially fixes the clipping on longer names. +#if DEBUG_TRANSLATE && DEBUG +# define BLENDER_DEBUG_BERRY_LEN 12 +#else +# define BLENDER_DEBUG_BERRY_LEN 6 +#endif + static void BlenderDebug_PrintBerryData(void) { u8 text[128]; @@ -3294,8 +3301,8 @@ static void BlenderDebug_PrintBerryData(void) else { CopyItemName(sBlenderDebug.berries[i] + 133, &text[0]); - text[6] = CHAR_SPACE; - text[7] = EOS; + text[BLENDER_DEBUG_BERRY_LEN] = CHAR_SPACE; + text[BLENDER_DEBUG_BERRY_LEN + 1] = EOS; } var = (i * 3) + 3; Menu_PrintText(text, 2, var); @@ -3318,7 +3325,7 @@ static void BlenderDebug_PrintBerryData(void) ConvertIntToDecimalStringN(&text[15], gBerries[sBlenderDebug.berries[i]].smoothness, 2, 2); text[17] = EOS; - Menu_PrintText(text, 7, var); + Menu_PrintText(text, BLENDER_DEBUG_BERRY_LEN + 1, var); } if (sBlenderDebug.pokeblock.color != 0) { @@ -3343,7 +3350,7 @@ static void BlenderDebug_PrintBerryData(void) ConvertIntToHexStringN(&text[15], sBlenderDebug.feel, 2, 2); text[17] = EOS; - Menu_PrintText(text, 7, 17); + Menu_PrintText(text, BLENDER_DEBUG_BERRY_LEN + 1, 17); } } diff --git a/src/bike.c b/src/bike.c index b1176997b..c03926168 100644 --- a/src/bike.c +++ b/src/bike.c @@ -20,6 +20,7 @@ extern u8 gUnknown_020297ED; u8 debug_sub_805F2B0(u8); #endif +// this file's functions static void MovePlayerOnMachBike(u8, u16, u16); static u8 GetMachBikeTransition(u8 *); static void MachBikeTransition_FaceDirection(u8); @@ -54,13 +55,15 @@ static void Bike_UpdateDirTimerHistory(u8); static void Bike_UpdateABStartSelectHistory(u8); static u8 Bike_DPadToDirection(u16); static u8 get_some_collision(u8); -static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *, s16, s16, u8, u8); +static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct ObjectEvent *, s16, s16, u8, u8); static bool8 IsRunningDisallowedByMetatile(u8); static void Bike_TryAdvanceCyclingRoadCollisions(); static u8 CanBikeFaceDirOnMetatile(u8, u8); static bool8 WillPlayerCollideWithCollision(u8, u8); static void Bike_SetBikeStill(void); +// const rom data + /* A bike transition is a type of callback for the bike that actually modifies the bicycle's direction or momentum or otherwise movement. @@ -123,7 +126,7 @@ static const u8 sAcroBikeJumpTimerList[] = {4, 0}; // this is a list of history inputs to do in order to do the check to retrieve a jump direction for acro bike. it seems to be an extensible list, so its possible that Game Freak may have intended for the Acro Bike to have more complex tricks at some point. The final list only has the acro jump. static const struct BikeHistoryInputInfo sAcroBikeTricksList[] = { - // the 0xF is a mask performed with each byte of the array in order to perform the check on only the last entry of the history list, otherwise the check wouldnt work as there can be 0xF0 as opposed to 0x0F. + // the 0xF is a mask performed with each byte of the array in order to perform the check on only the last entry of the history list, otherwise the check wouldn't work as there can be 0xF0 as opposed to 0x0F. {DIR_SOUTH, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_SOUTH}, {DIR_NORTH, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_NORTH}, {DIR_WEST, B_BUTTON, 0xF, 0xF, sAcroBikeJumpTimerList, sAcroBikeJumpTimerList, DIR_WEST}, @@ -199,31 +202,31 @@ static void MachBikeTransition_FaceDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior)) { PlayerTurnInPlace(direction); Bike_SetBikeStill(); } else { - MachBikeTransition_FaceDirection(playerEventObj->facingDirection); + MachBikeTransition_FaceDirection(playerObjEvent->facingDirection); } } static void MachBikeTransition_TrySpeedUp(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; u8 collision; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == FALSE) { // we cannot go forward, so either slow down or, if we are stopped, idle face direction. if (gPlayerAvatar.bikeSpeed) - MachBikeTransition_TrySlowDown(playerEventObj->movementDirection); + MachBikeTransition_TrySlowDown(playerObjEvent->movementDirection); else - MachBikeTransition_FaceDirection(playerEventObj->movementDirection); + MachBikeTransition_FaceDirection(playerObjEvent->movementDirection); } else { @@ -383,10 +386,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; gPlayerAvatar.runningState = NOT_MOVING; if (heldKeys & B_BUTTON) @@ -395,7 +398,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 { // B button was released. gPlayerAvatar.bikeFrameCounter = 0; - if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // Go back to normal on flat ground *newDirection = direction; @@ -430,15 +433,15 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // B button was released Bike_SetBikeStill(); - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // even though B was released, dont undo the wheelie on the bumpy slope. gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; @@ -477,15 +480,15 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerFacingDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // we were moving on a wheelie, but we let go while moving. reset bike still status Bike_SetBikeStill(); - if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; @@ -531,10 +534,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->facingDirectionLocked = 0; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + playerObjEvent->facingDirectionLocked = 0; + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -552,21 +555,21 @@ static void AcroBikeTransition_FaceDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerFaceDirection(direction); } static void AcroBikeTransition_Moving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - AcroBikeTransition_FaceDirection(playerEventObj->movementDirection); + AcroBikeTransition_FaceDirection(playerObjEvent->movementDirection); return; } collision = get_some_collision(direction); @@ -585,52 +588,52 @@ static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerStartWheelie(direction); } static void AcroBikeTransition_WheelieToNormal(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerEndWheelie(direction); } static void AcroBikeTransition_WheelieIdle(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerIdleWheelie(direction); } static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerStandingHoppingWheelie(direction); } static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - AcroBikeTransition_WheelieHoppingStanding(playerEventObj->movementDirection); + AcroBikeTransition_WheelieHoppingStanding(playerObjEvent->movementDirection); return; } collision = get_some_collision(direction); - //TODO: Try to get rid of this goto + // TODO: Try to get rid of this goto if (collision == 0 || collision == 9) { goto derp; @@ -647,7 +650,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) } else { - derp: + derp: PlayerMovingHoppingWheelie(direction); } } @@ -656,7 +659,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; collision = get_some_collision(direction); if (collision != 0) @@ -674,9 +677,9 @@ static void AcroBikeTransition_SideJump(u8 direction) return; } } - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; PlaySE(SE_JITE_PYOKO); - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); } @@ -688,11 +691,11 @@ static void AcroBikeTransition_TurnJump(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerIdleWheelie(playerEventObj->movementDirection); + PlayerIdleWheelie(playerObjEvent->movementDirection); return; } collision = get_some_collision(direction); @@ -708,7 +711,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_80595DC(direction); //hit wall? @@ -722,11 +725,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerStartWheelie(playerEventObj->movementDirection); + PlayerStartWheelie(playerObjEvent->movementDirection); return; } collision = get_some_collision(direction); @@ -742,7 +745,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_80595DC(direction); //hit wall? @@ -755,20 +758,20 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) { - u8 var; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + u8 collision; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerEndWheelie(playerEventObj->movementDirection); + PlayerEndWheelie(playerObjEvent->movementDirection); return; } - var = get_some_collision(direction); - if (var > 0 && var < 12) + collision = get_some_collision(direction); + if (collision > 0 && collision < 12) { - if (var == 6) + if (collision == 6) PlayerJumpLedge(direction); - else if (var < 5 || var > 8) + else if (collision < 5 || collision > 8) PlayerEndWheelie(direction); return; } @@ -885,18 +888,18 @@ static u8 get_some_collision(u8 direction) s16 x; s16 y; u8 metatitleBehavior; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - x = playerEventObj->currentCoords.x; - y = playerEventObj->currentCoords.y; + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); - return Bike_CheckCollisionTryAdvanceCollisionCount(playerEventObj, x, y, direction, metatitleBehavior); + return Bike_CheckCollisionTryAdvanceCollisionCount(playerObjEvent, x, y, direction, metatitleBehavior); } -static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) +static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatitleBehavior) { - u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior); + u8 collision = CheckForObjectEventCollision(objectEvent, x, y, direction, metatitleBehavior); if (collision > 4) return collision; @@ -984,7 +987,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index e217de503..428d114c7 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -5,7 +5,7 @@ #include "field_effect.h" #include "fieldmap.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "rom6.h" #include "script.h" @@ -186,7 +186,7 @@ void Task_BrailleWait(u8 taskId) data[0] = 4; break; } - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); DestroyTask(taskId); ScriptContext2_Disable(); break; @@ -196,7 +196,7 @@ void Task_BrailleWait(u8 taskId) data[0] = 4; break; case 4: - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext1_SetupScript(S_OpenRegiceChamber); DestroyTask(taskId); break; diff --git a/src/cable_car.c b/src/cable_car.c index 52111b285..45e0a9cbc 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -818,15 +818,15 @@ static void LoadSprites(void) u8 i; u8 playerGraphicsIds[2] = { - EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, - EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, + OBJ_EVENT_GFX_RIVAL_MAY_NORMAL }; u16 rval = Random(); u8 hikerGraphicsIds[4] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_POOCHYENA + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_POOCHYENA }; s16 hikerCoords[2][2] = { { 0, 80 }, @@ -847,7 +847,7 @@ static void LoadSprites(void) { case 0: default: - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -871,7 +871,7 @@ static void LoadSprites(void) break; case 1: CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -902,7 +902,7 @@ static void LoadSprites(void) } if ((rval % 64) == 0) { - spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; diff --git a/src/cable_club.c b/src/cable_club.c index b030d8cc2..28bf3b759 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -940,7 +940,7 @@ void unref_sub_8083BB0(void) void sub_8083BDC(void) { - TrainerCard_ShowLinkCard(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music); + TrainerCard_ShowLinkCard(gSpecialVar_0x8006, CB2_ReturnToFieldContinueScriptPlayMapMusic); } bool32 sub_8083BF4(u8 linkPlayerIndex) diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index e4ae70c0b..760887834 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -153,7 +153,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (attackerHoldEffect == gHoldEffectToType[i][0] && type == gHoldEffectToType[i][1]) { - if (TYPE_IS_PHYSICAL(type)) + if (IS_TYPE_PHYSICAL(type)) attack = (attack * (attackerHoldEffectParam + 100)) / 100; else spAttack = (spAttack * (attackerHoldEffectParam + 100)) / 100; @@ -204,7 +204,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (gBattleMoves[gCurrentMove].effect == EFFECT_EXPLOSION) defense /= 2; - if (TYPE_IS_PHYSICAL(type)) // type < TYPE_MYSTERY + if (IS_TYPE_PHYSICAL(type)) // type < TYPE_MYSTERY { if (gCritMultiplier == 2) { @@ -232,7 +232,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de damage = damage / damageHelper; damage /= 50; - if ((attacker->status1 & STATUS_BURN) && attacker->ability != ABILITY_GUTS) + if ((attacker->status1 & STATUS1_BURN) && attacker->ability != ABILITY_GUTS) damage /= 2; if ((sideStatus & SIDE_STATUS_REFLECT) && gCritMultiplier == 1) @@ -254,7 +254,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de if (type == TYPE_MYSTERY) damage = 0; // is ??? type. does 0 damage. - if (TYPE_IS_SPECIAL(type)) // type > TYPE_MYSTERY + if (IS_TYPE_SPECIAL(type)) // type > TYPE_MYSTERY { if (gCritMultiplier == 2) { diff --git a/src/clock.c b/src/clock.c index fceccdfcb..3bea39754 100644 --- a/src/clock.c +++ b/src/clock.c @@ -1,21 +1,20 @@ #include "global.h" #include "clock.h" -#include "berry.h" -#include "dewford_trend.h" #include "event_data.h" +#include "rtc.h" +#include "time_events.h" #include "field_specials.h" -#include "field_weather.h" #include "lottery_corner.h" +#include "dewford_trend.h" +#include "tv.h" +#include "field_weather.h" +#include "berry.h" #include "main.h" #include "overworld.h" -#include "rtc.h" -#include "time_events.h" -#include "tv.h" #include "wallclock.h" -static void UpdatePerDay(struct Time *time); -static void UpdatePerMinute(struct Time *time); -static void ReturnFromStartWallClock(void); +static void UpdatePerDay(struct Time *localTime); +static void UpdatePerMinute(struct Time *localTime); void InitTimeBasedEvents(void) { @@ -35,50 +34,49 @@ void DoTimeBasedEvents(void) } } -static void UpdatePerDay(struct Time *time) +static void UpdatePerDay(struct Time *localTime) { u16 *varPtr = GetVarPointer(VAR_DAYS); int days = *varPtr; - u16 newDays; + u16 daysSince; - if (days != time->days && days <= time->days) + if (days != localTime->days && days <= localTime->days) { - newDays = time->days - days; + daysSince = localTime->days - days; ClearDailyFlags(); - UpdateDewfordTrendPerDay(newDays); - UpdateTVShowsPerDay(newDays); - UpdateWeatherPerDay(newDays); - UpdatePartyPokerusTime(newDays); - UpdateMirageRnd(newDays); - UpdateBirchState(newDays); - SetShoalItemFlag(newDays); - SetRandomLotteryNumber(newDays); - *varPtr = time->days; + UpdateDewfordTrendPerDay(daysSince); + UpdateTVShowsPerDay(daysSince); + UpdateWeatherPerDay(daysSince); + UpdatePartyPokerusTime(daysSince); + UpdateMirageRnd(daysSince); + UpdateBirchState(daysSince); + SetShoalItemFlag(daysSince); + SetRandomLotteryNumber(daysSince); + *varPtr = localTime->days; } } -static void UpdatePerMinute(struct Time *time) +static void UpdatePerMinute(struct Time *localTime) { - struct Time newTime; - s32 minutesPassed; - - CalcTimeDifference(&newTime, &gSaveBlock2.lastBerryTreeUpdate, time); - minutesPassed = 1440 * newTime.days + 60 * newTime.hours + newTime.minutes; - - if (minutesPassed == 0) // do not do the update for the first minute. - return; + struct Time difference; + int minutes; - if (minutesPassed > -1) // do not perform an update on invalid minutesPassed. + CalcTimeDifference(&difference, &gSaveBlock2.lastBerryTreeUpdate, localTime); + minutes = 24 * 60 * difference.days + 60 * difference.hours + difference.minutes; + if (minutes != 0) { - BerryTreeTimeUpdate(minutesPassed); - gSaveBlock2.lastBerryTreeUpdate = *time; + if (minutes >= 0) + { + BerryTreeTimeUpdate(minutes); + gSaveBlock2.lastBerryTreeUpdate = *localTime; + } } } static void ReturnFromStartWallClock(void) { InitTimeBasedEvents(); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void StartWallClock(void) diff --git a/src/contest.c b/src/contest.c index 54294fdfa..40afb9741 100644 --- a/src/contest.c +++ b/src/contest.c @@ -46,7 +46,7 @@ extern u8 gDisplayedStringBattle[]; extern u16 gBattleTypeFlags; extern u8 gBattlerAttacker; extern u8 gBattlerTarget; -extern u8 gBanksBySide[]; +extern u8 gBattlerPositions[]; extern u8 gBattlerSpriteIds[]; extern struct Window gUnknown_03004210; extern u32 gContestRngValue; @@ -528,10 +528,10 @@ u8 sub_80AB70C(u8 *a) CreateApplauseMeterSprite(); sub_80B0324(); sub_80B0518(); - gBanksBySide[0] = 0; - gBanksBySide[1] = 1; - gBanksBySide[2] = 3; - gBanksBySide[3] = 2; + gBattlerPositions[0] = 0; + gBattlerPositions[1] = 1; + gBattlerPositions[2] = 3; + gBattlerPositions[3] = 2; gBattleTypeFlags = 0; gBattlerAttacker = 2; gBattlerTarget = 3; @@ -2123,9 +2123,9 @@ void Contest_CreatePlayerMon(u8 partyIndex) } memcpy(gContestMons[gContestPlayerMonIndex].trainerName, name, 8); if (gSaveBlock2.playerGender == MALE) - gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_BRENDAN; + gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_BRENDAN; else - gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_MAY; + gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_MAY; gContestMons[gContestPlayerMonIndex].flags = 0; gContestMons[gContestPlayerMonIndex].unk2C[0] = 0; gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES); diff --git a/src/contest_link_80C2020.c b/src/contest_link_80C2020.c index 8269f424b..f4203dd42 100644 --- a/src/contest_link_80C2020.c +++ b/src/contest_link_80C2020.c @@ -753,7 +753,7 @@ static void sub_80C2EA0(u8 taskId) REG_BLDCNT = 0; REG_BLDY = 0; DestroyTask(taskId); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } } } diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h index 8fe9cc998..c328ac348 100644 --- a/src/data/bard_music/bard_sounds.h +++ b/src/data/bard_music/bard_sounds.h @@ -50,4 +50,4 @@ const struct BardSound (*const gBardSoundsTable[])[6] = { gBardSounds_Pokemon2 }; -#endif //GUARD_BARD_SOUNDS_TABLE_H
\ No newline at end of file +#endif //GUARD_BARD_SOUNDS_TABLE_H diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_effects/field_effect_object_graphics.h index e06fc7260..e06fc7260 100644 --- a/src/data/field_event_obj/field_effect_object_graphics.h +++ b/src/data/field_effects/field_effect_object_graphics.h diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/field_effects/field_effect_object_template_pointers.h index 682816ed9..682816ed9 100644 --- a/src/data/field_event_obj/field_effect_object_template_pointers.h +++ b/src/data/field_effects/field_effect_object_template_pointers.h diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index d5d2f2016..d5d2f2016 100644 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h deleted file mode 100644 index 69f33c393..000000000 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ /dev/null @@ -1,573 +0,0 @@ -// - -// - -#ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H -#define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H - -const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; - -const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5) -}; - -const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; - -const u8 gDeadBerryTreeGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; - -const u8 gBerryTreeGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; - -const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { - gEventObjectPicTable_CheriBerryTree, - gEventObjectPicTable_ChestoBerryTree, - gEventObjectPicTable_PechaBerryTree, - gEventObjectPicTable_RawstBerryTree, - gEventObjectPicTable_AspearBerryTree, - gEventObjectPicTable_LeppaBerryTree, - gEventObjectPicTable_OranBerryTree, - gEventObjectPicTable_PersimBerryTree, - gEventObjectPicTable_LumBerryTree, - gEventObjectPicTable_SitrusBerryTree, - gEventObjectPicTable_FigyBerryTree, - gEventObjectPicTable_WikiBerryTree, - gEventObjectPicTable_MagoBerryTree, - gEventObjectPicTable_AguavBerryTree, - gEventObjectPicTable_IapapaBerryTree, - gEventObjectPicTable_RazzBerryTree, - gEventObjectPicTable_RazzBerryTree, - gEventObjectPicTable_MagoBerryTree, - gEventObjectPicTable_WepearBerryTree, - gEventObjectPicTable_IapapaBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_KelpsyBerryTree, - gEventObjectPicTable_WepearBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_GrepaBerryTree, - gEventObjectPicTable_TamatoBerryTree, - gEventObjectPicTable_CornnBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_RabutaBerryTree, - gEventObjectPicTable_NomelBerryTree, - gEventObjectPicTable_SpelonBerryTree, - gEventObjectPicTable_PamtreBerryTree, - gEventObjectPicTable_RabutaBerryTree, - gEventObjectPicTable_DurinBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_LiechiBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_AguavBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_GrepaBerryTree, - gEventObjectPicTable_LansatBerryTree, - gEventObjectPicTable_CornnBerryTree, - gEventObjectPicTable_DurinBerryTree -}; - -const u8 *const gBerryTreePaletteSlotTablePointers[] = { - gBerryTreePaletteSlotTable_Cheri, - gBerryTreePaletteSlotTable_Chesto, - gBerryTreePaletteSlotTable_Pecha, - gBerryTreePaletteSlotTable_Rawst, - gBerryTreePaletteSlotTable_Aspear, - gBerryTreePaletteSlotTable_Leppa, - gBerryTreePaletteSlotTable_Oran, - gBerryTreePaletteSlotTable_Persim, - gBerryTreePaletteSlotTable_Lum, - gBerryTreePaletteSlotTable_Sitrus, - gBerryTreePaletteSlotTable_Figy, - gBerryTreePaletteSlotTable_Wiki, - gBerryTreePaletteSlotTable_Mago, - gBerryTreePaletteSlotTable_Aguav, - gBerryTreePaletteSlotTable_Iapapa, - gBerryTreePaletteSlotTable_Razz, - gBerryTreePaletteSlotTable_Razz, - gBerryTreePaletteSlotTable_Mago, - gBerryTreePaletteSlotTable_Wepear, - gBerryTreePaletteSlotTable_Iapapa, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Kelpsy, - gBerryTreePaletteSlotTable_Wepear, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Grepa, - gBerryTreePaletteSlotTable_Tamato, - gBerryTreePaletteSlotTable_Cornn, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Rabuta, - gBerryTreePaletteSlotTable_Nomel, - gBerryTreePaletteSlotTable_Spelon, - gBerryTreePaletteSlotTable_Pamtre, - gBerryTreePaletteSlotTable_Rabuta, - gBerryTreePaletteSlotTable_Durin, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Liechi, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Aguav, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Grepa, - gBerryTreePaletteSlotTable_Lansat, - gBerryTreePaletteSlotTable_Cornn, - gBerryTreePaletteSlotTable_Durin -}; - -const u8 *const gBerryTreeGraphicsIdTablePointers[] = { - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable -}; - -#endif //POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h deleted file mode 100644 index f1733b627..000000000 --- a/src/data/field_event_obj/event_object_anims.h +++ /dev/null @@ -1,886 +0,0 @@ -// - -// - -#ifndef POKERUBY_EVENT_OBJECT_ANIMS_H -#define POKERUBY_EVENT_OBJECT_ANIMS_H - - -const union AnimCmd gEventObjectImageAnim_83708C8[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708DC[] = { - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708E4[] = { - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708EC[] = { - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708F4[] = { - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708FC[] = { - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(3, 8, .hFlip = TRUE), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370910[] = { - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(4, 8, .hFlip = TRUE), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370924[] = { - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370938[] = { - ANIMCMD_FRAME(5, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(6, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_837094C[] = { - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370960[] = { - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(4, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370974[] = { - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370988[] = { - ANIMCMD_FRAME(5, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(6, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_837099C[] = { - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(3, 2, .hFlip = TRUE), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83709B0[] = { - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(4, 2, .hFlip = TRUE), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83709C4[] = { - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83709D8[] = { - ANIMCMD_FRAME(5, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(6, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83709EC[] = { - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(3, 1, .hFlip = TRUE), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A00[] = { - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(4, 1, .hFlip = TRUE), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A14[] = { - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A28[] = { - ANIMCMD_FRAME(5, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(6, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A3C[] = { - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A44[] = { - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A4C[] = { - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A54[] = { - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A5C[] = { - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A70[] = { - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A84[] = { - ANIMCMD_FRAME(7, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(8, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A98[] = { - ANIMCMD_FRAME(7, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(8, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AAC[] = { - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AC0[] = { - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AD4[] = { - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AE8[] = { - ANIMCMD_FRAME(7, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(8, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AFC[] = { - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B10[] = { - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B24[] = { - ANIMCMD_FRAME(7, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(8, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B38[] = { - ANIMCMD_FRAME(7, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(8, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B4C[] = { - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B60[] = { - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B74[] = { - ANIMCMD_FRAME(7, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(8, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B88[] = { - ANIMCMD_FRAME(7, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(8, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B9C[] = { - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_FRAME(13, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BB0[] = { - ANIMCMD_FRAME(14, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_FRAME(15, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BC4[] = { - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_FRAME(17, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BD8[] = { - ANIMCMD_FRAME(16, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_FRAME(17, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BEC[] = { - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(4, 8), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C04[] = { - ANIMCMD_FRAME(9, 32), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C0C[] = { - ANIMCMD_FRAME(10, 32), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C14[] = { - ANIMCMD_FRAME(11, 32), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C1C[] = { - ANIMCMD_FRAME(11, 32, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C24[] = { - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C30[] = { - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C3C[] = { - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C48[] = { - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C54[] = { - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C60[] = { - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C6C[] = { - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(20, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C78[] = { - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(20, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C84[] = { - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C90[] = { - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C9C[] = { - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CA8[] = { - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CB4[] = { - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CC0[] = { - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CCC[] = { - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CD8[] = { - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CE4[] = { - ANIMCMD_FRAME(21, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(22, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370CF8[] = { - ANIMCMD_FRAME(23, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_FRAME(24, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370D0C[] = { - ANIMCMD_FRAME(25, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_FRAME(26, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370D20[] = { - ANIMCMD_FRAME(25, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_FRAME(26, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370D34[] = { - ANIMCMD_FRAME(0, 32), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D3C[] = { - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(2, 32), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D48[] = { - ANIMCMD_FRAME(3, 48), - ANIMCMD_FRAME(4, 48), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D54[] = { - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D68[] = { - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D7C[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(9, 32), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D8C[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DA0[] = { - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DB4[] = { - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(11, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DC8[] = { - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(7, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DDC[] = { - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DF0[] = { - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E04[] = { - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(9, 6), - ANIMCMD_FRAME(8, 6), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E18[] = { - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(5, 6), - ANIMCMD_FRAME(4, 6), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E2C[] = { - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E40[] = { - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E54[] = { - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(11, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(11, 30), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370E68[] = { - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(7, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(7, 30), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370E7C[] = { - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370E90[] = { - ANIMCMD_FRAME(2, 6, .hFlip = TRUE), - ANIMCMD_FRAME(3, 6, .hFlip = TRUE), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8370EA4[] = { - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(7), - AFFINEANIMCMD_JUMP(0) -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8370ED4[] = { - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_JUMP(0) -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { - gEventObjectImageAnim_83708C8 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = { - gEventObjectImageAnim_83708DC, - gEventObjectImageAnim_83708E4, - gEventObjectImageAnim_83708EC, - gEventObjectImageAnim_83708F4, - gEventObjectImageAnim_83708FC, - gEventObjectImageAnim_8370910, - gEventObjectImageAnim_8370924, - gEventObjectImageAnim_8370938, - gEventObjectImageAnim_837094C, - gEventObjectImageAnim_8370960, - gEventObjectImageAnim_8370974, - gEventObjectImageAnim_8370988, - gEventObjectImageAnim_837099C, - gEventObjectImageAnim_83709B0, - gEventObjectImageAnim_83709C4, - gEventObjectImageAnim_83709D8, - gEventObjectImageAnim_83709EC, - gEventObjectImageAnim_8370A00, - gEventObjectImageAnim_8370A14, - gEventObjectImageAnim_8370A28 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370B9C, - gEventObjectImageAnim_8370BB0, - gEventObjectImageAnim_8370BC4, - gEventObjectImageAnim_8370BD8 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370C24, - gEventObjectImageAnim_8370C30, - gEventObjectImageAnim_8370C3C, - gEventObjectImageAnim_8370C48, - gEventObjectImageAnim_8370C54, - gEventObjectImageAnim_8370C60, - gEventObjectImageAnim_8370C6C, - gEventObjectImageAnim_8370C78, - gEventObjectImageAnim_8370C84, - gEventObjectImageAnim_8370C90, - gEventObjectImageAnim_8370C9C, - gEventObjectImageAnim_8370CA8, - gEventObjectImageAnim_8370CB4, - gEventObjectImageAnim_8370CC0, - gEventObjectImageAnim_8370CCC, - gEventObjectImageAnim_8370CD8, - gEventObjectImageAnim_8370CE4, - gEventObjectImageAnim_8370CF8, - gEventObjectImageAnim_8370D0C, - gEventObjectImageAnim_8370D20 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370C04, - gEventObjectImageAnim_8370C0C, - gEventObjectImageAnim_8370C14, - gEventObjectImageAnim_8370C1C -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370D7C -}; - -const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = { - gEventObjectImageAnim_8370BEC -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { - gEventObjectImageAnim_8370D34, - gEventObjectImageAnim_8370D3C, - gEventObjectImageAnim_8370D48, - gEventObjectImageAnim_8370D54, - gEventObjectImageAnim_8370D68 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { - gEventObjectImageAnim_83708C8, - gEventObjectImageAnim_8370D8C -}; - -const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { - gEventObjectImageAnim_83708C8, - gEventObjectImageAnim_8370DA0 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = { - gEventObjectImageAnim_8370DB4, - gEventObjectImageAnim_8370DC8, - gEventObjectImageAnim_8370DDC, - gEventObjectImageAnim_8370DF0, - gEventObjectImageAnim_8370E04, - gEventObjectImageAnim_8370E18, - gEventObjectImageAnim_8370E2C, - gEventObjectImageAnim_8370E40, - gEventObjectImageAnim_8370E54, - gEventObjectImageAnim_8370E68, - gEventObjectImageAnim_8370E7C, - gEventObjectImageAnim_8370E90 -}; - -const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = { - gEventObjectRotScalAnim_8370EA4, - gEventObjectRotScalAnim_8370ED4 -}; - -#endif //POKERUBY_EVENT_OBJECT_ANIMS_H diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h deleted file mode 100644 index 0be0be30a..000000000 --- a/src/data/field_event_obj/event_object_graphics.h +++ /dev/null @@ -1,285 +0,0 @@ -#ifndef POKERUBY_EVENT_OBJECT_GFX_H -#define POKERUBY_EVENT_OBJECT_GFX_H - -const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal.4bpp"); -const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/08.gbapal"); -const u16 NullPalette_8310F68[16] = {}; -const u16 NullPalette_8310F88[16] = {}; -const u16 NullPalette_8310FA8[16] = {}; -const u16 NullPalette_8310FC8[16] = {}; -const u16 NullPalette_8310FE8[16] = {}; -const u16 NullPalette_8311008[16] = {}; -const u16 NullPalette_8311028[16] = {}; -const u16 NullPalette_8311048[16] = {}; -const u16 NullPalette_8311068[16] = {}; -const u16 NullPalette_8311088[16] = {}; -const u16 NullPalette_83110A8[16] = {}; -const u16 NullPalette_83110C8[16] = {}; -const u16 NullPalette_83110E8[16] = {}; -const u16 NullPalette_8311108[16] = {}; -const u16 NullPalette_8311128[16] = {}; -const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/09.gbapal"); -const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/10.gbapal"); -const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); -const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); -const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); -const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); -const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); -const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); -const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); -const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/11.gbapal"); -const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal.4bpp"); -const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/17.gbapal"); -const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/18.gbapal"); -const u16 NullPalette_831B7E8[16] = {}; -const u16 NullPalette_831B808[16] = {}; -const u16 NullPalette_831B828[16] = {}; -const u16 NullPalette_831B848[16] = {}; -const u16 NullPalette_831B868[16] = {}; -const u16 NullPalette_831B888[16] = {}; -const u16 NullPalette_831B8A8[16] = {}; -const u16 NullPalette_831B8C8[16] = {}; -const u16 NullPalette_831B8E8[16] = {}; -const u16 NullPalette_831B908[16] = {}; -const u16 NullPalette_831B928[16] = {}; -const u16 NullPalette_831B948[16] = {}; -const u16 NullPalette_831B968[16] = {}; -const u16 NullPalette_831B988[16] = {}; -const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); -const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); -const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); -const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); -const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); -const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/00.gbapal"); -const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/01.gbapal"); -const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/02.gbapal"); -const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/03.gbapal"); -const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/04.gbapal"); -const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/05.gbapal"); -const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/06.gbapal"); -const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/07.gbapal"); -const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp"); -const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.4bpp"); -const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); -const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); -const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); -const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); -const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp"); -const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp"); -const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); -const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); -const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp"); -const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); -const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); -const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); -const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp"); -const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp"); -const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); -const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); -const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); -const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); -const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp"); -const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp"); -const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.4bpp"); -const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); -const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); -const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp"); -const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); -const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); -const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); -const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); -const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); -const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); -const u32 gEventObjectPic_Woman8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8.4bpp"); -const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); -const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); -const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); -const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); -const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); -const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); -const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); -const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); -const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); -const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); -const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); -const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); -const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.4bpp"); -const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); -const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); -const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); -const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); -const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); -const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); -const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); -const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); -const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); -const u32 gEventObjectPic_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp"); -const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m.4bpp"); -const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f.4bpp"); -const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m.4bpp"); -const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f.4bpp"); -const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/sidney.4bpp"); -const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe.4bpp"); -const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/glacia.4bpp"); -const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/drake.4bpp"); -const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne.4bpp"); -const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/brawly.4bpp"); -const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/wattson.4bpp"); -const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/flannery.4bpp"); -const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/norman.4bpp"); -const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/winona.4bpp"); -const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/liza.4bpp"); -const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/tate.4bpp"); -const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); -const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); -const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); -const u32 gEventObjectPic_LittleBoy3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); -const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); -const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp"); -const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); -const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/archie.4bpp"); -const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/maxie.4bpp"); -const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); -const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); -const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); -const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); -const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); -const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); -const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); -const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); -const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); -const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); -const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); -const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/22.gbapal"); -const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/23.gbapal"); -const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/24.gbapal"); -const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/25.gbapal"); -const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); -const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); -const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); -const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); -const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); -const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); -const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); -const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); -const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); -const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); -const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); -const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); -const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); -const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); -const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); -const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); -const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); -const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); -const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); -const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); -const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); -const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); -const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); -const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); -const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); -const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); -const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); -const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); -const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); -const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); -const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); -const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); -const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); -const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); -const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); -const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); -const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); -const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); -const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); -const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); -const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); -const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); -const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); -const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); -const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); -const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); -const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); -const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); -const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); -const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); -const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); -const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); -const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); -const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/26.gbapal"); -const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/14.gbapal"); -const u32 gEventObjectPic_MachokeCarryingBox[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box.4bpp"); -const u32 gEventObjectPic_MachokeFacingAway[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away.4bpp"); -const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/15.gbapal"); -const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/16.gbapal"); -const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/20.gbapal"); -const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/21.gbapal"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle.4bpp"); -const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); -const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); -const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); -const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); -const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); -const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); -const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); -const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); -const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); -const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); -const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); -const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); -const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); -const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); -const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); -const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); -const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); -const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); -const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); -const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); -const u32 gFieldEffectPic_SurfBlob[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob.4bpp"); -const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/12.gbapal"); -const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/13.gbapal"); - -#endif //POKERUBY_EVENT_OBJECT_GFX_H diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h deleted file mode 100644 index 88085980b..000000000 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ /dev/null @@ -1,227 +0,0 @@ -// - -// - -#ifndef POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H -#define POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H - -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xffff, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xffff, 0x110b, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman8 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman8, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xffff, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xffff, 0x110f, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gEventObjectSubspriteTables_CableCar, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy3 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gEventObjectSubspriteTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gEventObjectSubspriteTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kyogre, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Groudon, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xffff, 0x1116, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kyogre, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xffff, 0x1118, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Groudon, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xffff, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; - -#endif //POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h deleted file mode 100644 index d221534ad..000000000 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ /dev/null @@ -1,444 +0,0 @@ -#ifndef POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H -#define POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H - -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman8; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeCarryingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeFacingAway; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay; - -const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { - [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_BrendanNormal, - [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_BrendanMachBike, - [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_BrendanSurfing, - [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_BrendanFieldMove, - [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gEventObjectGraphicsInfo_QuintyPlump, - [EVENT_OBJ_GFX_LITTLE_BOY_1] = &gEventObjectGraphicsInfo_LittleBoy1, - [EVENT_OBJ_GFX_LITTLE_GIRL_1] = &gEventObjectGraphicsInfo_LittleGirl1, - [EVENT_OBJ_GFX_BOY_1] = &gEventObjectGraphicsInfo_Boy1, - [EVENT_OBJ_GFX_GIRL_1] = &gEventObjectGraphicsInfo_Girl1, - [EVENT_OBJ_GFX_BOY_2] = &gEventObjectGraphicsInfo_Boy2, - [EVENT_OBJ_GFX_GIRL_2] = &gEventObjectGraphicsInfo_Girl2, - [EVENT_OBJ_GFX_LITTLE_BOY_2] = &gEventObjectGraphicsInfo_LittleBoy2, - [EVENT_OBJ_GFX_LITTLE_GIRL_2] = &gEventObjectGraphicsInfo_LittleGirl2, - [EVENT_OBJ_GFX_BOY_3] = &gEventObjectGraphicsInfo_Boy3, - [EVENT_OBJ_GFX_GIRL_3] = &gEventObjectGraphicsInfo_Girl3, - [EVENT_OBJ_GFX_BOY_4] = &gEventObjectGraphicsInfo_Boy4, - [EVENT_OBJ_GFX_WOMAN_1] = &gEventObjectGraphicsInfo_Woman1, - [EVENT_OBJ_GFX_FAT_MAN] = &gEventObjectGraphicsInfo_FatMan, - [EVENT_OBJ_GFX_WOMAN_2] = &gEventObjectGraphicsInfo_Woman2, - [EVENT_OBJ_GFX_MAN_1] = &gEventObjectGraphicsInfo_Man1, - [EVENT_OBJ_GFX_WOMAN_3] = &gEventObjectGraphicsInfo_Woman3, - [EVENT_OBJ_GFX_OLD_MAN_1] = &gEventObjectGraphicsInfo_OldMan1, - [EVENT_OBJ_GFX_OLD_WOMAN_1] = &gEventObjectGraphicsInfo_OldWoman1, - [EVENT_OBJ_GFX_MAN_2] = &gEventObjectGraphicsInfo_Man2, - [EVENT_OBJ_GFX_WOMAN_4] = &gEventObjectGraphicsInfo_Woman4, - [EVENT_OBJ_GFX_MAN_3] = &gEventObjectGraphicsInfo_Man3, - [EVENT_OBJ_GFX_WOMAN_5] = &gEventObjectGraphicsInfo_Woman5, - [EVENT_OBJ_GFX_COOK] = &gEventObjectGraphicsInfo_Cook, - [EVENT_OBJ_GFX_WOMAN_6] = &gEventObjectGraphicsInfo_Woman6, - [EVENT_OBJ_GFX_OLD_MAN_2] = &gEventObjectGraphicsInfo_OldMan2, - [EVENT_OBJ_GFX_OLD_WOMAN_2] = &gEventObjectGraphicsInfo_OldWoman2, - [EVENT_OBJ_GFX_CAMPER] = &gEventObjectGraphicsInfo_Camper, - [EVENT_OBJ_GFX_PICNICKER] = &gEventObjectGraphicsInfo_Picnicker, - [EVENT_OBJ_GFX_MAN_4] = &gEventObjectGraphicsInfo_Man4, - [EVENT_OBJ_GFX_WOMAN_7] = &gEventObjectGraphicsInfo_Woman7, - [EVENT_OBJ_GFX_YOUNGSTER] = &gEventObjectGraphicsInfo_Youngster, - [EVENT_OBJ_GFX_BUG_CATCHER] = &gEventObjectGraphicsInfo_BugCatcher, - [EVENT_OBJ_GFX_PSYCHIC_M] = &gEventObjectGraphicsInfo_PsychicM, - [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gEventObjectGraphicsInfo_SchoolKidM, - [EVENT_OBJ_GFX_MANIAC] = &gEventObjectGraphicsInfo_Maniac, - [EVENT_OBJ_GFX_HEX_MANIAC] = &gEventObjectGraphicsInfo_HexManiac, - [EVENT_OBJ_GFX_WOMAN_8] = &gEventObjectGraphicsInfo_Woman8, - [EVENT_OBJ_GFX_SWIMMER_M] = &gEventObjectGraphicsInfo_SwimmerM, - [EVENT_OBJ_GFX_SWIMMER_F] = &gEventObjectGraphicsInfo_SwimmerF, - [EVENT_OBJ_GFX_BLACK_BELT] = &gEventObjectGraphicsInfo_BlackBelt, - [EVENT_OBJ_GFX_BEAUTY] = &gEventObjectGraphicsInfo_Beauty, - [EVENT_OBJ_GFX_SCIENTIST_1] = &gEventObjectGraphicsInfo_Scientist1, - [EVENT_OBJ_GFX_LASS] = &gEventObjectGraphicsInfo_Lass, - [EVENT_OBJ_GFX_GENTLEMAN] = &gEventObjectGraphicsInfo_Gentleman, - [EVENT_OBJ_GFX_SAILOR] = &gEventObjectGraphicsInfo_Sailor, - [EVENT_OBJ_GFX_FISHERMAN] = &gEventObjectGraphicsInfo_Fisherman, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_RunningTriathleteM, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_RunningTriathleteF, - [EVENT_OBJ_GFX_TUBER_F] = &gEventObjectGraphicsInfo_TuberF, - [EVENT_OBJ_GFX_TUBER_M] = &gEventObjectGraphicsInfo_TuberM, - [EVENT_OBJ_GFX_HIKER] = &gEventObjectGraphicsInfo_Hiker, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_CyclingTriathleteM, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_CyclingTriathleteF, - [EVENT_OBJ_GFX_NURSE] = &gEventObjectGraphicsInfo_Nurse, - [EVENT_OBJ_GFX_ITEM_BALL] = &gEventObjectGraphicsInfo_ItemBall, - [EVENT_OBJ_GFX_BERRY_TREE] = &gEventObjectGraphicsInfo_BerryTree, - [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gEventObjectGraphicsInfo_BerryTreeEarlyStages, - [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gEventObjectGraphicsInfo_BerryTreeLateStages, - [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_BrendanAcroBike, - [EVENT_OBJ_GFX_PROF_BIRCH] = &gEventObjectGraphicsInfo_ProfBirch, - [EVENT_OBJ_GFX_MAN_5] = &gEventObjectGraphicsInfo_Man5, - [EVENT_OBJ_GFX_MAN_6] = &gEventObjectGraphicsInfo_Man6, - [EVENT_OBJ_GFX_REPORTER_M] = &gEventObjectGraphicsInfo_ReporterM, - [EVENT_OBJ_GFX_REPORTER_F] = &gEventObjectGraphicsInfo_ReporterF, - [EVENT_OBJ_GFX_BARD] = &gEventObjectGraphicsInfo_Bard, - [EVENT_OBJ_GFX_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, - [EVENT_OBJ_GFX_TRADER] = &gEventObjectGraphicsInfo_Trader, - [EVENT_OBJ_GFX_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, - [EVENT_OBJ_GFX_GIDDY] = &gEventObjectGraphicsInfo_Giddy, - [EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - [EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, - [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gEventObjectGraphicsInfo_UnusedNatuDoll, - [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, - [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gEventObjectGraphicsInfo_UnusedSquirtleDoll, - [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gEventObjectGraphicsInfo_UnusedWooperDoll, - [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_UnusedPikachuDoll, - [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gEventObjectGraphicsInfo_UnusedPorygon2Doll, - [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gEventObjectGraphicsInfo_CuttableTree, - [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gEventObjectGraphicsInfo_MartEmployee, - [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gEventObjectGraphicsInfo_RooftopSaleWoman, - [EVENT_OBJ_GFX_TEALA] = &gEventObjectGraphicsInfo_Teala, - [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gEventObjectGraphicsInfo_BreakableRock, - [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gEventObjectGraphicsInfo_PushableBoulder, - [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gEventObjectGraphicsInfo_MrBrineysBoat, - [EVENT_OBJ_GFX_MAY_NORMAL] = &gEventObjectGraphicsInfo_MayNormal, - [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_MayMachBike, - [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_MayAcroBike, - [EVENT_OBJ_GFX_MAY_SURFING] = &gEventObjectGraphicsInfo_MaySurfing, - [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_MayFieldMove, - [EVENT_OBJ_GFX_TRUCK] = &gEventObjectGraphicsInfo_Truck, - [EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX] = &gEventObjectGraphicsInfo_MachokeCarryingBox, - [EVENT_OBJ_GFX_MACHOKE_FACING_AWAY] = &gEventObjectGraphicsInfo_MachokeFacingAway, - [EVENT_OBJ_GFX_BIRCHS_BAG] = &gEventObjectGraphicsInfo_BirchsBag, - [EVENT_OBJ_GFX_POOCHYENA] = &gEventObjectGraphicsInfo_Poochyena, - [EVENT_OBJ_GFX_ARTIST] = &gEventObjectGraphicsInfo_Artist, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_RivalBrendanNormal, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanMachBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanAcroBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_RivalBrendanSurfing, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalBrendanFieldMove, - [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gEventObjectGraphicsInfo_RivalMayNormal, - [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalMayMachBike, - [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalMayAcroBike, - [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gEventObjectGraphicsInfo_RivalMaySurfing, - [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalMayFieldMove, - [EVENT_OBJ_GFX_CAMERAMAN] = &gEventObjectGraphicsInfo_Cameraman, - [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gEventObjectGraphicsInfo_BrendanUnderwater, - [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gEventObjectGraphicsInfo_MayUnderwater, - [EVENT_OBJ_GFX_MOVING_BOX] = &gEventObjectGraphicsInfo_MovingBox, - [EVENT_OBJ_GFX_CABLE_CAR] = &gEventObjectGraphicsInfo_CableCar, - [EVENT_OBJ_GFX_SCIENTIST_2] = &gEventObjectGraphicsInfo_Scientist2, - [EVENT_OBJ_GFX_MAN_7] = &gEventObjectGraphicsInfo_Man7, - [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gEventObjectGraphicsInfo_AquaMemberM, - [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gEventObjectGraphicsInfo_AquaMemberF, - [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gEventObjectGraphicsInfo_MagmaMemberM, - [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gEventObjectGraphicsInfo_MagmaMemberF, - [EVENT_OBJ_GFX_SIDNEY] = &gEventObjectGraphicsInfo_Sidney, - [EVENT_OBJ_GFX_PHOEBE] = &gEventObjectGraphicsInfo_Phoebe, - [EVENT_OBJ_GFX_GLACIA] = &gEventObjectGraphicsInfo_Glacia, - [EVENT_OBJ_GFX_DRAKE] = &gEventObjectGraphicsInfo_Drake, - [EVENT_OBJ_GFX_ROXANNE] = &gEventObjectGraphicsInfo_Roxanne, - [EVENT_OBJ_GFX_BRAWLY] = &gEventObjectGraphicsInfo_Brawly, - [EVENT_OBJ_GFX_WATTSON] = &gEventObjectGraphicsInfo_Wattson, - [EVENT_OBJ_GFX_FLANNERY] = &gEventObjectGraphicsInfo_Flannery, - [EVENT_OBJ_GFX_NORMAN] = &gEventObjectGraphicsInfo_Norman, - [EVENT_OBJ_GFX_WINONA] = &gEventObjectGraphicsInfo_Winona, - [EVENT_OBJ_GFX_LIZA] = &gEventObjectGraphicsInfo_Liza, - [EVENT_OBJ_GFX_TATE] = &gEventObjectGraphicsInfo_Tate, - [EVENT_OBJ_GFX_WALLACE] = &gEventObjectGraphicsInfo_Wallace, - [EVENT_OBJ_GFX_STEVEN] = &gEventObjectGraphicsInfo_Steven, - [EVENT_OBJ_GFX_WALLY] = &gEventObjectGraphicsInfo_Wally, - [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gEventObjectGraphicsInfo_LittleBoy3, - [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gEventObjectGraphicsInfo_BrendanFishing, - [EVENT_OBJ_GFX_MAY_FISHING] = &gEventObjectGraphicsInfo_MayFishing, - [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gEventObjectGraphicsInfo_HotSpringsOldWoman, - [EVENT_OBJ_GFX_SS_TIDAL] = &gEventObjectGraphicsInfo_SSTidal, - [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gEventObjectGraphicsInfo_SubmarineShadow, - [EVENT_OBJ_GFX_PICHU_DOLL] = &gEventObjectGraphicsInfo_PichuDoll, - [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_PikachuDoll, - [EVENT_OBJ_GFX_MARILL_DOLL] = &gEventObjectGraphicsInfo_MarillDoll, - [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gEventObjectGraphicsInfo_TogepiDoll, - [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gEventObjectGraphicsInfo_CyndaquilDoll, - [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gEventObjectGraphicsInfo_ChikoritaDoll, - [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gEventObjectGraphicsInfo_TotodileDoll, - [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gEventObjectGraphicsInfo_JigglypuffDoll, - [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gEventObjectGraphicsInfo_MeowthDoll, - [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gEventObjectGraphicsInfo_ClefairyDoll, - [EVENT_OBJ_GFX_DITTO_DOLL] = &gEventObjectGraphicsInfo_DittoDoll, - [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gEventObjectGraphicsInfo_SmoochumDoll, - [EVENT_OBJ_GFX_TREECKO_DOLL] = &gEventObjectGraphicsInfo_TreeckoDoll, - [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gEventObjectGraphicsInfo_TorchicDoll, - [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gEventObjectGraphicsInfo_MudkipDoll, - [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gEventObjectGraphicsInfo_DuskullDoll, - [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gEventObjectGraphicsInfo_WynautDoll, - [EVENT_OBJ_GFX_BALTOY_DOLL] = &gEventObjectGraphicsInfo_BaltoyDoll, - [EVENT_OBJ_GFX_KECLEON_DOLL] = &gEventObjectGraphicsInfo_KecleonDoll, - [EVENT_OBJ_GFX_AZURILL_DOLL] = &gEventObjectGraphicsInfo_AzurillDoll, - [EVENT_OBJ_GFX_SKITTY_DOLL] = &gEventObjectGraphicsInfo_SkittyDoll, - [EVENT_OBJ_GFX_SWABLU_DOLL] = &gEventObjectGraphicsInfo_SwabluDoll, - [EVENT_OBJ_GFX_GULPIN_DOLL] = &gEventObjectGraphicsInfo_GulpinDoll, - [EVENT_OBJ_GFX_LOTAD_DOLL] = &gEventObjectGraphicsInfo_LotadDoll, - [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gEventObjectGraphicsInfo_SeedotDoll, - [EVENT_OBJ_GFX_PIKA_CUSHION] = &gEventObjectGraphicsInfo_PikaCushion, - [EVENT_OBJ_GFX_ROUND_CUSHION] = &gEventObjectGraphicsInfo_RoundCushion, - [EVENT_OBJ_GFX_KISS_CUSHION] = &gEventObjectGraphicsInfo_KissCushion, - [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gEventObjectGraphicsInfo_ZigzagCushion, - [EVENT_OBJ_GFX_SPIN_CUSHION] = &gEventObjectGraphicsInfo_SpinCushion, - [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gEventObjectGraphicsInfo_DiamondCushion, - [EVENT_OBJ_GFX_BALL_CUSHION] = &gEventObjectGraphicsInfo_BallCushion, - [EVENT_OBJ_GFX_GRASS_CUSHION] = &gEventObjectGraphicsInfo_GrassCushion, - [EVENT_OBJ_GFX_FIRE_CUSHION] = &gEventObjectGraphicsInfo_FireCushion, - [EVENT_OBJ_GFX_WATER_CUSHION] = &gEventObjectGraphicsInfo_WaterCushion, - [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gEventObjectGraphicsInfo_BigSnorlaxDoll, - [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gEventObjectGraphicsInfo_BigRhydonDoll, - [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gEventObjectGraphicsInfo_BigLaprasDoll, - [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gEventObjectGraphicsInfo_BigVenusaurDoll, - [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gEventObjectGraphicsInfo_BigCharizardDoll, - [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gEventObjectGraphicsInfo_BigBlastoiseDoll, - [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gEventObjectGraphicsInfo_BigWailmerDoll, - [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gEventObjectGraphicsInfo_BigRegirockDoll, - [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gEventObjectGraphicsInfo_BigRegiceDoll, - [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gEventObjectGraphicsInfo_BigRegisteelDoll, - [EVENT_OBJ_GFX_LATIAS] = &gEventObjectGraphicsInfo_Latias, - [EVENT_OBJ_GFX_LATIOS] = &gEventObjectGraphicsInfo_Latios, - [EVENT_OBJ_GFX_BOY_5] = &gEventObjectGraphicsInfo_Boy5, - [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gEventObjectGraphicsInfo_ContestJudge, - [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gEventObjectGraphicsInfo_BrendanWatering, - [EVENT_OBJ_GFX_MAY_WATERING] = &gEventObjectGraphicsInfo_MayWatering, - [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gEventObjectGraphicsInfo_BrendanDecorating, - [EVENT_OBJ_GFX_MAY_DECORATING] = &gEventObjectGraphicsInfo_MayDecorating, - [EVENT_OBJ_GFX_ARCHIE] = &gEventObjectGraphicsInfo_Archie, - [EVENT_OBJ_GFX_MAXIE] = &gEventObjectGraphicsInfo_Maxie, - [EVENT_OBJ_GFX_KYOGRE_1] = &gEventObjectGraphicsInfo_Kyogre1, - [EVENT_OBJ_GFX_GROUDON_1] = &gEventObjectGraphicsInfo_Groudon1, - [EVENT_OBJ_GFX_FOSSIL] = &gEventObjectGraphicsInfo_Fossil, - [EVENT_OBJ_GFX_REGIROCK] = &gEventObjectGraphicsInfo_Regirock, - [EVENT_OBJ_GFX_REGICE] = &gEventObjectGraphicsInfo_Regice, - [EVENT_OBJ_GFX_REGISTEEL] = &gEventObjectGraphicsInfo_Registeel, - [EVENT_OBJ_GFX_SKITTY] = &gEventObjectGraphicsInfo_Skitty, - [EVENT_OBJ_GFX_KECLEON_1] = &gEventObjectGraphicsInfo_Kecleon1, - [EVENT_OBJ_GFX_KYOGRE_2] = &gEventObjectGraphicsInfo_Kyogre2, - [EVENT_OBJ_GFX_GROUDON_2] = &gEventObjectGraphicsInfo_Groudon2, - [EVENT_OBJ_GFX_RAYQUAZA] = &gEventObjectGraphicsInfo_Rayquaza, - [EVENT_OBJ_GFX_ZIGZAGOON] = &gEventObjectGraphicsInfo_Zigzagoon, - [EVENT_OBJ_GFX_PIKACHU] = &gEventObjectGraphicsInfo_Pikachu, - [EVENT_OBJ_GFX_AZUMARILL] = &gEventObjectGraphicsInfo_Azumarill, - [EVENT_OBJ_GFX_WINGULL] = &gEventObjectGraphicsInfo_Wingull, - [EVENT_OBJ_GFX_KECLEON_2] = &gEventObjectGraphicsInfo_Kecleon2, - [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gEventObjectGraphicsInfo_TuberMSwimming, - [EVENT_OBJ_GFX_AZURILL] = &gEventObjectGraphicsInfo_Azurill, - [EVENT_OBJ_GFX_MOM] = &gEventObjectGraphicsInfo_Mom, - [EVENT_OBJ_GFX_LINK_BRENDAN] = &gEventObjectGraphicsInfo_LinkBrendan, - [EVENT_OBJ_GFX_LINK_MAY] = &gEventObjectGraphicsInfo_LinkMay -}; - -#endif //POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h deleted file mode 100644 index 5a21a7f57..000000000 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ /dev/null @@ -1,1879 +0,0 @@ -// - -// - -#ifndef POKERUBY_EVENT_OBJECT_PIC_TABLES_H -#define POKERUBY_EVENT_OBJECT_PIC_TABLES_H - -const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 9), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 10), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 11), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 12), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 13), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 14), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 15), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 16), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 17) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4) -}; - -const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { - overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - overworld_frame(gEventObjectPic_Man1, 2, 4, 0), - overworld_frame(gEventObjectPic_Man1, 2, 4, 1), - overworld_frame(gEventObjectPic_Man1, 2, 4, 2), - overworld_frame(gEventObjectPic_Man1, 2, 4, 3), - overworld_frame(gEventObjectPic_Man1, 2, 4, 4), - overworld_frame(gEventObjectPic_Man1, 2, 4, 5), - overworld_frame(gEventObjectPic_Man1, 2, 4, 6), - overworld_frame(gEventObjectPic_Man1, 2, 4, 7), - overworld_frame(gEventObjectPic_Man1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - overworld_frame(gEventObjectPic_Man2, 2, 4, 0), - overworld_frame(gEventObjectPic_Man2, 2, 4, 1), - overworld_frame(gEventObjectPic_Man2, 2, 4, 2), - overworld_frame(gEventObjectPic_Man2, 2, 4, 3), - overworld_frame(gEventObjectPic_Man2, 2, 4, 4), - overworld_frame(gEventObjectPic_Man2, 2, 4, 5), - overworld_frame(gEventObjectPic_Man2, 2, 4, 6), - overworld_frame(gEventObjectPic_Man2, 2, 4, 7), - overworld_frame(gEventObjectPic_Man2, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - overworld_frame(gEventObjectPic_Man3, 2, 4, 0), - overworld_frame(gEventObjectPic_Man3, 2, 4, 1), - overworld_frame(gEventObjectPic_Man3, 2, 4, 2), - overworld_frame(gEventObjectPic_Man3, 2, 4, 3), - overworld_frame(gEventObjectPic_Man3, 2, 4, 4), - overworld_frame(gEventObjectPic_Man3, 2, 4, 5), - overworld_frame(gEventObjectPic_Man3, 2, 4, 6), - overworld_frame(gEventObjectPic_Man3, 2, 4, 7), - overworld_frame(gEventObjectPic_Man3, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { - overworld_frame(gEventObjectPic_Woman6, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - overworld_frame(gEventObjectPic_Camper, 2, 4, 0), - overworld_frame(gEventObjectPic_Camper, 2, 4, 1), - overworld_frame(gEventObjectPic_Camper, 2, 4, 2), - overworld_frame(gEventObjectPic_Camper, 2, 4, 3), - overworld_frame(gEventObjectPic_Camper, 2, 4, 4), - overworld_frame(gEventObjectPic_Camper, 2, 4, 5), - overworld_frame(gEventObjectPic_Camper, 2, 4, 6), - overworld_frame(gEventObjectPic_Camper, 2, 4, 7), - overworld_frame(gEventObjectPic_Camper, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - overworld_frame(gEventObjectPic_Man4, 2, 4, 0), - overworld_frame(gEventObjectPic_Man4, 2, 4, 1), - overworld_frame(gEventObjectPic_Man4, 2, 4, 2), - overworld_frame(gEventObjectPic_Man4, 2, 4, 3), - overworld_frame(gEventObjectPic_Man4, 2, 4, 4), - overworld_frame(gEventObjectPic_Man4, 2, 4, 5), - overworld_frame(gEventObjectPic_Man4, 2, 4, 6), - overworld_frame(gEventObjectPic_Man4, 2, 4, 7), - overworld_frame(gEventObjectPic_Man4, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { - overworld_frame(gEventObjectPic_Woman7, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman8[] = { - overworld_frame(gEventObjectPic_Woman8, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - overworld_frame(gEventObjectPic_Lass, 2, 4, 0), - overworld_frame(gEventObjectPic_Lass, 2, 4, 1), - overworld_frame(gEventObjectPic_Lass, 2, 4, 2), - overworld_frame(gEventObjectPic_Lass, 2, 4, 3), - overworld_frame(gEventObjectPic_Lass, 2, 4, 4), - overworld_frame(gEventObjectPic_Lass, 2, 4, 5), - overworld_frame(gEventObjectPic_Lass, 2, 4, 6), - overworld_frame(gEventObjectPic_Lass, 2, 4, 7), - overworld_frame(gEventObjectPic_Lass, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 4), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 5), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 6), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 7), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 8), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 9) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - overworld_frame(gEventObjectPic_ItemBall, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - overworld_frame(gEventObjectPic_Man5, 2, 4, 0), - overworld_frame(gEventObjectPic_Man5, 2, 4, 1), - overworld_frame(gEventObjectPic_Man5, 2, 4, 2), - overworld_frame(gEventObjectPic_Man5, 2, 4, 3), - overworld_frame(gEventObjectPic_Man5, 2, 4, 4), - overworld_frame(gEventObjectPic_Man5, 2, 4, 5), - overworld_frame(gEventObjectPic_Man5, 2, 4, 6), - overworld_frame(gEventObjectPic_Man5, 2, 4, 7), - overworld_frame(gEventObjectPic_Man5, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { - overworld_frame(gEventObjectPic_Man6, 2, 4, 0), - overworld_frame(gEventObjectPic_Man6, 2, 4, 1), - overworld_frame(gEventObjectPic_Man6, 2, 4, 2), - overworld_frame(gEventObjectPic_Man6, 2, 4, 3), - overworld_frame(gEventObjectPic_Man6, 2, 4, 4), - overworld_frame(gEventObjectPic_Man6, 2, 4, 5), - overworld_frame(gEventObjectPic_Man6, 2, 4, 6), - overworld_frame(gEventObjectPic_Man6, 2, 4, 7), - overworld_frame(gEventObjectPic_Man6, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { - overworld_frame(gEventObjectPic_UnusedNatuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - overworld_frame(gEventObjectPic_UnusedMagnemiteDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - overworld_frame(gEventObjectPic_UnusedSquirtleDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - overworld_frame(gEventObjectPic_UnusedWooperDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - overworld_frame(gEventObjectPic_UnusedPikachuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - overworld_frame(gEventObjectPic_UnusedPorygon2Doll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - overworld_frame(gEventObjectPic_Teala, 2, 4, 0), - overworld_frame(gEventObjectPic_Teala, 2, 4, 1), - overworld_frame(gEventObjectPic_Teala, 2, 4, 2), - overworld_frame(gEventObjectPic_Teala, 2, 4, 3), - overworld_frame(gEventObjectPic_Teala, 2, 4, 4), - overworld_frame(gEventObjectPic_Teala, 2, 4, 5), - overworld_frame(gEventObjectPic_Teala, 2, 4, 6), - overworld_frame(gEventObjectPic_Teala, 2, 4, 7), - overworld_frame(gEventObjectPic_Teala, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { - overworld_frame(gEventObjectPic_PushableBoulder, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { - overworld_frame(gEventObjectPic_Truck, 6, 6, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MachokeCarryingBox[] = { - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MachokeFacingAway[] = { - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - overworld_frame(gEventObjectPic_BirchsBag, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - overworld_frame(gEventObjectPic_Artist, 2, 4, 0), - overworld_frame(gEventObjectPic_Artist, 2, 4, 1), - overworld_frame(gEventObjectPic_Artist, 2, 4, 2), - overworld_frame(gEventObjectPic_Artist, 2, 4, 3), - overworld_frame(gEventObjectPic_Artist, 2, 4, 4), - overworld_frame(gEventObjectPic_Artist, 2, 4, 5), - overworld_frame(gEventObjectPic_Artist, 2, 4, 6), - overworld_frame(gEventObjectPic_Artist, 2, 4, 7), - overworld_frame(gEventObjectPic_Artist, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 9), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 10), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 11), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 12), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 13), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 14), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 15), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 16), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 17) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { - overworld_frame(gEventObjectPic_MovingBox, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - overworld_frame(gEventObjectPic_CableCar, 8, 8, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { - overworld_frame(gEventObjectPic_Man7, 2, 4, 0), - overworld_frame(gEventObjectPic_Man7, 2, 4, 1), - overworld_frame(gEventObjectPic_Man7, 2, 4, 2), - overworld_frame(gEventObjectPic_Man7, 2, 4, 3), - overworld_frame(gEventObjectPic_Man7, 2, 4, 4), - overworld_frame(gEventObjectPic_Man7, 2, 4, 5), - overworld_frame(gEventObjectPic_Man7, 2, 4, 6), - overworld_frame(gEventObjectPic_Man7, 2, 4, 7), - overworld_frame(gEventObjectPic_Man7, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - overworld_frame(gEventObjectPic_Norman, 2, 4, 0), - overworld_frame(gEventObjectPic_Norman, 2, 4, 1), - overworld_frame(gEventObjectPic_Norman, 2, 4, 2), - overworld_frame(gEventObjectPic_Norman, 2, 4, 3), - overworld_frame(gEventObjectPic_Norman, 2, 4, 4), - overworld_frame(gEventObjectPic_Norman, 2, 4, 5), - overworld_frame(gEventObjectPic_Norman, 2, 4, 6), - overworld_frame(gEventObjectPic_Norman, 2, 4, 7), - overworld_frame(gEventObjectPic_Norman, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - overworld_frame(gEventObjectPic_Steven, 2, 4, 0), - overworld_frame(gEventObjectPic_Steven, 2, 4, 1), - overworld_frame(gEventObjectPic_Steven, 2, 4, 2), - overworld_frame(gEventObjectPic_Steven, 2, 4, 3), - overworld_frame(gEventObjectPic_Steven, 2, 4, 4), - overworld_frame(gEventObjectPic_Steven, 2, 4, 5), - overworld_frame(gEventObjectPic_Steven, 2, 4, 6), - overworld_frame(gEventObjectPic_Steven, 2, 4, 7), - overworld_frame(gEventObjectPic_Steven, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - overworld_frame(gEventObjectPic_Wally, 2, 4, 0), - overworld_frame(gEventObjectPic_Wally, 2, 4, 1), - overworld_frame(gEventObjectPic_Wally, 2, 4, 2), - overworld_frame(gEventObjectPic_Wally, 2, 4, 3), - overworld_frame(gEventObjectPic_Wally, 2, 4, 4), - overworld_frame(gEventObjectPic_Wally, 2, 4, 5), - overworld_frame(gEventObjectPic_Wally, 2, 4, 6), - overworld_frame(gEventObjectPic_Wally, 2, 4, 7), - overworld_frame(gEventObjectPic_Wally, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy3[] = { - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11) -}; - -const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - overworld_frame(gEventObjectPic_PichuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - overworld_frame(gEventObjectPic_PikachuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - overworld_frame(gEventObjectPic_MarillDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - overworld_frame(gEventObjectPic_TogepiDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - overworld_frame(gEventObjectPic_CyndaquilDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - overworld_frame(gEventObjectPic_ChikoritaDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - overworld_frame(gEventObjectPic_TotodileDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - overworld_frame(gEventObjectPic_JigglypuffDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - overworld_frame(gEventObjectPic_MeowthDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - overworld_frame(gEventObjectPic_ClefairyDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - overworld_frame(gEventObjectPic_DittoDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - overworld_frame(gEventObjectPic_SmoochumDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - overworld_frame(gEventObjectPic_TreeckoDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - overworld_frame(gEventObjectPic_TorchicDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - overworld_frame(gEventObjectPic_MudkipDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - overworld_frame(gEventObjectPic_DuskullDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - overworld_frame(gEventObjectPic_WynautDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - overworld_frame(gEventObjectPic_BaltoyDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - overworld_frame(gEventObjectPic_KecleonDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - overworld_frame(gEventObjectPic_AzurillDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - overworld_frame(gEventObjectPic_SkittyDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - overworld_frame(gEventObjectPic_SwabluDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - overworld_frame(gEventObjectPic_GulpinDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - overworld_frame(gEventObjectPic_LotadDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - overworld_frame(gEventObjectPic_SeedotDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - overworld_frame(gEventObjectPic_PikaCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - overworld_frame(gEventObjectPic_RoundCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - overworld_frame(gEventObjectPic_KissCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - overworld_frame(gEventObjectPic_ZigzagCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - overworld_frame(gEventObjectPic_SpinCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - overworld_frame(gEventObjectPic_DiamondCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - overworld_frame(gEventObjectPic_BallCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - overworld_frame(gEventObjectPic_GrassCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - overworld_frame(gEventObjectPic_FireCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - overworld_frame(gEventObjectPic_WaterCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - overworld_frame(gEventObjectPic_BigSnorlaxDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - overworld_frame(gEventObjectPic_BigRhydonDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - overworld_frame(gEventObjectPic_BigLaprasDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - overworld_frame(gEventObjectPic_BigVenusaurDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - overworld_frame(gEventObjectPic_BigCharizardDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - overworld_frame(gEventObjectPic_BigBlastoiseDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - overworld_frame(gEventObjectPic_BigWailmerDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - overworld_frame(gEventObjectPic_BigRegirockDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - overworld_frame(gEventObjectPic_BigRegiceDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - overworld_frame(gEventObjectPic_BigRegisteelDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { - overworld_frame(gEventObjectPic_BrendanDecorating, 2, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - overworld_frame(gEventObjectPic_MayDecorating, 2, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - overworld_frame(gEventObjectPic_Archie, 2, 4, 0), - overworld_frame(gEventObjectPic_Archie, 2, 4, 1), - overworld_frame(gEventObjectPic_Archie, 2, 4, 2), - overworld_frame(gEventObjectPic_Archie, 2, 4, 3), - overworld_frame(gEventObjectPic_Archie, 2, 4, 4), - overworld_frame(gEventObjectPic_Archie, 2, 4, 5), - overworld_frame(gEventObjectPic_Archie, 2, 4, 6), - overworld_frame(gEventObjectPic_Archie, 2, 4, 7), - overworld_frame(gEventObjectPic_Archie, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kyogre[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Groudon[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { - overworld_frame(gEventObjectPic_Fossil, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - overworld_frame(gEventObjectPic_Mom, 2, 4, 0), - overworld_frame(gEventObjectPic_Mom, 2, 4, 1), - overworld_frame(gEventObjectPic_Mom, 2, 4, 2), - overworld_frame(gEventObjectPic_Mom, 2, 4, 3), - overworld_frame(gEventObjectPic_Mom, 2, 4, 4), - overworld_frame(gEventObjectPic_Mom, 2, 4, 5), - overworld_frame(gEventObjectPic_Mom, 2, 4, 6), - overworld_frame(gEventObjectPic_Mom, 2, 4, 7), - overworld_frame(gEventObjectPic_Mom, 2, 4, 8), -}; - -#endif //POKERUBY_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/graphics.c b/src/data/graphics.c index 20d8f91d0..9cb0a83d6 100644 --- a/src/data/graphics.c +++ b/src/data/graphics.c @@ -10,10 +10,18 @@ const u8 gMonBackPic_CircledQuestionMark[] = INCBIN_U8("graphics/pokemon/circled const u16 gMonPalette_CircledQuestionMark[] = INCBIN_U16("graphics/pokemon/circled_question_mark/normal.gbapal.lz"); const u16 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U16("graphics/pokemon/circled_question_mark/shiny.gbapal.lz"); -// japanese table and bunch of stuff -const u8 gUnusedOldCharmap_Gfx_lz[] = INCBIN_U8("graphics/unused/old_charmap.4bpp.lz"); -const u8 gUnusedOldCharmap_Tilemap_lz[] = INCBIN_U8("graphics/unused/old_charmap.bin.lz"); -const u16 gUnusedOldCharmap_Pal_lz[] = INCBIN_U16("graphics/unused/old_charmap.gbapal.lz"); +// The test menu debug battle tileset. This uses the old Crystal charmap and +// rendering method (it uses tiles instead of text). +// Oddly, the English version is in Japanese and the German version is in English. +#if DEBUG_TRANSLATE || GERMAN +const u8 gDebugBattleCharmap_Gfx_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_en.4bpp.lz"); +const u8 gDebugBattleCharmap_Tilemap_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_en.bin.lz"); +const u8 gDebugBattleCharmap_Pal_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_en.gbapal.lz"); +#else +const u8 gDebugBattleCharmap_Gfx_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_jp.4bpp.lz"); +const u8 gDebugBattleCharmap_Tilemap_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_jp.bin.lz"); +const u8 gDebugBattleCharmap_Pal_lz[] = INCBIN_U8("graphics/debug/debug_battle_charmap_jp.gbapal.lz"); +#endif const u8 gSmokescreenImpactTiles[] = INCBIN_U8("graphics/battle_anims/sprites/smokescreen_impact.4bpp.lz"); const u16 gSmokescreenImpactPalette[] = INCBIN_U16("graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"); diff --git a/src/data/field_event_obj/base_oam.h b/src/data/object_events/base_oam.h index 49c14e8c2..49c14e8c2 100644 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/object_events/base_oam.h diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h new file mode 100644 index 000000000..d2d7d6c09 --- /dev/null +++ b/src/data/object_events/berry_tree_graphics_tables.h @@ -0,0 +1,573 @@ +// + +// + +#ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H +#define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H + +const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_KelpsyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_WepearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_IapapaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_CheriBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_FigyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_MagoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LumBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_RazzBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_GrepaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RabutaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_NomelBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LeppaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LiechiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_HondewBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_AguavBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_WikiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PomegBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RawstBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_SpelonBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_ChestoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_OranBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_PersimBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_SitrusBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_AspearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PamtreBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_CornnBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_LansatBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_DurinBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5) +}; + +const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; + +const u8 gDeadBerryTreeGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; + +const u8 gBerryTreeGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES}; + +const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { + gObjectEventPicTable_CheriBerryTree, + gObjectEventPicTable_ChestoBerryTree, + gObjectEventPicTable_PechaBerryTree, + gObjectEventPicTable_RawstBerryTree, + gObjectEventPicTable_AspearBerryTree, + gObjectEventPicTable_LeppaBerryTree, + gObjectEventPicTable_OranBerryTree, + gObjectEventPicTable_PersimBerryTree, + gObjectEventPicTable_LumBerryTree, + gObjectEventPicTable_SitrusBerryTree, + gObjectEventPicTable_FigyBerryTree, + gObjectEventPicTable_WikiBerryTree, + gObjectEventPicTable_MagoBerryTree, + gObjectEventPicTable_AguavBerryTree, + gObjectEventPicTable_IapapaBerryTree, + gObjectEventPicTable_RazzBerryTree, + gObjectEventPicTable_RazzBerryTree, + gObjectEventPicTable_MagoBerryTree, + gObjectEventPicTable_WepearBerryTree, + gObjectEventPicTable_IapapaBerryTree, + gObjectEventPicTable_PomegBerryTree, + gObjectEventPicTable_KelpsyBerryTree, + gObjectEventPicTable_WepearBerryTree, + gObjectEventPicTable_HondewBerryTree, + gObjectEventPicTable_GrepaBerryTree, + gObjectEventPicTable_TamatoBerryTree, + gObjectEventPicTable_CornnBerryTree, + gObjectEventPicTable_PomegBerryTree, + gObjectEventPicTable_RabutaBerryTree, + gObjectEventPicTable_NomelBerryTree, + gObjectEventPicTable_SpelonBerryTree, + gObjectEventPicTable_PamtreBerryTree, + gObjectEventPicTable_RabutaBerryTree, + gObjectEventPicTable_DurinBerryTree, + gObjectEventPicTable_HondewBerryTree, + gObjectEventPicTable_LiechiBerryTree, + gObjectEventPicTable_HondewBerryTree, + gObjectEventPicTable_AguavBerryTree, + gObjectEventPicTable_PomegBerryTree, + gObjectEventPicTable_GrepaBerryTree, + gObjectEventPicTable_LansatBerryTree, + gObjectEventPicTable_CornnBerryTree, + gObjectEventPicTable_DurinBerryTree +}; + +const u8 *const gBerryTreePaletteSlotTablePointers[] = { + gBerryTreePaletteSlotTable_Cheri, + gBerryTreePaletteSlotTable_Chesto, + gBerryTreePaletteSlotTable_Pecha, + gBerryTreePaletteSlotTable_Rawst, + gBerryTreePaletteSlotTable_Aspear, + gBerryTreePaletteSlotTable_Leppa, + gBerryTreePaletteSlotTable_Oran, + gBerryTreePaletteSlotTable_Persim, + gBerryTreePaletteSlotTable_Lum, + gBerryTreePaletteSlotTable_Sitrus, + gBerryTreePaletteSlotTable_Figy, + gBerryTreePaletteSlotTable_Wiki, + gBerryTreePaletteSlotTable_Mago, + gBerryTreePaletteSlotTable_Aguav, + gBerryTreePaletteSlotTable_Iapapa, + gBerryTreePaletteSlotTable_Razz, + gBerryTreePaletteSlotTable_Razz, + gBerryTreePaletteSlotTable_Mago, + gBerryTreePaletteSlotTable_Wepear, + gBerryTreePaletteSlotTable_Iapapa, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Kelpsy, + gBerryTreePaletteSlotTable_Wepear, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Grepa, + gBerryTreePaletteSlotTable_Tamato, + gBerryTreePaletteSlotTable_Cornn, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Rabuta, + gBerryTreePaletteSlotTable_Nomel, + gBerryTreePaletteSlotTable_Spelon, + gBerryTreePaletteSlotTable_Pamtre, + gBerryTreePaletteSlotTable_Rabuta, + gBerryTreePaletteSlotTable_Durin, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Liechi, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Aguav, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Grepa, + gBerryTreePaletteSlotTable_Lansat, + gBerryTreePaletteSlotTable_Cornn, + gBerryTreePaletteSlotTable_Durin +}; + +const u8 *const gBerryTreeGraphicsIdTablePointers[] = { + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable +}; + +#endif //POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index 61871a2ca..07182a638 100644 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -1,378 +1,378 @@ #ifndef POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H #define POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); - -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *); - -u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PauseSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay1_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay2_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay4_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay16_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WaitSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FacePlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetInvisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetVisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); + +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); + +u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { gMovementActionFuncs_FaceDown, // MOVEMENT_ACTION_FACE_DOWN gMovementActionFuncs_FaceUp, // MOVEMENT_ACTION_FACE_UP gMovementActionFuncs_FaceLeft, // MOVEMENT_ACTION_FACE_LEFT @@ -514,22 +514,22 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) }; -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceDown_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceUp_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceLeft_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceRight_Step0, MovementAction_PauseSpriteAnim }; @@ -542,49 +542,49 @@ u8 (*const gUnknown_083759C0[])(u8) = { GetMoveDirectionFastestAnimNum }; -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDown_Step0, MovementAction_WalkSlowDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowUp_Step0, MovementAction_WalkSlowUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowLeft_Step0, MovementAction_WalkSlowLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowRight_Step0, MovementAction_WalkSlowRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDown_Step0, MovementAction_WalkNormalDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalUp_Step0, MovementAction_WalkNormalUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalLeft_Step0, MovementAction_WalkNormalLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalRight_Step0, MovementAction_WalkNormalRight_Step1, MovementAction_PauseSpriteAnim @@ -593,761 +593,761 @@ u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct const s16 gUnknown_08375A34[] = {0, 1, 1}; const s16 gUnknown_08375A3A[] = {0, 0, 1}; -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Down_Step0, MovementAction_Jump2Down_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Up_Step0, MovementAction_Jump2Up_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Left_Step0, MovementAction_Jump2Left_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Right_Step0, MovementAction_Jump2Right_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay1_Step0, MovementAction_Delay_Step1, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay2_Step0, MovementAction_Delay_Step1, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay4_Step0, MovementAction_Delay_Step1, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay8_Step0, MovementAction_Delay_Step1, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay16_Step0, MovementAction_Delay_Step1, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastDown_Step0, MovementAction_WalkFastDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastUp_Step0, MovementAction_WalkFastUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastLeft_Step0, MovementAction_WalkFastLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastRight_Step0, MovementAction_WalkFastRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowDown_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowUp_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowLeft_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowRight_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentDown_Step0, MovementAction_RideWaterCurrentDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentUp_Step0, MovementAction_RideWaterCurrentUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentLeft_Step0, MovementAction_RideWaterCurrentLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentRight_Step0, MovementAction_RideWaterCurrentRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestDown_Step0, MovementAction_WalkFastestDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestUp_Step0, MovementAction_WalkFastestUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestLeft_Step0, MovementAction_WalkFastestLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestRight_Step0, MovementAction_WalkFastestRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideDown_Step0, MovementAction_SlideDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideUp_Step0, MovementAction_SlideUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideLeft_Step0, MovementAction_SlideLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideRight_Step0, MovementAction_SlideRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunDown_Step0, MovementAction_PlayerRunDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunUp_Step0, MovementAction_PlayerRunUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunLeft_Step0, MovementAction_PlayerRunLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunRight_Step0, MovementAction_PlayerRunRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StartAnimInDirection_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialDown_Step0, MovementAction_JumpSpecialDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialUp_Step0, MovementAction_JumpSpecialUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialLeft_Step0, MovementAction_JumpSpecialLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialRight_Step0, MovementAction_JumpSpecialRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FacePlayer_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceAwayPlayer_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_LockFacingDirection_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnlockFacingDirection_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpDown_Step0, MovementAction_JumpDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpUp_Step0, MovementAction_JumpUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpLeft_Step0, MovementAction_JumpLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpRight_Step0, MovementAction_JumpRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDown_Step0, MovementAction_JumpInPlaceDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUp_Step0, MovementAction_JumpInPlaceUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeft_Step0, MovementAction_JumpInPlaceLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRight_Step0, MovementAction_JumpInPlaceRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDownUp_Step0, MovementAction_JumpInPlaceDownUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUpDown_Step0, MovementAction_JumpInPlaceUpDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeftRight_Step0, MovementAction_JumpInPlaceLeftRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRightLeft_Step0, MovementAction_JumpInPlaceRightLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceOriginalDirection_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_NurseJoyBowDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EnableJumpLandingGroundEffect_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableJumpLandingGroundEffect_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableAnimation_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RestoreAnimation_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetInvisible_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetVisible_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteExclamationMark_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteQuestionMark_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteHeart_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RevealTrainer_Step0, MovementAction_RevealTrainer_Step1, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RockSmashBreak_Step0, MovementAction_RockSmashBreak_Step1, MovementAction_RockSmashBreak_Step2, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_CutTree_Step0, MovementAction_CutTree_Step1, MovementAction_CutTree_Step2, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetFixedPriority_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearFixedPriority_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_InitAffineAnim_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearAffineAnim_Step0, MovementAction_Finish }; -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownStartAffine_Step0, MovementAction_WalkDownStartAffine_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownAffine_Step0, MovementAction_WalkDownAffine_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceDown_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceUp_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceLeft_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceRight_Step0, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceDown_Step0, MovementAction_AcroWheelieHopFaceDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceUp_Step0, MovementAction_AcroWheelieHopFaceUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceLeft_Step0, MovementAction_AcroWheelieHopFaceLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceRight_Step0, MovementAction_AcroWheelieHopFaceRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopDown_Step0, MovementAction_AcroWheelieHopDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopUp_Step0, MovementAction_AcroWheelieHopUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopLeft_Step0, MovementAction_AcroWheelieHopLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopRight_Step0, MovementAction_AcroWheelieHopRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpDown_Step0, MovementAction_AcroWheelieJumpDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpUp_Step0, MovementAction_AcroWheelieJumpUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpLeft_Step0, MovementAction_AcroWheelieJumpLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpRight_Step0, MovementAction_AcroWheelieJumpRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveDown_Step0, MovementAction_AcroPopWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveUp_Step0, MovementAction_AcroPopWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveLeft_Step0, MovementAction_AcroPopWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveRight_Step0, MovementAction_AcroPopWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveDown_Step0, MovementAction_AcroWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveUp_Step0, MovementAction_AcroWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveLeft_Step0, MovementAction_AcroWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveRight_Step0, MovementAction_AcroWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveDown_Step0, MovementAction_AcroEndWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveUp_Step0, MovementAction_AcroEndWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveLeft_Step0, MovementAction_AcroEndWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveRight_Step0, MovementAction_AcroEndWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/object_events/movement_type_func_tables.h index b038d5b20..b89c00b6e 100644 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/object_events/movement_type_func_tables.h @@ -1,7 +1,7 @@ #ifndef POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H #define POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H -u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderAround_Step0, MovementType_WanderAround_Step1, MovementType_WanderAround_Step2, @@ -27,7 +27,7 @@ u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = { GetLimitedVectorDirection_SouthWestEast }; -u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_LookAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_LookAround_Step0, MovementType_LookAround_Step1, MovementType_LookAround_Step2, @@ -35,7 +35,7 @@ u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite MovementType_LookAround_Step4, }; -u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderUpAndDown_Step0, MovementType_WanderUpAndDown_Step1, MovementType_WanderUpAndDown_Step2, @@ -47,7 +47,7 @@ u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sp const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderLeftAndRight_Step0, MovementType_WanderLeftAndRight_Step1, MovementType_WanderLeftAndRight_Step2, @@ -59,13 +59,13 @@ u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDirection_Step0, MovementType_FaceDirection_Step1, MovementType_FaceDirection_Step2, }; -u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_BerryTreeGrowth_Step0, MovementType_BerryTreeGrowth_Step1, MovementType_BerryTreeGrowth_Step2, @@ -73,7 +73,7 @@ u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sp MovementType_BerryTreeGrowth_Step4, }; -u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndUp_Step0, MovementType_FaceDownAndUp_Step1, MovementType_FaceDownAndUp_Step2, @@ -81,7 +81,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Spri MovementType_FaceDownAndUp_Step4, }; -u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceLeftAndRight_Step0, MovementType_FaceLeftAndRight_Step1, MovementType_FaceLeftAndRight_Step2, @@ -89,7 +89,7 @@ u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct S MovementType_FaceLeftAndRight_Step4, }; -u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndLeft_Step0, MovementType_FaceUpAndLeft_Step1, MovementType_FaceUpAndLeft_Step2, @@ -99,7 +99,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Spri const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndRight_Step0, MovementType_FaceUpAndRight_Step1, MovementType_FaceUpAndRight_Step2, @@ -109,7 +109,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Spr const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndLeft_Step0, MovementType_FaceDownAndLeft_Step1, MovementType_FaceDownAndLeft_Step2, @@ -119,7 +119,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sp const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndRight_Step0, MovementType_FaceDownAndRight_Step1, MovementType_FaceDownAndRight_Step2, @@ -129,7 +129,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct S const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndLeft_Step0, MovementType_FaceDownUpAndLeft_Step1, MovementType_FaceDownUpAndLeft_Step2, @@ -139,7 +139,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndRight_Step0, MovementType_FaceDownUpAndRight_Step1, MovementType_FaceDownUpAndRight_Step2, @@ -149,7 +149,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpLeftAndRight_Step0, MovementType_FaceUpLeftAndRight_Step1, MovementType_FaceUpLeftAndRight_Step2, @@ -159,7 +159,7 @@ u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownLeftAndRight_Step0, MovementType_FaceDownLeftAndRight_Step1, MovementType_FaceDownLeftAndRight_Step2, @@ -169,7 +169,7 @@ u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, stru const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateCounterclockwise_Step0, MovementType_RotateCounterclockwise_Step1, MovementType_RotateCounterclockwise_Step2, @@ -178,7 +178,7 @@ u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, st const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateClockwise_Step0, MovementType_RotateClockwise_Step1, MovementType_RotateClockwise_Step2, @@ -187,14 +187,14 @@ u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sp const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkBackAndForth_Step0, MovementType_WalkBackAndForth_Step1, MovementType_WalkBackAndForth_Step2, MovementType_WalkBackAndForth_Step3, }; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightLeftDown_Step1, MovementType_WalkSequence_Step2 @@ -202,7 +202,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftDownUp_Step1, MovementType_WalkSequence_Step2 @@ -210,7 +210,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpRightLeft_Step1, MovementType_WalkSequence_Step2 @@ -218,7 +218,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownUpRight_Step1, MovementType_WalkSequence_Step2 @@ -226,7 +226,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftRightDown_Step1, MovementType_WalkSequence_Step2 @@ -234,7 +234,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightDownUp_Step1, MovementType_WalkSequence_Step2 @@ -242,13 +242,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpLeftRight_Step1, MovementType_WalkSequence_Step2 }; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownUpLeft_Step1, MovementType_WalkSequence_Step2 @@ -256,7 +256,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpDownRight_Step1, MovementType_WalkSequence_Step2 @@ -264,7 +264,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownRightLeft_Step1, MovementType_WalkSequence_Step2 @@ -272,7 +272,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftUpDown_Step1, MovementType_WalkSequence_Step2 @@ -280,7 +280,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightLeftUp_Step1, MovementType_WalkSequence_Step2 @@ -288,7 +288,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpDownLeft_Step1, MovementType_WalkSequence_Step2 @@ -296,7 +296,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownLeftRight_Step1, MovementType_WalkSequence_Step2 @@ -304,7 +304,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightUpDown_Step1, MovementType_WalkSequence_Step2 @@ -312,7 +312,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftRightUp_Step1, MovementType_WalkSequence_Step2 @@ -320,7 +320,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftDownRight_Step1, MovementType_WalkSequence_Step2 @@ -328,7 +328,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightUpLeft_Step1, MovementType_WalkSequence_Step2 @@ -336,7 +336,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownRightUp_Step1, MovementType_WalkSequence_Step2 @@ -344,7 +344,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpLeftDown_Step1, MovementType_WalkSequence_Step2 @@ -352,7 +352,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightDownLeft_Step1, MovementType_WalkSequence_Step2 @@ -360,7 +360,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftUpRight_Step1, MovementType_WalkSequence_Step2 @@ -368,7 +368,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpRightDown_Step1, MovementType_WalkSequence_Step2 @@ -376,7 +376,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownLeftUp_Step1, MovementType_WalkSequence_Step2 @@ -384,13 +384,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayer_Step1, MovementType_CopyPlayer_Step2 }; -u8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { +u8 (*const gCopyPlayerMovementFuncs[])(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)) = { CopyablePlayerMovement_None, CopyablePlayerMovement_FaceDirection, CopyablePlayerMovement_GoSpeed0, @@ -404,32 +404,32 @@ u8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8 CopyablePlayerMovement_None }; -u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayerInGrass_Step1, MovementType_CopyPlayer_Step2 }; -u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Hidden[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Hidden_Step0 }; -u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkInPlace_Step0, MovementType_MoveInPlace_Step1 }; -u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_JogInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_JogInPlace_Step0, MovementType_MoveInPlace_Step1 }; -u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RunInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RunInPlace_Step0, MovementType_MoveInPlace_Step1 }; -u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Invisible_Step0, MovementType_Invisible_Step1, MovementType_Invisible_Step2 diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h new file mode 100644 index 000000000..01cb8f173 --- /dev/null +++ b/src/data/object_events/object_event_anims.h @@ -0,0 +1,886 @@ +// + +// + +#ifndef POKERUBY_OBJECT_EVENT_ANIMS_H +#define POKERUBY_OBJECT_EVENT_ANIMS_H + + +const union AnimCmd gObjectEventImageAnim_83708C8[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708DC[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708E4[] = { + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708EC[] = { + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708F4[] = { + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708FC[] = { + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(3, 8, .hFlip = TRUE), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370910[] = { + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(4, 8, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370924[] = { + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370938[] = { + ANIMCMD_FRAME(5, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(6, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_837094C[] = { + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370960[] = { + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(4, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370974[] = { + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370988[] = { + ANIMCMD_FRAME(5, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(6, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_837099C[] = { + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(3, 2, .hFlip = TRUE), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83709B0[] = { + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(4, 2, .hFlip = TRUE), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83709C4[] = { + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83709D8[] = { + ANIMCMD_FRAME(5, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(6, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83709EC[] = { + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(3, 1, .hFlip = TRUE), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A00[] = { + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(4, 1, .hFlip = TRUE), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A14[] = { + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A28[] = { + ANIMCMD_FRAME(5, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(6, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A3C[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A44[] = { + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A4C[] = { + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A54[] = { + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A5C[] = { + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A70[] = { + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A84[] = { + ANIMCMD_FRAME(7, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A98[] = { + ANIMCMD_FRAME(7, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(8, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AAC[] = { + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AC0[] = { + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AD4[] = { + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AE8[] = { + ANIMCMD_FRAME(7, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(8, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AFC[] = { + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B10[] = { + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B24[] = { + ANIMCMD_FRAME(7, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(8, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B38[] = { + ANIMCMD_FRAME(7, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(8, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B4C[] = { + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B60[] = { + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B74[] = { + ANIMCMD_FRAME(7, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(8, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B88[] = { + ANIMCMD_FRAME(7, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(8, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B9C[] = { + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_FRAME(13, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BB0[] = { + ANIMCMD_FRAME(14, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_FRAME(15, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BC4[] = { + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_FRAME(17, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BD8[] = { + ANIMCMD_FRAME(16, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_FRAME(17, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BEC[] = { + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 8), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C04[] = { + ANIMCMD_FRAME(9, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C0C[] = { + ANIMCMD_FRAME(10, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C14[] = { + ANIMCMD_FRAME(11, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C1C[] = { + ANIMCMD_FRAME(11, 32, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C24[] = { + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C30[] = { + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C3C[] = { + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C48[] = { + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C54[] = { + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C60[] = { + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C6C[] = { + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(20, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C78[] = { + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(20, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C84[] = { + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C90[] = { + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C9C[] = { + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CA8[] = { + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CB4[] = { + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CC0[] = { + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CCC[] = { + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CD8[] = { + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CE4[] = { + ANIMCMD_FRAME(21, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(22, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370CF8[] = { + ANIMCMD_FRAME(23, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370D0C[] = { + ANIMCMD_FRAME(25, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_FRAME(26, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370D20[] = { + ANIMCMD_FRAME(25, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_FRAME(26, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370D34[] = { + ANIMCMD_FRAME(0, 32), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D3C[] = { + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(2, 32), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D48[] = { + ANIMCMD_FRAME(3, 48), + ANIMCMD_FRAME(4, 48), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D54[] = { + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D68[] = { + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D7C[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(9, 32), + ANIMCMD_FRAME(0, 8), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D8C[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DA0[] = { + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DB4[] = { + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(11, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DC8[] = { + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DDC[] = { + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DF0[] = { + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E04[] = { + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(9, 6), + ANIMCMD_FRAME(8, 6), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E18[] = { + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(5, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E2C[] = { + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E40[] = { + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E54[] = { + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(11, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(11, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370E68[] = { + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(7, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(7, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370E7C[] = { + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370E90[] = { + ANIMCMD_FRAME(2, 6, .hFlip = TRUE), + ANIMCMD_FRAME(3, 6, .hFlip = TRUE), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8370EA4[] = { + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(7), + AFFINEANIMCMD_JUMP(0) +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8370ED4[] = { + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_JUMP(0) +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Inanimate[] = { + gObjectEventImageAnim_83708C8 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_QuintyPlump[] = { + gObjectEventImageAnim_83708DC, + gObjectEventImageAnim_83708E4, + gObjectEventImageAnim_83708EC, + gObjectEventImageAnim_83708F4, + gObjectEventImageAnim_83708FC, + gObjectEventImageAnim_8370910, + gObjectEventImageAnim_8370924, + gObjectEventImageAnim_8370938, + gObjectEventImageAnim_837094C, + gObjectEventImageAnim_8370960, + gObjectEventImageAnim_8370974, + gObjectEventImageAnim_8370988, + gObjectEventImageAnim_837099C, + gObjectEventImageAnim_83709B0, + gObjectEventImageAnim_83709C4, + gObjectEventImageAnim_83709D8, + gObjectEventImageAnim_83709EC, + gObjectEventImageAnim_8370A00, + gObjectEventImageAnim_8370A14, + gObjectEventImageAnim_8370A28 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Standard[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BrendanMayNormal[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370B9C, + gObjectEventImageAnim_8370BB0, + gObjectEventImageAnim_8370BC4, + gObjectEventImageAnim_8370BD8 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_AcroBike[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370C24, + gObjectEventImageAnim_8370C30, + gObjectEventImageAnim_8370C3C, + gObjectEventImageAnim_8370C48, + gObjectEventImageAnim_8370C54, + gObjectEventImageAnim_8370C60, + gObjectEventImageAnim_8370C6C, + gObjectEventImageAnim_8370C78, + gObjectEventImageAnim_8370C84, + gObjectEventImageAnim_8370C90, + gObjectEventImageAnim_8370C9C, + gObjectEventImageAnim_8370CA8, + gObjectEventImageAnim_8370CB4, + gObjectEventImageAnim_8370CC0, + gObjectEventImageAnim_8370CCC, + gObjectEventImageAnim_8370CD8, + gObjectEventImageAnim_8370CE4, + gObjectEventImageAnim_8370CF8, + gObjectEventImageAnim_8370D0C, + gObjectEventImageAnim_8370D20 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Surfing[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370C04, + gObjectEventImageAnim_8370C0C, + gObjectEventImageAnim_8370C14, + gObjectEventImageAnim_8370C1C +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Nurse[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370D7C +}; + +const union AnimCmd *const gObjectEventImageAnimTable_FieldMove[] = { + gObjectEventImageAnim_8370BEC +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BerryTree[] = { + gObjectEventImageAnim_8370D34, + gObjectEventImageAnim_8370D3C, + gObjectEventImageAnim_8370D48, + gObjectEventImageAnim_8370D54, + gObjectEventImageAnim_8370D68 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BreakableRock[] = { + gObjectEventImageAnim_83708C8, + gObjectEventImageAnim_8370D8C +}; + +const union AnimCmd *const gObjectEventImageAnimTable_CuttableTree[] = { + gObjectEventImageAnim_83708C8, + gObjectEventImageAnim_8370DA0 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Fishing[] = { + gObjectEventImageAnim_8370DB4, + gObjectEventImageAnim_8370DC8, + gObjectEventImageAnim_8370DDC, + gObjectEventImageAnim_8370DF0, + gObjectEventImageAnim_8370E04, + gObjectEventImageAnim_8370E18, + gObjectEventImageAnim_8370E2C, + gObjectEventImageAnim_8370E40, + gObjectEventImageAnim_8370E54, + gObjectEventImageAnim_8370E68, + gObjectEventImageAnim_8370E7C, + gObjectEventImageAnim_8370E90 +}; + +const union AffineAnimCmd *const gObjectEventRotScalAnimTable_KyogreGroudon[] = { + gObjectEventRotScalAnim_8370EA4, + gObjectEventRotScalAnim_8370ED4 +}; + +#endif //POKERUBY_OBJECT_EVENT_ANIMS_H diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h new file mode 100644 index 000000000..9738bb04a --- /dev/null +++ b/src/data/object_events/object_event_graphics.h @@ -0,0 +1,285 @@ +#ifndef POKERUBY_OBJECT_EVENT_GFX_H +#define POKERUBY_OBJECT_EVENT_GFX_H + +const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/normal.4bpp"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/08.gbapal"); +const u16 NullPalette_8310F68[16] = {}; +const u16 NullPalette_8310F88[16] = {}; +const u16 NullPalette_8310FA8[16] = {}; +const u16 NullPalette_8310FC8[16] = {}; +const u16 NullPalette_8310FE8[16] = {}; +const u16 NullPalette_8311008[16] = {}; +const u16 NullPalette_8311028[16] = {}; +const u16 NullPalette_8311048[16] = {}; +const u16 NullPalette_8311068[16] = {}; +const u16 NullPalette_8311088[16] = {}; +const u16 NullPalette_83110A8[16] = {}; +const u16 NullPalette_83110C8[16] = {}; +const u16 NullPalette_83110E8[16] = {}; +const u16 NullPalette_8311108[16] = {}; +const u16 NullPalette_8311128[16] = {}; +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal"); +const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp"); +const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp"); +const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp"); +const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/acro_bike.4bpp"); +const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/fishing.4bpp"); +const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/object_events/pics/people/brendan/watering.4bpp"); +const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_events/pics/people/brendan/decorating.4bpp"); +const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp"); +const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp"); +const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); +const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/normal.4bpp"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/18.gbapal"); +const u16 NullPalette_831B7E8[16] = {}; +const u16 NullPalette_831B808[16] = {}; +const u16 NullPalette_831B828[16] = {}; +const u16 NullPalette_831B848[16] = {}; +const u16 NullPalette_831B868[16] = {}; +const u16 NullPalette_831B888[16] = {}; +const u16 NullPalette_831B8A8[16] = {}; +const u16 NullPalette_831B8C8[16] = {}; +const u16 NullPalette_831B8E8[16] = {}; +const u16 NullPalette_831B908[16] = {}; +const u16 NullPalette_831B928[16] = {}; +const u16 NullPalette_831B948[16] = {}; +const u16 NullPalette_831B968[16] = {}; +const u16 NullPalette_831B988[16] = {}; +const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp"); +const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp"); +const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp"); +const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp"); +const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp"); +const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/07.gbapal"); +const u32 gObjectEventPic_LittleBoy1[] = INCBIN_U32("graphics/object_events/pics/people/little_boy_1.4bpp"); +const u32 gObjectEventPic_LittleGirl1[] = INCBIN_U32("graphics/object_events/pics/people/little_girl_1.4bpp"); +const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp"); +const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/object_events/pics/people/girl_1.4bpp"); +const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/object_events/pics/people/boy_2.4bpp"); +const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/object_events/pics/people/girl_2.4bpp"); +const u32 gObjectEventPic_LittleBoy2[] = INCBIN_U32("graphics/object_events/pics/people/little_boy_2.4bpp"); +const u32 gObjectEventPic_LittleGirl2[] = INCBIN_U32("graphics/object_events/pics/people/little_girl_2.4bpp"); +const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/object_events/pics/people/boy_3.4bpp"); +const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/object_events/pics/people/girl_3.4bpp"); +const u32 gObjectEventPic_Boy4[] = INCBIN_U32("graphics/object_events/pics/people/boy_4.4bpp"); +const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/object_events/pics/people/woman_1.4bpp"); +const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/object_events/pics/people/fat_man.4bpp"); +const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp"); +const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/object_events/pics/people/man_1.4bpp"); +const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp"); +const u32 gObjectEventPic_OldMan1[] = INCBIN_U32("graphics/object_events/pics/people/old_man_1.4bpp"); +const u32 gObjectEventPic_OldWoman1[] = INCBIN_U32("graphics/object_events/pics/people/old_woman_1.4bpp"); +const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/object_events/pics/people/man_2.4bpp"); +const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/object_events/pics/people/woman_4.4bpp"); +const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/object_events/pics/people/man_3.4bpp"); +const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/object_events/pics/people/woman_5.4bpp"); +const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/object_events/pics/people/cook.4bpp"); +const u32 gObjectEventPic_Woman6[] = INCBIN_U32("graphics/object_events/pics/people/woman_6.4bpp"); +const u32 gObjectEventPic_OldMan2[] = INCBIN_U32("graphics/object_events/pics/people/old_man_2.4bpp"); +const u32 gObjectEventPic_OldWoman2[] = INCBIN_U32("graphics/object_events/pics/people/old_woman_2.4bpp"); +const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/object_events/pics/people/camper.4bpp"); +const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/object_events/pics/people/picnicker.4bpp"); +const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/object_events/pics/people/man_4.4bpp"); +const u32 gObjectEventPic_Woman7[] = INCBIN_U32("graphics/object_events/pics/people/woman_7.4bpp"); +const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/object_events/pics/people/youngster.4bpp"); +const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/object_events/pics/people/bug_catcher.4bpp"); +const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/object_events/pics/people/psychic_m.4bpp"); +const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/object_events/pics/people/school_kid_m.4bpp"); +const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/object_events/pics/people/maniac.4bpp"); +const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/object_events/pics/people/hex_maniac.4bpp"); +const u32 gObjectEventPic_Woman8[] = INCBIN_U32("graphics/object_events/pics/people/woman_8.4bpp"); +const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m.4bpp"); +const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f.4bpp"); +const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/object_events/pics/people/black_belt.4bpp"); +const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/object_events/pics/people/beauty.4bpp"); +const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/object_events/pics/people/scientist_1.4bpp"); +const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/object_events/pics/people/lass.4bpp"); +const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/object_events/pics/people/gentleman.4bpp"); +const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/object_events/pics/people/sailor.4bpp"); +const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/object_events/pics/people/fisherman.4bpp"); +const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_m.4bpp"); +const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_f.4bpp"); +const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/object_events/pics/people/tuber_f.4bpp"); +const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m.4bpp"); +const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/object_events/pics/people/hiker.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_m.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_f.4bpp"); +const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/object_events/pics/people/man_5.4bpp"); +const u32 gObjectEventPic_Man6[] = INCBIN_U32("graphics/object_events/pics/people/man_6.4bpp"); +const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/object_events/pics/people/nurse.4bpp"); +const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/object_events/pics/misc/item_ball.4bpp"); +const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/object_events/pics/people/prof_birch.4bpp"); +const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/object_events/pics/people/reporter_m.4bpp"); +const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/object_events/pics/people/reporter_f.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_1.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_2.4bpp"); +const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/object_events/pics/people/mart_employee.4bpp"); +const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/object_events/pics/people/rooftop_sale_woman.4bpp"); +const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/object_events/pics/people/teala.4bpp"); +const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/object_events/pics/people/artist.4bpp"); +const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/object_events/pics/people/cameraman.4bpp"); +const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/object_events/pics/people/scientist_2.4bpp"); +const u32 gObjectEventPic_Man7[] = INCBIN_U32("graphics/object_events/pics/people/man_7.4bpp"); +const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/aqua_member_m.4bpp"); +const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/aqua_member_f.4bpp"); +const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/magma_member_m.4bpp"); +const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/magma_member_f.4bpp"); +const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/object_events/pics/people/sidney.4bpp"); +const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/object_events/pics/people/phoebe.4bpp"); +const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/object_events/pics/people/glacia.4bpp"); +const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/object_events/pics/people/drake.4bpp"); +const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/object_events/pics/people/roxanne.4bpp"); +const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/object_events/pics/people/brawly.4bpp"); +const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/object_events/pics/people/wattson.4bpp"); +const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/object_events/pics/people/flannery.4bpp"); +const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/object_events/pics/people/norman.4bpp"); +const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/object_events/pics/people/winona.4bpp"); +const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/object_events/pics/people/liza.4bpp"); +const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/object_events/pics/people/tate.4bpp"); +const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/object_events/pics/people/wallace.4bpp"); +const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/object_events/pics/people/steven.4bpp"); +const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/object_events/pics/people/wally.4bpp"); +const u32 gObjectEventPic_LittleBoy3[] = INCBIN_U32("graphics/object_events/pics/people/little_boy_3.4bpp"); +const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/object_events/pics/people/hot_springs_old_woman.4bpp"); +const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/object_events/pics/pokemon/latias_latios.4bpp"); +const u32 gObjectEventPic_Boy5[] = INCBIN_U32("graphics/object_events/pics/people/boy_5.4bpp"); +const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/object_events/pics/people/contest_judge.4bpp"); +const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/object_events/pics/people/archie.4bpp"); +const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/object_events/pics/people/maxie.4bpp"); +const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/object_events/pics/pokemon/kyogre.4bpp"); +const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/object_events/pics/pokemon/groudon.4bpp"); +const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/object_events/pics/pokemon/regi.4bpp"); +const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/object_events/pics/pokemon/skitty.4bpp"); +const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/object_events/pics/pokemon/kecleon.4bpp"); +const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza.4bpp"); +const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/zigzagoon.4bpp"); +const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu.4bpp"); +const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azumarill.4bpp"); +const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/pokemon/wingull.4bpp"); +const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp"); +const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp"); +const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/25.gbapal"); +const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp"); +const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pichu_doll.4bpp"); +const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pikachu_doll.4bpp"); +const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/marill_doll.4bpp"); +const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/togepi_doll.4bpp"); +const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/chikorita_doll.4bpp"); +const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/totodile_doll.4bpp"); +const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/meowth_doll.4bpp"); +const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/clefairy_doll.4bpp"); +const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/ditto_doll.4bpp"); +const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/smoochum_doll.4bpp"); +const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/treecko_doll.4bpp"); +const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/torchic_doll.4bpp"); +const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/mudkip_doll.4bpp"); +const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/duskull_doll.4bpp"); +const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/wynaut_doll.4bpp"); +const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/baltoy_doll.4bpp"); +const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/kecleon_doll.4bpp"); +const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/azurill_doll.4bpp"); +const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/skitty_doll.4bpp"); +const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/swablu_doll.4bpp"); +const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/gulpin_doll.4bpp"); +const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/lotad_doll.4bpp"); +const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/seedot_doll.4bpp"); +const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/pika_cushion.4bpp"); +const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/round_cushion.4bpp"); +const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/kiss_cushion.4bpp"); +const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/zigzag_cushion.4bpp"); +const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/spin_cushion.4bpp"); +const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/diamond_cushion.4bpp"); +const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/ball_cushion.4bpp"); +const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/grass_cushion.4bpp"); +const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/fire_cushion.4bpp"); +const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/water_cushion.4bpp"); +const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_lapras_doll.4bpp"); +const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_charizard_doll.4bpp"); +const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regirock_doll.4bpp"); +const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regice_doll.4bpp"); +const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_registeel_doll.4bpp"); +const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/object_events/pics/misc/cuttable_tree.4bpp"); +const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/object_events/pics/misc/breakable_rock.4bpp"); +const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events/pics/misc/pushable_boulder.4bpp"); +const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp"); +const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); +const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/26.gbapal"); +const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/14.gbapal"); +const u32 gObjectEventPic_MachokeCarryingBox[] = INCBIN_U32("graphics/object_events/pics/pokemon/machoke_carrying_box.4bpp"); +const u32 gObjectEventPic_MachokeFacingAway[] = INCBIN_U32("graphics/object_events/pics/pokemon/machoke_facing_away.4bpp"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/15.gbapal"); +const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp"); +const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/16.gbapal"); +const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal"); +const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal"); +const u32 gFieldEffectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle.4bpp"); +const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp"); +const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp"); +const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp"); +const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kelpsy.4bpp"); +const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wepear.4bpp"); +const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/iapapa.4bpp"); +const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cheri.4bpp"); +const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/figy.4bpp"); +const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/mago.4bpp"); +const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lum.4bpp"); +const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/razz.4bpp"); +const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/grepa.4bpp"); +const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rabuta.4bpp"); +const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/nomel.4bpp"); +const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/leppa.4bpp"); +const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/liechi.4bpp"); +const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/hondew.4bpp"); +const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aguav.4bpp"); +const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wiki.4bpp"); +const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pomeg.4bpp"); +const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rawst.4bpp"); +const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/spelon.4bpp"); +const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chesto.4bpp"); +const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/oran.4bpp"); +const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/persim.4bpp"); +const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sitrus.4bpp"); +const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aspear.4bpp"); +const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pamtre.4bpp"); +const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cornn.4bpp"); +const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp"); +const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp"); +const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp"); +const u32 gFieldEffectPic_SurfBlob[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob.4bpp"); +const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/13.gbapal"); + +#endif //POKERUBY_OBJECT_EVENT_GFX_H diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h new file mode 100644 index 000000000..87b26da64 --- /dev/null +++ b/src/data/object_events/object_event_graphics_info.h @@ -0,0 +1,227 @@ +// + +// + +#ifndef POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_H +#define POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_H + +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xffff, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xffff, 0x110b, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy1 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy2 = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl2 = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy4 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman6 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman6, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman7, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman8 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman8, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man6 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man6, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xffff, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xffff, 0x110f, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gObjectEventSubspriteTables_CableCar, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man7, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy3 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy5 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kyogre, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Groudon, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xffff, 0x1116, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kyogre, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xffff, 0x1118, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Groudon, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xffff, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; + +#endif //POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_H diff --git a/src/data/object_events/object_event_graphics_info_pointers.h b/src/data/object_events/object_event_graphics_info_pointers.h new file mode 100644 index 000000000..1725b7168 --- /dev/null +++ b/src/data/object_events/object_event_graphics_info_pointers.h @@ -0,0 +1,444 @@ +#ifndef POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_POINTERS_H +#define POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_POINTERS_H + +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman6; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman7; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman8; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man6; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeCarryingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeFacingAway; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man7; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay; + +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = { + [OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, + [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, + [OBJ_EVENT_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, + [OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove, + [OBJ_EVENT_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump, + [OBJ_EVENT_GFX_LITTLE_BOY_1] = &gObjectEventGraphicsInfo_LittleBoy1, + [OBJ_EVENT_GFX_LITTLE_GIRL_1] = &gObjectEventGraphicsInfo_LittleGirl1, + [OBJ_EVENT_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1, + [OBJ_EVENT_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1, + [OBJ_EVENT_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2, + [OBJ_EVENT_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2, + [OBJ_EVENT_GFX_LITTLE_BOY_2] = &gObjectEventGraphicsInfo_LittleBoy2, + [OBJ_EVENT_GFX_LITTLE_GIRL_2] = &gObjectEventGraphicsInfo_LittleGirl2, + [OBJ_EVENT_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, + [OBJ_EVENT_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, + [OBJ_EVENT_GFX_BOY_4] = &gObjectEventGraphicsInfo_Boy4, + [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, + [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, + [OBJ_EVENT_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, + [OBJ_EVENT_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, + [OBJ_EVENT_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, + [OBJ_EVENT_GFX_OLD_MAN_1] = &gObjectEventGraphicsInfo_OldMan1, + [OBJ_EVENT_GFX_OLD_WOMAN_1] = &gObjectEventGraphicsInfo_OldWoman1, + [OBJ_EVENT_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, + [OBJ_EVENT_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, + [OBJ_EVENT_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, + [OBJ_EVENT_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, + [OBJ_EVENT_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, + [OBJ_EVENT_GFX_WOMAN_6] = &gObjectEventGraphicsInfo_Woman6, + [OBJ_EVENT_GFX_OLD_MAN_2] = &gObjectEventGraphicsInfo_OldMan2, + [OBJ_EVENT_GFX_OLD_WOMAN_2] = &gObjectEventGraphicsInfo_OldWoman2, + [OBJ_EVENT_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, + [OBJ_EVENT_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, + [OBJ_EVENT_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, + [OBJ_EVENT_GFX_WOMAN_7] = &gObjectEventGraphicsInfo_Woman7, + [OBJ_EVENT_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster, + [OBJ_EVENT_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher, + [OBJ_EVENT_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM, + [OBJ_EVENT_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM, + [OBJ_EVENT_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac, + [OBJ_EVENT_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac, + [OBJ_EVENT_GFX_WOMAN_8] = &gObjectEventGraphicsInfo_Woman8, + [OBJ_EVENT_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM, + [OBJ_EVENT_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF, + [OBJ_EVENT_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, + [OBJ_EVENT_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty, + [OBJ_EVENT_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1, + [OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, + [OBJ_EVENT_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman, + [OBJ_EVENT_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor, + [OBJ_EVENT_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman, + [OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM, + [OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF, + [OBJ_EVENT_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF, + [OBJ_EVENT_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM, + [OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, + [OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM, + [OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF, + [OBJ_EVENT_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse, + [OBJ_EVENT_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall, + [OBJ_EVENT_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree, + [OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages, + [OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages, + [OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike, + [OBJ_EVENT_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch, + [OBJ_EVENT_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5, + [OBJ_EVENT_GFX_MAN_6] = &gObjectEventGraphicsInfo_Man6, + [OBJ_EVENT_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, + [OBJ_EVENT_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, + [OBJ_EVENT_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, + [OBJ_EVENT_GFX_HIPSTER] = &gObjectEventGraphicsInfo_Hipster, + [OBJ_EVENT_GFX_TRADER] = &gObjectEventGraphicsInfo_Trader, + [OBJ_EVENT_GFX_STORYTELLER] = &gObjectEventGraphicsInfo_Storyteller, + [OBJ_EVENT_GFX_GIDDY] = &gObjectEventGraphicsInfo_Giddy, + [OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_1] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan1, + [OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_2] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan2, + [OBJ_EVENT_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll, + [OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll, + [OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll, + [OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll, + [OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll, + [OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll, + [OBJ_EVENT_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree, + [OBJ_EVENT_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee, + [OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman, + [OBJ_EVENT_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala, + [OBJ_EVENT_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock, + [OBJ_EVENT_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder, + [OBJ_EVENT_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat, + [OBJ_EVENT_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal, + [OBJ_EVENT_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike, + [OBJ_EVENT_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike, + [OBJ_EVENT_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing, + [OBJ_EVENT_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove, + [OBJ_EVENT_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck, + [OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX] = &gObjectEventGraphicsInfo_MachokeCarryingBox, + [OBJ_EVENT_GFX_MACHOKE_FACING_AWAY] = &gObjectEventGraphicsInfo_MachokeFacingAway, + [OBJ_EVENT_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, + [OBJ_EVENT_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, + [OBJ_EVENT_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove, + [OBJ_EVENT_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal, + [OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike, + [OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike, + [OBJ_EVENT_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing, + [OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove, + [OBJ_EVENT_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman, + [OBJ_EVENT_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater, + [OBJ_EVENT_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater, + [OBJ_EVENT_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox, + [OBJ_EVENT_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar, + [OBJ_EVENT_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2, + [OBJ_EVENT_GFX_MAN_7] = &gObjectEventGraphicsInfo_Man7, + [OBJ_EVENT_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM, + [OBJ_EVENT_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF, + [OBJ_EVENT_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM, + [OBJ_EVENT_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF, + [OBJ_EVENT_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney, + [OBJ_EVENT_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe, + [OBJ_EVENT_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia, + [OBJ_EVENT_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake, + [OBJ_EVENT_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne, + [OBJ_EVENT_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly, + [OBJ_EVENT_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson, + [OBJ_EVENT_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery, + [OBJ_EVENT_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman, + [OBJ_EVENT_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona, + [OBJ_EVENT_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza, + [OBJ_EVENT_GFX_TATE] = &gObjectEventGraphicsInfo_Tate, + [OBJ_EVENT_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace, + [OBJ_EVENT_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven, + [OBJ_EVENT_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally, + [OBJ_EVENT_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_LittleBoy3, + [OBJ_EVENT_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing, + [OBJ_EVENT_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing, + [OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman, + [OBJ_EVENT_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal, + [OBJ_EVENT_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow, + [OBJ_EVENT_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll, + [OBJ_EVENT_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll, + [OBJ_EVENT_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll, + [OBJ_EVENT_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll, + [OBJ_EVENT_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll, + [OBJ_EVENT_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll, + [OBJ_EVENT_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll, + [OBJ_EVENT_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll, + [OBJ_EVENT_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll, + [OBJ_EVENT_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll, + [OBJ_EVENT_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll, + [OBJ_EVENT_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll, + [OBJ_EVENT_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll, + [OBJ_EVENT_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll, + [OBJ_EVENT_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll, + [OBJ_EVENT_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll, + [OBJ_EVENT_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll, + [OBJ_EVENT_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll, + [OBJ_EVENT_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll, + [OBJ_EVENT_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll, + [OBJ_EVENT_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll, + [OBJ_EVENT_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll, + [OBJ_EVENT_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll, + [OBJ_EVENT_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll, + [OBJ_EVENT_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll, + [OBJ_EVENT_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion, + [OBJ_EVENT_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion, + [OBJ_EVENT_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion, + [OBJ_EVENT_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion, + [OBJ_EVENT_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion, + [OBJ_EVENT_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion, + [OBJ_EVENT_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion, + [OBJ_EVENT_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion, + [OBJ_EVENT_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion, + [OBJ_EVENT_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion, + [OBJ_EVENT_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll, + [OBJ_EVENT_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll, + [OBJ_EVENT_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll, + [OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll, + [OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll, + [OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll, + [OBJ_EVENT_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll, + [OBJ_EVENT_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll, + [OBJ_EVENT_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll, + [OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll, + [OBJ_EVENT_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias, + [OBJ_EVENT_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios, + [OBJ_EVENT_GFX_BOY_5] = &gObjectEventGraphicsInfo_Boy5, + [OBJ_EVENT_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge, + [OBJ_EVENT_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering, + [OBJ_EVENT_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering, + [OBJ_EVENT_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating, + [OBJ_EVENT_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating, + [OBJ_EVENT_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie, + [OBJ_EVENT_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie, + [OBJ_EVENT_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1, + [OBJ_EVENT_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1, + [OBJ_EVENT_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil, + [OBJ_EVENT_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock, + [OBJ_EVENT_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice, + [OBJ_EVENT_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel, + [OBJ_EVENT_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty, + [OBJ_EVENT_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1, + [OBJ_EVENT_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2, + [OBJ_EVENT_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2, + [OBJ_EVENT_GFX_RAYQUAZA] = &gObjectEventGraphicsInfo_Rayquaza, + [OBJ_EVENT_GFX_ZIGZAGOON] = &gObjectEventGraphicsInfo_Zigzagoon, + [OBJ_EVENT_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu, + [OBJ_EVENT_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill, + [OBJ_EVENT_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull, + [OBJ_EVENT_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2, + [OBJ_EVENT_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming, + [OBJ_EVENT_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill, + [OBJ_EVENT_GFX_MOM] = &gObjectEventGraphicsInfo_Mom, + [OBJ_EVENT_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan, + [OBJ_EVENT_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay +}; + +#endif //POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_POINTERS_H diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h new file mode 100644 index 000000000..f176e24a1 --- /dev/null +++ b/src/data/object_events/object_event_pic_tables.h @@ -0,0 +1,1879 @@ +// + +// + +#ifndef POKERUBY_OBJECT_EVENT_PIC_TABLES_H +#define POKERUBY_OBJECT_EVENT_PIC_TABLES_H + +const struct SpriteFrameImage gObjectEventPicTable_BrendanNormal[] = { + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 9), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 10), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 11), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 12), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 13), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 14), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 15), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 16), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 17) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanMachBike[] = { + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanAcroBike[] = { + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 26) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanSurfing[] = { + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 5) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanUnderwater[] = { + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFieldMove[] = { + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 4) +}; + +const struct SpriteFrameImage gObjectEventPicTable_QuintyPlump[] = { + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 0), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 1), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 2), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 3), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 4), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 5), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 6) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleBoy1[] = { + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl1[] = { + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 0), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 1), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 2), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 3), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 4), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 5), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 6), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 7), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy1[] = { + overworld_frame(gObjectEventPic_Boy1, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl1[] = { + overworld_frame(gObjectEventPic_Girl1, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy2[] = { + overworld_frame(gObjectEventPic_Boy2, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl2[] = { + overworld_frame(gObjectEventPic_Girl2, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleBoy2[] = { + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl2[] = { + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy3[] = { + overworld_frame(gObjectEventPic_Boy3, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl3[] = { + overworld_frame(gObjectEventPic_Girl3, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy4[] = { + overworld_frame(gObjectEventPic_Boy4, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman1[] = { + overworld_frame(gObjectEventPic_Woman1, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_FatMan[] = { + overworld_frame(gObjectEventPic_FatMan, 2, 4, 0), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 1), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 2), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 3), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 4), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 5), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 6), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 7), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman2[] = { + overworld_frame(gObjectEventPic_Woman2, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man1[] = { + overworld_frame(gObjectEventPic_Man1, 2, 4, 0), + overworld_frame(gObjectEventPic_Man1, 2, 4, 1), + overworld_frame(gObjectEventPic_Man1, 2, 4, 2), + overworld_frame(gObjectEventPic_Man1, 2, 4, 3), + overworld_frame(gObjectEventPic_Man1, 2, 4, 4), + overworld_frame(gObjectEventPic_Man1, 2, 4, 5), + overworld_frame(gObjectEventPic_Man1, 2, 4, 6), + overworld_frame(gObjectEventPic_Man1, 2, 4, 7), + overworld_frame(gObjectEventPic_Man1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman3[] = { + overworld_frame(gObjectEventPic_Woman3, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldMan1[] = { + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 3), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 4), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 5), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 6), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 7), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman1[] = { + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 3), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 4), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 5), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 6), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 7), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man2[] = { + overworld_frame(gObjectEventPic_Man2, 2, 4, 0), + overworld_frame(gObjectEventPic_Man2, 2, 4, 1), + overworld_frame(gObjectEventPic_Man2, 2, 4, 2), + overworld_frame(gObjectEventPic_Man2, 2, 4, 3), + overworld_frame(gObjectEventPic_Man2, 2, 4, 4), + overworld_frame(gObjectEventPic_Man2, 2, 4, 5), + overworld_frame(gObjectEventPic_Man2, 2, 4, 6), + overworld_frame(gObjectEventPic_Man2, 2, 4, 7), + overworld_frame(gObjectEventPic_Man2, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman4[] = { + overworld_frame(gObjectEventPic_Woman4, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man3[] = { + overworld_frame(gObjectEventPic_Man3, 2, 4, 0), + overworld_frame(gObjectEventPic_Man3, 2, 4, 1), + overworld_frame(gObjectEventPic_Man3, 2, 4, 2), + overworld_frame(gObjectEventPic_Man3, 2, 4, 3), + overworld_frame(gObjectEventPic_Man3, 2, 4, 4), + overworld_frame(gObjectEventPic_Man3, 2, 4, 5), + overworld_frame(gObjectEventPic_Man3, 2, 4, 6), + overworld_frame(gObjectEventPic_Man3, 2, 4, 7), + overworld_frame(gObjectEventPic_Man3, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman5[] = { + overworld_frame(gObjectEventPic_Woman5, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cook[] = { + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman6[] = { + overworld_frame(gObjectEventPic_Woman6, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldMan2[] = { + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman2[] = { + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Camper[] = { + overworld_frame(gObjectEventPic_Camper, 2, 4, 0), + overworld_frame(gObjectEventPic_Camper, 2, 4, 1), + overworld_frame(gObjectEventPic_Camper, 2, 4, 2), + overworld_frame(gObjectEventPic_Camper, 2, 4, 3), + overworld_frame(gObjectEventPic_Camper, 2, 4, 4), + overworld_frame(gObjectEventPic_Camper, 2, 4, 5), + overworld_frame(gObjectEventPic_Camper, 2, 4, 6), + overworld_frame(gObjectEventPic_Camper, 2, 4, 7), + overworld_frame(gObjectEventPic_Camper, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Picnicker[] = { + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 0), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 1), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 2), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 3), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 4), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 5), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 6), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 7), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man4[] = { + overworld_frame(gObjectEventPic_Man4, 2, 4, 0), + overworld_frame(gObjectEventPic_Man4, 2, 4, 1), + overworld_frame(gObjectEventPic_Man4, 2, 4, 2), + overworld_frame(gObjectEventPic_Man4, 2, 4, 3), + overworld_frame(gObjectEventPic_Man4, 2, 4, 4), + overworld_frame(gObjectEventPic_Man4, 2, 4, 5), + overworld_frame(gObjectEventPic_Man4, 2, 4, 6), + overworld_frame(gObjectEventPic_Man4, 2, 4, 7), + overworld_frame(gObjectEventPic_Man4, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman7[] = { + overworld_frame(gObjectEventPic_Woman7, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Youngster[] = { + overworld_frame(gObjectEventPic_Youngster, 2, 4, 0), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 1), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 2), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 3), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 4), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 5), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 6), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 7), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BugCatcher[] = { + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 0), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 1), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 2), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 3), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 4), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 5), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 6), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 7), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PsychicM[] = { + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 0), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 1), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 2), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 3), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 4), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 5), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 6), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 7), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SchoolKidM[] = { + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 0), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 1), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 2), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 3), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 4), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 5), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 6), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 7), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maniac[] = { + overworld_frame(gObjectEventPic_Maniac, 2, 4, 0), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 1), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 2), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 3), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 4), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 5), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 6), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 7), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_HexManiac[] = { + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 0), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 1), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 2), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 3), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 4), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 5), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 6), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 7), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman8[] = { + overworld_frame(gObjectEventPic_Woman8, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerM[] = { + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerF[] = { + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BlackBelt[] = { + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Beauty[] = { + overworld_frame(gObjectEventPic_Beauty, 2, 4, 0), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 1), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 2), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 3), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 4), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 5), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 6), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 7), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist1[] = { + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lass[] = { + overworld_frame(gObjectEventPic_Lass, 2, 4, 0), + overworld_frame(gObjectEventPic_Lass, 2, 4, 1), + overworld_frame(gObjectEventPic_Lass, 2, 4, 2), + overworld_frame(gObjectEventPic_Lass, 2, 4, 3), + overworld_frame(gObjectEventPic_Lass, 2, 4, 4), + overworld_frame(gObjectEventPic_Lass, 2, 4, 5), + overworld_frame(gObjectEventPic_Lass, 2, 4, 6), + overworld_frame(gObjectEventPic_Lass, 2, 4, 7), + overworld_frame(gObjectEventPic_Lass, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Gentleman[] = { + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 0), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 1), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 2), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 3), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 4), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 5), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 6), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 7), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sailor[] = { + overworld_frame(gObjectEventPic_Sailor, 2, 4, 0), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 1), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 2), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 3), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 4), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 5), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 6), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 7), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fisherman[] = { + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 0), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 1), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 2), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 3), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 4), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 5), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 6), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 7), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteM[] = { + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteF[] = { + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberF[] = { + overworld_frame(gObjectEventPic_TuberF, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberM[] = { + overworld_frame(gObjectEventPic_TuberM, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Hiker[] = { + overworld_frame(gObjectEventPic_Hiker, 2, 4, 0), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 1), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 2), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 3), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 4), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 5), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 6), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 7), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteM[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteF[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Nurse[] = { + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 3), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 4), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 5), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 6), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 7), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 8), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 9) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ItemBall[] = { + overworld_frame(gObjectEventPic_ItemBall, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ProfBirch[] = { + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 0), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 1), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 2), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 3), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 4), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 5), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 6), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 7), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man5[] = { + overworld_frame(gObjectEventPic_Man5, 2, 4, 0), + overworld_frame(gObjectEventPic_Man5, 2, 4, 1), + overworld_frame(gObjectEventPic_Man5, 2, 4, 2), + overworld_frame(gObjectEventPic_Man5, 2, 4, 3), + overworld_frame(gObjectEventPic_Man5, 2, 4, 4), + overworld_frame(gObjectEventPic_Man5, 2, 4, 5), + overworld_frame(gObjectEventPic_Man5, 2, 4, 6), + overworld_frame(gObjectEventPic_Man5, 2, 4, 7), + overworld_frame(gObjectEventPic_Man5, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man6[] = { + overworld_frame(gObjectEventPic_Man6, 2, 4, 0), + overworld_frame(gObjectEventPic_Man6, 2, 4, 1), + overworld_frame(gObjectEventPic_Man6, 2, 4, 2), + overworld_frame(gObjectEventPic_Man6, 2, 4, 3), + overworld_frame(gObjectEventPic_Man6, 2, 4, 4), + overworld_frame(gObjectEventPic_Man6, 2, 4, 5), + overworld_frame(gObjectEventPic_Man6, 2, 4, 6), + overworld_frame(gObjectEventPic_Man6, 2, 4, 7), + overworld_frame(gObjectEventPic_Man6, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterM[] = { + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterF[] = { + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan1[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan2[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedNatuDoll[] = { + overworld_frame(gObjectEventPic_UnusedNatuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedMagnemiteDoll[] = { + overworld_frame(gObjectEventPic_UnusedMagnemiteDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedSquirtleDoll[] = { + overworld_frame(gObjectEventPic_UnusedSquirtleDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedWooperDoll[] = { + overworld_frame(gObjectEventPic_UnusedWooperDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPikachuDoll[] = { + overworld_frame(gObjectEventPic_UnusedPikachuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPorygon2Doll[] = { + overworld_frame(gObjectEventPic_UnusedPorygon2Doll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CuttableTree[] = { + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 0), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 1), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 2), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 3) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MartEmployee[] = { + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_RooftopSaleWoman[] = { + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Teala[] = { + overworld_frame(gObjectEventPic_Teala, 2, 4, 0), + overworld_frame(gObjectEventPic_Teala, 2, 4, 1), + overworld_frame(gObjectEventPic_Teala, 2, 4, 2), + overworld_frame(gObjectEventPic_Teala, 2, 4, 3), + overworld_frame(gObjectEventPic_Teala, 2, 4, 4), + overworld_frame(gObjectEventPic_Teala, 2, 4, 5), + overworld_frame(gObjectEventPic_Teala, 2, 4, 6), + overworld_frame(gObjectEventPic_Teala, 2, 4, 7), + overworld_frame(gObjectEventPic_Teala, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BreakableRock[] = { + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 0), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 1), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 2), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 3) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PushableBoulder[] = { + overworld_frame(gObjectEventPic_PushableBoulder, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MrBrineysBoat[] = { + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Truck[] = { + overworld_frame(gObjectEventPic_Truck, 6, 6, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MachokeCarryingBox[] = { + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MachokeFacingAway[] = { + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirchsBag[] = { + overworld_frame(gObjectEventPic_BirchsBag, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Poochyena[] = { + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 0), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 1), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 2), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 3), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 4), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 5), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 6), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 7), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Artist[] = { + overworld_frame(gObjectEventPic_Artist, 2, 4, 0), + overworld_frame(gObjectEventPic_Artist, 2, 4, 1), + overworld_frame(gObjectEventPic_Artist, 2, 4, 2), + overworld_frame(gObjectEventPic_Artist, 2, 4, 3), + overworld_frame(gObjectEventPic_Artist, 2, 4, 4), + overworld_frame(gObjectEventPic_Artist, 2, 4, 5), + overworld_frame(gObjectEventPic_Artist, 2, 4, 6), + overworld_frame(gObjectEventPic_Artist, 2, 4, 7), + overworld_frame(gObjectEventPic_Artist, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayNormal[] = { + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 9), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 10), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 11), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 12), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 13), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 14), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 15), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 16), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 17) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayMachBike[] = { + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayAcroBike[] = { + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 26) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MaySurfing[] = { + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 5) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayUnderwater[] = { + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFieldMove[] = { + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 4) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cameraman[] = { + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 0), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 1), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 2), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 3), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 4), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 5), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 6), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 7), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MovingBox[] = { + overworld_frame(gObjectEventPic_MovingBox, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CableCar[] = { + overworld_frame(gObjectEventPic_CableCar, 8, 8, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist2[] = { + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man7[] = { + overworld_frame(gObjectEventPic_Man7, 2, 4, 0), + overworld_frame(gObjectEventPic_Man7, 2, 4, 1), + overworld_frame(gObjectEventPic_Man7, 2, 4, 2), + overworld_frame(gObjectEventPic_Man7, 2, 4, 3), + overworld_frame(gObjectEventPic_Man7, 2, 4, 4), + overworld_frame(gObjectEventPic_Man7, 2, 4, 5), + overworld_frame(gObjectEventPic_Man7, 2, 4, 6), + overworld_frame(gObjectEventPic_Man7, 2, 4, 7), + overworld_frame(gObjectEventPic_Man7, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberM[] = { + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberF[] = { + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberM[] = { + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberF[] = { + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sidney[] = { + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Phoebe[] = { + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Glacia[] = { + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Drake[] = { + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Roxanne[] = { + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brawly[] = { + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wattson[] = { + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Flannery[] = { + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Norman[] = { + overworld_frame(gObjectEventPic_Norman, 2, 4, 0), + overworld_frame(gObjectEventPic_Norman, 2, 4, 1), + overworld_frame(gObjectEventPic_Norman, 2, 4, 2), + overworld_frame(gObjectEventPic_Norman, 2, 4, 3), + overworld_frame(gObjectEventPic_Norman, 2, 4, 4), + overworld_frame(gObjectEventPic_Norman, 2, 4, 5), + overworld_frame(gObjectEventPic_Norman, 2, 4, 6), + overworld_frame(gObjectEventPic_Norman, 2, 4, 7), + overworld_frame(gObjectEventPic_Norman, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Winona[] = { + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Liza[] = { + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tate[] = { + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wallace[] = { + overworld_frame(gObjectEventPic_Wallace, 2, 4, 0), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 1), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 2), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 3), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 4), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 5), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 6), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 7), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Steven[] = { + overworld_frame(gObjectEventPic_Steven, 2, 4, 0), + overworld_frame(gObjectEventPic_Steven, 2, 4, 1), + overworld_frame(gObjectEventPic_Steven, 2, 4, 2), + overworld_frame(gObjectEventPic_Steven, 2, 4, 3), + overworld_frame(gObjectEventPic_Steven, 2, 4, 4), + overworld_frame(gObjectEventPic_Steven, 2, 4, 5), + overworld_frame(gObjectEventPic_Steven, 2, 4, 6), + overworld_frame(gObjectEventPic_Steven, 2, 4, 7), + overworld_frame(gObjectEventPic_Steven, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wally[] = { + overworld_frame(gObjectEventPic_Wally, 2, 4, 0), + overworld_frame(gObjectEventPic_Wally, 2, 4, 1), + overworld_frame(gObjectEventPic_Wally, 2, 4, 2), + overworld_frame(gObjectEventPic_Wally, 2, 4, 3), + overworld_frame(gObjectEventPic_Wally, 2, 4, 4), + overworld_frame(gObjectEventPic_Wally, 2, 4, 5), + overworld_frame(gObjectEventPic_Wally, 2, 4, 6), + overworld_frame(gObjectEventPic_Wally, 2, 4, 7), + overworld_frame(gObjectEventPic_Wally, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleBoy3[] = { + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFishing[] = { + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 11) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFishing[] = { + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 11) +}; + +const struct SpriteFrameImage gObjectEventPicTable_HotSpringsOldWoman[] = { + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SSTidal[] = { + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SubmarineShadow[] = { + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PichuDoll[] = { + overworld_frame(gObjectEventPic_PichuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikachuDoll[] = { + overworld_frame(gObjectEventPic_PikachuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MarillDoll[] = { + overworld_frame(gObjectEventPic_MarillDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TogepiDoll[] = { + overworld_frame(gObjectEventPic_TogepiDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyndaquilDoll[] = { + overworld_frame(gObjectEventPic_CyndaquilDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ChikoritaDoll[] = { + overworld_frame(gObjectEventPic_ChikoritaDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TotodileDoll[] = { + overworld_frame(gObjectEventPic_TotodileDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_JigglypuffDoll[] = { + overworld_frame(gObjectEventPic_JigglypuffDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MeowthDoll[] = { + overworld_frame(gObjectEventPic_MeowthDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ClefairyDoll[] = { + overworld_frame(gObjectEventPic_ClefairyDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_DittoDoll[] = { + overworld_frame(gObjectEventPic_DittoDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SmoochumDoll[] = { + overworld_frame(gObjectEventPic_SmoochumDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TreeckoDoll[] = { + overworld_frame(gObjectEventPic_TreeckoDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TorchicDoll[] = { + overworld_frame(gObjectEventPic_TorchicDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MudkipDoll[] = { + overworld_frame(gObjectEventPic_MudkipDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_DuskullDoll[] = { + overworld_frame(gObjectEventPic_DuskullDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_WynautDoll[] = { + overworld_frame(gObjectEventPic_WynautDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BaltoyDoll[] = { + overworld_frame(gObjectEventPic_BaltoyDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_KecleonDoll[] = { + overworld_frame(gObjectEventPic_KecleonDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzurillDoll[] = { + overworld_frame(gObjectEventPic_AzurillDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SkittyDoll[] = { + overworld_frame(gObjectEventPic_SkittyDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwabluDoll[] = { + overworld_frame(gObjectEventPic_SwabluDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_GulpinDoll[] = { + overworld_frame(gObjectEventPic_GulpinDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LotadDoll[] = { + overworld_frame(gObjectEventPic_LotadDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SeedotDoll[] = { + overworld_frame(gObjectEventPic_SeedotDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikaCushion[] = { + overworld_frame(gObjectEventPic_PikaCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_RoundCushion[] = { + overworld_frame(gObjectEventPic_RoundCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_KissCushion[] = { + overworld_frame(gObjectEventPic_KissCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ZigzagCushion[] = { + overworld_frame(gObjectEventPic_ZigzagCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SpinCushion[] = { + overworld_frame(gObjectEventPic_SpinCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_DiamondCushion[] = { + overworld_frame(gObjectEventPic_DiamondCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BallCushion[] = { + overworld_frame(gObjectEventPic_BallCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_GrassCushion[] = { + overworld_frame(gObjectEventPic_GrassCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_FireCushion[] = { + overworld_frame(gObjectEventPic_FireCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_WaterCushion[] = { + overworld_frame(gObjectEventPic_WaterCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigSnorlaxDoll[] = { + overworld_frame(gObjectEventPic_BigSnorlaxDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRhydonDoll[] = { + overworld_frame(gObjectEventPic_BigRhydonDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigLaprasDoll[] = { + overworld_frame(gObjectEventPic_BigLaprasDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigVenusaurDoll[] = { + overworld_frame(gObjectEventPic_BigVenusaurDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigCharizardDoll[] = { + overworld_frame(gObjectEventPic_BigCharizardDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigBlastoiseDoll[] = { + overworld_frame(gObjectEventPic_BigBlastoiseDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigWailmerDoll[] = { + overworld_frame(gObjectEventPic_BigWailmerDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegirockDoll[] = { + overworld_frame(gObjectEventPic_BigRegirockDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegiceDoll[] = { + overworld_frame(gObjectEventPic_BigRegiceDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegisteelDoll[] = { + overworld_frame(gObjectEventPic_BigRegisteelDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LatiasLatios[] = { + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy5[] = { + overworld_frame(gObjectEventPic_Boy5, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ContestJudge[] = { + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 0), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 1), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 2), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 3), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 4), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 5), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 6), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 7), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanWatering[] = { + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayWatering[] = { + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanDecorating[] = { + overworld_frame(gObjectEventPic_BrendanDecorating, 2, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayDecorating[] = { + overworld_frame(gObjectEventPic_MayDecorating, 2, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Archie[] = { + overworld_frame(gObjectEventPic_Archie, 2, 4, 0), + overworld_frame(gObjectEventPic_Archie, 2, 4, 1), + overworld_frame(gObjectEventPic_Archie, 2, 4, 2), + overworld_frame(gObjectEventPic_Archie, 2, 4, 3), + overworld_frame(gObjectEventPic_Archie, 2, 4, 4), + overworld_frame(gObjectEventPic_Archie, 2, 4, 5), + overworld_frame(gObjectEventPic_Archie, 2, 4, 6), + overworld_frame(gObjectEventPic_Archie, 2, 4, 7), + overworld_frame(gObjectEventPic_Archie, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maxie[] = { + overworld_frame(gObjectEventPic_Maxie, 2, 4, 0), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 1), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 2), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 3), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 4), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 5), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 6), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 7), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kyogre[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Groudon[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fossil[] = { + overworld_frame(gObjectEventPic_Fossil, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Regi[] = { + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Skitty[] = { + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kecleon[] = { + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Rayquaza[] = { + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Zigzagoon[] = { + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Pikachu[] = { + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azumarill[] = { + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wingull[] = { + overworld_frame(gObjectEventPic_Wingull, 2, 2, 0), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 2), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 4), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberMSwimming[] = { + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azurill[] = { + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mom[] = { + overworld_frame(gObjectEventPic_Mom, 2, 4, 0), + overworld_frame(gObjectEventPic_Mom, 2, 4, 1), + overworld_frame(gObjectEventPic_Mom, 2, 4, 2), + overworld_frame(gObjectEventPic_Mom, 2, 4, 3), + overworld_frame(gObjectEventPic_Mom, 2, 4, 4), + overworld_frame(gObjectEventPic_Mom, 2, 4, 5), + overworld_frame(gObjectEventPic_Mom, 2, 4, 6), + overworld_frame(gObjectEventPic_Mom, 2, 4, 7), + overworld_frame(gObjectEventPic_Mom, 2, 4, 8), +}; + +#endif //POKERUBY_OBJECT_EVENT_PIC_TABLES_H diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/object_events/object_event_subsprites.h index 95ff6dc03..49238f674 100644 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/object_events/object_event_subsprites.h @@ -2,108 +2,108 @@ // -#ifndef POKERUBY_EVENT_OBJECT_SUBSPRITES_H -#define POKERUBY_EVENT_OBJECT_SUBSPRITES_H +#ifndef POKERUBY_OBJECT_EVENT_SUBSPRITES_H +#define POKERUBY_OBJECT_EVENT_SUBSPRITES_H -const struct Subsprite gEventObjectSubspriteTable_16x16_0[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_1[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_1[] = { { -8, -8, 0, 1, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_2[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_2[] = { { -8, -8, 1, 0, 0, 2}, { -8, 0, 1, 0, 2, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_3[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_3[] = { { -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_4[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_4[] = { { -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 3} }; -const struct SubspriteTable gEventObjectSubspriteTables_16x16[] = { +const struct SubspriteTable gObjectEventSubspriteTables_16x16[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_16x16_0}, - {1, gEventObjectSubspriteTable_16x16_1}, - {2, gEventObjectSubspriteTable_16x16_2}, - {2, gEventObjectSubspriteTable_16x16_3}, - {2, gEventObjectSubspriteTable_16x16_4} + {1, gObjectEventSubspriteTable_16x16_0}, + {1, gObjectEventSubspriteTable_16x16_1}, + {2, gObjectEventSubspriteTable_16x16_2}, + {2, gObjectEventSubspriteTable_16x16_3}, + {2, gObjectEventSubspriteTable_16x16_4} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_0[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_0[] = { { -8, -16, 2, 2, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_1[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_1[] = { { -8, -16, 2, 2, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_2[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_2[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 1, 0, 4, 2}, { -8, 8, 1, 0, 6, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_3[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_3[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 0, 1, 4, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_4[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_4[] = { { -8, -16, 0, 1, 0, 1}, { -8, 0, 0, 1, 4, 3} }; -const struct SubspriteTable gEventObjectSubspriteTables_16x32[] = { +const struct SubspriteTable gObjectEventSubspriteTables_16x32[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_16x32_0}, - {1, gEventObjectSubspriteTable_16x32_1}, - {3, gEventObjectSubspriteTable_16x32_2}, - {2, gEventObjectSubspriteTable_16x32_3}, - {2, gEventObjectSubspriteTable_16x32_4} + {1, gObjectEventSubspriteTable_16x32_0}, + {1, gObjectEventSubspriteTable_16x32_1}, + {3, gObjectEventSubspriteTable_16x32_2}, + {2, gObjectEventSubspriteTable_16x32_3}, + {2, gObjectEventSubspriteTable_16x32_4} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_0[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_0[] = { {-16, -16, 0, 2, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_1[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_1[] = { {-16, -16, 0, 2, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_2[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_2[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 1, 8, 2}, {-16, 8, 1, 1, 12, 3} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_3[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_3[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 2, 8, 3} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_4[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_4[] = { {-16, -16, 1, 2, 0, 1}, {-16, 0, 1, 2, 8, 3} }; -const struct SubspriteTable gEventObjectSubspriteTables_32x32[] = { +const struct SubspriteTable gObjectEventSubspriteTables_32x32[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_32x32_0}, - {1, gEventObjectSubspriteTable_32x32_1}, - {3, gEventObjectSubspriteTable_32x32_2}, - {2, gEventObjectSubspriteTable_32x32_3}, - {2, gEventObjectSubspriteTable_32x32_4} + {1, gObjectEventSubspriteTable_32x32_0}, + {1, gObjectEventSubspriteTable_32x32_1}, + {3, gObjectEventSubspriteTable_32x32_2}, + {2, gObjectEventSubspriteTable_32x32_3}, + {2, gObjectEventSubspriteTable_32x32_4} }; -const struct Subsprite gEventObjectSubspriteTable_Truck_0[] = { +const struct Subsprite gObjectEventSubspriteTable_Truck_0[] = { {-24, -24, 1, 1, 0, 2}, { 8, -24, 1, 0, 4, 2}, {-24, -16, 1, 1, 6, 2}, @@ -118,66 +118,66 @@ const struct Subsprite gEventObjectSubspriteTable_Truck_0[] = { { 8, 16, 1, 0, 34, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_Truck[] = { - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0} +const struct SubspriteTable gObjectEventSubspriteTables_Truck[] = { + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_0[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_0[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_1[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_1[] = { {-32, -16, 1, 3, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_2[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_2[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_3[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_3[] = { {-32, -16, 1, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_Unused[] = { +const struct SubspriteTable gObjectEventSubspriteTables_Unused[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_Unused_0}, - {1, gEventObjectSubspriteTable_Unused_1}, - {1, gEventObjectSubspriteTable_Unused_2}, - {1, gEventObjectSubspriteTable_Unused_3}, - {1, gEventObjectSubspriteTable_Unused_3} + {1, gObjectEventSubspriteTable_Unused_0}, + {1, gObjectEventSubspriteTable_Unused_1}, + {1, gObjectEventSubspriteTable_Unused_2}, + {1, gObjectEventSubspriteTable_Unused_3}, + {1, gObjectEventSubspriteTable_Unused_3} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_0[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_0[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_1[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_1[] = { {-32, -32, 0, 3, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_2[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_2[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_3[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_3[] = { {-32, -32, 0, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_CableCar[] = { +const struct SubspriteTable gObjectEventSubspriteTables_CableCar[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_CableCar_0}, - {1, gEventObjectSubspriteTable_CableCar_1}, - {1, gEventObjectSubspriteTable_CableCar_2}, - {1, gEventObjectSubspriteTable_CableCar_3}, - {1, gEventObjectSubspriteTable_CableCar_3} + {1, gObjectEventSubspriteTable_CableCar_0}, + {1, gObjectEventSubspriteTable_CableCar_1}, + {1, gObjectEventSubspriteTable_CableCar_2}, + {1, gObjectEventSubspriteTable_CableCar_3}, + {1, gObjectEventSubspriteTable_CableCar_3} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_0[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -195,7 +195,7 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_0[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_1[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -213,7 +213,7 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_1[] = { { 16, 12, 1, 1, 56, 1} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_2[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -231,7 +231,7 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_2[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_3[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -249,16 +249,16 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_3[] = { { 16, 12, 1, 1, 56, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_SSTidal[] = { - {15, gEventObjectSubspriteTable_SSTidal_0}, - {15, gEventObjectSubspriteTable_SSTidal_0}, - {15, gEventObjectSubspriteTable_SSTidal_1}, - {15, gEventObjectSubspriteTable_SSTidal_2}, - {15, gEventObjectSubspriteTable_SSTidal_3}, - {15, gEventObjectSubspriteTable_SSTidal_3} +const struct SubspriteTable gObjectEventSubspriteTables_SSTidal[] = { + {15, gObjectEventSubspriteTable_SSTidal_0}, + {15, gObjectEventSubspriteTable_SSTidal_0}, + {15, gObjectEventSubspriteTable_SSTidal_1}, + {15, gObjectEventSubspriteTable_SSTidal_2}, + {15, gObjectEventSubspriteTable_SSTidal_3}, + {15, gObjectEventSubspriteTable_SSTidal_3} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_0[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -277,7 +277,7 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_0[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_1[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -296,7 +296,7 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_1[] = { { 32, 4, 0, 0, 43, 1} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_2[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -315,7 +315,7 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_2[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_3[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -334,12 +334,12 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_3[] = { { 32, 4, 0, 0, 43, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_SubmarineShadow[] = { - {16, gEventObjectSubspriteTable_SubmarineShadow_0}, - {16, gEventObjectSubspriteTable_SubmarineShadow_0}, - {16, gEventObjectSubspriteTable_SubmarineShadow_1}, - {16, gEventObjectSubspriteTable_SubmarineShadow_2}, - {16, gEventObjectSubspriteTable_SubmarineShadow_3}, - {16, gEventObjectSubspriteTable_SubmarineShadow_3} +const struct SubspriteTable gObjectEventSubspriteTables_SubmarineShadow[] = { + {16, gObjectEventSubspriteTable_SubmarineShadow_0}, + {16, gObjectEventSubspriteTable_SubmarineShadow_0}, + {16, gObjectEventSubspriteTable_SubmarineShadow_1}, + {16, gObjectEventSubspriteTable_SubmarineShadow_2}, + {16, gObjectEventSubspriteTable_SubmarineShadow_3}, + {16, gObjectEventSubspriteTable_SubmarineShadow_3} }; -#endif //POKERUBY_EVENT_OBJECT_SUBSPRITES_H +#endif //POKERUBY_OBJECT_EVENT_SUBSPRITES_H diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 9adbc28de..e708404cc 100644 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -26,7 +26,12 @@ "type": "fishing_mons", "encounter_rates": [ 70, 30, 60, 20, 20, 40, 40, 15, 4, 1 - ] + ], + "groups": { + "old_rod": [0, 1], + "good_rod": [2, 3, 4], + "super_rod": [5, 6, 7, 8, 9] + } } ], "encounters": [ @@ -18909,4 +18914,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/src/data/wild_encounters.json.txt b/src/data/wild_encounters.json.txt index de8396dd6..c6bbdd34e 100644 --- a/src/data/wild_encounters.json.txt +++ b/src/data/wild_encounters.json.txt @@ -3,14 +3,26 @@ ## for wild_encounter_group in wild_encounter_groups {% if wild_encounter_group.for_maps %} ## for wild_encounter_field in wild_encounter_group.fields +{% if not existsIn(wild_encounter_field, "groups") %} ## for encounter_rate in wild_encounter_field.encounter_rates -{% if trackVar(encounter_rate, 100) %} +{% if loop.index == 0 %} #define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ loop.index }} {{ encounter_rate }} {% else %}#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ loop.index }} ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ subtract(loop.index, 1) }} + {{ encounter_rate }}{% endif %} {{ setVarInt(wild_encounter_field.type, loop.index) }} ## endfor #define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_TOTAL (ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_SLOT_{{ getVar(wild_encounter_field.type) }}) +{% else %} +## for field_subgroup_key, field_subgroup_subarray in wild_encounter_field.groups +## for field_subgroup_index in field_subgroup_subarray +{% if loop.index == 0 %} +#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ field_subgroup_index }} {{ at(wild_encounter_field.encounter_rates, field_subgroup_index) }} {% else %}#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ field_subgroup_index }} ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ getVar("previous_slot") }} + {{ at(wild_encounter_field.encounter_rates, field_subgroup_index) }}{% endif %}{{ setVarInt(concat(wild_encounter_field.type, field_subgroup_key), field_subgroup_index) }}{{ setVarInt("previous_slot", field_subgroup_index) }} +## endfor +#define ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_TOTAL (ENCOUNTER_CHANCE_{{ upper(wild_encounter_field.type) }}_{{ upper(field_subgroup_key) }}_SLOT_{{ getVar(concat(wild_encounter_field.type, field_subgroup_key)) }}) +## endfor +{% endif %} ## endfor {% endif %} + + ## for encounter in wild_encounter_group.encounters {% if contains(encounter.base_label, "Sapphire") %}#ifdef SAPPHIRE {% else if contains(encounter.base_label, "Ruby") %}#ifdef RUBY{% endif %} diff --git a/src/debug/ereader_debug_menu.c b/src/debug/ereader_debug_menu.c index aaffca383..74a5ff10c 100644 --- a/src/debug/ereader_debug_menu.c +++ b/src/debug/ereader_debug_menu.c @@ -10,7 +10,11 @@ #include "berry.h" #include "mail_data.h" +#if DEBUG +const u8 Str_842E238[] = DTR("タマゴ", "EGG"); +#else const u8 Str_842E238[] = _("タマゴ"); +#endif #if DEBUG @@ -131,7 +135,7 @@ extern u8 gUnknown_Debug_845DDB2[]; extern u8 gUnknown_Debug_845DDB2End[]; extern u8 gUnknown_Debug_845DDD6[]; -const u8 Str_842E23C[] = _("ガイブ"); +const u8 Str_842E23C[] = DTR("ガイブ", "EXTERNAL"); size_t debug_sub_813C5B4(u8 * dest) { @@ -286,7 +290,7 @@ extern u8 gUnknown_Debug_845E4EF[]; extern u8 gUnknown_Debug_845E4EFEnd[]; extern u8 gUnknown_Debug_845E506[]; -const u8 Str_842E253[] = _(" そら カードイー"); +const u8 Str_842E253[] = DTR(" そら カードイー", "eCARD TRAINER"); size_t debug_sub_813C93C(u8 * dest) { @@ -305,22 +309,22 @@ size_t debug_sub_813C93C(u8 * dest) return size; } -const u8 Str_842E25E[] = _("ポケコッコ"); +const u8 Str_842E25E[] = KANA("ポケコッコ"); // TRN: kokko? const u8 Str_842E264[] = _("ticket"); const u8 Str_842E26B[] = _("{PKMN}"); -const u8 Str_842E26E[] = _("wrong {PKMN}"); +const u8 Str_842E26E[] = _("wrong {PKMN}"); const u8 Str_842E277[] = _("ribbon"); const u8 Str_842E27E[] = _("DEX"); const u8 Str_842E282[] = _("message"); const u8 Str_842E28A[] = _("egg"); -const u8 Str_842E28E[] = _("RAM seed"); +const u8 Str_842E28E[] = _("RAM seed"); const u8 Str_842E297[] = _("trainer"); const u8 Str_842E29F[] = _("clock"); const u8 Str_842E2A5[] = _("item"); const u8 Str_842E2AA[] = _("goods"); const u8 Str_842E2B0[] = _("potion"); const u8 Str_842E2B7[] = _("ball"); -const u8 Str_842E2BC[] = _("cheri berry"); +const u8 Str_842E2BC[] = _("cheri berry"); const u8 Str_842E2C8[] = _("TM01"); const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[] = { diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 1d2879661..27d2db66b 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -44,13 +44,13 @@ static void sub_80AA614(u8, u8); static void sub_80AAD08(struct Sprite *, s8); // unused -const u8 gText_Unused83C9150[] = _("テストです"); // "test" +const u8 gText_Unused83C9150[] = DTR("テストです", "Test"); const u8 gMatsudaDebugMenu_ActionContestText[] = _("Contest"); const u8 gMatsudaDebugMenu_ActionContestResultsText[] = _("Contest results"); // unused -const u8 gMatsudaDebugMenu_ActionChangePerimeterText[] = _("パラメータへんこう"); // "Change parameter" +const u8 gMatsudaDebugMenu_ActionChangeParameterText[] = DTR("パラメータへんこう", "Change parameter"); // unused -const u8 gMatsudaDebugMenu_ActionChangeMoveText[] = _("わざ へんこう"); // "Change move" +const u8 gMatsudaDebugMenu_ActionChangeMoveText[] = DTR("わざ へんこう", "Change move"); // "Change move" const u8 gMatsudaDebugMenu_ActionContestCommText[] = _("Contest (comm.)"); const u8 gMatsudaDebugMenu_ActionCommTestText[] = _("Init comm. data"); const u8 gMatsudaDebugMenu_ActionSetHighScoreText[] = _("Set highest score"); @@ -387,8 +387,8 @@ static void (* const gUnknown_083C92E4[][2])(struct Sprite *, s8) = }; static const u8 gMatsudaDebugMenu_StartText[] = _("{COLOR CYAN}{HIGHLIGHT RED}"); -static const u8 gMatsudaDebugMenu_StartJapText[] = _("かいし"); // because StartText is only called by StringCopy, this part appears to be unused. -static const u8 gMatsudaDebugMenu_GoBackText[] = _("もどる"); +static const u8 gMatsudaDebugMenu_StartJapText[] = DTR("かいし", "START"); // because StartText is only called by StringCopy, this part appears to be unused. +static const u8 gMatsudaDebugMenu_GoBackText[] = DTR("もどる", "BACK"); #ifdef GERMAN static const u8 gMatsudaDebugMenu_BattlePointsText[] = _("{COLOR MAGENTA}BP,"); @@ -396,12 +396,12 @@ static const u8 gMatsudaDebugMenu_BattlePointsText[] = _("{COLOR MAGENTA}BP,"); static const u8 gMatsudaDebugMenu_BattlePointsText[] = _("{COLOR MAGENTA}BP."); #endif -static const u8 MatsudaDebugMenuText_Cool[] = _("かっこよさ"); // cool -static const u8 MatsudaDebugMenuText_Cute[] = _("かわいさ"); // cute -static const u8 MatsudaDebugMenuText_Beauty[] = _("うつくしさ"); // beauty -static const u8 MatsudaDebugMenuText_Smart[] = _("かしこさ"); // smart -static const u8 MatsudaDebugMenuText_Tough[] = _("たくましさ"); // tough -static const u8 MatsudaDebugMenuText_Sheen[] = _("けづや"); // sheen +static const u8 MatsudaDebugMenuText_Cool[] = DTR("かっこよさ", "COOL"); +static const u8 MatsudaDebugMenuText_Cute[] = DTR("かわいさ", "CUTE"); +static const u8 MatsudaDebugMenuText_Beauty[] = DTR("うつくしさ", "BEAUTY"); +static const u8 MatsudaDebugMenuText_Smart[] = DTR("かしこさ", "SMART"); +static const u8 MatsudaDebugMenuText_Tough[] = DTR("たくましさ", "TOUGH"); +static const u8 MatsudaDebugMenuText_Sheen[] = DTR("けづや", "SHEEN"); static const u8 *const gMatsudaDebugMenuTextList1[] = { @@ -413,11 +413,11 @@ static const u8 *const gMatsudaDebugMenuTextList1[] = MatsudaDebugMenuText_Sheen, }; -static const u8 MatsudaDebugMenuText_CoolContest[] = _("かっこよさコンテスト"); -static const u8 MatsudaDebugMenuText_BeautyContest[] = _("うつくしさコンテスト"); -static const u8 MatsudaDebugMenuText_CuteContest[] = _("かわいさコンテスト "); -static const u8 MatsudaDebugMenuText_SmartContest[] = _("かしこさコンテスト "); -static const u8 MatsudaDebugMenuText_ToughContest[] = _("たくましさコンテスト"); +static const u8 MatsudaDebugMenuText_CoolContest[] = DTR("かっこよさコンテスト", "COOL CONTEST"); +static const u8 MatsudaDebugMenuText_BeautyContest[] = DTR("うつくしさコンテスト", "BEAUTY CONTEST"); +static const u8 MatsudaDebugMenuText_CuteContest[] = DTR("かわいさコンテスト ", "CUTE CONTEST"); +static const u8 MatsudaDebugMenuText_SmartContest[] = DTR("かしこさコンテスト ", "SMART CONTEST"); +static const u8 MatsudaDebugMenuText_ToughContest[] = DTR("たくましさコンテスト", "TOUGH CONTEST"); static const u8 *const gMatsudaDebugMenuTextList2[] = { @@ -428,10 +428,10 @@ static const u8 *const gMatsudaDebugMenuTextList2[] = MatsudaDebugMenuText_ToughContest, }; -static const u8 MatsudaDebugMenuText_Fallarbor[] = _("ハジツゲ/ノーマル"); // Fallarbor / Normal -static const u8 MatsudaDebugMenuText_Verdanturf[] = _("シダケ/スーパー "); // Verdanturf / Super -static const u8 MatsudaDebugMenuText_Slateport[] = _("カイナ/ハイパー "); // Slateport / Hyper -static const u8 MatsudaDebugMenuText_Lilycove[] = _("ミナモ/マスター "); // Lilycove / Master +static const u8 MatsudaDebugMenuText_Fallarbor[] = DTR("ハジツゲ/ノーマル", "FALLARBOR/NORMAL"); // Fallarbor / Normal +static const u8 MatsudaDebugMenuText_Verdanturf[] = DTR("シダケ/スーパー ", "VERDANTURF/SUPER"); // Verdanturf / Super +static const u8 MatsudaDebugMenuText_Slateport[] = DTR("カイナ/ハイパー ", "SLATEPORT/HYPER"); // Slateport / Hyper +static const u8 MatsudaDebugMenuText_Lilycove[] = DTR("ミナモ/マスター ", "LILYCOVE/MASTER"); // Lilycove / Master static const u8 *const gMatsudaDebugMenuTextList3[] = { diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 4f798ecb3..dfa2487a5 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -31,9 +31,9 @@ const u8 gUnknown_0839B22C[][3] = }; const u8 gUnknown_0839B24A[] = _("ND"); -const u8 gUnknown_0839B24D[] = _("の こどもは\n"); // "'s child <topic-particle>"= +const u8 gUnknown_0839B24D[] = DTR("の こどもは\n", "'s child is\n"); const u8 gUnknown_0839B255[] = _(" "); -const u8 gUnknown_0839B257[] = _("ながいなまえぽけもん"); // "long name pokemon" (used as test name) +const u8 gUnknown_0839B257[] = DTR("ながいなまえぽけもん", "LongName{PKMN}"); // "long name pokemon" (used as test name) const u8 Text_39B262[] = _("Search a child"); const u8 Text_39B271[] = _("Egg"); const u8 Text_39B275[] = _("Egg (male)"); @@ -45,7 +45,7 @@ const u8 Text_39B2AF[] = _("Long name"); #ifdef GERMAN const u8 Text_39B2B9[] = _("Delete {POKEBLOCK}"); #else -const u8 Text_39B2B9[] = _("ポロックけす"); +const u8 Text_39B2B9[] = DTR("ポロックけす", "Delete {POKEBLOCK}"); #endif const struct MenuAction gMoriDebugMenuActions[] = diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index e6af3c58d..32ac57dc2 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -50,7 +50,7 @@ static bool8 SetPokeblock(void); static const u8 Str_843E36C[] = _("Berries"); static const u8 Str_843E374[] = _("Goods"); static const u8 Str_843E37A[] = _("{PKMN} list"); -static const u8 Str_843E382[] = _("トラップ"); +static const u8 Str_843E382[] = DTR("トラップ", "Trap"); static const u8 Str_843E387[] = _("Move your base"); static const u8 Str_843E396[] = _("Moving {PKMN}"); static const u8 Str_843E3A0[] = _("Fishing points"); @@ -874,10 +874,11 @@ static struct { EWRAM_DATA u8 sNakaGenderTest_CursorPosition = 0; static const u8 _843E5D1[] = {0x0F, 0x16, 0x19}; -static const u8 Str_843E5D4[] = _( - "Aボタン {ESCAPE}\p" - " Bボタン ー\n" - "START けってい"); +static const u8 Str_843E5D4[] = DTR( + "Aボタン {TALL_PLUS} Bボタン ー\n" + "START けってい", + "A BUTTON {TALL_PLUS} B BUTTON {JPN}ー{ENG}\n" + "START CHOOSE"); void NakaGenderTest(void) { @@ -1916,14 +1917,14 @@ static bool8 SetPokeblock(void) EWRAM_DATA u8 sEVTest_CursorPosition = 0; -static const u8 Str_843E5F2[] = _("HP どりょくち"); -static const u8 Str_843E5FB[] = _("こうげき どりょくち"); -static const u8 Str_843E606[] = _("ぼうぎょ どりょくち"); -static const u8 Str_843E611[] = _("すばやさ どりょくち"); -static const u8 Str_843E61C[] = _("とくこう どりょくち"); -static const u8 Str_843E627[] = _("とくぼう どりょくち"); -static const u8 Str_843E632[] = _("なつきど"); -static const u8 Str_843E637[] = _("どりょくち ごうけい"); +static const u8 Str_843E5F2[] = DTR("HP どりょくち", "HP EVs"); +static const u8 Str_843E5FB[] = DTR("こうげき どりょくち", "ATK EVs"); +static const u8 Str_843E606[] = DTR("ぼうぎょ どりょくち", "DEF EVs"); +static const u8 Str_843E611[] = DTR("すばやさ どりょくち", "SPE EVs"); +static const u8 Str_843E61C[] = DTR("とくこう どりょくち", "SPA EVs"); +static const u8 Str_843E627[] = DTR("とくぼう どりょくち", "SPD EVs"); +static const u8 Str_843E632[] = DTR("なつきど", "FRIENDSHIP"); +static const u8 Str_843E637[] = DTR("どりょくち ごうけい", "EV TOTAL"); static void EVTest_Init(void) { @@ -2071,13 +2072,13 @@ EWRAM_DATA u16 sRngRight = 0; EWRAM_DATA u16 sNumSamples = 0; EWRAM_DATA u16 sRngMax = 0; -static const u8 Str_843E642[] = _("ここから"); -static const u8 Str_843E647[] = _("ここまで"); -static const u8 Str_843E64C[] = _("かいすう"); -static const u8 Str_843E651[] = _("けっか"); -static const u8 Str_843E655[] = _("かい"); +static const u8 Str_843E642[] = DTR("ここから", "FROM"); +static const u8 Str_843E647[] = DTR("ここまで", "TO"); +static const u8 Str_843E64C[] = DTR("かいすう", "TIMES"); +static const u8 Str_843E651[] = DTR("けっか", "RESULT"); +static const u8 Str_843E655[] = DTR("かい", "×"); static const u8 Str_843E658[] = _("0"); -static const u8 Str_843E65A[] = _("はんい"); +static const u8 Str_843E65A[] = DTR("はんい", "RANGE"); static u16 EVTest_GetDiscreteUniformRandomSamples(void) { diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 349e5111f..d26d6038c 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -57,14 +57,14 @@ bool8 NoharaDebugMenu_LegendsFlagOn(void); bool8 NoharaDebugMenu_AddNumWinningStreaks(void); const u8 gUnknown_Debug_083C48C4[] = _("TV"); -const u8 gUnknown_Debug_083C48C7[] = _("Fan"); -const u8 gUnknown_Debug_083C48CB[] = _("Battle (vs Dad)"); -const u8 gUnknown_Debug_083C48DB[] = _("Dad after battle"); -const u8 gUnknown_Debug_083C48EC[] = _("SOOTOPOLIS CITY"); -const u8 gUnknown_Debug_083C48FC[] = _("Embark"); -const u8 gUnknown_Debug_083C4903[] = _("Yes 9999"); -const u8 gUnknown_Debug_083C490C[] = _("Legends flag ON"); -const u8 gUnknown_Debug_083C491C[] = _("Add num of winning streaks"); +const u8 gUnknown_Debug_083C48C7[] = DTR("Fan", "LILYCOVE TRAINER FAN CLUB"); +const u8 gUnknown_Debug_083C48CB[] = _("Battle (vs Dad)"); +const u8 gUnknown_Debug_083C48DB[] = _("Dad after battle"); +const u8 gUnknown_Debug_083C48EC[] = _("SOOTOPOLIS CITY"); +const u8 gUnknown_Debug_083C48FC[] = DTR("Embark", "Reset Mr. BRINEY"); +const u8 gUnknown_Debug_083C4903[] = _("Yes 9999"); +const u8 gUnknown_Debug_083C490C[] = _("Legends flag ON"); +const u8 gUnknown_Debug_083C491C[] = _("Add num of winning streaks"); const struct MenuAction gUnknown_Debug_083C4938[] = { {gUnknown_Debug_083C48C4, NoharaDebugMenu_TV}, @@ -104,28 +104,30 @@ bool8 debug_sub_808F414(void) } } -const u8 gUnknown_Debug_083C4980[] = _("Want to change data type{CLEAR_TO 143}Press Left\n" - "to see secret type now？{CLEAR_TO 143}to switch"); +const u8 gUnknown_Debug_083C4980[] = _("Want to change data type{CLEAR_TO 143}Press Left\n" + "to see secret type now？{CLEAR_TO 143}to switch"); -const u8 gUnknown_Debug_083C49CA[] = _("Choose the TV data you wish to\n" - "create to check a transmission。"); +const u8 gUnknown_Debug_083C49CA[] = _("Choose the TV data you wish to\n" + "create to check a transmission。"); -const u8 gUnknown_Debug_083C4A09[] = _("ほうそうの はっせいりつを セット\n" - "してください ？ぶんの1に なります"); +const u8 gUnknown_Debug_083C4A09[] = DTR("ほうそうの はっせいりつを セット\n" + "してください ？ぶんの1に なります", + "Please set the transmission frequency\n" + "Part 1"); const u8 gUnknown_Debug_083C4A2E[] = _("SURVEY"); -const u8 gUnknown_Debug_083C4A35[] = _("RECENT HAPPENINGS"); -const u8 gUnknown_Debug_083C4A47[] = _("POKひMON FAN CLUB"); -const u8 gUnknown_Debug_083C4A58[] = _("ジム"); +const u8 gUnknown_Debug_083C4A35[] = _("RECENT HAPPENINGS"); +const u8 gUnknown_Debug_083C4A47[] = _("POKéMON FAN CLUB"); +const u8 gUnknown_Debug_083C4A58[] = DTR("ジム", "GYM"); const u8 gUnknown_Debug_083C4A5B[] = _("OUTBREAKS"); -const u8 gUnknown_Debug_083C4A65[] = _("NAME RATER"); +const u8 gUnknown_Debug_083C4A65[] = _("NAME RATER"); const u8 gUnknown_Debug_083C4A70[] = _("CONTEST"); const u8 gUnknown_Debug_083C4A78[] = _("INTRODUCTION"); const u8 gUnknown_Debug_083C4A85[] = _("SHOPPING"); const u8 gUnknown_Debug_083C4A8E[] = _("MISFORTUNE"); const u8 gUnknown_Debug_083C4A99[] = _("FISHING"); -const u8 gUnknown_Debug_083C4AA1[] = _("MEMORABLE DAY"); -const u8 gUnknown_Debug_083C4AAF[] = _("BRAVO TRAINER"); +const u8 gUnknown_Debug_083C4AA1[] = _("MEMORABLE DAY"); +const u8 gUnknown_Debug_083C4AAF[] = _("BRAVO TRAINER"); const u8 gUnknown_Debug_083C4ABD[] = { TVSHOW_FAN_CLUB_LETTER, @@ -159,8 +161,8 @@ const u8 *const gUnknown_Debug_083C4ACC[] = { const u8 gDebugText_BigSale[] = _("BIG SALE"); -const u8 gUnknown_Debug_083C4B05[] = _("SERVICE DAY"); -const u8 gUnknown_Debug_083C4B11[] = _("CLEARーOUT SALE"); +const u8 gUnknown_Debug_083C4B05[] = _("SERVICE DAY"); +const u8 gUnknown_Debug_083C4B11[] = _("CLEAR-OUT SALE"); const u8 gUnknown_Debug_083C4B20[] = {1, 2, 3}; const u8 *const gUnknown_Debug_083C4B24[] = { @@ -169,15 +171,15 @@ const u8 *const gUnknown_Debug_083C4B24[] = { gUnknown_Debug_083C4B11 }; -const u8 gUnknown_Debug_083C4B30[] = _("Secret type"); +const u8 gUnknown_Debug_083C4B30[] = _("Secret type"); const u8 gUnknown_Debug_083C4B3C[] = _("Start"); -const u8 gUnknown_Debug_083C4B42[] = _("Create TV"); -const u8 gUnknown_Debug_083C4B4C[] = _("All clear"); -const u8 gUnknown_Debug_083C4B56[] = _("All seen"); -const u8 gUnknown_Debug_083C4B5F[] = _("Create CM"); -const u8 gUnknown_Debug_083C4B69[] = _("Not yet seen"); -const u8 gUnknown_Debug_083C4B76[] = _("Hit Table"); -const u8 gUnknown_Debug_083C4B80[] = _("Set full"); +const u8 gUnknown_Debug_083C4B42[] = _("Create TV"); +const u8 gUnknown_Debug_083C4B4C[] = _("All clear"); +const u8 gUnknown_Debug_083C4B56[] = _("All seen"); +const u8 gUnknown_Debug_083C4B5F[] = _("Create CM"); +const u8 gUnknown_Debug_083C4B69[] = _("Not yet seen"); +const u8 gUnknown_Debug_083C4B76[] = _("Hit Table"); +const u8 gUnknown_Debug_083C4B80[] = _("Set full"); // Normaly these would be struct MenuAction, but the prototype of // member .func is not consistent. @@ -754,15 +756,18 @@ bool8 debug_sub_80900AC(void) CloseMenu(); return TRUE; } - -const u8 gUnknown_Debug_083C4C77[] = _("1 スクル"); -const u8 gUnknown_Debug_083C4C7D[] = _("2 ミドル"); -const u8 gUnknown_Debug_083C4C83[] = _("3 オジヨ"); -const u8 gUnknown_Debug_083C4C89[] = _("4 ボーヤ"); -const u8 gUnknown_Debug_083C4C8F[] = _("5 ボーイ"); -const u8 gUnknown_Debug_083C4C95[] = _("6 ヤング"); -const u8 gUnknown_Debug_083C4C9B[] = _("7 ヲーカ"); -const u8 gUnknown_Debug_083C4CA1[] = _("8 オルド"); +// These represent the people in Lilycove Fan Club. +// TRN: These translations are probably wrong but it is really hard to tell with +// the abbreviations. They are mosly based on observation +// The first one is selected by default when there are no fans. +const u8 gUnknown_Debug_083C4C77[] = DTR("1 スクル", "1 LASS/NONE"); // school (girl) +const u8 gUnknown_Debug_083C4C7D[] = DTR("2 ミドル", "2 MIDDLE AGE MAN"); // middle +const u8 gUnknown_Debug_083C4C83[] = DTR("3 オジヨ", "3 DAUGHTER"); // おしょう (daughter) +const u8 gUnknown_Debug_083C4C89[] = DTR("4 ボーヤ", "4 YOUNG BOY"); // 坊や (boy) +const u8 gUnknown_Debug_083C4C8F[] = DTR("5 ボーイ", "5 BOY"); // boy +const u8 gUnknown_Debug_083C4C95[] = DTR("6 ヤング", "6 YOUNG MAN"); // young +const u8 gUnknown_Debug_083C4C9B[] = DTR("7 ヲーカ", "7 MOM"); // お母さん? (probably typo) +const u8 gUnknown_Debug_083C4CA1[] = DTR("8 オルド", "8 OLD LADY"); // old const u8 *const gUnknown_Debug_083C4CA8[] = { gUnknown_Debug_083C4C77, @@ -775,15 +780,15 @@ const u8 *const gUnknown_Debug_083C4CA8[] = { gUnknown_Debug_083C4CA1 }; -const u8 gUnknown_Debug_083C4CC8[] = _("Start"); -const u8 gUnknown_Debug_083C4CCE[] = _("Increase"); -const u8 gUnknown_Debug_083C4CD7[] = _("Reduce"); +const u8 gUnknown_Debug_083C4CC8[] = _("Start"); // Starts the "Oh! I've heard of you' script" +const u8 gUnknown_Debug_083C4CCE[] = _("Increase"); // Increases popularity +const u8 gUnknown_Debug_083C4CD7[] = _("Reduce"); // reduces popularity const u8 gUnknown_Debug_083C4CDE[] = _("Points"); -const u8 gUnknown_Debug_083C4CE5[] = _("Play time 6"); -const u8 gUnknown_Debug_083C4CF1[] = _("P ELITE FOUR"); -const u8 gUnknown_Debug_083C4CFE[] = _("P SECRET BASE"); -const u8 gUnknown_Debug_083C4D0C[] = _("P CONTEST"); -const u8 gUnknown_Debug_083C4D16[] = _("P BATTLE TOWER"); +const u8 gUnknown_Debug_083C4CE5[] = _("Play time 6"); +const u8 gUnknown_Debug_083C4CF1[] = _("P ELITE FOUR"); +const u8 gUnknown_Debug_083C4CFE[] = _("P SECRET BASE"); +const u8 gUnknown_Debug_083C4D0C[] = _("P CONTEST"); +const u8 gUnknown_Debug_083C4D16[] = _("P BATTLE TOWER"); const struct MenuAction gUnknown_Debug_083C4D28[] = { {gUnknown_Debug_083C4CC8, debug_sub_80901E4}, diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 1ead5ae1b..95e71fad5 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -156,10 +156,10 @@ void CB2_StartSoundCheckMenu(void) void Task_InitSoundCheckMenu(u8 taskId) { - u8 soundcheckStr[] = _("サウンドチェック"); + u8 soundcheckStr[] = DTR("サウンドチェック", "SOUND CHECK"); u8 bgmStr[] = _("BGM"); u8 seStr[] = _("SE "); - u8 abDescStr[] = _("A‥さいせい B‥おわり"); + u8 abDescStr[] = DTR("A‥さいせい B‥おわり", "A PLAY B STOP"); u8 upDownStr[] = _("L‥UP R‥DOWN"); u8 driverStr[] = _("R‥DRIVER-TEST"); @@ -399,8 +399,8 @@ void sub_80BA79C(const u8 *const string, u16 x, u16 y) void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu { - u8 bbackStr[] = _("Bぼたんで もどる"); - u8 aplayStr[] = _("Aぼたんで さいせい"); + u8 bbackStr[] = DTR("Bぼたんで もどる", "B BUTTON: BACK"); + u8 aplayStr[] = DTR("Aぼたんで さいせい", "A BUTTON: PLAY"); u8 voiceStr[] = _("VOICE‥‥‥‥"); u8 volumeStr[] = _("VOLUME‥‥‥"); u8 panpotStr[] = _("PANPOT‥‥‥"); @@ -410,9 +410,9 @@ void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu u8 progressStr[] = _("PROGRESS‥"); u8 chorusStr[] = _("CHORUS‥‥‥"); u8 priorityStr[] = _("PRIORITY‥"); - u8 playingStr[] = _("さいせいちゆう‥"); // 再生中 (playing) - u8 reverseStr[] = _("はんてん‥‥‥‥"); // 反転 (reverse) - u8 stereoStr[] = _("すてれお‥‥‥‥"); // stereo + u8 playingStr[] = DTR("さいせいちゆう‥", "PLAYING"); // 再生中 (playing) + u8 reverseStr[] = DTR("はんてん‥‥‥‥", "REVERSE"); // 反転 (reverse) + u8 stereoStr[] = DTR("すてれお‥‥‥‥", "STEREO"); // stereo REG_DISPCNT = 0x3140; Menu_DrawStdWindowFrame(0, 0, 29, 19); @@ -680,7 +680,7 @@ void sub_80BAF84(u8 taskId) { u8 seStr[] = _("SE"); u8 panStr[] = _("PAN"); - u8 playingStr[] = _("さいせいちゆう‥"); + u8 playingStr[] = DTR("さいせいちゆう‥", "PLAYING"); REG_DISPCNT = 0x3140; Menu_DrawStdWindowFrame(0, 0, 29, 19); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 01f04b8d9..940f21ac7 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -174,8 +174,8 @@ const u8 Str_839B7D8[] = _("Transport"); const u8 Str_839B7E2[] = _("See portraits"); const u8 Str_839B7F0[] = _("Time records"); const u8 Str_839B7FD[] = _("Set time"); -const u8 Str_839B806[] = _("National オカDex"); -const u8 Str_839B815[] = _("Hoenn オカDex"); +const u8 Str_839B806[] = _("National {POKE}Dex"); +const u8 Str_839B815[] = _("Hoenn {POKE}Dex"); const u8 Str_839B821[] = _("Create {PKMN}"); const u8 Str_839B82B[] = _("See {PKMN} graphics"); const u8 Str_839B83B[] = _("See trainers"); @@ -272,49 +272,50 @@ const u8 gUnknown_Debug_839BB64[] = const u8 gUnknown_Debug_0839BBA4[] = _("Debugging Version"); const u8 gUnknown_Debug_0839BBB6[] = _("{VERSION} Version"); const u8 gUnknown_Debug_0839BBC1[] = _("Normal RTC compatible"); -const u8 Str_839BBD7[] = _("か の じっけん"); -const u8 Str_839BBE0[] = _("じっけん2"); -const u8 Str_839BBE6[] = _("BGじっけん"); -const u8 Str_839BBED[] = _("Battle"); -const u8 Str_839BBF4[] = _("つうしん じっけん"); -const u8 Str_839BBFE[] = _("LINK Test2"); -const u8 Str_839BC09[] = _("フィールド はじめる"); -const u8 Str_839BC14[] = _("フィールド つづき"); -const u8 Str_839BC1E[] = _("Sound test"); -const u8 Str_839BC29[] = _("{POKEBLOCK} test"); -const u8 Str_839BC34[] = _("Crash backup data"); -const u8 Str_839BC46[] = _("e-Card test"); -const u8 Str_839BC52[] = _("こうかんデモ "); -const u8 Str_839BC5C[] = _("Time in game"); -const u8 Str_839BC69[] = _("フェスタ モード"); -const u8 Str_839BC72[] = _("Mimic e-Card"); -const u8 Str_839BC7F[] = _("RTC reset"); -const u8 Str_839BC89[] = _("Converter"); - -const struct MenuAction gUnknown_Debug_839BC94[] = -{ - { Str_839BBD7, DebugMenu_8076CBC }, - { Str_839BBE0, DebugMenu_8076CC0 }, - { Str_839BBE6, DebugMenu_8076CD4 }, - { Str_839BBED, DebugMenu_8076C6C }, - { Str_839BC29, DebugMenu_8076CD8 }, - { Str_839BBFE, DebugMenu_8076D28 }, - { Str_839BC1E, DebugMenu_8076D3C }, - { Str_839BC09, DebugMenu_8076C80 }, - { Str_839BC14, DebugMenu_8076C90 }, - { Str_839BC34, DebugMenu_8076D50 }, - { Str_839BC46, DebugMenu_8076CEC }, - { Str_839BC52, DebugMenu_8076D14 }, - { Str_839BC72, DebugMenu_8076D00 }, - { Str_839BC5C, DebugMenu_8076D5C }, - { Str_839BC7F, DebugMenu_8076E18 }, - { Str_839BC89, DebugMenu_8076EDC }, + +const u8 gTestMenu_TestMenuHeaderText[] = DTR("か の じっけん", "TEST MENU"); // 科の実験 (Test section) +const u8 gTestMenu_Test2Text[] = DTR("じっけん2", "Test2"); +const u8 gTestMenu_BGTestText[] = DTR("BGじっけん", "BG Test"); +const u8 gTestMenu_BattleText[] = _("Battle"); +const u8 gTestMenu_UnusedLinkTestText[] = DTR("つうしん じっけん", "LINK Test"); // unused +const u8 gTestMenu_LinkTest2Text[] = _("LINK Test2"); +const u8 gTestMenu_FieldStartText[] = DTR("フィールド はじめる", "New game"); // "Field start" +const u8 gTestMenu_FieldContinueText[] = DTR("フィールド つづき", "Continue game"); // "Field continue" +const u8 gTestMenu_SoundTestText[] = _("Sound test"); +const u8 gTestMenu_PokeblockTestText[] = _("{POKEBLOCK} test"); +const u8 gTestMenu_CrashBackupDataText[] = _("Crash backup data"); +const u8 gTestMenu_eCardTestText[] = _("e-Card test"); +const u8 gTestMenu_TradeDemoText[] = DTR("こうかんデモ ", "Trade demo"); +const u8 gTestMenu_TimeInGameText[] = _("Time in game"); +const u8 gTestMenu_UnusedFestaModeText[] = DTR("フェスタ モード", "Festa mode"); // unused +const u8 gTestMenu_MimicECardText[] = _("Mimic e-Card"); +const u8 gTestMenu_RTCResetText[] = _("RTC reset"); +const u8 gTestMenu_ConverterText[] = _("Converter"); + +const struct MenuAction gDebug_TestMenuItems[] = +{ + { gTestMenu_TestMenuHeaderText, DebugMenu_8076CBC }, // Disabled - nop header + { gTestMenu_Test2Text, DebugMenu_8076CC0 }, // Disabled - freezes game (likely went to tomohara menu + { gTestMenu_BGTestText, DebugMenu_8076CD4 }, // Disabled - nop + { gTestMenu_BattleText, DebugMenu_8076C6C }, + { gTestMenu_PokeblockTestText, DebugMenu_8076CD8 }, + { gTestMenu_LinkTest2Text, DebugMenu_8076D28 }, + { gTestMenu_SoundTestText, DebugMenu_8076D3C }, + { gTestMenu_FieldStartText, DebugMenu_8076C80 }, // Disabled - starts new game w/o intro with preset name + { gTestMenu_FieldContinueText, DebugMenu_8076C90 }, // Disabled - continues game + { gTestMenu_CrashBackupDataText, DebugMenu_8076D50 }, + { gTestMenu_eCardTestText, DebugMenu_8076CEC }, + { gTestMenu_TradeDemoText, DebugMenu_8076D14 }, // Disabled - starts a trade then crashes + { gTestMenu_MimicECardText, DebugMenu_8076D00 }, + { gTestMenu_TimeInGameText, DebugMenu_8076D5C }, + { gTestMenu_RTCResetText, DebugMenu_8076E18 }, + { gTestMenu_ConverterText, DebugMenu_8076EDC }, }; // NOTE: When decompiling this file, I found out that having an extraneous extern // in a C file can affect the generated asm. If this extern is commented out, // debug_sub_8076BB4 will access the array differently and no longer match. -//extern const struct MenuAction gUnknown_Debug_839BC94[]; +//extern const struct MenuAction gDebug_TestMenuItems[]; const u8 gMenuOrders_839BD14[][10] = { @@ -324,22 +325,34 @@ const u8 gMenuOrders_839BD14[][10] = const u8 Str_839BD26[] = {2, 0, 0, 0}; // doesn't appear to be referenced -const u8 Str_839BD2C[] = _("RTCを リセット します\n" // Reset RTC - "Aで じっこう Bでキャンセル"); - -const u8 Str_839BD4C[] = _("RTCを リセット した！"); +const u8 Str_839BD2C[] = DTR("RTCを リセット します\n" // Reset RTC + "Aで じっこう Bでキャンセル", + "Reset RTC?\n" + "A: START B: CANCEL"); -const u8 Str_839BD5A[] = _("セーブデータを コンバートします\n" - "Aで けってい Bで キャンセル"); +const u8 Str_839BD4C[] = DTR("RTCを リセット した！", "RTC reset successful!"); -const u8 Str_839BD7D[] = _("へんかんが しゅうりょう しました！"); +const u8 Str_839BD5A[] = DTR("セーブデータを コンバートします\n" + "Aで けってい Bで キャンセル", + "Convert save data?\n" + "A: CONFIRM B: CANCEL"); +const u8 Str_839BD7D[] = DTR("へんかんが しゅうりょう しました！", + "Conversion finished!"); extern const u8 Str_839BD2C[]; extern const u8 Str_839BD4C[]; static u8 gUnknown_030006B8; -UNUSED static const s32 * gUnknown_030006BC; + +struct DebugBuildDateInfo { + s32 max; + s32 digitMultiplier; + s32 numDigits; + s32 offset; +}; + +static const struct DebugBuildDateInfo *gDebugBuildDate; static u8 gUnknown_030006C0; static u8 gUnknown_030006C1; static const u8 * gUnknown_030006C4; @@ -354,7 +367,7 @@ void debug_sub_8076AC8(u8 a) ; Menu_EraseWindowRect(16, 0, 29, 19); Menu_DrawStdWindowFrame(16, 0, 29, r4 * 2 + 1); - Menu_PrintItemsReordered(17, 1, r4, (struct MenuAction2 *)gUnknown_Debug_839BC94, gUnknown_030006C4); + Menu_PrintItemsReordered(17, 1, r4, (struct MenuAction2 *)gDebug_TestMenuItems, gUnknown_030006C4); InitMenu(0, 17, 1, r4, 0, 12); } @@ -387,7 +400,7 @@ void debug_sub_8076BB4(u8 taskId) switch (input) { default: - gUnknown_Debug_839BC94[gUnknown_030006C4[cursorPos]].func(); + gDebug_TestMenuItems[gUnknown_030006C4[cursorPos]].func(); break; case -2: if (gMain.newKeys & 0x20) @@ -593,27 +606,28 @@ u8 DebugMenu_8076EDC(void) return 0; } -const u8 Str_839BD90[] = _("ジュンイチ"); -const u8 Str_839BD96[] = _("ダイゴロウ"); -const u8 Str_839BD9C[] = _("テツジ"); -const u8 Str_839BDA0[] = _("バレンシア"); -const u8 Str_839BDA6[] = _("ハルコマチ"); -const u8 Str_839BDAC[] = _("RAYMOND"); -const u8 Str_839BDB4[] = _("TIFFANY"); -const u8 Str_839BDBC[] = _("くまxちえ"); +// A list of preset player names +const u8 gTestMenuStr_Junichi[] = DTR("ジュンイチ", "JUNICHI"); +const u8 gTestMenuStr_Daigoro[] = DTR("ダイゴロウ", "DAIGORO"); +const u8 gTestMenuStr_Tetsuji[] = DTR("テツジ", "TETSUJI"); +const u8 gTestMenuStr_Valencia[] = DTR("バレンシア", "VALENCY"); // Valencia is too long +const u8 gTestMenuStr_Harukomachi[] = DTR("ハルコマチ", "MAY"); // May town? +const u8 gTestMenuStr_Raymond[] = _("RAYMOND"); +const u8 gTestMenuStr_Tiffany[] = _("TIFFANY"); +const u8 gTestMenuStr_KumaXChie[] = DTR("くまxちえ", "KUMA"); // Chie Kuma? const struct { const u8 * text; u32 flags; -} gUnknown_Debug_839BDC4[] = { - {Str_839BD90, 0x0}, - {Str_839BD96, 0x0}, - {Str_839BDA0, 0x1}, - {Str_839BDA6, 0x1}, - {Str_839BDAC, 0x80}, - {Str_839BDB4, 0x81}, - {Str_839BD9C, 0x0}, - {Str_839BDBC, 0x1} +} gTestMenu_FieldStartNames[] = { + {gTestMenuStr_Junichi, 0x0}, + {gTestMenuStr_Daigoro, 0x0}, + {gTestMenuStr_Valencia, 0x1}, + {gTestMenuStr_Harukomachi, 0x1}, + {gTestMenuStr_Raymond, 0x80}, + {gTestMenuStr_Tiffany, 0x81}, + {gTestMenuStr_Tetsuji, 0x0}, + {gTestMenuStr_KumaXChie, 0x1} }; void DebugMenu_8076EF4(void) @@ -621,12 +635,12 @@ void DebugMenu_8076EF4(void) u8 i; Menu_DrawStdWindowFrame(0, 0, 11, 17); - Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_839BDC4), gUnknown_Debug_839BDC4); - for (i = 0; i < ARRAY_COUNT(gUnknown_Debug_839BDC4); i++) + Menu_PrintItems(2, 1, ARRAY_COUNT(gTestMenu_FieldStartNames), gTestMenu_FieldStartNames); + for (i = 0; i < ARRAY_COUNT(gTestMenu_FieldStartNames); i++) { - sub_8071F60((gUnknown_Debug_839BDC4[i].flags & 1) == MALE ? CHAR_MALE : CHAR_FEMALE, 10, 2 * i + 1); + sub_8071F60((gTestMenu_FieldStartNames[i].flags & 1) == MALE ? CHAR_MALE : CHAR_FEMALE, 10, 2 * i + 1); } - InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_839BDC4), 0, 9); + InitMenu(0, 1, 1, ARRAY_COUNT(gTestMenu_FieldStartNames), 0, 9); } void DebugMenu_8076F60(u8 taskId) @@ -645,9 +659,9 @@ void DebugMenu_8076F60(u8 taskId) break; default: { - u8 flags = gUnknown_Debug_839BDC4[cursorPos].flags; + u8 flags = gTestMenu_FieldStartNames[cursorPos].flags; gSaveBlock2.playerGender = flags & 1; - StringCopy(gSaveBlock2.playerName, gUnknown_Debug_839BDC4[cursorPos].text); + StringCopy(gSaveBlock2.playerName, gTestMenu_FieldStartNames[cursorPos].text); if ((flags & 0x80) == 0) debug_sub_8057508(FALSE); else @@ -869,7 +883,7 @@ const u8 Str_839BE0F[] = _("HP"); const u8 Str_839BE12[] = _("PAR"); const u8 Str_839BE16[] = _("SLP"); const u8 Str_839BE1A[] = _("PSN"); -const u8 Str_839BE1E[] = _("ウマイ"); +const u8 Str_839BE1E[] = KANA("ウマイ"); u8 DebugMenu_8077434(void) { @@ -1161,10 +1175,12 @@ u8 DebugMenu_8077954(void) return TRUE; } -const u8 Str_839BE6B[] = _("さいせんかのうトレーナー:{STR_VAR_1}\n" - "さいせんじょうたいトレーナー:{STR_VAR_2}"); -const u8 Str_839BE8D[] = _("いる"); -const u8 Str_839BE90[] = _("いない"); +const u8 Str_839BE6B[] = DTR("さいせんかのうトレーナー:{STR_VAR_1}\n" + "さいせんじょうたいトレーナー:{STR_VAR_2}", + "Rematchable TRAINERS: {STR_VAR_1}\n" + "TRAINERS in rematch state: {STR_VAR_2}"); +const u8 Str_839BE8D[] = DTR("いる", "ON"); +const u8 Str_839BE90[] = DTR("いない", "OFF"); bool8 DebugMenu_8077974(void) { @@ -1251,11 +1267,15 @@ bool8 DebugMenu_8077AE8(void) return TRUE; } -const u8 Str_839BF0C[] = _("のこり {STR_VAR_1}ほ"); -const u8 Str_839BF14[] = _("{STR_VAR_1}\n" - "のこり {STR_VAR_2}ほ"); -const u8 Str_839BF1F[] = _("めのまえには\n" - "キューブが ありません！"); +const u8 Str_839BF0C[] = DTR("のこり {STR_VAR_1}ほ", "Remaining steps: {STR_VAR_1}"); +const u8 Str_839BF14[] = DTR("{STR_VAR_1}\n" + "のこり {STR_VAR_2}ほ", + "{STR_VAR_1}\n" + "Remaining steps: {STR_VAR_2}"); +const u8 Str_839BF1F[] = DTR("めのまえには\n" + "キューブが ありません！", + "There is no {POKEBLOCK}\n" + "in front of you!"); bool8 DebugMenu_8077B00(void) { @@ -1268,11 +1288,11 @@ bool8 DebugMenu_8077B00(void) return FALSE; } -const u8 Str_839BF33[] = _("ほすうをのこり1にする"); -const u8 Str_839BF3F[] = _("ボールをのこり1にする"); -const u8 Str_839BF4B[] = _("キューブおきば"); -const u8 Str_839BF53[] = _("ボールをのこり30に"); -const u8 Str_839BF5E[] = _("ほすうをのこり500に"); +const u8 Str_839BF33[] = DTR("ほすうをのこり1にする", "One step remaining"); +const u8 Str_839BF3F[] = DTR("ボールをのこり1にする", "One BALL remaining"); +const u8 Str_839BF4B[] = DTR("キューブおきば", "{POKEBLOCK} FEEDER"); +const u8 Str_839BF53[] = DTR("ボールをのこり30に", "30 BALLS remaining"); +const u8 Str_839BF5E[] = DTR("ほすうをのこり500に", "500 steps remaining"); const struct MenuAction gUnknown_Debug_839BF6C[] = { {Str_839BF4B, DebugMenu_8077B00}, @@ -1366,146 +1386,46 @@ u8 DebugMenu_8077C14(void) return FALSE; } -const u8 Str_839BFDC[] = _(" じかん ふん びょう"); -const s32 gUnknown_Debug_839BFE8[] = { - 99, 10, 2, 23, - 99, 10, 2, 26 +const u8 Str_839BFDC[] = DTR(" じかん ふん びょう", " HOURS MINUTES SECONDS"); + +static const struct DebugBuildDateInfo gDebugBuildDateInfo[] = { + { 99, 10, 2, 23 }, + { 99, 10, 2, 26 } }; -#ifdef NONMATCHING -void DebugMenu_8077C3C(const char * a0, u8 * a1) +// Parses the version code in a highly inefficient and unsafe way. +void DebugMenu_ConvertBuildDate(const char *buildDateStr, u8 *out) { - // Register allocation swap - // Intended: r7 = a1, r6 = gUnknown_030006BC[2] - // Observed: r6 = a1, r7 = gUnknown_030006BC[2] - int i; - - gUnknown_030006BC = gUnknown_Debug_839BFE8; - *a1++ = CHAR_SPACE; - *a1++ = CHAR_SPACE; - - for (i = 0; i < 2; i++, gUnknown_030006BC += 4) - { - u32 r5 = 0; - int r2; - int r4; - for (r2 = gUnknown_030006BC[1], r4 = 0; r4 < gUnknown_030006BC[2]; r4++, r2 /= 10) - r5 += (a0[gUnknown_030006BC[3] + r4] - '0') * r2; - if (gUnknown_030006BC[0] < r5) - r5 = gUnknown_030006BC[0]; - a1 = ConvertIntToDecimalStringN(a1, r5, STR_CONV_MODE_LEADING_ZEROS, gUnknown_030006BC[2]); - } - a1[0] = a0[29] - 'A' + CHAR_A; - if (a1[0] > 0xf6) - a1[0] = 0xf6; - a1[1] = EOS; -} -#else -NAKED void DebugMenu_8077C3C(const char * a0, u8 * a1) -{ - asm("\tpush\t{r4, r5, r6, r7, lr}\n" - "\tmov\tr7, sl\n" - "\tmov\tr6, r9\n" - "\tmov\tr5, r8\n" - "\tpush\t{r5, r6, r7}\n" - "\tadd\tsp, sp, #0xfffffffc\n" - "\tmov\tsl, r0\n" - "\tadd\tr7, r1, #0\n" - "\tldr\tr0, ._271 @ gUnknown_030006BC\n" - "\tldr\tr1, ._271 + 4 @ gUnknown_Debug_839BFE8\n" - "\tstr\tr1, [r0]\n" - "\tmov\tr1, #0x0\n" - "\tstrb\tr1, [r7]\n" - "\tadd\tr7, r7, #0x1\n" - "\tstrb\tr1, [r7]\n" - "\tadd\tr7, r7, #0x1\n" - "\tmov\tr3, #0x0\n" - "\tmov\tr8, r0\n" - "._269:\n" - "\tmov\tr5, #0x0\n" - "\tldr\tr1, ._271 @ gUnknown_030006BC\n" - "\tldr\tr0, [r1]\n" - "\tldr\tr2, [r0, #0x4]\n" - "\tmov\tr4, #0x0\n" - "\tldr\tr1, [r0, #0x8]\n" - "\tadd\tr3, r3, #0x1\n" - "\tmov\tr9, r3\n" - "\tcmp\tr5, r1\n" - "\tbge\t._266\t@cond_branch\n" - "\tadd\tr3, r0, #0\n" - "\tadd\tr6, r1, #0\n" - "._267:\n" - "\tldr\tr0, [r3, #0xc]\n" - "\tadd\tr0, r0, r4\n" - "\tadd r0, r0, sl\n" - "\tldrb\tr0, [r0]\n" - "\tsub\tr0, r0, #0x30\n" - "\tmul\tr0, r0, r2\n" - "\tadd\tr5, r5, r0\n" - "\tadd\tr4, r4, #0x1\n" - "\tadd\tr0, r2, #0\n" - "\tmov\tr1, #0xa\n" - "\tstr\tr3, [sp]\n" - "\tbl\t__divsi3\n" - "\tadd\tr2, r0, #0\n" - "\tldr\tr3, [sp]\n" - "\tcmp\tr4, r6\n" - "\tblt\t._267\t@cond_branch\n" - "._266:\n" - "\tmov\tr0, r8\n" - "\tldr\tr1, [r0]\n" - "\tldr\tr0, [r1]\n" - "\tcmp\tr0, r5\n" - "\tbcs\t._268\t@cond_branch\n" - "\tadd\tr5, r0, #0\n" - "._268:\n" - "\tldrb\tr3, [r1, #0x8]\n" - "\tadd\tr0, r7, #0\n" - "\tadd\tr1, r5, #0\n" - "\tmov\tr2, #0x2\n" - "\tbl\tConvertIntToDecimalStringN\n" - "\tadd\tr7, r0, #0\n" - "\tmov\tr3, r9\n" - "\tmov\tr1, r8\n" - "\tldr\tr0, [r1]\n" - "\tadd\tr0, r0, #0x10\n" - "\tstr\tr0, [r1]\n" - "\tcmp\tr3, #0x1\n" - "\tble\t._269\t@cond_branch\n" - "\tmov\tr1, sl\n" - "\tldrb\tr0, [r1, #0x1d]\n" - "\tadd\tr0, r0, #0x7a\n" - "\tstrb\tr0, [r7]\n" - "\tlsl\tr0, r0, #0x18\n" - "\tlsr\tr0, r0, #0x18\n" - "\tcmp\tr0, #0xf6\n" - "\tbls\t._270\t@cond_branch\n" - "\tmov\tr0, #0xf6\n" - "\tstrb\tr0, [r7]\n" - "._270:\n" - "\tmov\tr0, #0xff\n" - "\tstrb\tr0, [r7, #0x1]\n" - "\tadd\tsp, sp, #0x4\n" - "\tpop\t{r3, r4, r5}\n" - "\tmov\tr8, r3\n" - "\tmov\tr9, r4\n" - "\tmov\tsl, r5\n" - "\tpop\t{r4, r5, r6, r7}\n" - "\tpop\t{r0}\n" - "\tbx\tr0\n" - "._272:\n" - "\t.align\t2, 0\n" - "._271:\n" - "\t.word\tgUnknown_030006BC \n" - "\t.word\tgUnknown_Debug_839BFE8\n"); + // Prevents register allocation swap + // Intended: r7 = out, r6 = gDebugBuildDate->numDigits + // Observed: r6 = out, r7 = gDebugBuildDate->numDigits + ++out; --out; + + gDebugBuildDate = gDebugBuildDateInfo; + *out++ = CHAR_SPACE; + *out++ = CHAR_SPACE; + for (i = 0; i < 2; i++, gDebugBuildDate++) + { + int j; + int mul; + u32 date = 0; + for (mul = gDebugBuildDate->digitMultiplier, j = 0; j < gDebugBuildDate->numDigits; j++, mul /= 10) + date += (buildDateStr[gDebugBuildDate->offset + j] - '0') * mul; + if (gDebugBuildDate->max < date) + date = gDebugBuildDate->max; + out = ConvertIntToDecimalStringN(out, date, STR_CONV_MODE_LEADING_ZEROS, gDebugBuildDate->numDigits); + } + out[0] = buildDateStr[29] - 'A' + CHAR_A; + if (out[0] > 0xf6) // prevent special characters + out[0] = 0xf6; + out[1] = EOS; } -#endif void debug_sub_8077CF4(u8 x, u8 y) { - DebugMenu_8077C3C(BuildDateTime, gStringVar4); + DebugMenu_ConvertBuildDate(BuildDateTime, gStringVar4); Menu_PrintText(gStringVar4, x, y); } @@ -1636,7 +1556,7 @@ void DebugMenu_8077F40(u8 taskId) task->func = DebugMenu_8077F7C; } -const u8 Str_839C014[] = _("How many？"); +const u8 Str_839C014[] = _("How many？"); void DebugMenu_8077F7C(u8 taskId) { @@ -1685,13 +1605,19 @@ void DebugMenu_807806C(u8 taskId) DebugMenu_8077048(); } -const u8 Str_839C01E[] = _("にがおえ ばんごう\n" - "ポケモンナンバー\n" - "ポケモンめい\n" - "ブリーダーめい\n" - "しゅるい\n" - "こせいらんすう"); -const u8 Str_839C04D[] = _("データなし"); +const u8 Str_839C01E[] = DTR("にがおえ ばんごう\n" + "ポケモンナンバー\n" + "ポケモンめい\n" + "ブリーダーめい\n" + "しゅるい\n" + "こせいらんすう", + "PORTRAIT No.\n" + "POKéMON No.\n" + "POKéMON Name\n" + "BREEDER Name\n" // TRN ? + "TYPE\n" + "Personality"); +const u8 Str_839C04D[] = DTR("データなし", "No data"); void DebugMenu_807808C(u32 a0) { @@ -1932,60 +1858,61 @@ u8 DebugMenu_OpenMysteryEvent(void) const u8 Str_839C07C[] = _("{STR_VAR_1}:{STR_VAR_2}\n" "{STR_VAR_3}"); -const u8 Str_839C085[] = _("みしよう データ"); +const u8 Str_839C085[] = DTR("みしよう データ", "Unused data"); const u8 Str_839C08E[] = _("Confirmation"); const u8 Str_839C09B[] = _("Max-1 set"); const u8 Str_839C0A5[] = _("Zero clear"); -const u8 Str_839C0B0[] = _("レポート"); -const u8 Str_839C0B5[] = _("クリア じかん"); -const u8 Str_839C0BD[] = _("りゅうこう さくせい"); -const u8 Str_839C0C8[] = _("きのみを うえたかいすう"); -const u8 Str_839C0D5[] = _("じてんしゃこうかん"); -const u8 Str_839C0DF[] = _("ほすう"); -const u8 Str_839C0E3[] = _("インタビュー"); -const u8 Str_839C0EA[] = _("バトル"); -const u8 Str_839C0EE[] = _("やせいバトル"); -const u8 Str_839C0F5[] = _("トレーナーバトル"); -const u8 Str_839C0FE[] = _("でんどういり"); -const u8 Str_839C105[] = _("ポケモンほかく"); -const u8 Str_839C10D[] = _("つった かいすう"); -const u8 Str_839C116[] = _("タマゴかえった"); -const u8 Str_839C11E[] = _("しんかした"); -const u8 Str_839C124[] = _("ポケセン かいふく"); -const u8 Str_839C12E[] = _("じたく かいふく"); -const u8 Str_839C137[] = _("サファリ りよう"); -const u8 Str_839C140[] = _("ひでん:いあいぎり"); -const u8 Str_839C14A[] = _("ひでん:いわくだき"); -const u8 Str_839C154[] = _("きち ひっこし"); -const u8 Str_839C15C[] = _("つうしんこうかん"); -const u8 Str_839C165[] = _("つうしんたいせん"); -const u8 Str_839C16E[] = _("つうしん かち"); -const u8 Str_839C176[] = _("つうしん まけ"); -const u8 Str_839C17E[] = _("つうしん ひきわけ"); -const u8 Str_839C188[] = _("わざ:はねる"); -const u8 Str_839C18F[] = _("わざ:わるあがき"); -const u8 Str_839C198[] = _("スロットおおあたりかいすう"); -const u8 Str_839C1A6[] = _("ルーレット れんしょう"); -const u8 Str_839C1B2[] = _("バトルタワー"); -const u8 Str_839C1B9[] = _("バトルタワーかち"); -const u8 Str_839C1C2[] = _("バトルタワーれんしょう"); -const u8 Str_839C1CE[] = _("ポロックさくせい"); -const u8 Str_839C1D7[] = _("つうしんでポロックつくった"); -const u8 Str_839C1E5[] = _("つうしんコンテストかち"); -const u8 Str_839C1F1[] = _("CPUコンテストさんか"); -const u8 Str_839C1FD[] = _("CPUコンテストかち"); -const u8 Str_839C208[] = _("かいもの"); -const u8 Str_839C20D[] = _("ダウジングマシン"); -const u8 Str_839C216[] = _("あめふり"); -const u8 Str_839C21B[] = _("ずかんをみた"); -const u8 Str_839C222[] = _("リボン もらった"); -const u8 Str_839C22B[] = _("だんさ とびおり"); -const u8 Str_839C234[] = _("TVを みた"); -const u8 Str_839C23B[] = _("とけいを みた"); -const u8 Str_839C243[] = _("くじが あたった"); -const u8 Str_839C24C[] = _("ポケモンあずけた"); -const u8 Str_839C255[] = _("ロープウェイりよう"); -const u8 Str_839C25F[] = _("おんせん はいった"); +const u8 Str_839C0B0[] = DTR("レポート", "SAVES"); +const u8 Str_839C0B5[] = DTR("クリア じかん", "Clear time"); +const u8 Str_839C0BD[] = DTR("りゅうこう さくせい", "TRENDS created"); +const u8 Str_839C0C8[] = DTR("きのみを うえたかいすう", "BERRIES planted"); +const u8 Str_839C0D5[] = DTR("じてんしゃこうかん", "BIKE swaps"); +const u8 Str_839C0DF[] = DTR("ほすう", "Steps"); +const u8 Str_839C0E3[] = DTR("インタビュー", "INTERVIEWS"); +const u8 Str_839C0EA[] = DTR("バトル", "BATTLES"); +const u8 Str_839C0EE[] = DTR("やせいバトル", "Wild BATTLES"); +const u8 Str_839C0F5[] = DTR("トレーナーバトル", "TRAINER BATTLES"); +const u8 Str_839C0FE[] = DTR("でんどういり", "HALL of FAME times"); +const u8 Str_839C105[] = DTR("ポケモンほかく", "POKéMON caught"); +const u8 Str_839C10D[] = DTR("つった かいすう", "Times fished"); +const u8 Str_839C116[] = DTR("タマゴかえった", "EGGS hatched"); +const u8 Str_839C11E[] = DTR("しんかした", "Evolutions"); +const u8 Str_839C124[] = DTR("ポケセン かいふく", "{PKMN} Center heals"); +const u8 Str_839C12E[] = DTR("じたく かいふく", "Home heals"); +const u8 Str_839C137[] = DTR("サファリ りよう", "SAFARI times"); +const u8 Str_839C140[] = DTR("ひでん:いあいぎり", "HM: CUT"); +const u8 Str_839C14A[] = DTR("ひでん:いわくだき", "HM: ROCK SMASH"); +const u8 Str_839C154[] = DTR("きち ひっこし", "BASE relocations"); +const u8 Str_839C15C[] = DTR("つうしんこうかん", "LINK TRADES"); +const u8 Str_839C165[] = DTR("つうしんたいせん", "LINK BATTLES"); +const u8 Str_839C16E[] = DTR("つうしん かち", "LINK WINS"); +const u8 Str_839C176[] = DTR("つうしん まけ", "LINK LOSSES"); +const u8 Str_839C17E[] = DTR("つうしん ひきわけ", "LINK TIES"); +// Idiot counter? +const u8 Str_839C188[] = DTR("わざ:はねる", "Move: SPLASH"); +const u8 Str_839C18F[] = DTR("わざ:わるあがき", "Move: STRUGGLE"); +const u8 Str_839C198[] = DTR("スロットおおあたりかいすう", "SLOTS jackpots"); +const u8 Str_839C1A6[] = DTR("ルーレット れんしょう", "ROULETTE streak"); +const u8 Str_839C1B2[] = DTR("バトルタワー", "BATTLE TOWER"); +const u8 Str_839C1B9[] = DTR("バトルタワーかち", "BATTLE TOWER wins"); +const u8 Str_839C1C2[] = DTR("バトルタワーれんしょう", "BATTLE TOWER streak"); +const u8 Str_839C1CE[] = DTR("ポロックさくせい", "{POKEBLOCK}s created"); +const u8 Str_839C1D7[] = DTR("つうしんでポロックつくった", "LINK {POKEBLOCK}s made"); +const u8 Str_839C1E5[] = DTR("つうしんコンテストかち", "LINK CONTEST wins"); +const u8 Str_839C1F1[] = DTR("CPUコンテストさんか", "CPU CONTEST entries"); +const u8 Str_839C1FD[] = DTR("CPUコンテストかち", "CPU CONTEST wins"); +const u8 Str_839C208[] = DTR("かいもの", "Shopping"); +const u8 Str_839C20D[] = DTR("ダウジングマシン", "ITEMFINDER"); +const u8 Str_839C216[] = DTR("あめふり", "Rained"); +const u8 Str_839C21B[] = DTR("ずかんをみた", "POKéDEX reads"); +const u8 Str_839C222[] = DTR("リボン もらった", "RIBBONS awarded"); +const u8 Str_839C22B[] = DTR("だんさ とびおり", "Ledge hops"); +const u8 Str_839C234[] = DTR("TVを みた", "Watched TV"); +const u8 Str_839C23B[] = DTR("とけいを みた", "Checked CLOCK"); +const u8 Str_839C243[] = DTR("くじが あたった", "LOTTERY wins"); +const u8 Str_839C24C[] = DTR("ポケモンあずけた", "POKéMON DAYCARE uses"); +const u8 Str_839C255[] = DTR("ロープウェイりよう", "CABLE CAR uses"); +const u8 Str_839C25F[] = DTR("おんせん はいった", "HOT SPRING uses"); const struct { u32 maxVal; @@ -2248,7 +2175,7 @@ u8 DebugMenu_OpenBerryInfo(void) return TRUE; } -const u8 Str_839C42E[] = _("レベル ステージ"); +const u8 Str_839C42E[] = DTR("レベル ステージ", "TOWER level stage"); void DebugMenu_8078950(void) { @@ -2337,7 +2264,7 @@ u8 DebugMenu_BattleTowerStages(void) return TRUE; } -const u8 Str_839C438[] = _("ポロック グループ{STR_VAR_1}"); +const u8 Str_839C438[] = DTR("ポロック グループ{STR_VAR_1}", "{POKEBLOCK} GROUP{STR_VAR_1}"); void DebugMenu_8078B70(u16 value) { @@ -2473,10 +2400,10 @@ bool8 DebugMenu_8078CA8(void) return FALSE; } -const u8 Str_839C5CC[] =_("かきこみ せいこう"); -const u8 Str_839C5D6[] =_("よみこみせいこう"); -const u8 Str_839C5DF[] =_("かきこみ しっぱい"); -const u8 Str_839C5E9[] =_("よみこみ しっぱい"); +const u8 Str_839C5CC[] = DTR("かきこみ せいこう", "Write successful"); +const u8 Str_839C5D6[] = DTR("よみこみせいこう", "Read successful"); +const u8 Str_839C5DF[] = DTR("かきこみ しっぱい", "Writing failed"); +const u8 Str_839C5E9[] = DTR("よみこみ しっぱい", "Reading failed"); bool8 DebugMenu_8078CE4(void) { diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 68ccc6f9d..aa3c1d993 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -65,7 +65,7 @@ const u8 gUnknown_Debug_083C4E85[] = _("MAIL"); const u8 gUnknown_Debug_083C4E8A[] = _("MAIL salutation"); const u8 gUnknown_Debug_083C4E9A[] = _("BARD's song"); const u8 gUnknown_Debug_083C4EA6[] = _("Interview"); -const u8 gUnknown_Debug_083C4EB0[] = _("InterviewシBTス"); +const u8 gUnknown_Debug_083C4EB0[] = _("Interview(BT)"); const struct { const u8 * text; @@ -88,10 +88,10 @@ const u8 gUnknown_Debug_083C4F0E[] = _("BARD"); const u8 gUnknown_Debug_083C4F13[] = _("HIPSTER"); const u8 gUnknown_Debug_083C4F1B[] = _("RECYCLE"); const u8 gUnknown_Debug_083C4F23[] = _("STORYTELLER"); -const u8 gUnknown_Debug_083C4F2F[] = _("GIDDY GUY"); -const u8 gUnknown_Debug_083C4F39[] = _("Flag OFF"); -const u8 gUnknown_Debug_083C4F42[] = _("21 letters"); -const u8 gUnknown_Debug_083C4F4D[] = _("ナウくなる"); +const u8 gUnknown_Debug_083C4F2F[] = _("GIDDY GUY"); +const u8 gUnknown_Debug_083C4F39[] = _("Flag OFF"); +const u8 gUnknown_Debug_083C4F42[] = _("21 letters"); +const u8 gUnknown_Debug_083C4F4D[] = DTR("ナウくなる", "BECOME HIP"); const struct { const u8 * text; @@ -107,18 +107,18 @@ const struct { {gUnknown_Debug_083C4F4D} }; -const u8 gUnknown_Debug_083C4F94[] = _("しょうしょうおまちください！"); +const u8 gUnknown_Debug_083C4F94[] = DTR("しょうしょうおまちください！", "Please wait!"); const u8 gUnknown_Debug_083C4FA3[] = _("Weather"); -const u8 gUnknown_Debug_083C4FAB[] = _("LANETTE'S PC"); +const u8 gUnknown_Debug_083C4FAB[] = _("LANETTE'S PC"); const u8 gUnknown_Debug_083C4FB8[] = _("SimpleText"); const u8 gUnknown_Debug_083C4FC3[] = _("Old man"); const u8 gUnknown_Debug_083C4FCB[] = _("Trend"); -const u8 gUnknown_Debug_083C4FD1[] = _("Trend R"); -const u8 gUnknown_Debug_083C4FD9[] = _("Town flag"); -const u8 gUnknown_Debug_083C4FE3[] = _("Award a ribbon"); +const u8 gUnknown_Debug_083C4FD1[] = _("Trend R"); +const u8 gUnknown_Debug_083C4FD9[] = _("Town flag"); +const u8 gUnknown_Debug_083C4FE3[] = _("Award a ribbon"); const u8 gUnknown_Debug_083C4FF2[] = _("{PKMN}LOTTERY"); const u8 gUnknown_Debug_083C4FFC[] = _("Trainer"); -const u8 gUnknown_Debug_083C5004[] = _("POKéNAV D"); +const u8 gUnknown_Debug_083C5004[] = _("POKéNAV D"); const struct MenuAction gUnknown_Debug_083C5010[] = { {gUnknown_Debug_083C4FA3, debug_sub_808560C}, @@ -195,7 +195,7 @@ const struct { } }; -const u8 gUnknown_Debug_083C517C[] = _("Select Ribbon"); +const u8 gUnknown_Debug_083C517C[] = _("Select Ribbon"); bool8 TayaDebugMenu_Trend(void) { diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index daaca570c..c9804c638 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -16,6 +16,8 @@ #include "contest_painting.h" #include "sound.h" +// TRN: If anyone wants to translate the dummy options, they are welcome to :P + static u16 sPicTest_Species; static u32 sPicTest_OTID; static u32 sPicTest_Personality; @@ -295,19 +297,19 @@ static const struct MenuAction sMenuActions_TrickRelated[] = { {sString_TrickRelated_TrickMaster, TrickRelated_TrickMaster_InitSubmenu} }; -static const u8 sString_Event1[] = _("パート1"); -static const u8 sString_Event2[] = _("パート2"); +static const u8 sString_Event1[] = DTR("パート1", "PART 1"); +static const u8 sString_Event2[] = DTR("パート2", "PART 2"); static const struct MenuAction sMenuActions_ControlEvents[] = { {sString_Event1, ControlEvents_InitSubmenu1}, {sString_Event2, ControlEvents_InitSubmenu2} }; -static const u8 sString_EventFlag[] = _("イベントFLAG"); -static const u8 sString_VanishFlag[] = _("バニシュFLAG"); -static const u8 sString_TrainerFlag[] = _("トレーナーFLAG"); +static const u8 sString_EventFlag[] = DTR("イベントFLAG", "EVENT FLAG"); +static const u8 sString_VanishFlag[] = DTR("バニシュFLAG", "VANISH FLAG"); +static const u8 sString_TrainerFlag[] = DTR("トレーナーFLAG", "TRAINER FLAG"); static const u8 sString_SysFlag[] = _("SYSFLAG"); -static const u8 sString_BallVanishFlag[] = _("BALLバニシュFLAG"); +static const u8 sString_BallVanishFlag[] = DTR("BALLバニシュFLAG", "VANISH FLAG"); static const u8 sString_FH[] = _("FH"); static const u8 sString_FH_OBJ[] = _("FH-OBJ"); @@ -326,7 +328,7 @@ static const u8 sString_SysWork[] = _("SYSWORK"); static const u8 sString_LocalWork[] = _("LOCALWORK"); static const u8 sString_ObjWork[] = _("OBJWORK"); static const u8 sString_AnsWork[] = _("ANSWORK"); -static const u8 sString_SaveWorkPart2[] = _("SAVEWORK パート2"); +static const u8 sString_SaveWorkPart2[] = DTR("SAVEWORK パート2", "SAVEWORK PART 2"); static const struct MenuAction sMenuActions_ControlWorks[] = { {sString_SaveWork, ControlWorks_SaveWork_InitSubmenu}, @@ -337,15 +339,15 @@ static const struct MenuAction sMenuActions_ControlWorks[] = { {sString_SaveWorkPart2, ControlWorks_SaveWorkPart2_InitSubmenu} }; -static const u8 sString_Clear_go[] = _("クリアご"); -static const u8 sString_Coin_kounyuuka[] = _("コインこうにゅうかのう"); -static const u8 sString_Oldale_supporter_set[] = _("コトキサポーターセット"); -static const u8 sString_New_Mauville_open[] = _("ニューキンセツOPEN"); -static const u8 sString_Renrakusen_ni_noreru[] = _("れんらくせんにのれる"); -static const u8 sString_Egg_tsuika[] = _("タマゴついか"); -static const u8 sString_Item_ippai[] = _("アイテムいっぱい"); -static const u8 sString_Gezzu_ippai[] = _("グッズいっぱい"); -static const u8 sString_Coin_ippai[] = _("COINいっぱい"); +static const u8 sString_Clear_go[] = DTR("クリアご", "POSTGAME"); +static const u8 sString_Coin_kounyuuka[] = DTR("コインこうにゅうかのう", ",Get COIN CASE"); +static const u8 sString_Oldale_supporter_set[] = DTR("コトキサポーターセット", "OLDALE POST RIVAL"); +static const u8 sString_New_Mauville_open[] = DTR("ニューキンセツOPEN", "Open NEW MAUVILLE"); +static const u8 sString_Renrakusen_ni_noreru[] = DTR("れんらくせんにのれる", "Get S.S. TICKET"); +static const u8 sString_Egg_tsuika[] = DTR("タマゴついか", "Get KYOGRE EGG"); +static const u8 sString_Item_ippai[] = DTR("アイテムいっぱい", "Max Items"); +static const u8 sString_Gezzu_ippai[] = DTR("グッズいっぱい", "Max Decorations"); +static const u8 sString_Coin_ippai[] = DTR("COINいっぱい", "Max COINS"); static const struct MenuAction sMenuActions_ControlEvents_Events1[] = { {sString_Clear_go, CallScript_DoHallOfFame}, @@ -359,12 +361,13 @@ static const struct MenuAction sMenuActions_ControlEvents_Events1[] = { {sString_Coin_ippai, CallScript_GiveAllCoins} }; -static const u8 sString_SootpolisGymOpen[] = _("ムロジムOPEN"); -static const u8 sString_MoneyTo0[] = _("おかねを0へ"); -static const u8 sString_BarboachFull[] = _("ドジョッチ FULL"); -static const u8 sString_ShroomishFull[] = _("キノココ FULL"); -static const u8 sString_BarboachEgg[] = _("ドジョッチ タマゴ"); -static const u8 sString_ShroomishEgg[] = _("キノココ タマゴ"); +// Note: JP text says Dewford Gym for some reason. +static const u8 sString_SootpolisGymOpen[] = DTR("ムロジムOPEN", "Open SOOTOPOLIS GYM"); +static const u8 sString_MoneyTo0[] = DTR("おかねを0へ", "Set money to 0"); +static const u8 sString_BarboachFull[] = DTR("ドジョッチ FULL", "Full BARBOACH PARTY"); +static const u8 sString_ShroomishFull[] = DTR("キノココ FULL", "Full SHROOMISH PARTY"); +static const u8 sString_BarboachEgg[] = DTR("ドジョッチ タマゴ", "Get BARBOACH EGG"); +static const u8 sString_ShroomishEgg[] = DTR("キノココ タマゴ", "Get SHROOMISH EGG"); static const struct MenuAction sMenuActions_ControlEvents_Events2[] = { {sString_SootpolisGymOpen, CallScript_OpenSootopolisGym}, @@ -375,7 +378,7 @@ static const struct MenuAction sMenuActions_ControlEvents_Events2[] = { {sString_ShroomishEgg, CallScript_GiveShroomishEgg} }; -static const u8 sString_Answork_Mikansei[] = _("ANSWORK みかんせい"); +static const u8 sString_Answork_Mikansei[] = DTR("ANSWORK みかんせい", "ANSWORK Incomplete"); static const struct MenuAction sMenuActions_ControlEvents_AnsWork[] = { {sString_Answork_Mikansei, DummyMenuAction} @@ -499,15 +502,15 @@ static const u16 gUnknown_Debug_083C12D2[][9] = { {0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10} }; -static const u8 gUnknown_Debug_083C12F6[] = _("BATCH"); -static const u8 gUnknown_Debug_083C12FC[] = _("タウンとうちゃく"); -static const u8 gUnknown_Debug_083C1305[] = _("シティとうちゃく"); +static const u8 gUnknown_Debug_083C12F6[] = DTR("BATCH", "BADGE"); +static const u8 gUnknown_Debug_083C12FC[] = DTR("タウンとうちゃく", "Towns arrived"); +static const u8 gUnknown_Debug_083C1305[] = DTR("シティとうちゃく", "Cities arrived"); static const u8 gUnknown_Debug_083C130E[] = _("GET"); -static const u8 gUnknown_Debug_083C1312[] = _("そのた1"); -static const u8 gUnknown_Debug_083C1317[] = _("そのた2"); -static const u8 gUnknown_Debug_083C131C[] = _("そのた3"); -static const u8 gUnknown_Debug_083C1321[] = _("そのた4"); -static const u8 gUnknown_Debug_083C1326[] = _("そのた とうちゃく"); +static const u8 gUnknown_Debug_083C1312[] = DTR("そのた1", "Other 1"); +static const u8 gUnknown_Debug_083C1317[] = DTR("そのた2", "Other 2"); +static const u8 gUnknown_Debug_083C131C[] = DTR("そのた3", "Other 3"); +static const u8 gUnknown_Debug_083C1321[] = DTR("そのた4", "Other 4"); +static const u8 gUnknown_Debug_083C1326[] = DTR("そのた とうちゃく", "Others arrived"); static const struct MenuAction gUnknown_Debug_083C1330[] = { {gUnknown_Debug_083C12F6, debug_sub_808CFA4}, @@ -717,7 +720,7 @@ static const u16 gUnknown_Debug_083C19C6[][9] = { {FLAG_LANDMARK_SEAFLOOR_CAVERN, FLAG_LANDMARK_BATTLE_TOWER, FLAG_LANDMARK_SOUTHERN_ISLAND, FLAG_SYS_POKEMON_LEAGUE_FLY, FLAG_LANDMARK_SKY_PILLAR} }; -static const u8 gDebug_0x83C1A68[] = _("FVーBALL パート1"); +static const u8 gDebug_0x83C1A68[] = DTR("FVーBALL パート1", "FV-BALL PART 1"); static const struct MenuAction gUnknown_Debug_083C1A78[] = { {gDebug_0x83C1A68, debug_sub_808D8D8} @@ -737,9 +740,9 @@ static const u16 gUnknown_Debug_083C1AAE[][9] = { {FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1} }; -static const u8 gUnknown_Debug_083C1AC0[] = _("ジムリーダー"); -static const u8 gUnknown_Debug_083C1AC7[] = _("してんのう"); -static const u8 gUnknown_Debug_083C1ACD[] = _("みつる/Champロード"); +static const u8 gUnknown_Debug_083C1AC0[] = DTR("ジムリーダー", "GYM LEADER"); +static const u8 gUnknown_Debug_083C1AC7[] = DTR("してんのう", "ELITE FOUR"); +static const u8 gUnknown_Debug_083C1ACD[] = DTR("みつる/Champロード", "WALLY/VICTORY ROAD"); static const struct MenuAction gUnknown_Debug_083C1ADC[] = { {gUnknown_Debug_083C1AC0, debug_sub_808CD08}, @@ -792,14 +795,14 @@ static const u16 gUnknown_Debug_083C1C38[][9] = { {0x04E1} }; -static const u8 gUnknown_Debug_083C1C6E[] = _("120/119ばんどうろカクレオン"); -static const u8 gUnknown_Debug_083C1C80[] = _("そのた1 / SUPPORTM/W"); -static const u8 gUnknown_Debug_083C1C92[] = _("ODAMAKI/FIGHTER1"); -static const u8 gUnknown_Debug_083C1CA3[] = _("MITSURU/TENKI"); -static const u8 gUnknown_Debug_083C1CB1[] = _("そのた2 /DAIGO"); +static const u8 gUnknown_Debug_083C1C6E[] = DTR("120/119ばんどうろカクレオン", "ROUTE 120/119 KECLEON"); +static const u8 gUnknown_Debug_083C1C80[] = DTR("そのた1 / SUPPORTM/W", "Other 1/SUPPORT/M/W"); +static const u8 gUnknown_Debug_083C1C92[] = DTR("ODAMAKI/FIGHTER1", "BIRCH/FIGHTER1"); +static const u8 gUnknown_Debug_083C1CA3[] = DTR("MITSURU/TENKI", "WALLY/WEATHER"); +static const u8 gUnknown_Debug_083C1CB1[] = DTR("そのた2 /DAIGO", "Other 2/STEVEN"); static const u8 gUnknown_Debug_083C1CBD[] = _("POKE/POKEMON"); static const u8 gUnknown_Debug_083C1CCA[] = _("MAMA/SUPPORT02"); -static const u8 gUnknown_Debug_083C1CD9[] = _("HAGI"); +static const u8 gUnknown_Debug_083C1CD9[] = DTR("HAGI", "Mr. BRINEY"); static const u8 gUnknown_Debug_083C1CDE[] = _("SUPPORT01"); static const struct MenuAction gUnknown_Debug_083C1CE8[] = { @@ -1020,15 +1023,16 @@ static const u16 gUnknown_Debug_083C271A[][9] = { {FLAG_HIDE_RIVAL_BIRCH_LAB, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, FLAG_HIDE_RIVAL_RUSTBORO, FLAG_HIDE_RIVAL_LILYCOVE_MART, FLAG_HIDE_RIVAL_ROUTE103, FLAG_HIDE_RIVAL_ROUTE110, FLAG_HIDE_RIVAL_ROUTE119, FLAG_HIDE_RIVAL_LAVARIDGE_1, FLAG_HIDE_RIVAL_OLDALE_TOWN} }; -static const u8 gUnknown_Debug_083C27BC[] = _("FEひでんわざ/デボンかんれん"); -static const u8 gUnknown_Debug_083C27CC[] = _("FEだいじなアイテムPART1"); -static const u8 gUnknown_Debug_083C27DC[] = _("そのた1"); -static const u8 gUnknown_Debug_083C27E1[] = _("MITSURU/DOOR"); -static const u8 gUnknown_Debug_083C27EE[] = _("カラクリやしき10のやじるし/GYM07"); -static const u8 gUnknown_Debug_083C2803[] = _("SUPPORT/そのた4"); -static const u8 gUnknown_Debug_083C2810[] = _("DAISUKI/そのた5"); -static const u8 gUnknown_Debug_083C281D[] = _("そのた2"); -static const u8 gUnknown_Debug_083C2822[] = _("そのた6"); +static const u8 gUnknown_Debug_083C27BC[] = DTR("FEひでんわざ/デボンかんれん", "Field HMs/DEVON-related"); +static const u8 gUnknown_Debug_083C27CC[] = DTR("FEだいじなアイテムPART1", "Field Key Items Part 1"); +static const u8 gUnknown_Debug_083C27DC[] = DTR("そのた1", "Other 1"); +static const u8 gUnknown_Debug_083C27E1[] = DTR("MITSURU/DOOR", "WALLY/Door"); +static const u8 gUnknown_Debug_083C27EE[] = DTR("カラクリやしき10のやじるし/GYM07", + "TRICK HOUSE 10 Arrows/GYM 7"); +static const u8 gUnknown_Debug_083C2803[] = DTR("SUPPORT/そのた4", "Support/Other 4"); +static const u8 gUnknown_Debug_083C2810[] = DTR("DAISUKI/そのた5", "FAN CLUB/Other 5"); +static const u8 gUnknown_Debug_083C281D[] = DTR("そのた2", "Other 2"); +static const u8 gUnknown_Debug_083C2822[] = DTR("そのた6", "Other 6"); static const struct MenuAction gUnknown_Debug_083C2828[] = { {gUnknown_Debug_083C27BC, debug_sub_808C3B0}, @@ -1254,11 +1258,11 @@ static const u16 gUnknown_Debug_83C31E6[][9] = { {FLAG_BIRCH_AIDE_MET, FLAG_DECLINED_BIKE, FLAG_RECEIVED_SECRET_POWER} }; -static const u8 gUnknown_Debug_083C3288[] = _("CYCLEかんれん"); -static const u8 gUnknown_Debug_083C3292[] = _("おおきさくらべ"); -static const u8 gUnknown_Debug_083C329A[] = _("カウンタ"); -static const u8 gUnknown_Debug_083C329F[] = _("そのた1"); -static const u8 gUnknown_Debug_083C32A4[] = _("そのた2"); +static const u8 gUnknown_Debug_083C3288[] = DTR("CYCLEかんれん", "CYCLE-related"); +static const u8 gUnknown_Debug_083C3292[] = DTR("おおきさくらべ", "Size comparison"); +static const u8 gUnknown_Debug_083C329A[] = DTR("カウンタ", "Counter"); +static const u8 gUnknown_Debug_083C329F[] = DTR("そのた1", "Other 1"); +static const u8 gUnknown_Debug_083C32A4[] = DTR("そのた2", "Other 2"); static const struct MenuAction gUnknown_Debug_083C32AC[] = { {gUnknown_Debug_083C3288, debug_sub_808E400}, @@ -1404,11 +1408,11 @@ static const u16 gUnknown_Debug_083C371E[][9] = { }; static const u8 gUnknown_Debug_083C3742[] = _("SP"); -static const u8 gUnknown_Debug_083C3745[] = _("ルーム R110 PART1/カラクリ"); -static const u8 gUnknown_Debug_083C3759[] = _("ルーム R110 PART2"); -static const u8 gUnknown_Debug_083C3768[] = _("ルーム ロード"); -static const u8 gUnknown_Debug_083C3770[] = _("ソノタ1"); -static const u8 gUnknown_Debug_083C3775[] = _("ソノタ2"); +static const u8 gUnknown_Debug_083C3745[] = DTR("ルーム R110 PART1/カラクリ", "Room R110 Part 1/TRICK"); +static const u8 gUnknown_Debug_083C3759[] = DTR("ルーム R110 PART2", "Room R110 Part 2"); +static const u8 gUnknown_Debug_083C3768[] = DTR("ルーム ロード", "Room road"); // TRN +static const u8 gUnknown_Debug_083C3770[] = DTR("ソノタ1", "Other 1"); +static const u8 gUnknown_Debug_083C3775[] = DTR("ソノタ2", "Other 2"); static const struct MenuAction sMenuActions_ControlWorks_SaveWorkPart2[] = { {gUnknown_Debug_083C3742, ControlWorks_SaveWorkPart2_SP_InitSubsubmenu}, @@ -1561,15 +1565,15 @@ static const u16 sControlWorks_SaveWork_ItemArrays[][9] = { {VAR_WEATHER_INSTITUTE_STATE, VAR_SLATEPORT_FAN_CLUB_STATE, 0x40BB, VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, VAR_GAME_CORNER_STATE, VAR_WHICH_FOSSIL_REVIVED} }; -static const u8 sString_Town[] = _("タウン"); -static const u8 sString_City[] = _("シティ"); -static const u8 sString_Route_101_to_109[] = _("ロード101ー109"); -static const u8 sString_Route_110_to_118[] = _("ロード110ー118"); -static const u8 sString_Route_119_to_127[] = _("ロード119ー127"); -static const u8 sString_Route_128_to_134[] = _("ロード128ー134"); -static const u8 sString_Room_Town[] = _("ルーム タウン"); -static const u8 sString_Room_City[] = _("ルーム シティ"); -static const u8 sString_Dungeon_nai[] = _("ダンジョンない"); +static const u8 sString_Town[] = DTR("タウン", "TOWN"); +static const u8 sString_City[] = DTR("シティ", "CITY"); +static const u8 sString_Route_101_to_109[] = DTR("ロード101ー109", "ROUTE 101-109"); +static const u8 sString_Route_110_to_118[] = DTR("ロード110ー118", "ROUTE 110-118"); +static const u8 sString_Route_119_to_127[] = DTR("ロード119ー127", "ROUTE 119-127"); +static const u8 sString_Route_128_to_134[] = DTR("ロード128ー134", "ROUTE 128-134"); +static const u8 sString_Room_Town[] = DTR("ルーム タウン", "Room Town"); // TRN +static const u8 sString_Room_City[] = DTR("ルーム シティ", "Room City"); +static const u8 sString_Dungeon_nai[] = DTR("ダンジョンない", "DUNGEON"); static const struct MenuAction sMenuAction_ControlWorks_SaveWork[] = { {sString_Town, ControlWorks_SaveWork_Town_InitSubsubmenu}, @@ -1858,13 +1862,13 @@ static const struct MenuAction gUnknown_Debug_083C47F0[] = { {gUnknown_Debug_083C47E9, DummyMenuAction} }; -static const u8 gUnknown_Debug_083C4830[] = _("Trick Master"); +static const u8 gUnknown_Debug_083C4830[] = _("Trick Master"); -static const u8 gUnknown_Debug_083C483D[] = _("Hidden MASTER"); -static const u8 gUnknown_Debug_083C484B[] = _("Inside the HOUSE"); -static const u8 gUnknown_Debug_083C485C[] = _("Pass a reward"); -static const u8 gUnknown_Debug_083C486A[] = _("Rig a trick"); -static const u8 gUnknown_Debug_083C4876[] = _("MASTER is gone"); +static const u8 gUnknown_Debug_083C483D[] = _("Hidden MASTER"); +static const u8 gUnknown_Debug_083C484B[] = _("Inside the HOUSE"); +static const u8 gUnknown_Debug_083C485C[] = _("Pass a reward"); +static const u8 gUnknown_Debug_083C486A[] = _("Rig a trick"); +static const u8 gUnknown_Debug_083C4876[] = _("MASTER is gone"); static const struct MenuAction gUnknown_Debug_083C4888[] = { {gUnknown_Debug_083C483D, DummyMenuAction}, @@ -1885,7 +1889,7 @@ bool8 InitTomomichiDebugWindow(void) static void debug_sub_808B868(void) { - c2_exit_to_overworld_1_continue_scripts_restart_music(); + CB2_ReturnToFieldContinueScriptPlayMapMusic(); } static bool8 InitDebugWindow(void) diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 2e3b684d9..c055781fb 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -400,16 +400,16 @@ void InitSizeComparison(void) gTasks[taskId].data[0] = 0xfc; } -const u8 gUnknown_Debug_083F7FDA[] = _("ひりつ"); -const u8 gUnknown_Debug_083F7FDE[] = _("たかさ"); -const u8 gUnknown_Debug_083F7FE2[] = _("Lキー▶しゅくしょう"); -const u8 gUnknown_Debug_083F7FED[] = _("Rキー▶かくだい"); -const u8 gUnknown_Debug_083F7FF6[] = _("Uキー▶うえ いどう"); -const u8 gUnknown_Debug_083F8001[] = _("Dキー▶した いどう"); -const u8 gUnknown_Debug_083F800C[] = _("Aボタン▶そうさきりかえ"); -const u8 gUnknown_Debug_083F8019[] = _("Bボタン▶やめる"); -const u8 gUnknown_Debug_083F8022[] = _("スタート:"); -const u8 gUnknown_Debug_083F8028[] = _(":セレクト"); +const u8 gUnknown_Debug_083F7FDA[] = DTR("ひりつ", "SCALE"); +const u8 gUnknown_Debug_083F7FDE[] = DTR("たかさ", "HEIGHT"); +const u8 gUnknown_Debug_083F7FE2[] = DTR("Lキー▶しゅくしょう", "{LEFT_ARROW}: SHRINK"); +const u8 gUnknown_Debug_083F7FED[] = DTR("Rキー▶かくだい", "{RIGHT_ARROW}: ENLARGE"); +const u8 gUnknown_Debug_083F7FF6[] = DTR("Uキー▶うえ いどう", "{UP_ARROW}: MOVE UP"); +const u8 gUnknown_Debug_083F8001[] = DTR("Dキー▶した いどう", "{DOWN_ARROW}: MOVE DOWN"); +const u8 gUnknown_Debug_083F800C[] = DTR("Aボタン▶そうさきりかえ", "A: SWITCH CONTROL"); +const u8 gUnknown_Debug_083F8019[] = DTR("Bボタン▶やめる", "B: QUIT"); +const u8 gUnknown_Debug_083F8022[] = DTR("スタート:", "START:"); +const u8 gUnknown_Debug_083F8028[] = DTR(":セレクト", ":SELECT"); #ifdef NONMATCHING void debug_80C3A50(u8 taskId) @@ -1003,11 +1003,13 @@ void debug_80C41A8(void) CreateTask(debug_80C47BC, 0); } -const u8 gUnknown_Debug_083F802E[] = _("やせいたいせん"); -const u8 gUnknown_Debug_083F8036[] = _("1VS1たいせん"); -const u8 gUnknown_Debug_083F803F[] = _("2VS2たいせん"); -const u8 gUnknown_Debug_083F8048[] = _("{COLOR BLUE}1VS1つうしんたいせん"); -const u8 gUnknown_Debug_083F8058[] = _("{COLOR BLUE}2VS2つうしんたいせん"); +const u8 gUnknown_Debug_083F802E[] = DTR("やせいたいせん", "Wild BATTLE"); +const u8 gUnknown_Debug_083F8036[] = DTR("1VS1たいせん", "1v1 BATTLE"); +const u8 gUnknown_Debug_083F803F[] = DTR("2VS2たいせん", "2v2 BATTLE"); +const u8 gUnknown_Debug_083F8048[] = DTR("{COLOR BLUE}1VS1つうしんたいせん", + "{COLOR BLUE}LINK 1v1 BATTLE"); +const u8 gUnknown_Debug_083F8058[] = DTR("{COLOR BLUE}2VS2つうしんたいせん", + "{COLOR BLUE}LINK 2v2 BATTLE"); const struct WatanabeDebugMenuItem gUnknown_Debug_083F8068[] = { {gUnknown_Debug_083F802E, {.type1 = {0x00, 0x01}}}, @@ -1017,16 +1019,16 @@ const struct WatanabeDebugMenuItem gUnknown_Debug_083F8068[] = { {gUnknown_Debug_083F8058, {.type1 = {0x0B, 0x02}}} }; -const u8 gUnknown_Debug_083F8090[] = _("きほんタイプ"); -const u8 gUnknown_Debug_083F8097[] = _("AIタイプ2"); -const u8 gUnknown_Debug_083F809E[] = _("AIタイプ3"); -const u8 gUnknown_Debug_083F80A5[] = _("AIタイプ4"); -const u8 gUnknown_Debug_083F80AC[] = _("AIタイプ5"); -const u8 gUnknown_Debug_083F80B3[] = _("AIタイプ6"); -const u8 gUnknown_Debug_083F80BA[] = _("AIタイプ7"); -const u8 gUnknown_Debug_083F80C1[] = _("AIタイプ8"); -const u8 gUnknown_Debug_083F80C8[] = _("AIタイプ9"); -const u8 gUnknown_Debug_083F80CF[] = _("AIタイプ10"); +const u8 gUnknown_Debug_083F8090[] = DTR("きほんタイプ", "Base type"); +const u8 gUnknown_Debug_083F8097[] = DTR("AIタイプ2", "AI type 2"); +const u8 gUnknown_Debug_083F809E[] = DTR("AIタイプ3", "AI type 3"); +const u8 gUnknown_Debug_083F80A5[] = DTR("AIタイプ4", "AI type 4"); +const u8 gUnknown_Debug_083F80AC[] = DTR("AIタイプ5", "AI type 5"); +const u8 gUnknown_Debug_083F80B3[] = DTR("AIタイプ6", "AI type 6"); +const u8 gUnknown_Debug_083F80BA[] = DTR("AIタイプ7", "AI type 7"); +const u8 gUnknown_Debug_083F80C1[] = DTR("AIタイプ8", "AI type 8"); +const u8 gUnknown_Debug_083F80C8[] = DTR("AIタイプ9", "AI type 9"); +const u8 gUnknown_Debug_083F80CF[] = DTR("AIタイプ10", "AI type 10"); const struct WatanabeDebugMenuItem gUnknown_Debug_083F80D8[] = { {gUnknown_Debug_083F8090, {.type2 = 0x1}}, @@ -1041,15 +1043,15 @@ const struct WatanabeDebugMenuItem gUnknown_Debug_083F80D8[] = { {gUnknown_Debug_083F80CF, {.type2 = 0x200}} }; -const u8 gUnknown_Debug_083F8128[] = _("くさ"); -const u8 gUnknown_Debug_083F812B[] = _("ながい くさ"); -const u8 gUnknown_Debug_083F8132[] = _("すな"); -const u8 gUnknown_Debug_083F8135[] = _("みず"); -const u8 gUnknown_Debug_083F8138[] = _("うみ"); -const u8 gUnknown_Debug_083F813B[] = _("いけ"); -const u8 gUnknown_Debug_083F813E[] = _("いわ"); -const u8 gUnknown_Debug_083F8141[] = _("どうくつ"); -const u8 gUnknown_Debug_083F8146[] = _("そのた"); +const u8 gUnknown_Debug_083F8128[] = DTR("くさ", "GRASS"); +const u8 gUnknown_Debug_083F812B[] = DTR("ながい くさ", "TALL GRASS"); +const u8 gUnknown_Debug_083F8132[] = DTR("すな", "SAND"); +const u8 gUnknown_Debug_083F8135[] = DTR("みず", "WATER"); +const u8 gUnknown_Debug_083F8138[] = DTR("うみ", "SEA"); +const u8 gUnknown_Debug_083F813B[] = DTR("いけ", "POND"); +const u8 gUnknown_Debug_083F813E[] = DTR("いわ", "ROCKY"); +const u8 gUnknown_Debug_083F8141[] = DTR("どうくつ", "CAVE"); +const u8 gUnknown_Debug_083F8146[] = DTR("そのた", "OTHER"); const struct WatanabeDebugMenuItem gUnknown_Debug_083F814C[] = { {gUnknown_Debug_083F8128, {.type3 = 0x0}}, @@ -1105,8 +1107,8 @@ void debug_80C4214(UNUSED u8 a0) void debug_80C42B8(u8 taskId) { - u8 sp00[] = _("ポケモンを えらんでね"); - u8 sp0c[] = _("{COLOR RED}START:つぎへ"); + u8 sp00[] = DTR("ポケモンを えらんでね", "Choose POKéMON"); + u8 sp0c[] = DTR("{COLOR RED}START:つぎへ", "{COLOR RED}START: NEXT"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1218,7 +1220,7 @@ void debug_80C4550(u8 taskId) void debug_80C4694(void) { u8 i; - u8 sp00[] = _("{COLOR RED}じぶんの ポケモン"); + u8 sp00[] = DTR("{COLOR RED}じぶんの ポケモン", "{COLOR RED}Enemy's POKéMON"); u8 sp10[POKEMON_NAME_LENGTH + 1]; Menu_DrawStdWindowFrame(0, 0, 14, 15); @@ -1233,7 +1235,7 @@ void debug_80C4694(void) void debug_80C4704(void) { u8 i; - u8 sp00[] = _("{COLOR RED}あいての ポケモン"); + u8 sp00[] = DTR("{COLOR RED}あいての ポケモン", "{COLOR RED}Your POKéMON"); u8 sp10[POKEMON_NAME_LENGTH + 1]; Menu_DrawStdWindowFrame(15, 0, 29, 15); @@ -1256,10 +1258,10 @@ bool8 debug_80C4774(void) void debug_80C47BC(u8 taskId) { u8 i; - u8 sp00[] = _("たいせんモードを えらんでね"); - u8 sp10[] = _("{COLOR RED}START:つぎへ"); - u8 sp20[] = _("{COLOR RED}バトルモード せんたく"); - u8 sp30[] = _("{COLOR RED}トレーナーAI せんたく"); + u8 sp00[] = DTR("たいせんモードを えらんでね", "Choose a battle mode"); + u8 sp10[] = DTR("{COLOR RED}START:つぎへ", "{COLOR RED}START: NEXT"); + u8 sp20[] = DTR("{COLOR RED}バトルモード せんたく", "{COLOR RED}Battle mode:"); + u8 sp30[] = DTR("{COLOR RED}トレーナーAI せんたく", "{COLOR RED}TRAINER AI mode:"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1424,9 +1426,9 @@ void debug_80C4C44(u8 a0) void debug_80C4D14(u8 taskId) { - u8 sp00[] = _("たいせんモードを えらんでね"); - u8 sp10[] = _("{COLOR RED}START:かいし"); - u8 sp20[] = _("{COLOR RED}バトルちけい せんたく"); + u8 sp00[] = DTR("たいせんモードを えらんでね", "Choose a battle mode"); + u8 sp10[] = DTR("{COLOR RED}START:かいし", "{COLOR RED}START: BEGIN"); + u8 sp20[] = DTR("{COLOR RED}バトルちけい せんたく", "{COLOR RED}Battle terrain:"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1499,11 +1501,11 @@ void debug_80C4F00(u8 a0) void debug_80C4F48(u8 taskId) { - u8 sp00[] = _("じぶんの せいべつを えらんでね"); - u8 sp14[] = _("{COLOR RED}START:つぎへ"); - u8 sp24[] = _("{COLOR RED}せいべつ せんたく"); - u8 sp34[] = _("おとこ"); - u8 sp38[] = _("おんな"); + u8 sp00[] = DTR("じぶんの せいべつを えらんでね", "Choose a gender"); + u8 sp14[] = DTR("{COLOR RED}START:つぎへ", "{COLOR RED}START: NEXT"); + u8 sp24[] = DTR("{COLOR RED}せいべつ せんたく", "{COLOR RED}Gender:"); + u8 sp34[] = DTR("おとこ", "BOY"); + u8 sp38[] = DTR("おんな", "GIRL"); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(sp00, 1, 17); @@ -1732,7 +1734,7 @@ const u8 gUnknown_Debug_083F851C[] = _("{COLOR RED}DEF "); const u8 gUnknown_Debug_083F8524[] = _("{COLOR RED}SPEED"); const u8 gUnknown_Debug_083F852D[] = _("{COLOR RED}SP。ATK"); const u8 gUnknown_Debug_083F8537[] = _("{COLOR RED}SP。DEF"); -const u8 gUnknown_Debug_083F8541[] = _("なし"); +const u8 gUnknown_Debug_083F8541[] = DTR("なし", "without"); const u8 gUnknown_Debug_083F8544[] = _("♂"); const u8 gUnknown_Debug_083F8546[] = _("♀"); const u8 gUnknown_Debug_083F8548[] = _("ー"); @@ -1828,11 +1830,11 @@ const struct WatanabeDebugMenuItem gUnknown_Debug_083F86E8[] = { {gUnknown_Debug_083F86E0, {.type3 = 0x80}} }; -const u8 gUnknown_Debug_083F8720[] = _("PKMNワLIST"); -const u8 gUnknown_Debug_083F872A[] = _("PKMNワBOX"); +const u8 gUnknown_Debug_083F8720[] = _("PKMN{RIGHT_ARROW}LIST"); +const u8 gUnknown_Debug_083F872A[] = _("PKMN{RIGHT_ARROW}BOX"); void InitCreatePokemon(void) { - u8 sp04[] = _("Create POKひMON LR:Shift START:Add"); + u8 sp04[] = _("Create POKéMON LR:Shift START:Add"); debug_80C35DC(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); @@ -2193,7 +2195,7 @@ void debug_80C5EF4(void) void debug_80C5FFC(void) { u32 ivs; - u8 sp10[] = _("たまご"); + u8 sp10[] = DTR("たまご", "EGG"); u8 sp14[] = _("DebugーG"); u8 one; u16 ff; @@ -2600,12 +2602,12 @@ const u16 gUnknown_Debug_083F8790[] = { 0x0002 }; -const u8 gUnknown_Debug_083F87D0[] = _("{COLOR RED}L{ESCAPE}ロ"); -const u8 gUnknown_Debug_083F87D8[] = _("{COLOR RED}{ESCAPE}ワR"); -const u8 gUnknown_Debug_083F87E0[] = _("かいはつナンバー"); -const u8 gUnknown_Debug_083F87E9[] = _("グラフィックナンバー"); -const u8 gUnknown_Debug_083F87F4[] = _("{COLOR RED}A:カラーせってい"); -const u8 gUnknown_Debug_083F8801[] = _("{COLOR RED}A:けってい B:キャンセル"); +const u8 gUnknown_Debug_083F87D0[] = _("{COLOR RED}L{ESCAPE}{LEFT_ARROW}"); +const u8 gUnknown_Debug_083F87D8[] = _("{COLOR RED}{ESCAPE}{RIGHT_ARROW}R"); +const u8 gUnknown_Debug_083F87E0[] = DTR("かいはつナンバー", "Devel No."); +const u8 gUnknown_Debug_083F87E9[] = DTR("グラフィックナンバー", "Graphic No."); +const u8 gUnknown_Debug_083F87F4[] = DTR("{COLOR RED}A:カラーせってい", "{COLOR RED}A: SET COLOR"); +const u8 gUnknown_Debug_083F8801[] = DTR("{COLOR RED}A:けってい B:キャンセル", "{COLOR RED}A: CONFIRM B: CANCEL"); const u8 gUnknown_Debug_083F8813[] = _(":"); void debug_80C6B00(u8 taskId) { diff --git a/src/decoration.c b/src/decoration.c index e5b427738..8dde2834d 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1089,183 +1089,183 @@ const u16 DecorGfx_KISS_POSTER[] = { }; const u16 DecorGfx_PICHU_DOLL[] = { - EVENT_OBJ_GFX_PICHU_DOLL + OBJ_EVENT_GFX_PICHU_DOLL }; const u16 DecorGfx_PIKACHU_DOLL[] = { - EVENT_OBJ_GFX_PIKACHU_DOLL + OBJ_EVENT_GFX_PIKACHU_DOLL }; const u16 DecorGfx_MARILL_DOLL[] = { - EVENT_OBJ_GFX_MARILL_DOLL + OBJ_EVENT_GFX_MARILL_DOLL }; const u16 DecorGfx_TOGEPI_DOLL[] = { - EVENT_OBJ_GFX_TOGEPI_DOLL + OBJ_EVENT_GFX_TOGEPI_DOLL }; const u16 DecorGfx_CYNDAQUIL_DOLL[] = { - EVENT_OBJ_GFX_CYNDAQUIL_DOLL + OBJ_EVENT_GFX_CYNDAQUIL_DOLL }; const u16 DecorGfx_CHIKORITA_DOLL[] = { - EVENT_OBJ_GFX_CHIKORITA_DOLL + OBJ_EVENT_GFX_CHIKORITA_DOLL }; const u16 DecorGfx_TOTODILE_DOLL[] = { - EVENT_OBJ_GFX_TOTODILE_DOLL + OBJ_EVENT_GFX_TOTODILE_DOLL }; const u16 DecorGfx_JIGGLYPUFF_DOLL[] = { - EVENT_OBJ_GFX_JIGGLYPUFF_DOLL + OBJ_EVENT_GFX_JIGGLYPUFF_DOLL }; const u16 DecorGfx_MEOWTH_DOLL[] = { - EVENT_OBJ_GFX_MEOWTH_DOLL + OBJ_EVENT_GFX_MEOWTH_DOLL }; const u16 DecorGfx_CLEFAIRY_DOLL[] = { - EVENT_OBJ_GFX_CLEFAIRY_DOLL + OBJ_EVENT_GFX_CLEFAIRY_DOLL }; const u16 DecorGfx_DITTO_DOLL[] = { - EVENT_OBJ_GFX_DITTO_DOLL + OBJ_EVENT_GFX_DITTO_DOLL }; const u16 DecorGfx_SMOOCHUM_DOLL[] = { - EVENT_OBJ_GFX_SMOOCHUM_DOLL + OBJ_EVENT_GFX_SMOOCHUM_DOLL }; const u16 DecorGfx_TREECKO_DOLL[] = { - EVENT_OBJ_GFX_TREECKO_DOLL + OBJ_EVENT_GFX_TREECKO_DOLL }; const u16 DecorGfx_TORCHIC_DOLL[] = { - EVENT_OBJ_GFX_TORCHIC_DOLL + OBJ_EVENT_GFX_TORCHIC_DOLL }; const u16 DecorGfx_MUDKIP_DOLL[] = { - EVENT_OBJ_GFX_MUDKIP_DOLL + OBJ_EVENT_GFX_MUDKIP_DOLL }; const u16 DecorGfx_DUSKULL_DOLL[] = { - EVENT_OBJ_GFX_DUSKULL_DOLL + OBJ_EVENT_GFX_DUSKULL_DOLL }; const u16 DecorGfx_WYNAUT_DOLL[] = { - EVENT_OBJ_GFX_WYNAUT_DOLL + OBJ_EVENT_GFX_WYNAUT_DOLL }; const u16 DecorGfx_BALTOY_DOLL[] = { - EVENT_OBJ_GFX_BALTOY_DOLL + OBJ_EVENT_GFX_BALTOY_DOLL }; const u16 DecorGfx_KECLEON_DOLL[] = { - EVENT_OBJ_GFX_KECLEON_DOLL + OBJ_EVENT_GFX_KECLEON_DOLL }; const u16 DecorGfx_AZURILL_DOLL[] = { - EVENT_OBJ_GFX_AZURILL_DOLL + OBJ_EVENT_GFX_AZURILL_DOLL }; const u16 DecorGfx_SKITTY_DOLL[] = { - EVENT_OBJ_GFX_SKITTY_DOLL + OBJ_EVENT_GFX_SKITTY_DOLL }; const u16 DecorGfx_SWABLU_DOLL[] = { - EVENT_OBJ_GFX_SWABLU_DOLL + OBJ_EVENT_GFX_SWABLU_DOLL }; const u16 DecorGfx_GULPIN_DOLL[] = { - EVENT_OBJ_GFX_GULPIN_DOLL + OBJ_EVENT_GFX_GULPIN_DOLL }; const u16 DecorGfx_LOTAD_DOLL[] = { - EVENT_OBJ_GFX_LOTAD_DOLL + OBJ_EVENT_GFX_LOTAD_DOLL }; const u16 DecorGfx_SEEDOT_DOLL[] = { - EVENT_OBJ_GFX_SEEDOT_DOLL + OBJ_EVENT_GFX_SEEDOT_DOLL }; const u16 DecorGfx_PIKA_CUSHION[] = { - EVENT_OBJ_GFX_PIKA_CUSHION + OBJ_EVENT_GFX_PIKA_CUSHION }; const u16 DecorGfx_ROUND_CUSHION[] = { - EVENT_OBJ_GFX_ROUND_CUSHION + OBJ_EVENT_GFX_ROUND_CUSHION }; const u16 DecorGfx_KISS_CUSHION[] = { - EVENT_OBJ_GFX_KISS_CUSHION + OBJ_EVENT_GFX_KISS_CUSHION }; const u16 DecorGfx_ZIGZAG_CUSHION[] = { - EVENT_OBJ_GFX_ZIGZAG_CUSHION + OBJ_EVENT_GFX_ZIGZAG_CUSHION }; const u16 DecorGfx_SPIN_CUSHION[] = { - EVENT_OBJ_GFX_SPIN_CUSHION + OBJ_EVENT_GFX_SPIN_CUSHION }; const u16 DecorGfx_DIAMOND_CUSHION[] = { - EVENT_OBJ_GFX_DIAMOND_CUSHION + OBJ_EVENT_GFX_DIAMOND_CUSHION }; const u16 DecorGfx_BALL_CUSHION[] = { - EVENT_OBJ_GFX_BALL_CUSHION + OBJ_EVENT_GFX_BALL_CUSHION }; const u16 DecorGfx_GRASS_CUSHION[] = { - EVENT_OBJ_GFX_GRASS_CUSHION + OBJ_EVENT_GFX_GRASS_CUSHION }; const u16 DecorGfx_FIRE_CUSHION[] = { - EVENT_OBJ_GFX_FIRE_CUSHION + OBJ_EVENT_GFX_FIRE_CUSHION }; const u16 DecorGfx_WATER_CUSHION[] = { - EVENT_OBJ_GFX_WATER_CUSHION + OBJ_EVENT_GFX_WATER_CUSHION }; const u16 DecorGfx_SNORLAX_DOLL[] = { - EVENT_OBJ_GFX_BIG_SNORLAX_DOLL + OBJ_EVENT_GFX_BIG_SNORLAX_DOLL }; const u16 DecorGfx_RHYDON_DOLL[] = { - EVENT_OBJ_GFX_BIG_RHYDON_DOLL + OBJ_EVENT_GFX_BIG_RHYDON_DOLL }; const u16 DecorGfx_LAPRAS_DOLL[] = { - EVENT_OBJ_GFX_BIG_LAPRAS_DOLL + OBJ_EVENT_GFX_BIG_LAPRAS_DOLL }; const u16 DecorGfx_VENUSAUR_DOLL[] = { - EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL + OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL }; const u16 DecorGfx_CHARIZARD_DOLL[] = { - EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL + OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL }; const u16 DecorGfx_BLASTOISE_DOLL[] = { - EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL + OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL }; const u16 DecorGfx_WAILMER_DOLL[] = { - EVENT_OBJ_GFX_BIG_WAILMER_DOLL + OBJ_EVENT_GFX_BIG_WAILMER_DOLL }; const u16 DecorGfx_REGIROCK_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGIROCK_DOLL + OBJ_EVENT_GFX_BIG_REGIROCK_DOLL }; const u16 DecorGfx_REGICE_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGICE_DOLL + OBJ_EVENT_GFX_BIG_REGICE_DOLL }; const u16 DecorGfx_REGISTEEL_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL + OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL }; #if ENGLISH @@ -2158,20 +2158,20 @@ void sub_80FF474(void) if (FlagGet(i + FLAG_DECORATION_2) == 1) { FlagClear(i + FLAG_DECORATION_2); - for (j=0; j<gMapHeader.events->eventObjectCount; j++) + for (j=0; j<gMapHeader.events->objectEventCount; j++) { - if (gMapHeader.events->eventObjects[j].flagId == i + FLAG_DECORATION_2) + if (gMapHeader.events->objectEvents[j].flagId == i + FLAG_DECORATION_2) { break; } } - VarSet(0x3f20 + gMapHeader.events->eventObjects[j].graphicsId, gUnknown_02038900.decoration->tiles[0]); - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; + VarSet(0x3f20 + gMapHeader.events->objectEvents[j].graphicsId, gUnknown_02038900.decoration->tiles[0]); + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId; gSpecialVar_0x8006 = gUnknown_020391A4; gSpecialVar_0x8007 = gUnknown_020391A6; show_sprite(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); sub_805C0F8(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideTemplateCoordsForEventObject(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); break; } } @@ -2243,7 +2243,7 @@ void sub_80FF6AC(u8 taskId) break; case 1: gPaletteFade.bufferTransferDisabled = 1; - AddDecorationIconObjectFromEventObject(&gUnknown_02038900, gUnknown_020388D0[gUnknown_020388F5]); + AddDecorationIconObjectFromObjectEvent(&gUnknown_02038900, gUnknown_020388D0[gUnknown_020388F5]); sub_80FF960(taskId); SetUpPlacingDecorationPlayerAvatar(taskId, &gUnknown_02038900); pal_fill_black(); @@ -2260,7 +2260,7 @@ void sub_80FF6AC(u8 taskId) } } -void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_02038900, u8 decoIdx) +void AddDecorationIconObjectFromObjectEvent(struct UnkStruct_02038900 * unk_02038900, u8 decoIdx) { sub_80FEF74(); sub_80FED1C(); @@ -2278,7 +2278,7 @@ void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_0203 } else { gUnknown_020391A8 = gSprites[gFieldCamera.trackedSpriteId].data[0]; - gFieldCamera.trackedSpriteId = AddPseudoEventObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); + gFieldCamera.trackedSpriteId = AddPseudoObjectEvent(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); gSprites[gFieldCamera.trackedSpriteId].oam.priority = 1; } } @@ -2293,10 +2293,10 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct UnkStruct_02038900 *un } if (gSaveBlock2.playerGender == MALE) { - gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, v0, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc1, SpriteCallbackDummy, v0, 0x48, 0); } else { - gUnknown_020391A9 = AddPseudoEventObject(0xc2, SpriteCallbackDummy, v0, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc2, SpriteCallbackDummy, v0, 0x48, 0); } gSprites[gUnknown_020391A9].oam.priority = 1; DestroySprite(&gSprites[gUnknown_020391A8]); @@ -2437,7 +2437,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) { return FALSE; } - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) { return FALSE; @@ -2462,7 +2462,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) { return FALSE; } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) { return FALSE; } @@ -2482,7 +2482,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) { return FALSE; } - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) { return FALSE; @@ -2527,7 +2527,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) return FALSE; } } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) { return FALSE; } @@ -2678,7 +2678,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0xC]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r4, r0, 24\n" "\tcmp r4, 0\n" @@ -2801,7 +2801,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0x20]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r0, 24\n" "\tcmp r0, 0x10\n" @@ -2905,7 +2905,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0x20]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r4, r0, 24\n" "\tcmp r4, 0\n" @@ -3045,7 +3045,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0x20]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r0, 24\n" "\tcmp r0, 0x10\n" @@ -3618,11 +3618,11 @@ void sub_8100A7C(void) { gSpecialVar_0x8005 = gUnknown_020391B4[gSpecialVar_0x8004].flagId; sub_8100A60(gUnknown_020391B4[gSpecialVar_0x8004].decorId); - for (i=0; i<gMapHeader.events->eventObjectCount; i++) + for (i=0; i<gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8005) { - gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8006 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -3632,11 +3632,11 @@ void sub_8100A7C(void) void sub_8100B20(void) { u8 i; - for (i=0; i<gMapHeader.events->eventObjectCount; i++) + for (i=0; i<gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8004) { - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -3729,10 +3729,10 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) gFieldCamera.trackedSpriteId = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0); if (gSaveBlock2.playerGender == MALE) { - gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0); } else { - gUnknown_020391A9 = AddPseudoEventObject(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0); } gSprites[gUnknown_020391A9].oam.priority = 1; DestroySprite(&gSprites[gUnknown_020391A8]); @@ -3916,9 +3916,9 @@ void sub_81012A0(void) yOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].decorId] & 0xf; for (i=0; i<0x40; i++) { - if (gSaveBlock1.eventObjectTemplates[i].x == xOff && gSaveBlock1.eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1.eventObjectTemplates[i].flagId)) + if (gSaveBlock1.objectEventTemplates[i].x == xOff && gSaveBlock1.objectEventTemplates[i].y == yOff && !FlagGet(gSaveBlock1.objectEventTemplates[i].flagId)) { - gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.eventObjectTemplates[i].flagId; + gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.objectEventTemplates[i].flagId; break; } } diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 7cf4d87b9..70626b367 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -740,10 +740,10 @@ void sub_80E8BF4(u8 reporter, u8 b) { case 0: // Gabby default: - gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_M; + gabbyTyGfxId = OBJ_EVENT_GFX_REPORTER_M; break; case 1: // Ty - gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_F; + gabbyTyGfxId = OBJ_EVENT_GFX_REPORTER_F; break; } @@ -751,8 +751,8 @@ void sub_80E8BF4(u8 reporter, u8 b) LoadSpritePalette(&gUnknown_083DBD38); CreateSprite(&gSpriteTemplate_83DBD48, x, y, 1); - spriteId = AddPseudoEventObject( - (gSaveBlock2.playerGender == MALE) ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + spriteId = AddPseudoObjectEvent( + (gSaveBlock2.playerGender == MALE) ? OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL : OBJ_EVENT_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, x - 12, y, 0); if (spriteId != MAX_SPRITES) { @@ -760,7 +760,7 @@ void sub_80E8BF4(u8 reporter, u8 b) StartSpriteAnim(&gSprites[spriteId], 3); } - spriteId = AddPseudoEventObject(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); + spriteId = AddPseudoObjectEvent(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; diff --git a/src/event_data.c b/src/event_data.c index bfa9ff821..e114af901 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -114,9 +114,9 @@ u16 *GetVarPointer(u16 id) { if (id < VARS_START) return NULL; - if (id < 0x8000) + if (id < SPECIAL_VARS_START) return &gSaveBlock1.vars[id - VARS_START]; - return gSpecialVars[id - 0x8000]; + return gSpecialVars[id - SPECIAL_VARS_START]; } u16 VarGet(u16 id) @@ -136,7 +136,7 @@ bool8 VarSet(u16 id, u16 value) return TRUE; } -u8 VarGetEventObjectGraphicsId(u8 id) +u8 VarGetObjectEventGraphicsId(u8 id) { return VarGet(VAR_OBJ_GFX_ID_0 + id); } diff --git a/src/event_obj_lock.c b/src/event_object_lock.c index 33f37e87e..9ffea9460 100644 --- a/src/event_obj_lock.c +++ b/src/event_object_lock.c @@ -1,5 +1,5 @@ #include "global.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" #include "script_movement.h" @@ -37,9 +37,9 @@ bool8 sub_8064CFC(void) } } -void ScriptFreezeEventObjects(void) +void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8064CDC, 80); } @@ -52,9 +52,9 @@ void sub_8064D38(u8 taskId) sub_80594C0(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) + if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -74,44 +74,44 @@ bool8 sub_8064DB4(void) } } -void LockSelectedEventObject(void) +void LockSelectedObjectEvent(void) { u8 taskId; - FreezeEventObjectsExceptOne(gSelectedEventObject); + FreezeObjectEventsExceptOne(gSelectedObjectEvent); taskId = CreateTask(sub_8064D38, 80); - if (!gEventObjects[gSelectedEventObject].singleMovementActive) + if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); gTasks[taskId].data[1] = 1; } } -void ScriptUnfreezeEventObjects(void) +void ScriptUnfreezeObjectEvents(void) { - u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); } void unref_sub_8064E5C(void) { u8 playerObjectId; - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); } void sub_8064EAC(void) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } void sub_8064ED4(void) { - EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 743d9bb92..81e352e70 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -15,37 +15,37 @@ #include "trainer_see.h" #include "constants/field_effects.h" #include "constants/maps.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" // this file was known as evobjmv.c in Game Freak's original source -static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject*, struct Sprite*); -static u8 MovementType_Disguise_Callback(struct EventObject*, struct Sprite*); -static u8 MovementType_Hidden_Callback(struct EventObject*, struct Sprite*); -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject*, s16, s16); -static bool8 DoesObjectCollideWithObjectAt(struct EventObject*, s16, s16); -static bool8 IsMetatileDirectionallyImpassable(struct EventObject*, s16, s16, u8); -static void ClearEventObjectMovement(struct EventObject*, struct Sprite *sprite); -static void EventObjectSetSingleMovement(struct EventObject*, struct Sprite*, u8); -static u8 EventObjectExecSingleMovementAction(struct EventObject*, struct Sprite*); +static u8 MovementType_BerryTreeGrowth_Callback(struct ObjectEvent*, struct Sprite*); +static u8 MovementType_Disguise_Callback(struct ObjectEvent*, struct Sprite*); +static u8 MovementType_Hidden_Callback(struct ObjectEvent*, struct Sprite*); +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent*, s16, s16); +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent*, s16, s16); +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent*, s16, s16, u8); +static void ClearObjectEventMovement(struct ObjectEvent*, struct Sprite *sprite); +static void ObjectEventSetSingleMovement(struct ObjectEvent*, struct Sprite*, u8); +static u8 ObjectEventExecSingleMovementAction(struct ObjectEvent*, struct Sprite*); static void SetMovementDelay(struct Sprite*, s16); static u8 WaitForMovementDelay(struct Sprite*); -static u8 GetCollisionInDirection(struct EventObject*, u8); +static u8 GetCollisionInDirection(struct ObjectEvent*, u8); static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); -static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*); -static void UpdateEventObjectSpriteAnimPause(struct EventObject*, struct Sprite*); -static void TryEnableEventObjectAnim(struct EventObject*, struct Sprite*); -static void EventObjectExecHeldMovementAction(struct EventObject*, struct Sprite*); -static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*); -static void UpdateEventObjectVisibility(struct EventObject*, struct Sprite*); -static void UpdateEventObjectIsOffscreen(struct EventObject*, struct Sprite*); -static void UpdateEventObjSpriteVisibility(struct EventObject*, struct Sprite*); -static void nullsub(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8); +static void DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*); +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent*, struct Sprite*); +static void TryEnableObjectEventAnim(struct ObjectEvent*, struct Sprite*); +static void ObjectEventExecHeldMovementAction(struct ObjectEvent*, struct Sprite*); +static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); +static void UpdateObjectEventVisibility(struct ObjectEvent*, struct Sprite*); +static void UpdateObjectEventIsOffscreen(struct ObjectEvent*, struct Sprite*); +static void UpdateObjEventSpriteVisibility(struct ObjectEvent*, struct Sprite*); +static void nullsub(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8); static u8 GetReflectionTypeByMetatileBehavior(u32); static void Step1(struct Sprite *sprite, u8 direction); static void Step2(struct Sprite *sprite, u8 direction); @@ -57,41 +57,41 @@ static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); static void ObjectCB_CameraObject(struct Sprite *sprite); -static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8, struct EventObjectTemplate*, u8); -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *, u8); +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8, struct ObjectEventTemplate*, u8); +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); static void CreateReflectionEffectSprites(void); -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static u8 GetEventObjectIdByLocalId(u8); -static void RemoveEventObjectInternal(struct EventObject *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); -static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject); -static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); -static void sub_805B914(struct EventObject *); +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); +static u8 GetObjectEventIdByLocalId(u8); +static void RemoveObjectEventInternal(struct ObjectEvent *); +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent); +static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); +static void sub_805B914(struct ObjectEvent *); static u8 sub_805BE58(const struct SpritePalette *); -static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); -static void SetEventObjectDynamicGraphicsId(struct EventObject *); -static u8 FindEventObjectPaletteIndexByTag(u16); -static u16 GetEventObjectFlagIdByEventObjectId(u8); -static void GetEventObjectMovingCameraOffset(s16 *, s16 *); -static void EventObjectUpdateMetatileBehaviors(struct EventObject *); -static void GetGroundEffectFlags_Reflection(struct EventObject *, u32 *); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *, u32 *); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *, u32 *); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *, u32 *); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Tracks(struct EventObject *, u32 *); -static void GetGroundEffectFlags_SandPile(struct EventObject *, u32 *); -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Puddle(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Ripple(struct EventObject *, u32 *); -static void GetGroundEffectFlags_ShortGrass(struct EventObject *, u32 *); -static void GetGroundEffectFlags_HotSprings(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Seaweed(struct EventObject *, u32 *); -static void GetGroundEffectFlags_JumpLanding(struct EventObject *, u32 *); -static u8 EventObjectCheckForReflectiveSurface(struct EventObject *); -static void DoRippleFieldEffect(struct EventObject *eventObj, struct Sprite *sprite); +static bool8 GetAvailableObjectEventId(u16, u8, u8, u8 *); +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *); +static u8 FindObjectEventPaletteIndexByTag(u16); +static u16 GetObjectEventFlagIdByObjectEventId(u8); +static void GetObjectEventMovingCameraOffset(s16 *, s16 *); +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_SandPile(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *, u32 *); +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *); +static void DoRippleFieldEffect(struct ObjectEvent *objEvent, struct Sprite *sprite); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -103,485 +103,485 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/field_event_obj/event_object_graphics.h" -#include "data/field_event_obj/field_effect_object_graphics.h" +#include "data/object_events/object_event_graphics.h" +#include "data/field_effects/field_effect_object_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = { - MovementType_None, // MOVEMENT_TYPE_NONE - MovementType_LookAround, // MOVEMENT_TYPE_LOOK_AROUND - MovementType_WanderAround, // MOVEMENT_TYPE_WANDER_AROUND - MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - MovementType_WanderUpAndDown, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - MovementType_WanderLeftAndRight, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_UP - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_DOWN - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_LEFT - MovementType_FaceDirection, // MOVEMENT_TYPE_FACE_RIGHT - MovementType_Player, // MOVEMENT_TYPE_PLAYER - MovementType_BerryTreeGrowth, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - MovementType_FaceDownAndUp, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - MovementType_FaceLeftAndRight, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - MovementType_FaceUpAndLeft, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - MovementType_FaceUpAndRight, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - MovementType_FaceDownAndLeft, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - MovementType_FaceDownAndRight, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - MovementType_FaceDownUpAndLeft, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - MovementType_FaceDownUpAndRight, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - MovementType_FaceUpLeftAndRight, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - MovementType_FaceDownLeftAndRight, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - MovementType_RotateCounterclockwise, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - MovementType_RotateClockwise, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - MovementType_WalkBackAndForth, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - MovementType_WalkSequenceUpRightLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - MovementType_WalkSequenceRightLeftDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - MovementType_WalkSequenceDownUpRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - MovementType_WalkSequenceLeftDownUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - MovementType_WalkSequenceUpLeftRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - MovementType_WalkSequenceLeftRightDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - MovementType_WalkSequenceDownUpLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - MovementType_WalkSequenceRightDownUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - MovementType_WalkSequenceLeftUpDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - MovementType_WalkSequenceUpDownRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - MovementType_WalkSequenceRightLeftUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - MovementType_WalkSequenceDownRightLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - MovementType_WalkSequenceRightUpDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - MovementType_WalkSequenceUpDownLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - MovementType_WalkSequenceLeftRightUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - MovementType_WalkSequenceDownLeftRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - MovementType_WalkSequenceUpLeftDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - MovementType_WalkSequenceDownRightUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - MovementType_WalkSequenceLeftDownRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - MovementType_WalkSequenceRightUpLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - MovementType_WalkSequenceUpRightDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - MovementType_WalkSequenceDownLeftUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - MovementType_WalkSequenceLeftUpRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - MovementType_WalkSequenceRightDownLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - MovementType_CopyPlayer, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - MovementType_TreeDisguise, // MOVEMENT_TYPE_TREE_DISGUISE - MovementType_MountainDisguise, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - MovementType_CopyPlayerInGrass, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - MovementType_CopyPlayerInGrass, // 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_Hidden, // MOVEMENT_TYPE_HIDDEN - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - MovementType_WalkInPlace, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - MovementType_JogInPlace, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - MovementType_RunInPlace, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - MovementType_Invisible, // MOVEMENT_TYPE_INVISIBLE + [MOVEMENT_TYPE_NONE] = MovementType_None, + [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround, + [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = MovementType_WanderUpAndDown, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = MovementType_WanderUpAndDown, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = MovementType_WanderLeftAndRight, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = MovementType_WanderLeftAndRight, + [MOVEMENT_TYPE_FACE_UP] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_DOWN] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_LEFT] = MovementType_FaceDirection, + [MOVEMENT_TYPE_FACE_RIGHT] = MovementType_FaceDirection, + [MOVEMENT_TYPE_PLAYER] = MovementType_Player, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = MovementType_BerryTreeGrowth, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = MovementType_FaceDownAndUp, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = MovementType_FaceLeftAndRight, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = MovementType_FaceUpAndLeft, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = MovementType_FaceUpAndRight, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = MovementType_FaceDownAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = MovementType_FaceDownAndRight, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = MovementType_FaceDownUpAndLeft, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = MovementType_FaceDownUpAndRight, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = MovementType_FaceUpLeftAndRight, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = MovementType_FaceDownLeftAndRight, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = MovementType_RotateCounterclockwise, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = MovementType_RotateClockwise, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = MovementType_WalkBackAndForth, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = MovementType_WalkSequenceUpRightLeftDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = MovementType_WalkSequenceRightLeftDownUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = MovementType_WalkSequenceDownUpRightLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = MovementType_WalkSequenceLeftDownUpRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = MovementType_WalkSequenceUpLeftRightDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = MovementType_WalkSequenceLeftRightDownUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = MovementType_WalkSequenceDownUpLeftRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = MovementType_WalkSequenceRightDownUpLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = MovementType_WalkSequenceLeftUpDownRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = MovementType_WalkSequenceUpDownRightLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = MovementType_WalkSequenceRightLeftUpDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = MovementType_WalkSequenceDownRightLeftUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = MovementType_WalkSequenceRightUpDownLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = MovementType_WalkSequenceUpDownLeftRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = MovementType_WalkSequenceLeftRightUpDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = MovementType_WalkSequenceDownLeftRightUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = MovementType_WalkSequenceUpLeftDownRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = MovementType_WalkSequenceDownRightUpLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = MovementType_WalkSequenceLeftDownRightUp, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = MovementType_WalkSequenceRightUpLeftDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = MovementType_WalkSequenceUpRightDownLeft, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = MovementType_WalkSequenceDownLeftUpRight, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = MovementType_WalkSequenceLeftUpRightDown, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = MovementType_WalkSequenceRightDownLeftUp, + [MOVEMENT_TYPE_COPY_PLAYER] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = MovementType_CopyPlayer, + [MOVEMENT_TYPE_TREE_DISGUISE] = MovementType_TreeDisguise, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = MovementType_MountainDisguise, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = MovementType_CopyPlayerInGrass, + [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_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = MovementType_WalkInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = MovementType_JogInPlace, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = MovementType_JogInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = MovementType_RunInPlace, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = MovementType_RunInPlace, + [MOVEMENT_TYPE_INVISIBLE] = MovementType_Invisible, }; const u8 gRangedMovementTypes[] = { - 0, // MOVEMENT_TYPE_NONE - 0, // MOVEMENT_TYPE_LOOK_AROUND - 1, // MOVEMENT_TYPE_WANDER_AROUND - 1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - 1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - 1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - 1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_UP - 0, // MOVEMENT_TYPE_FACE_DOWN - 0, // MOVEMENT_TYPE_FACE_LEFT - 0, // MOVEMENT_TYPE_FACE_RIGHT - 0, // MOVEMENT_TYPE_PLAYER - 0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - 0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - 0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - 0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - 0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - 1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - 1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - 1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - 1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - 1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - 1, // MOVEMENT_TYPE_COPY_PLAYER - 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - 0, // MOVEMENT_TYPE_TREE_DISGUISE - 0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - 1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - 1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - 0, // MOVEMENT_TYPE_HIDDEN - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - 0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - 0, // MOVEMENT_TYPE_INVISIBLE + [MOVEMENT_TYPE_NONE] = 0, + [MOVEMENT_TYPE_LOOK_AROUND] = 0, + [MOVEMENT_TYPE_WANDER_AROUND] = 1, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = 1, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = 1, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = 1, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = 1, + [MOVEMENT_TYPE_FACE_UP] = 0, + [MOVEMENT_TYPE_FACE_DOWN] = 0, + [MOVEMENT_TYPE_FACE_LEFT] = 0, + [MOVEMENT_TYPE_FACE_RIGHT] = 0, + [MOVEMENT_TYPE_PLAYER] = 0, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = 0, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = 0, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = 0, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = 0, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = 1, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = 1, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = 1, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = 1, + [MOVEMENT_TYPE_COPY_PLAYER] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = 1, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = 1, + [MOVEMENT_TYPE_TREE_DISGUISE] = 0, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = 0, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = 1, + [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_WALK_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = 0, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = 0, + [MOVEMENT_TYPE_INVISIBLE] = 0, }; const u8 gInitialMovementTypeFacingDirections[] = { - DIR_SOUTH, // MOVEMENT_TYPE_NONE - DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND - DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND - DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN - DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_FACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_PLAYER - DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE - DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - DIR_WEST, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - DIR_EAST, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER - DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE - DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE - DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - DIR_WEST, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - DIR_EAST, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN - DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP - DIR_WEST, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - DIR_EAST, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE + [MOVEMENT_TYPE_NONE] = DIR_SOUTH, + [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, + [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, + [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, + [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, + [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, + [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, + [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, + [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, + [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, + [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, + [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, + [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_WALK_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, + [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, + [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, + [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, + [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, }; -#define EVENT_OBJ_PAL_TAG_0 0x1103 -#define EVENT_OBJ_PAL_TAG_1 0x1104 -#define EVENT_OBJ_PAL_TAG_2 0x1105 -#define EVENT_OBJ_PAL_TAG_3 0x1106 -#define EVENT_OBJ_PAL_TAG_4 0x1107 -#define EVENT_OBJ_PAL_TAG_5 0x1108 -#define EVENT_OBJ_PAL_TAG_6 0x1109 -#define EVENT_OBJ_PAL_TAG_7 0x110A -#define EVENT_OBJ_PAL_TAG_8 0x1100 -#define EVENT_OBJ_PAL_TAG_9 0x1101 -#define EVENT_OBJ_PAL_TAG_10 0x1102 -#define EVENT_OBJ_PAL_TAG_11 0x1115 -#define EVENT_OBJ_PAL_TAG_12 0x110B -#define EVENT_OBJ_PAL_TAG_13 0x110C -#define EVENT_OBJ_PAL_TAG_14 0x110D -#define EVENT_OBJ_PAL_TAG_15 0x110E -#define EVENT_OBJ_PAL_TAG_16 0x110F -#define EVENT_OBJ_PAL_TAG_17 0x1110 -#define EVENT_OBJ_PAL_TAG_18 0x1111 -#define EVENT_OBJ_PAL_TAG_19 0x1112 -#define EVENT_OBJ_PAL_TAG_20 0x1113 -#define EVENT_OBJ_PAL_TAG_21 0x1114 -#define EVENT_OBJ_PAL_TAG_22 0x1116 -#define EVENT_OBJ_PAL_TAG_23 0x1117 -#define EVENT_OBJ_PAL_TAG_24 0x1118 -#define EVENT_OBJ_PAL_TAG_25 0x1119 -#define EVENT_OBJ_PAL_TAG_26 0x111A - -#define EVENT_OBJ_PAL_TAG_NONE 0x11FF - -#include "data/field_event_obj/event_object_graphics_info_pointers.h" -#include "data/field_event_obj/field_effect_object_template_pointers.h" -#include "data/field_event_obj/event_object_pic_tables.h" -#include "data/field_event_obj/event_object_anims.h" -#include "data/field_event_obj/base_oam.h" -#include "data/field_event_obj/event_object_subsprites.h" -#include "data/field_event_obj/event_object_graphics_info.h" - -const struct SpritePalette sEventObjectSpritePalettes[] = { - {gEventObjectPalette0, EVENT_OBJ_PAL_TAG_0}, - {gEventObjectPalette1, EVENT_OBJ_PAL_TAG_1}, - {gEventObjectPalette2, EVENT_OBJ_PAL_TAG_2}, - {gEventObjectPalette3, EVENT_OBJ_PAL_TAG_3}, - {gEventObjectPalette4, EVENT_OBJ_PAL_TAG_4}, - {gEventObjectPalette5, EVENT_OBJ_PAL_TAG_5}, - {gEventObjectPalette6, EVENT_OBJ_PAL_TAG_6}, - {gEventObjectPalette7, EVENT_OBJ_PAL_TAG_7}, - {gEventObjectPalette8, EVENT_OBJ_PAL_TAG_8}, - {gEventObjectPalette9, EVENT_OBJ_PAL_TAG_9}, - {gEventObjectPalette10, EVENT_OBJ_PAL_TAG_10}, - {gEventObjectPalette11, EVENT_OBJ_PAL_TAG_11}, - {gEventObjectPalette12, EVENT_OBJ_PAL_TAG_12}, - {gEventObjectPalette13, EVENT_OBJ_PAL_TAG_13}, - {gEventObjectPalette14, EVENT_OBJ_PAL_TAG_14}, - {gEventObjectPalette15, EVENT_OBJ_PAL_TAG_15}, - {gEventObjectPalette16, EVENT_OBJ_PAL_TAG_16}, - {gEventObjectPalette17, EVENT_OBJ_PAL_TAG_17}, - {gEventObjectPalette18, EVENT_OBJ_PAL_TAG_18}, - {gEventObjectPalette19, EVENT_OBJ_PAL_TAG_19}, - {gEventObjectPalette20, EVENT_OBJ_PAL_TAG_20}, - {gEventObjectPalette21, EVENT_OBJ_PAL_TAG_21}, - {gEventObjectPalette22, EVENT_OBJ_PAL_TAG_22}, - {gEventObjectPalette23, EVENT_OBJ_PAL_TAG_23}, - {gEventObjectPalette24, EVENT_OBJ_PAL_TAG_24}, - {gEventObjectPalette25, EVENT_OBJ_PAL_TAG_25}, - {gEventObjectPalette26, EVENT_OBJ_PAL_TAG_26}, +#define OBJ_EVENT_PAL_TAG_0 0x1103 +#define OBJ_EVENT_PAL_TAG_1 0x1104 +#define OBJ_EVENT_PAL_TAG_2 0x1105 +#define OBJ_EVENT_PAL_TAG_3 0x1106 +#define OBJ_EVENT_PAL_TAG_4 0x1107 +#define OBJ_EVENT_PAL_TAG_5 0x1108 +#define OBJ_EVENT_PAL_TAG_6 0x1109 +#define OBJ_EVENT_PAL_TAG_7 0x110A +#define OBJ_EVENT_PAL_TAG_8 0x1100 +#define OBJ_EVENT_PAL_TAG_9 0x1101 +#define OBJ_EVENT_PAL_TAG_10 0x1102 +#define OBJ_EVENT_PAL_TAG_11 0x1115 +#define OBJ_EVENT_PAL_TAG_12 0x110B +#define OBJ_EVENT_PAL_TAG_13 0x110C +#define OBJ_EVENT_PAL_TAG_14 0x110D +#define OBJ_EVENT_PAL_TAG_15 0x110E +#define OBJ_EVENT_PAL_TAG_16 0x110F +#define OBJ_EVENT_PAL_TAG_17 0x1110 +#define OBJ_EVENT_PAL_TAG_18 0x1111 +#define OBJ_EVENT_PAL_TAG_19 0x1112 +#define OBJ_EVENT_PAL_TAG_20 0x1113 +#define OBJ_EVENT_PAL_TAG_21 0x1114 +#define OBJ_EVENT_PAL_TAG_22 0x1116 +#define OBJ_EVENT_PAL_TAG_23 0x1117 +#define OBJ_EVENT_PAL_TAG_24 0x1118 +#define OBJ_EVENT_PAL_TAG_25 0x1119 +#define OBJ_EVENT_PAL_TAG_26 0x111A + +#define OBJ_EVENT_PAL_TAG_NONE 0x11FF + +#include "data/object_events/object_event_graphics_info_pointers.h" +#include "data/field_effects/field_effect_object_template_pointers.h" +#include "data/object_events/object_event_pic_tables.h" +#include "data/object_events/object_event_anims.h" +#include "data/object_events/base_oam.h" +#include "data/object_events/object_event_subsprites.h" +#include "data/object_events/object_event_graphics_info.h" + +const struct SpritePalette sObjectEventSpritePalettes[] = { + {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, + {gObjectEventPalette1, OBJ_EVENT_PAL_TAG_1}, + {gObjectEventPalette2, OBJ_EVENT_PAL_TAG_2}, + {gObjectEventPalette3, OBJ_EVENT_PAL_TAG_3}, + {gObjectEventPalette4, OBJ_EVENT_PAL_TAG_4}, + {gObjectEventPalette5, OBJ_EVENT_PAL_TAG_5}, + {gObjectEventPalette6, OBJ_EVENT_PAL_TAG_6}, + {gObjectEventPalette7, OBJ_EVENT_PAL_TAG_7}, + {gObjectEventPalette8, OBJ_EVENT_PAL_TAG_8}, + {gObjectEventPalette9, OBJ_EVENT_PAL_TAG_9}, + {gObjectEventPalette10, OBJ_EVENT_PAL_TAG_10}, + {gObjectEventPalette11, OBJ_EVENT_PAL_TAG_11}, + {gObjectEventPalette12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPalette13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPalette14, OBJ_EVENT_PAL_TAG_14}, + {gObjectEventPalette15, OBJ_EVENT_PAL_TAG_15}, + {gObjectEventPalette16, OBJ_EVENT_PAL_TAG_16}, + {gObjectEventPalette17, OBJ_EVENT_PAL_TAG_17}, + {gObjectEventPalette18, OBJ_EVENT_PAL_TAG_18}, + {gObjectEventPalette19, OBJ_EVENT_PAL_TAG_19}, + {gObjectEventPalette20, OBJ_EVENT_PAL_TAG_20}, + {gObjectEventPalette21, OBJ_EVENT_PAL_TAG_21}, + {gObjectEventPalette22, OBJ_EVENT_PAL_TAG_22}, + {gObjectEventPalette23, OBJ_EVENT_PAL_TAG_23}, + {gObjectEventPalette24, OBJ_EVENT_PAL_TAG_24}, + {gObjectEventPalette25, OBJ_EVENT_PAL_TAG_25}, + {gObjectEventPalette26, OBJ_EVENT_PAL_TAG_26}, {NULL, 0x0000}, }; const u16 gPlayerReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, }; // These were probably intended to be used for the female player's reflection. const u16 gUnusedPlayerReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, }; const u16 gPlayerUnderwaterReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, }; const struct ReflectionPaletteSet gPlayerReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gQuintyPlumpReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, }; const u16 gTruckReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, }; const u16 gMachokeMoverReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, }; const u16 gMovingBoxReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, }; const u16 gCableCarReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, }; const u16 gSSTidalReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, }; const u16 gSubmarineShadowReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, }; const u16 gKyogre2ReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, }; const u16 gGroudon2ReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, }; const u16 gInvisibleKecleonReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, }; const struct ReflectionPaletteSet gSpecialObjectReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_14, gTruckReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_15, gMachokeMoverReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_20, gCableCarReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_21, gSSTidalReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_22, gKyogre2ReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_24, gGroudon2ReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_2, gInvisibleKecleonReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_14, gTruckReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_15, gMachokeMoverReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_20, gCableCarReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_21, gSSTidalReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_22, gKyogre2ReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_24, gGroudon2ReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_2, gInvisibleKecleonReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gObjectPaletteTags0[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags1[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags2[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags3[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 *const gObjectPaletteTagSets[] = { @@ -591,14 +591,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/field_event_obj/berry_tree_graphics_tables.h" -#include "data/field_event_obj/field_effect_objects.h" +#include "data/object_events/berry_tree_graphics_tables.h" +#include "data/field_effects/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/field_event_obj/movement_type_func_tables.h" +#include "data/object_events/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { 0, // DIR_NONE @@ -1019,7 +1019,7 @@ const u8 gUnknown_08375767[][4] = { {3, 4, 2, 1} }; -#include "data/field_event_obj/movement_action_func_tables.h" +#include "data/object_events/movement_action_func_tables.h" // There is code supporing multiple sets of player reflection palettes, but // the data for each is identical. Perhaps non-water/ice reflections were planned. @@ -1027,45 +1027,45 @@ static u8 sCurrentReflectionType; static u16 sCurrentSpecialObjectPaletteTag; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; extern u8 gReservedSpritePaletteCount; extern struct Camera gCamera; -extern struct EventObject gEventObjects[16]; +extern struct ObjectEvent gObjectEvents[16]; #if DEBUG u8 gUnknown_Debug_03004BC0; #endif -static void ClearEventObject(struct EventObject *eventObject) +static void ClearObjectEvent(struct ObjectEvent *objectEvent) { - memset(eventObject, 0, sizeof(struct EventObject)); - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + memset(objectEvent, 0, sizeof(struct ObjectEvent)); + objectEvent->localId = 0xFF; + objectEvent->mapNum = 0xFF; + objectEvent->mapGroup = 0xFF; + objectEvent->movementActionId = 0xFF; } -static void ClearAllEventObjects(void) +static void ClearAllObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - ClearEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + ClearObjectEvent(&gObjectEvents[i]); #if DEBUG gUnknown_Debug_03004BC0 = 0; #endif } -void ResetEventObjects(void) +void ResetObjectEvents(void) { - ClearLinkPlayerEventObjects(); - ClearAllEventObjects(); + ClearLinkPlayerObjectEvents(); + ClearAllObjectEvents(); ClearPlayerAvatarInfo(); CreateReflectionEffectSprites(); } static void CreateReflectionEffectSprites(void) { - // The reflection effect when an event object is standing over water or ice + // The reflection effect when an object event is standing over water or ice // is driven by these two invisible sprites' callback functions. The callback // continuously updates OAM rot/scale matrices using affine animations that scale // the sprite up and down horizontally. The second one is needed to handle the inverted @@ -1083,218 +1083,218 @@ static void CreateReflectionEffectSprites(void) gSprites[spriteId].invisible = TRUE; } -u8 GetFirstInactiveEventObjectId(void) +u8 GetFirstInactiveObjectEventId(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; } return i; } -u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { if (localId < 0xFF) - return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroup); + return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroup); else - return GetEventObjectIdByLocalId(localId); + return GetObjectEventIdByLocalId(localId); } -bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) { - *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup); - if (*eventObjectId == EVENT_OBJECTS_COUNT) + *objectEventId = GetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup); + if (*objectEventId == OBJECT_EVENTS_COUNT) return TRUE; else return FALSE; } -u8 GetEventObjectIdByXY(s16 x, s16 y) +u8 GetObjectEventIdByXY(s16 x, s16 y) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) + if (gObjectEvents[i].active && gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) break; } return i; } -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static u8 GetEventObjectIdByLocalId(u8 localId) +static u8 GetObjectEventIdByLocalId(u8 localId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) +static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapNum, u8 mapGroup) { - struct EventObject *eventObject; - u8 eventObjectId; + struct ObjectEvent *objectEvent; + u8 objectEventId; s16 initialX; s16 initialY; - if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId) != 0) - return EVENT_OBJECTS_COUNT; + if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId) != 0) + return OBJECT_EVENTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - ClearEventObject(eventObject); + objectEvent = &gObjectEvents[objectEventId]; + ClearObjectEvent(objectEvent); initialX = template->x + 7; initialY = template->y + 7; - eventObject->active = TRUE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->graphicsId = template->graphicsId; - eventObject->movementType = template->movementType; - eventObject->localId = template->localId; - eventObject->mapNum = mapNum; + objectEvent->active = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->graphicsId = template->graphicsId; + objectEvent->movementType = template->movementType; + objectEvent->localId = template->localId; + objectEvent->mapNum = mapNum; asm("":::"r6"); - eventObject->mapGroup = mapGroup; - eventObject->initialCoords.x = initialX; - eventObject->initialCoords.y = initialY; - eventObject->currentCoords.x = initialX; - eventObject->currentCoords.y = initialY; - eventObject->previousCoords.x = initialX; - eventObject->previousCoords.y = initialY; - eventObject->currentElevation = template->elevation; - eventObject->previousElevation = template->elevation; - eventObject->range.as_nybbles.x = template->movementRangeX; - eventObject->range.as_nybbles.y = template->movementRangeY; - eventObject->trainerType = template->trainerType; - eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; - eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - SetEventObjectDirection(eventObject, eventObject->previousMovementDirection); + objectEvent->mapGroup = mapGroup; + objectEvent->initialCoords.x = initialX; + objectEvent->initialCoords.y = initialY; + objectEvent->currentCoords.x = initialX; + objectEvent->currentCoords.y = initialY; + objectEvent->previousCoords.x = initialX; + objectEvent->previousCoords.y = initialY; + objectEvent->currentElevation = template->elevation; + objectEvent->previousElevation = template->elevation; + objectEvent->range.as_nybbles.x = template->movementRangeX; + objectEvent->range.as_nybbles.y = template->movementRangeY; + objectEvent->trainerType = template->trainerType; + objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; + SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); asm("":::"r5","r6"); - SetEventObjectDynamicGraphicsId(eventObject); + SetObjectEventDynamicGraphicsId(objectEvent); - if (gRangedMovementTypes[eventObject->movementType]) + if (gRangedMovementTypes[objectEvent->movementType]) { // Ensure a ranged movement type has at least 1 tile of room to move. - if (eventObject->range.as_nybbles.x == 0) - eventObject->range.as_nybbles.x++; - if (eventObject->range.as_nybbles.y == 0) - eventObject->range.as_nybbles.y++; + if (objectEvent->range.as_nybbles.x == 0) + objectEvent->range.as_nybbles.x++; + if (objectEvent->range.as_nybbles.y == 0) + objectEvent->range.as_nybbles.y++; } #if DEBUG gUnknown_Debug_03004BC0++; #endif - return eventObjectId; + return objectEventId; } -u8 TryInitLocalEventObject(u8 localId) +u8 TryInitLocalObjectEvent(u8 localId) { u8 i; - u8 eventObjectCount; + u8 objectEventCount; if (gMapHeader.events == NULL) - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; - eventObjectCount = gMapHeader.events->eventObjectCount; - for (i = 0; i < eventObjectCount; i++) + objectEventCount = gMapHeader.events->objectEventCount; + for (i = 0; i < objectEventCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1.objectEventTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) - return InitEventObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + return InitObjectEventStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) { u8 i = 0; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; - if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } - if (i >= EVENT_OBJECTS_COUNT) + if (i >= OBJECT_EVENTS_COUNT) return TRUE; - *eventObjectId = i; - for (; i < EVENT_OBJECTS_COUNT; i++) + *objectEventId = i; + for (; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } return FALSE; } -static void RemoveEventObject(struct EventObject *eventObject) +static void RemoveObjectEvent(struct ObjectEvent *objectEvent) { - eventObject->active = FALSE; - RemoveEventObjectInternal(eventObject); + objectEvent->active = FALSE; + RemoveObjectEventInternal(objectEvent); #if DEBUG gUnknown_Debug_03004BC0--; #endif } -void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId)); - RemoveEventObject(&gEventObjects[eventObjectId]); + FlagSet(GetObjectEventFlagIdByObjectEventId(objectEventId)); + RemoveObjectEvent(&gObjectEvents[objectEventId]); } } -static void RemoveEventObjectInternal(struct EventObject *eventObject) +static void RemoveObjectEventInternal(struct ObjectEvent *objectEvent) { struct SpriteFrameImage image; - image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size; - gSprites[eventObject->spriteId].images = ℑ - DestroySprite(&gSprites[eventObject->spriteId]); + image.size = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->size; + gSprites[objectEvent->spriteId].images = ℑ + DestroySprite(&gSprites[objectEvent->spriteId]); } -void RemoveAllEventObjectsExceptPlayer(void) +void RemoveAllObjectEventsExceptPlayer(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (i != gPlayerAvatar.eventObjectId) - RemoveEventObject(&gEventObjects[i]); + if (i != gPlayerAvatar.objectEventId) + RemoveObjectEvent(&gObjectEvents[i]); } } -static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) +static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { u8 spriteId; - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - struct EventObject *eventObject; - const struct EventObjectGraphicsInfo *graphicsInfo; + struct ObjectEvent *objectEvent; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); - if (eventObjectId == EVENT_OBJECTS_COUNT) - return EVENT_OBJECTS_COUNT; + objectEventId = InitObjectEventStateFromTemplate(objectEventTemplate, mapNum, mapGroup); + if (objectEventId == OBJECT_EVENTS_COUNT) + return OBJECT_EVENTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent = &gObjectEvents[objectEventId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->paletteSlot == 0) { LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); @@ -1303,9 +1303,9 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl { LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } - if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE) + if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; } *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); @@ -1314,101 +1314,101 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl #if DEBUG gUnknown_Debug_03004BC0--; #endif - gEventObjects[eventObjectId].active = FALSE; - return EVENT_OBJECTS_COUNT; + gObjectEvents[objectEventId].active = FALSE; + return OBJECT_EVENTS_COUNT; } sprite = &gSprites[spriteId]; - sub_8060388(cameraDeltaX + eventObject->currentCoords.x, cameraDeltaY + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(cameraDeltaX + objectEvent->currentCoords.x, cameraDeltaY + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = graphicsInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - eventObject->inanimate = graphicsInfo->inanimate; - if (!eventObject->inanimate) + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + objectEvent->inanimate = graphicsInfo->inanimate; + if (!objectEvent->inanimate) { - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); } - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); - UpdateEventObjectVisibility(eventObject, sprite); - return eventObjectId; + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); + UpdateObjectEventVisibility(objectEvent, sprite); + return objectEventId; } -static u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) +static u8 TrySpawnObjectEvent(struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { - u8 eventObjectId; + u8 objectEventId; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; const struct SubspriteTable *subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId); - MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(objectEventTemplate->graphicsId); + MakeObjectTemplateFromObjectEventTemplate(objectEventTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; - eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraDeltaX, cameraDeltaY); - if (eventObjectId == EVENT_OBJECTS_COUNT) + objectEventId = TrySetupObjectEventSprite(objectEventTemplate, &spriteTemplate, mapNum, mapGroup, cameraDeltaX, cameraDeltaY); + if (objectEventId == OBJECT_EVENTS_COUNT) { - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } - gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images; + gSprites[gObjectEvents[objectEventId].spriteId].images = graphicsInfo->images; if (subspriteTables != NULL) { - SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables); + SetSubspriteTables(&gSprites[gObjectEvents[objectEventId].spriteId], subspriteTables); } - return eventObjectId; + return objectEventId; } -u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *objectEventTemplate) { s16 x; s16 y; - GetEventObjectMovingCameraOffset(&x, &y); - return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); + GetObjectEventMovingCameraOffset(&x, &y); + return TrySpawnObjectEvent(objectEventTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); } -u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementType, u8 localId, s16 x, s16 y, u8 elevation) +u8 SpawnSpecialObjectEventParametrized(u8 graphicsId, u8 movementType, u8 localId, s16 x, s16 y, u8 elevation) { - struct EventObjectTemplate eventObjectTemplate; + struct ObjectEventTemplate objectEventTemplate; x -= 7; y -= 7; - eventObjectTemplate.localId = localId; - eventObjectTemplate.graphicsId = graphicsId; - eventObjectTemplate.unk2 = 0; - eventObjectTemplate.x = x; - eventObjectTemplate.y = y; - eventObjectTemplate.elevation = elevation; - eventObjectTemplate.movementType = movementType; - eventObjectTemplate.movementRangeX = 0; - eventObjectTemplate.movementRangeY = 0; - eventObjectTemplate.trainerType = 0; - eventObjectTemplate.trainerRange_berryTreeId = 0; - return SpawnSpecialEventObject(&eventObjectTemplate); + objectEventTemplate.localId = localId; + objectEventTemplate.graphicsId = graphicsId; + objectEventTemplate.unk2 = 0; + objectEventTemplate.x = x; + objectEventTemplate.y = y; + objectEventTemplate.elevation = elevation; + objectEventTemplate.movementType = movementType; + objectEventTemplate.movementRangeX = 0; + objectEventTemplate.movementRangeY = 0; + objectEventTemplate.trainerType = 0; + objectEventTemplate.trainerRange_berryTreeId = 0; + return SpawnSpecialObjectEvent(&objectEventTemplate); } u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; s16 x; s16 y; - eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (eventObjectTemplate == NULL) + objectEventTemplate = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (objectEventTemplate == NULL) { - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } - GetEventObjectMovingCameraOffset(&x, &y); - return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, x, y); + GetObjectEventMovingCameraOffset(&x, &y); + return TrySpawnObjectEvent(objectEventTemplate, mapNum, mapGroup, x, y); } -void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); spriteTemplate->tileTag = graphicsInfo->tileTag; spriteTemplate->paletteTag = graphicsInfo->paletteTag; @@ -1420,23 +1420,23 @@ void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callba *subspriteTables = graphicsInfo->subspriteTables; } -static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], spriteTemplate, subspriteTables); } -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjTemplate->graphicsId, eventObjTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objEventTemplate->graphicsId, objEventTemplate->movementType, spriteTemplate, subspriteTables); } -u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) +u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) { struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; u8 spriteId; - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); if (spriteTemplate.paletteTag != 0xFFFF) { sub_805BDF8(spriteTemplate.paletteTag); @@ -1455,10 +1455,10 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) u8 spriteId; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, UpdateObjectEventSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; x += 7; y += 7; @@ -1491,7 +1491,7 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) return spriteId; } -void TrySpawnEventObjects(s16 cameraDeltaX, s16 cameraDeltaY) +void TrySpawnObjectEvents(s16 cameraDeltaX, s16 cameraDeltaY) { u8 i; @@ -1501,57 +1501,57 @@ void TrySpawnEventObjects(s16 cameraDeltaX, s16 cameraDeltaY) s16 right = gSaveBlock1.pos.x + 17; s16 top = gSaveBlock1.pos.y; s16 bottom = gSaveBlock1.pos.y + 16; - u8 objectCount = gMapHeader.events->eventObjectCount; + u8 objectCount = gMapHeader.events->objectEventCount; for (i = 0; i < objectCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1.objectEventTemplates[i]; s16 npcX = template->x + 7; s16 npcY = template->y + 7; if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - TrySpawnEventObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, cameraDeltaX, cameraDeltaY); + TrySpawnObjectEvent(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, cameraDeltaX, cameraDeltaY); } } } -void RemoveEventObjectsOutsideView(void) +void RemoveObjectEventsOutsideView(void) { u8 i, j; bool8 isActiveLinkPlayer; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { for (j = 0, isActiveLinkPlayer = FALSE; j < 4; j++) { - if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId) + if (gLinkPlayerObjectEvents[j].active && i == gLinkPlayerObjectEvents[j].objEventId) isActiveLinkPlayer = TRUE; } if (!isActiveLinkPlayer) { - struct EventObject *eventObject = &gEventObjects[i]; + struct ObjectEvent *objectEvent = &gObjectEvents[i]; - if (eventObject->active && !eventObject->isPlayer) - RemoveEventObjectIfOutsideView(eventObject); + if (objectEvent->active && !objectEvent->isPlayer) + RemoveObjectEventIfOutsideView(objectEvent); } } } -static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject) +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent) { s16 left = gSaveBlock1.pos.x - 2; s16 right = gSaveBlock1.pos.x + 17; s16 top = gSaveBlock1.pos.y; s16 bottom = gSaveBlock1.pos.y + 16; - if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right - && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom) + if (objectEvent->currentCoords.x >= left && objectEvent->currentCoords.x <= right + && objectEvent->currentCoords.y >= top && objectEvent->currentCoords.y <= bottom) return; - if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right - && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom) + if (objectEvent->initialCoords.x >= left && objectEvent->initialCoords.x <= right + && objectEvent->initialCoords.y >= top && objectEvent->initialCoords.y <= bottom) return; - RemoveEventObject(eventObject); + RemoveObjectEvent(objectEvent); } void sub_805B75C(u8, s16, s16); @@ -1564,9 +1564,9 @@ void sub_805B710(u16 a, u16 b) gUnknown_Debug_03004BC0 = 0; #endif ClearPlayerAvatarInfo(); - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { sub_805B75C(i, a, b); #if DEBUG @@ -1577,30 +1577,30 @@ void sub_805B710(u16 a, u16 b) CreateReflectionEffectSprites(); } -void sub_805B75C(u8 eventObjectId, s16 x, s16 y) +void sub_805B75C(u8 objectEventId, s16 x, s16 y) { u8 spriteId; struct Sprite *sprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; #define i spriteId for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) + if (gLinkPlayerObjectEvents[i].active && objectEventId == gLinkPlayerObjectEvents[i].objEventId) return; } #undef i - eventObject = &gEventObjects[eventObjectId]; + objectEvent = &gObjectEvents[objectEventId]; asm("":::"r5"); subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEvent->graphicsId, objectEvent->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; if (graphicsInfo->paletteSlot == 0) @@ -1616,16 +1616,16 @@ void sub_805B75C(u8 eventObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8060388(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; - if (eventObject->movementType == MOVEMENT_TYPE_PLAYER) + if (objectEvent->movementType == MOVEMENT_TYPE_PLAYER) { - SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId); - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); + SetPlayerAvatarObjectEventIdAndObjectId(objectEventId, spriteId); + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); } if (subspriteTables != NULL) { @@ -1633,45 +1633,45 @@ void sub_805B75C(u8 eventObjectId, s16 x, s16 y) } sprite->oam.paletteNum = graphicsInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - if (!eventObject->inanimate && eventObject->movementType != MOVEMENT_TYPE_PLAYER) + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + if (!objectEvent->inanimate && objectEvent->movementType != MOVEMENT_TYPE_PLAYER) { - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); } - sub_805B914(eventObject); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); + sub_805B914(objectEvent); + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); } } -static void sub_805B914(struct EventObject *eventObject) +static void sub_805B914(struct ObjectEvent *objectEvent) { - eventObject->singleMovementActive = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->hasShadow = FALSE; - eventObject->hasReflection = FALSE; - eventObject->inShortGrass = FALSE; - eventObject->inShallowFlowingWater = FALSE; - eventObject->inSandPile = FALSE; - eventObject->inHotSprings = FALSE; - EventObjectClearHeldMovement(eventObject); + objectEvent->singleMovementActive = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->hasShadow = FALSE; + objectEvent->hasReflection = FALSE; + objectEvent->inShortGrass = FALSE; + objectEvent->inShallowFlowingWater = FALSE; + objectEvent->inSandPile = FALSE; + objectEvent->inHotSprings = FALSE; + ObjectEventClearHeldMovement(objectEvent); } -static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId) +static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteId) { - gPlayerAvatar.eventObjectId = eventObjectId; + gPlayerAvatar.objectEventId = objectEventId; gPlayerAvatar.spriteId = spriteId; - gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId); - SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20); + gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gObjectEvents[objectEventId].graphicsId); + SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, 0x20); } -void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) +void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *sprite; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - sprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + sprite = &gSprites[objectEvent->spriteId]; if (graphicsInfo->paletteSlot == 0) { PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); @@ -1686,166 +1686,166 @@ void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = graphicsInfo->paletteSlot; - eventObject->inanimate = graphicsInfo->inanimate; - eventObject->graphicsId = graphicsId; - sub_80603CC(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + objectEvent->inanimate = graphicsInfo->inanimate; + objectEvent->graphicsId = graphicsId; + sub_80603CC(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (eventObject->trackedByCamera) + if (objectEvent->trackedByCamera) { CameraObjectReset1(); } } -void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) +void ObjectEventSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId); + ObjectEventSetGraphicsId(&gObjectEvents[objectEventId], graphicsId); } } -void EventObjectTurn(struct EventObject *eventObject, u8 direction) +void ObjectEventTurn(struct ObjectEvent *objectEvent, u8 direction) { - SetEventObjectDirection(eventObject, direction); - if (!eventObject->inanimate) + SetObjectEventDirection(objectEvent, direction); + if (!objectEvent->inanimate) { - StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection)); - SeekSpriteAnim(&gSprites[eventObject->spriteId], 0); + StartSpriteAnim(&gSprites[objectEvent->spriteId], GetFaceDirectionAnimNum(objectEvent->facingDirection)); + SeekSpriteAnim(&gSprites[objectEvent->spriteId], 0); } } -void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) +void ObjectEventTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectTurn(&gEventObjects[eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[objectEventId], direction); } } void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) { - EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[playerAvatar->objectEventId], direction); } -static void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) +static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; u8 berryId; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage != 0) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; - berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; + berryId = GetBerryTypeByBerryTreeId(objectEvent->trainerRange_berryTreeId) - 1; berryStage--; if (berryId > 0x2B) { berryId = 0; } - EventObjectSetGraphicsId(eventObject, gBerryTreeGraphicsIdTablePointers[berryId][berryStage]); + ObjectEventSetGraphicsId(objectEvent, gBerryTreeGraphicsIdTablePointers[berryId][berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; StartSpriteAnim(sprite, berryStage); } } -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { - if (graphicsId > SPRITE_VAR) + if (graphicsId >= OBJ_EVENT_GFX_VARS) { - graphicsId = VarGetEventObjectGraphicsId(graphicsId + 16); + graphicsId = VarGetObjectEventGraphicsId(graphicsId + 16); } - if (graphicsId > NUM_OBJECT_GRAPHICS_INFO) + if (graphicsId >= NUM_OBJ_EVENT_GFX) { - graphicsId = EVENT_OBJ_GFX_LITTLE_BOY_1; + graphicsId = OBJ_EVENT_GFX_LITTLE_BOY_1; } - return gEventObjectGraphicsInfoPointers[graphicsId]; + return gObjectEventGraphicsInfoPointers[graphicsId]; } -static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) { - if (eventObject->graphicsId > SPRITE_VAR) + if (objectEvent->graphicsId >= OBJ_EVENT_GFX_VARS) { - eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId + 16); + objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId + 16); } } void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gEventObjects[eventObjectId].invisible = state; + gObjectEvents[objectEventId].invisible = state; } } -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup) +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup) { - *(u8 *)localId = eventObject->localId; - *(u8 *)mapNum = eventObject->mapNum; - *(u8 *)mapGroup = eventObject->mapGroup; + *(u8 *)localId = objectEvent->localId; + *(u8 *)mapNum = objectEvent->mapNum; + *(u8 *)mapGroup = objectEvent->mapGroup; } void sub_805BCC0(s16 x, s16 y) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - eventObjectId = GetEventObjectIdByXY(x, y); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByXY(x, y); + if (objectEventId != OBJECT_EVENTS_COUNT) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_805BCF0(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->fixedPriority = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->fixedPriority = TRUE; sprite->subpriority = subpriority; } } void sub_805BD48(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->fixedPriority = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->fixedPriority = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos2.x = x; sprite->pos2.y = y; } @@ -1859,11 +1859,11 @@ void FreeAndReserveObjectSpritePalettes(void) void sub_805BDF8(u16 paletteTag) { - u16 paletteSlot = FindEventObjectPaletteIndexByTag(paletteTag); + u16 paletteSlot = FindObjectEventPaletteIndexByTag(paletteTag); - if (paletteSlot != EVENT_OBJ_PAL_TAG_NONE) //always happens. FindEventObjectPaletteIndexByTag returns u8 + if (paletteSlot != OBJ_EVENT_PAL_TAG_NONE) //always happens. FindObjectEventPaletteIndexByTag returns u8 { - sub_805BE58(&sEventObjectSpritePalettes[paletteSlot]); + sub_805BE58(&sObjectEventSpritePalettes[paletteSlot]); } } @@ -1871,7 +1871,7 @@ void unref_sub_805BE24(u16 *paletteTags) { u8 i; - for (i = 0; paletteTags[i] != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; paletteTags[i] != OBJ_EVENT_PAL_TAG_NONE; i++) sub_805BDF8(paletteTags[i]); } @@ -1886,9 +1886,9 @@ static u8 sub_805BE58(const struct SpritePalette *palette) void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) { - u8 paletteIndex = FindEventObjectPaletteIndexByTag(paletteTag); + u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag); - LoadPalette(sEventObjectSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); + LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); } static void PatchObjectPalettes(const u16 *paletteTags, u8 minSlot, u8 maxSlot) @@ -1901,13 +1901,13 @@ static void PatchObjectPalettes(const u16 *paletteTags, u8 minSlot, u8 maxSlot) } } -static u8 FindEventObjectPaletteIndexByTag(u16 tag) +static u8 FindObjectEventPaletteIndexByTag(u16 tag) { u8 i; - for (i = 0; sEventObjectSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; sObjectEventSpritePalettes[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { - if (sEventObjectSpritePalettes[i].tag == tag) + if (sObjectEventSpritePalettes[i].tag == tag) { return i; } @@ -1920,7 +1920,7 @@ void LoadPlayerObjectReflectionPalette(u16 paletteTag, u8 paletteIndex) u8 i; PatchObjectPalette(paletteTag, paletteIndex); - for (i = 0; gPlayerReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gPlayerReflectionPaletteSets[i].mainPaletteTag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gPlayerReflectionPaletteSets[i].mainPaletteTag == paletteTag) { @@ -1936,7 +1936,7 @@ void LoadSpecialObjectReflectionPalette(u16 paletteTag, u8 paletteIndex) sCurrentSpecialObjectPaletteTag = paletteTag; PatchObjectPalette(paletteTag, paletteIndex); - for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].mainPaletteTag == paletteTag) { @@ -1946,64 +1946,64 @@ void LoadSpecialObjectReflectionPalette(u16 paletteTag, u8 paletteIndex) } } -void unref_sub_805C014(struct EventObject *eventObject, s16 x, s16 y) +void unref_sub_805C014(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x += x; - eventObject->currentCoords.y += y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x += x; + objectEvent->currentCoords.y += y; } -void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +void ShiftObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +static void SetObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -void sub_805C058(struct EventObject *eventObject, s16 x, s16 y) +void sub_805C058(struct ObjectEvent *objectEvent, s16 x, s16 y) { - struct Sprite *sprite = &gSprites[eventObject->spriteId]; - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + struct Sprite *sprite = &gSprites[objectEvent->spriteId]; + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - SetEventObjectCoords(eventObject, x, y); - sub_80603CC(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + SetObjectEventCoords(objectEvent, x, y); + sub_80603CC(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - sub_805B914(eventObject); - if (eventObject->trackedByCamera) + sub_805B914(objectEvent); + if (objectEvent->trackedByCamera) CameraObjectReset1(); } void sub_805C0F8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { x += 7; y += 7; - sub_805C058(&gEventObjects[eventObjectId], x, y); + sub_805C058(&gObjectEvents[objectEventId], x, y); } } -void ShiftStillEventObjectCoords(struct EventObject *eventObject) +void ShiftStillObjectEventCoords(struct ObjectEvent *objectEvent) { - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); } -void UpdateEventObjectCoordsForCameraUpdate(void) +void UpdateObjectEventCoordsForCameraUpdate(void) { u8 i; s16 deltaX; @@ -2013,52 +2013,52 @@ void UpdateEventObjectCoordsForCameraUpdate(void) { deltaX = gCamera.x; deltaY = gCamera.y; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - gEventObjects[i].initialCoords.x -= deltaX; - gEventObjects[i].initialCoords.y -= deltaY; - gEventObjects[i].currentCoords.x -= deltaX; - gEventObjects[i].currentCoords.y -= deltaY; - gEventObjects[i].previousCoords.x -= deltaX; - gEventObjects[i].previousCoords.y -= deltaY; + gObjectEvents[i].initialCoords.x -= deltaX; + gObjectEvents[i].initialCoords.y -= deltaY; + gObjectEvents[i].currentCoords.x -= deltaX; + gObjectEvents[i].currentCoords.y -= deltaY; + gObjectEvents[i].previousCoords.x -= deltaX; + gObjectEvents[i].previousCoords.y -= deltaY; } } } } -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - if (gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y && EventObjectDoesZCoordMatch(&gEventObjects[i], z)) + if (gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y && ObjectEventDoesZCoordMatch(&gObjectEvents[i], z)) { return i; } } } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z) +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *objectEvent, u8 z) { - if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z) + if (objectEvent->currentElevation != 0 && z != 0 && objectEvent->currentElevation != z) { return FALSE; } return TRUE; } -void UpdateEventObjectsForCameraUpdate(s16 cameraDeltaX, s16 cameraDeltaY) +void UpdateObjectEventsForCameraUpdate(s16 cameraDeltaX, s16 cameraDeltaY) { - UpdateEventObjectCoordsForCameraUpdate(); - TrySpawnEventObjects(cameraDeltaX, cameraDeltaY); - RemoveEventObjectsOutsideView(); + UpdateObjectEventCoordsForCameraUpdate(); + TrySpawnObjectEvents(cameraDeltaX, cameraDeltaY); + RemoveObjectEventsOutsideView(); } u8 AddCameraObject(u8 trackedSpriteId) @@ -2194,80 +2194,80 @@ u8 CreateCopySpriteAt(struct Sprite *src, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) +void SetObjectEventDirection(struct ObjectEvent *objectEvent, u8 direction) { - eventObject->previousMovementDirection = eventObject->facingDirection; - if (!eventObject->facingDirectionLocked) + objectEvent->previousMovementDirection = objectEvent->facingDirection; + if (!objectEvent->facingDirectionLocked) { s8 _direction = direction; //needed for the asm to match - eventObject->facingDirection = _direction; + objectEvent->facingDirection = _direction; } - eventObject->movementDirection = direction; + objectEvent->movementDirection = direction; } -static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const u8 *GetObjectEventScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; } -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId) { - return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventScriptPointerByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } -static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static u16 GetObjectEventFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) +static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId) { - return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventFlagIdByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } u8 unref_sub_805C5D0(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) return 0xFF; else - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } -u8 unref_sub_805C60C(u8 eventObjectId) +u8 unref_sub_805C60C(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } u8 unref_sub_805C624(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) return 0xFF; else - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -u8 EventObjectGetBerryTreeId(u8 eventObjectId) +u8 ObjectEventGetBerryTreeId(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { if (gSaveBlock1.location.mapNum == mapNum && gSaveBlock1.location.mapGroup == mapGroup) - return FindEventObjectTemplateByLocalId(localId, gSaveBlock1.eventObjectTemplates, gMapHeader.events->eventObjectCount); + return FindObjectEventTemplateByLocalId(localId, gSaveBlock1.objectEventTemplates, gMapHeader.events->objectEventCount); else { struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - return FindEventObjectTemplateByLocalId(localId, mapHeader->events->eventObjects, mapHeader->events->eventObjectCount); + return FindObjectEventTemplateByLocalId(localId, mapHeader->events->objectEvents, mapHeader->events->objectEventCount); } } -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count) { u8 i; @@ -2279,53 +2279,53 @@ static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, return NULL; } -static struct EventObjectTemplate *GetBaseTemplateForEventObject(struct EventObject *eventObject) +static struct ObjectEventTemplate *GetBaseTemplateForObjectEvent(struct ObjectEvent *objectEvent) { s32 i; - if (eventObject->mapNum != gSaveBlock1.location.mapNum - || eventObject->mapGroup != gSaveBlock1.location.mapGroup) + if (objectEvent->mapNum != gSaveBlock1.location.mapNum + || objectEvent->mapGroup != gSaveBlock1.location.mapGroup) return NULL; for (i = 0; i < 64; i++) { - if (eventObject->localId == gSaveBlock1.eventObjectTemplates[i].localId) - return &gSaveBlock1.eventObjectTemplates[i]; + if (objectEvent->localId == gSaveBlock1.objectEventTemplates[i].localId) + return &gSaveBlock1.objectEventTemplates[i]; } return NULL; } -void OverrideTemplateCoordsForEventObject(struct EventObject *eventObject) +void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *objectEvent) { - struct EventObjectTemplate *template = GetBaseTemplateForEventObject(eventObject); + struct ObjectEventTemplate *template = GetBaseTemplateForObjectEvent(objectEvent); if (template != NULL) { - template->x = eventObject->currentCoords.x - 7; - template->y = eventObject->currentCoords.y - 7; + template->x = objectEvent->currentCoords.x - 7; + template->y = objectEvent->currentCoords.y - 7; } } -void OverrideMovementTypeForEventObject(struct EventObject *eventObject, u8 movementType) +void OverrideMovementTypeForObjectEvent(struct ObjectEvent *objectEvent, u8 movementType) { - struct EventObjectTemplate *template = GetBaseTemplateForEventObject(eventObject); + struct ObjectEventTemplate *template = GetBaseTemplateForObjectEvent(objectEvent); if (template != NULL) template->movementType = movementType; } -void TryOverrideTemplateCoordsForEventObject(u8 localId, u8 mapNum, u8 mapGroup) +void TryOverrideTemplateCoordsForObjectEvent(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) - OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]); + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + OverrideTemplateCoordsForObjectEvent(&gObjectEvents[objectEventId]); } -void InitEventObjectPalettes(u8 reflectionType) +void InitObjectEventPalettes(u8 reflectionType) { FreeAndReserveObjectSpritePalettes(); - sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; + sCurrentSpecialObjectPaletteTag = OBJ_EVENT_PAL_TAG_NONE; sCurrentReflectionType = reflectionType; PatchObjectPalettes(gObjectPaletteTagSets[sCurrentReflectionType], 0, 10); } @@ -2339,7 +2339,7 @@ u16 GetObjectPaletteTag(u8 paletteIndex) return gObjectPaletteTagSets[sCurrentReflectionType][paletteIndex]; // Palette slots 10 and 11 belong to the special object. - for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].mainPaletteTag == sCurrentSpecialObjectPaletteTag) { @@ -2347,29 +2347,29 @@ u16 GetObjectPaletteTag(u8 paletteIndex) } } - return EVENT_OBJ_PAL_TAG_NONE; + return OBJ_EVENT_PAL_TAG_NONE; } movement_type_empty_callback(MovementType_None); movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround); -bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) == 0) { return FALSE; } @@ -2378,7 +2378,7 @@ bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sp return TRUE; } -bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2388,40 +2388,40 @@ bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gStandardDirections, 4); direction = directions[Random() & 3]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction) != 0) + if (GetCollisionInDirection(objectEvent, direction) != 0) { sprite->data[1] = 1; } return TRUE; } -bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) +bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent) { s16 x; s16 y; @@ -2435,17 +2435,17 @@ bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) { return FALSE; } - if (eventObject->trainerType != 1 && eventObject->trainerType != 3) + if (objectEvent->trainerType != 1 && objectEvent->trainerType != 3) { return FALSE; } PlayerGetDestCoords(&x, &y); - objx = eventObject->currentCoords.x; - objy = eventObject->currentCoords.y; - minx = objx - eventObject->trainerRange_berryTreeId; - miny = objy - eventObject->trainerRange_berryTreeId; - maxx = objx + eventObject->trainerRange_berryTreeId; - maxy = objy + eventObject->trainerRange_berryTreeId; + objx = objectEvent->currentCoords.x; + objy = objectEvent->currentCoords.y; + minx = objx - objectEvent->trainerRange_berryTreeId; + miny = objy - objectEvent->trainerRange_berryTreeId; + maxx = objx + objectEvent->trainerRange_berryTreeId; + maxy = objy + objectEvent->trainerRange_berryTreeId; if (minx > x || maxx < x || miny > y || maxy < y) { return FALSE; @@ -2632,17 +2632,17 @@ u8 GetLimitedVectorDirection_SouthWestEast(s16 x, s16 y, s16 xAbs, s16 yAbs) return direction; } -u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 directionFuncIndex) +u8 TryGetTrainerEncounterDirection(struct ObjectEvent *objectEvent, u8 directionFuncIndex) { s16 x, y; s16 xAbs, yAbs; - if (!EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (!ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { return 0; } PlayerGetDestCoords(&x, &y); - x -= eventObject->currentCoords.x; - y -= eventObject->currentCoords.y; + x -= objectEvent->currentCoords.x; + y -= objectEvent->currentCoords.y; xAbs = x; yAbs = y; if (xAbs < 0) @@ -2655,34 +2655,34 @@ u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 direction movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround); -bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -2690,39 +2690,39 @@ bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Spri return FALSE; } -bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gStandardDirections, sizeof directions); - direction = TryGetTrainerEncounterDirection(eventObject, 0); + direction = TryGetTrainerEncounterDirection(objectEvent, 0); if (direction == DIR_NONE) direction = directions[Random() & 3]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown); -bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) == 0) { return FALSE; } @@ -2731,7 +2731,7 @@ bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct return TRUE; } -bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2741,34 +2741,34 @@ bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction) != 0) + if (GetCollisionInDirection(objectEvent, direction) != 0) { sprite->data[1] = 1; } return TRUE; } -bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -2776,23 +2776,23 @@ bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight); -bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) == 0) { return FALSE; } @@ -2801,7 +2801,7 @@ bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, str return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2811,34 +2811,34 @@ bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction) != 0) + if (GetCollisionInDirection(objectEvent, direction) != 0) { sprite->data[1] = 1; } return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -2846,17 +2846,17 @@ bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, str movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection); -bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { sprite->data[1] = 2; return TRUE; @@ -2864,43 +2864,43 @@ bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } void MovementType_BerryTreeGrowth(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; + objectEvent = &gObjectEvents[sprite->data[0]]; if (!(sprite->data[7] & 1)) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[7] |= 1; } - UpdateEventObjectCurrentMovement(eventObject, sprite, MovementType_BerryTreeGrowth_Callback); + UpdateObjectEventCurrentMovement(objectEvent, sprite, MovementType_BerryTreeGrowth_Callback); } -static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static u8 MovementType_BerryTreeGrowth_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryTreeStage; - ClearEventObjectMovement(eventObject, sprite); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryTreeStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryTreeStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (!berryTreeStage) { if (!(sprite->data[7] & 4) && sprite->animNum == 4) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -2908,7 +2908,7 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct } return FALSE; } - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; berryTreeStage--; if (sprite->animNum != berryTreeStage) @@ -2916,15 +2916,15 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct sprite->data[1] = 2; return TRUE; } - get_berry_tree_graphics(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + get_berry_tree_graphics(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 0; return TRUE; @@ -2932,28 +2932,28 @@ bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 2; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = ((sprite->data[2] & 0x2) >> 1); + objectEvent->invisible = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = TRUE; if (sprite->data[2] > 64) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[1] = 4; sprite->data[2] = 0; return TRUE; @@ -2961,10 +2961,10 @@ bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = ((sprite->data[2] & 0x2) >> 1); + objectEvent->invisible = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -2977,34 +2977,34 @@ bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp); -bool8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3012,51 +3012,51 @@ bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 1); + direction = TryGetTrainerEncounterDirection(objectEvent, 1); if (direction == DIR_NONE) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight); -bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3064,51 +3064,51 @@ bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 2); + direction = TryGetTrainerEncounterDirection(objectEvent, 2); if (direction == DIR_NONE) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft); -bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3116,51 +3116,51 @@ bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 3); + direction = TryGetTrainerEncounterDirection(objectEvent, 3); if (direction == DIR_NONE) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight); -bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3168,51 +3168,51 @@ bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 4); + direction = TryGetTrainerEncounterDirection(objectEvent, 4); if (direction == DIR_NONE) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft); -bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3220,51 +3220,51 @@ bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 5); + direction = TryGetTrainerEncounterDirection(objectEvent, 5); if (direction == DIR_NONE) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight); -bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3272,51 +3272,51 @@ bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 6); + direction = TryGetTrainerEncounterDirection(objectEvent, 6); if (direction == DIR_NONE) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft); -bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3324,51 +3324,51 @@ bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 7); + direction = TryGetTrainerEncounterDirection(objectEvent, 7); if (direction == DIR_NONE) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight); -bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3376,51 +3376,51 @@ bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 8); + direction = TryGetTrainerEncounterDirection(objectEvent, 8); if (direction == DIR_NONE) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpLeftAndRight, gMovementTypeFuncs_FaceUpLeftAndRight); -bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3428,51 +3428,51 @@ bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 9); + direction = TryGetTrainerEncounterDirection(objectEvent, 9); if (direction == DIR_NONE) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownLeftAndRight, gMovementTypeFuncs_FaceDownLeftAndRight); -bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3480,34 +3480,34 @@ bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, s return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 10); + direction = TryGetTrainerEncounterDirection(objectEvent, 10); if (direction == DIR_NONE) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise); -bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3515,43 +3515,43 @@ bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 0); + direction = TryGetTrainerEncounterDirection(objectEvent, 0); if (direction == DIR_NONE) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise); -bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 0x30); sprite->data[1] = 2; @@ -3559,132 +3559,132 @@ bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, 0); + direction = TryGetTrainerEncounterDirection(objectEvent, 0); if (direction == DIR_NONE) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth); -bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; - direction = gInitialMovementTypeFacingDirections[eventObject->movementType]; - if (eventObject->directionSequenceIndex != 0) + direction = gInitialMovementTypeFacingDirections[objectEvent->movementType]; + if (objectEvent->directionSequenceIndex != 0) { direction = GetOppositeDirection(direction); } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 collisionState; u8 movementActionId; - if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + objectEvent->directionSequenceIndex = 0; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); } - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); if (collisionState == 1) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collisionState != 0) { - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); } - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *directionSequence) +bool8 MoveNextDirectionInSequence(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 *directionSequence) { u8 collisionState; u8 movementActionId; - if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 3 && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 0; + objectEvent->directionSequenceIndex = 0; } - SetEventObjectDirection(eventObject, directionSequence[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + SetObjectEventDirection(objectEvent, directionSequence[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); if (collisionState == 1) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, directionSequence[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, directionSequence[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collisionState != 0) { - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); } - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3692,560 +3692,560 @@ bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sp movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown); -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUpRightLeftDownDirections, sizeof gUpRightLeftDownDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp); -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gRightLeftDownUpDirections, sizeof gRightLeftDownUpDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft); -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gDownUpRightLeftDirections, sizeof gDownUpRightLeftDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight); -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gLeftDownUpRightDirections, sizeof gLeftDownUpRightDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown); -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUpLeftRightDownDirections, sizeof gUpLeftRightDownDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp); -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gLeftRightDownUpDirections, sizeof gLeftRightDownUpDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight); -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gStandardDirections, sizeof gStandardDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft); -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gRightDownUpLeftDirections, sizeof gRightDownUpLeftDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight); -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gLeftUpDownRightDirections, sizeof gLeftUpDownRightDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft); -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUpDownRightLeftDirections, sizeof gUpDownRightLeftDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown); -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gRightLeftUpDownDirections, sizeof gRightLeftUpDownDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp); -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gDownRightLeftUpDirections, sizeof gDownRightLeftUpDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft); -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gRightUpDownLeftDirections, sizeof gRightUpDownLeftDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight); -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUpDownLeftRightDirections, sizeof gUpDownLeftRightDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown); -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gLeftRightUpDownDirections, sizeof gLeftRightUpDownDirections); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp); -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gDownLeftRightUpDirections, sizeof gDownLeftRightUpDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight); -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUpLeftDownRightDirections, sizeof gUpLeftDownRightDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft); -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gDownRightUpLeftDirections, sizeof gDownRightUpLeftDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp); -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gLeftDownRightUpDirections, sizeof gLeftDownRightUpDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown); -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gRightUpLeftDownDirections, sizeof gRightUpLeftDownDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft); -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUpRightDownLeftDirections, sizeof gUpRightDownLeftDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight); -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gDownLeftUpRightDirections, sizeof gDownLeftUpRightDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown); -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gLeftUpRightDownDirections, sizeof gLeftUpRightDownDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp); -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gRightDownLeftUpDirections, sizeof gRightDownLeftUpDirections); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer); -bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - if (eventObject->directionSequenceIndex == 0) + ClearObjectEventMovement(objectEvent, sprite); + if (objectEvent->directionSequenceIndex == 0) { - eventObject->directionSequenceIndex = GetPlayerFacingDirection(); + objectEvent->directionSequenceIndex = GetPlayerFacingDirection(); } sprite->data[1] = 1; return TRUE; } -bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), NULL); } -bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_None(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { return FALSE; } -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, playerDirection))); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastestMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetSlideMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 cph_IM_DIFFERENT(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction)); - eventObject->singleMovementActive = TRUE; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpInPlaceMovementAction(direction)); + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoordsInDirection(direction, &x, &y, 2, 2); - EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventSetSingleMovement(objectEvent, sprite, GetJump2MovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass); -bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); } void MovementType_TreeDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } void MovementType_MountainDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } void MovementType_Hidden(struct Sprite *sprite) { if (!sprite->data[7]) { - gEventObjects[sprite->data[0]].fixedPriority = TRUE; + gObjectEvents[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 2; sprite->oam.priority = 3; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Hidden_Callback); } -static bool8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Hidden_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_Hidden[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Hidden_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } -bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_MoveInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 0; } @@ -4254,48 +4254,48 @@ bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Spr movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace); -bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace); -bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_JogInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace); -bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RunInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible); -bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); + objectEvent->invisible = TRUE; sprite->data[1] = 1; return TRUE; } -bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -4303,18 +4303,18 @@ bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } -static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite) +static void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = 0xFF; + objectEvent->singleMovementActive = 0; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + objectEvent->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -4393,9 +4393,9 @@ u8 GetRunningDirectionAnimNum(u8 direction) return gRunningDirectionAnimNums[direction]; } -void sub_805FE28(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void sub_805FE28(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; if (sprite->animCmdIndex == 1) @@ -4409,10 +4409,10 @@ void sub_805FE28(struct EventObject *eventObject, struct Sprite *sprite, u8 anim } } -void sub_805FE64(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void sub_805FE64(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { u8 animCmdIndex; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; animCmdIndex = 3; @@ -4435,13 +4435,13 @@ static u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType) +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType) { - eventObject->movementType = movementType; - eventObject->directionSequenceIndex = 0; - eventObject->playerCopyableMovement = 0; - gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType]; - gSprites[eventObject->spriteId].data[1] = 0; + objectEvent->movementType = movementType; + objectEvent->directionSequenceIndex = 0; + objectEvent->playerCopyableMovement = 0; + gSprites[objectEvent->spriteId].callback = sMovementTypeCallbacks[movementType]; + gSprites[objectEvent->spriteId].data[1] = 0; } u8 GetTrainerFacingDirectionMovementType(u8 direction) @@ -4449,73 +4449,73 @@ u8 GetTrainerFacingDirectionMovementType(u8 direction) return gTrainerFacingDirectionMovementTypes[direction]; } -static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction) +static u8 GetCollisionInDirection(struct ObjectEvent *objectEvent, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return GetCollisionAtCoords(eventObject, x, y, direction); + return GetCollisionAtCoords(objectEvent, x, y, direction); } -u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dirn) +u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dirn) { u8 direction; direction = dirn; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) return 1; - else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) + else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction)) return 2; - else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) + else if (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)) return 2; - else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + else if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) return 3; - else if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + else if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) return 4; return 0; } -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { u8 flags = 0; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) flags |= 1; - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction) || (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction))) flags |= 2; - if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) flags |= 4; - if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) flags |= 8; return flags; } -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y) +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *objectEvent, s16 x, s16 y) { s16 minv; s16 maxv; - if (eventObject->range.as_nybbles.x != 0) + if (objectEvent->range.as_nybbles.x != 0) { - minv = eventObject->initialCoords.x - (eventObject->range.as_nybbles.x); - maxv = eventObject->initialCoords.x + (eventObject->range.as_nybbles.x); + minv = objectEvent->initialCoords.x - (objectEvent->range.as_nybbles.x); + maxv = objectEvent->initialCoords.x + (objectEvent->range.as_nybbles.x); if (minv > x || maxv < x) return TRUE; } - if (eventObject->range.as_nybbles.y != 0) + if (objectEvent->range.as_nybbles.y != 0) { - minv = eventObject->initialCoords.y - (eventObject->range.as_nybbles.y); - maxv = eventObject->initialCoords.y + (eventObject->range.as_nybbles.y); + minv = objectEvent->initialCoords.y - (objectEvent->range.as_nybbles.y); + maxv = objectEvent->initialCoords.y + (objectEvent->range.as_nybbles.y); if (minv > y || maxv < y) return TRUE; } return FALSE; } -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { - if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](objectEvent->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; @@ -4523,18 +4523,18 @@ static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, return FALSE; } -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y) +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *objectEvent, s16 x, s16 y) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - struct EventObject *eventObject2 = &gEventObjects[i]; + struct ObjectEvent *objectEvent2 = &gObjectEvents[i]; - if (eventObject2->active && eventObject2 != eventObject) + if (objectEvent2->active && objectEvent2 != objectEvent) { - if (((eventObject2->currentCoords.x == x && eventObject2->currentCoords.y == y) || (eventObject2->previousCoords.x == x && eventObject2->previousCoords.y == y)) - && AreZCoordsCompatible(eventObject->currentElevation, eventObject2->currentElevation)) + if (((objectEvent2->currentCoords.x == x && objectEvent2->currentCoords.y == y) || (objectEvent2->previousCoords.x == x && objectEvent2->previousCoords.y == y)) + && AreZCoordsCompatible(objectEvent->currentElevation, objectEvent2->currentElevation)) return TRUE; } } @@ -4543,10 +4543,10 @@ static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) - if (gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + if (gSprites[gObjectEvents[objectEventId].spriteId].data[7] & 2) return TRUE; return FALSE; @@ -4554,10 +4554,10 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) void sub_8060288(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 4; + gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 4; } } @@ -4629,7 +4629,7 @@ void sub_8060470(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetObjectEventMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -4651,107 +4651,107 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) } } -void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y) +void ObjectEventMoveDestCoords(struct ObjectEvent *objectEvent, u32 direction, s16 *x, s16 *y) { u8 newDirn = direction; - *x = eventObject->currentCoords.x; - *y = eventObject->currentCoords.y; + *x = objectEvent->currentCoords.x; + *y = objectEvent->currentCoords.y; MoveCoords(newDirn, x, y); } -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent) { - if (eventObject->singleMovementActive || eventObject->heldMovementActive) + if (objectEvent->singleMovementActive || objectEvent->heldMovementActive) return TRUE; return FALSE; } -bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) + if (objectEvent->heldMovementActive && objectEvent->movementActionId != 0xFF) return TRUE; return FALSE; } -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - if (EventObjectIsMovementOverridden(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent)) return TRUE; - UnfreezeEventObject(eventObject); - eventObject->movementActionId = movementActionId; - eventObject->heldMovementActive = TRUE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[2] = 0; + UnfreezeObjectEvent(objectEvent); + objectEvent->movementActionId = movementActionId; + objectEvent->heldMovementActive = TRUE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[2] = 0; return FALSE; } -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - EventObjectClearHeldMovementIfActive(eventObject); - EventObjectSetHeldMovement(eventObject, movementActionId); + ObjectEventClearHeldMovementIfActive(objectEvent); + ObjectEventSetHeldMovement(objectEvent, movementActionId); } -void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - EventObjectClearHeldMovement(eventObject); + if (objectEvent->heldMovementActive) + ObjectEventClearHeldMovement(objectEvent); } -void EventObjectClearHeldMovement(struct EventObject *eventObject) +void ObjectEventClearHeldMovement(struct ObjectEvent *objectEvent) { - eventObject->movementActionId = 0xFF; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[1] = 0; - gSprites[eventObject->spriteId].data[2] = 0; + objectEvent->movementActionId = 0xFF; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[1] = 0; + gSprites[objectEvent->spriteId].data[2] = 0; } -bool8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject) +bool8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->heldMovementFinished; + if (objectEvent->heldMovementActive) + return objectEvent->heldMovementFinished; return 16; } -bool8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject) +bool8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *objectEvent) { - u8 heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject); + u8 heldMovementStatus = ObjectEventCheckHeldMovementStatus(objectEvent); if (heldMovementStatus != 0 && heldMovementStatus != 16) - EventObjectClearHeldMovementIfActive(eventObject); + ObjectEventClearHeldMovementIfActive(objectEvent); return heldMovementStatus; } -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->movementActionId; + if (objectEvent->heldMovementActive) + return objectEvent->movementActionId; return 0xFF; } -void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 (*callback)(struct EventObject *, struct Sprite *)) +void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 (*callback)(struct ObjectEvent *, struct Sprite *)) { - DoGroundEffects_OnSpawn(eventObject, sprite); - TryEnableEventObjectAnim(eventObject, sprite); - if (EventObjectIsHeldMovementActive(eventObject)) + DoGroundEffects_OnSpawn(objectEvent, sprite); + TryEnableObjectEventAnim(objectEvent, sprite); + if (ObjectEventIsHeldMovementActive(objectEvent)) { - EventObjectExecHeldMovementAction(eventObject, sprite); + ObjectEventExecHeldMovementAction(objectEvent, sprite); } - else if (!eventObject->frozen) + else if (!objectEvent->frozen) { - while (callback(eventObject, sprite)); + while (callback(objectEvent, sprite)); } - DoGroundEffects_OnBeginStep(eventObject, sprite); - DoGroundEffects_OnFinishStep(eventObject, sprite); - UpdateEventObjectSpriteAnimPause(eventObject, sprite); - UpdateEventObjectVisibility(eventObject, sprite); - EventObjectUpdateSubpriority(eventObject, sprite); + DoGroundEffects_OnBeginStep(objectEvent, sprite); + DoGroundEffects_OnFinishStep(objectEvent, sprite); + UpdateObjectEventSpriteAnimPause(objectEvent, sprite); + UpdateObjectEventVisibility(objectEvent, sprite); + ObjectEventUpdateSubpriority(objectEvent, sprite); } #define dirn_to_anim(name, table)\ @@ -4783,9 +4783,9 @@ dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActio dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions) dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions) -u8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction) { - return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); + return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); } u8 GetAcroWheelieFaceDirectionMovementAction(u8 direction) @@ -4927,19 +4927,19 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_08375767[a0 - 1][zffuOffset - 1]; } -static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->heldMovementFinished = TRUE; + objectEvent->heldMovementFinished = TRUE; } } -static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->movementActionId = 0xFF; + objectEvent->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } @@ -4947,135 +4947,135 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject return FALSE; } -static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 movementActionId) +static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 movementActionId) { - eventObject->movementActionId = movementActionId; + objectEvent->movementActionId = movementActionId; sprite->data[2] = 0; } -static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + sub_805FE64(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_SOUTH); + FaceDirection(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_NORTH); + FaceDirection(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_WEST); + FaceDirection(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_EAST); + FaceDirection(objectEvent, sprite, DIR_EAST); return TRUE; } -void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void npc_apply_direction(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } extern u8 (*const gUnknown_083759C0[5])(u8); -void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void do_go_anim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { u8 (*const functions[5])(u8); memcpy((void *)functions, gUnknown_083759C0, sizeof(gUnknown_083759C0)); - npc_apply_direction(eventObject, sprite, direction, speed); - sub_805FE28(eventObject, sprite, functions[speed](eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + sub_805FE28(objectEvent, sprite, functions[speed](objectEvent->facingDirection)); } -void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void StartRunningAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - npc_apply_direction(eventObject, sprite, direction, 1); - sub_805FE28(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, 1); + sub_805FE28(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection)); } bool8 obj_npc_ministep(struct Sprite *); -bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite) +bool8 npc_obj_ministep_stop_on_arrival(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (obj_npc_ministep(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -void sub_8060E68(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8060E68(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); sub_806467C(sprite, direction); sprite->animPaused = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void sub_8060ED8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8060ED8(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8060E68(eventObject, sprite, direction); - sub_805FE28(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + sub_8060E68(objectEvent, sprite, direction); + sub_805FE28(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); } -bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 an_walk_any_2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_806468C(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_SOUTH); - return MovementAction_WalkSlowDown_Step1(eventObject, sprite); + sub_8060ED8(objectEvent, sprite, DIR_SOUTH); + return MovementAction_WalkSlowDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5083,17 +5083,17 @@ bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_NORTH); - return MovementAction_WalkSlowUp_Step1(eventObject, sprite); + sub_8060ED8(objectEvent, sprite, DIR_NORTH); + return MovementAction_WalkSlowUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5101,17 +5101,17 @@ bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_WEST); - return MovementAction_WalkSlowLeft_Step1(eventObject, sprite); + sub_8060ED8(objectEvent, sprite, DIR_WEST); + return MovementAction_WalkSlowLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5119,17 +5119,17 @@ bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_EAST); - return MovementAction_WalkSlowRight_Step1(eventObject, sprite); + sub_8060ED8(objectEvent, sprite, DIR_EAST); + return MovementAction_WalkSlowRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5137,17 +5137,17 @@ bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 0); - return MovementAction_WalkNormalDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 0); + return MovementAction_WalkNormalDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5155,17 +5155,17 @@ bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 0); - return MovementAction_WalkNormalUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 0); + return MovementAction_WalkNormalUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5173,17 +5173,17 @@ bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 0); - return MovementAction_WalkNormalLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 0); + return MovementAction_WalkNormalLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5191,17 +5191,17 @@ bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 0); - return MovementAction_WalkNormalRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 0); + return MovementAction_WalkNormalRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5209,7 +5209,7 @@ bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, stru return FALSE; } -void sub_806113C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) +void sub_806113C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) { s16 vSPp4[3]; s16 x; @@ -5217,24 +5217,24 @@ void sub_806113C(struct EventObject *eventObject, struct Sprite *sprite, u8 dire memcpy(vSPp4, gUnknown_08375A34, sizeof gUnknown_08375A34); x = 0; y = 0; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); MoveCoordsInDirection(direction, &x, &y, vSPp4[a4], vSPp4[a4]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); sub_80646E4(sprite, direction, a4, a5); sprite->data[2] = 1; sprite->animPaused = 0; - eventObject->triggerGroundEffectsOnMove = 1; - eventObject->disableCoveringGroundEffects = 1; + objectEvent->triggerGroundEffectsOnMove = 1; + objectEvent->disableCoveringGroundEffects = 1; } -void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) +void maybe_shadow_1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) { - sub_806113C(eventObject, sprite, direction, a4, a5); - sub_805FE28(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); - DoShadowFieldEffect(eventObject); + sub_806113C(objectEvent, sprite, direction, a4, a5); + sub_805FE28(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); + DoShadowFieldEffect(objectEvent); } -u8 sub_806123C(struct EventObject *eventObject, struct Sprite *sprite, u8 (*const callback)(struct Sprite *)) +u8 sub_806123C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 (*const callback)(struct Sprite *)) { s16 vSPp4[3]; s16 x; @@ -5246,54 +5246,54 @@ u8 sub_806123C(struct EventObject *eventObject, struct Sprite *sprite, u8 (*cons { x = 0; y = 0; - MoveCoordsInDirection(eventObject->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->disableCoveringGroundEffects = TRUE; + MoveCoordsInDirection(objectEvent->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->disableCoveringGroundEffects = TRUE; } else if (retval == 0xFF) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; - eventObject->landingJump = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; + objectEvent->landingJump = TRUE; sprite->animPaused = TRUE; } return retval; } -u8 sub_8061300(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8061300(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_806123C(eventObject, sprite, sub_8064704); + return sub_806123C(objectEvent, sprite, sub_8064704); } -u8 sub_8061314(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8061314(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_806123C(eventObject, sprite, sub_806478C); + return sub_806123C(objectEvent, sprite, sub_806478C); } -bool8 sub_8061328(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8061328(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061300(eventObject, sprite) == 0xFF) + if (sub_8061300(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_8061340(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8061340(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061314(eventObject, sprite) == 0xFF) + if (sub_8061314(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_8061358(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8061358(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 retval; - retval = sub_8061300(eventObject, sprite); + retval = sub_8061300(objectEvent, sprite); if (retval != 1) { if (retval == 0xFF) @@ -5302,78 +5302,78 @@ bool8 sub_8061358(struct EventObject *eventObject, struct Sprite *sprite) } return FALSE; } - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + sub_805FE64(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); return FALSE; } -bool8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); -bool8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); -bool8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); -bool8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_Jump2Down_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_Jump2Down_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_Jump2Up_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_Jump2Up_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_Jump2Left_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_Jump2Left_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_Jump2Right_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_Jump2Right_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5386,7 +5386,7 @@ void sub_8061508(struct Sprite *sprite, u16 duration) sprite->data[3] = duration; } -bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[3]--; if (!sprite->data[3]) @@ -5397,50 +5397,50 @@ bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite return FALSE; } -bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay1_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8061508(sprite, 1); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay2_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8061508(sprite, 2); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay4_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8061508(sprite, 4); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8061508(sprite, 8); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay16_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8061508(sprite, 16); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); -bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); -bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); -bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); +bool8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); +bool8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); +bool8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_WalkFastDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_WalkFastDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5448,15 +5448,15 @@ bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_WalkFastUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_WalkFastUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5464,15 +5464,15 @@ bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 1); - return MovementAction_WalkFastLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_WalkFastLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5480,15 +5480,15 @@ bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 1); - return MovementAction_WalkFastRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_WalkFastRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5496,16 +5496,16 @@ bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct return FALSE; } -void sub_80616CC(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +void sub_80616CC(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - SetEventObjectDirection(eventObject, direction); - sub_805FE28(eventObject, sprite, animNum); + SetObjectEventDirection(objectEvent, direction); + sub_805FE28(objectEvent, sprite, animNum); sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } -bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[3]--; if (sprite->data[3] == 0) @@ -5517,122 +5517,122 @@ bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->data[3] & 1) { sprite->animDelayCounter++; } - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 2); - return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 2); + return MovementAction_RideWaterCurrentDown_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5641,17 +5641,17 @@ bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, } -bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 2); - return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 2); + return MovementAction_RideWaterCurrentUp_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5660,17 +5660,17 @@ bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, s } -bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 2); - return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 2); + return MovementAction_RideWaterCurrentLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5679,17 +5679,17 @@ bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, } -bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 2); - return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 2); + return MovementAction_RideWaterCurrentRight_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5697,17 +5697,17 @@ bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject return FALSE; } -bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 3); - return MovementAction_WalkFastestDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 3); + return MovementAction_WalkFastestDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5715,17 +5715,17 @@ bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 3); - return MovementAction_WalkFastestUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 3); + return MovementAction_WalkFastestUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5734,17 +5734,17 @@ bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct } -bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 3); - return MovementAction_WalkFastestLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 3); + return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5753,17 +5753,17 @@ bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, stru } -bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 3); - return MovementAction_WalkFastestRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 3); + return MovementAction_WalkFastestRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5771,17 +5771,17 @@ bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, str return FALSE; } -bool8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 4); - return MovementAction_SlideDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 4); + return MovementAction_SlideDown_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5789,17 +5789,17 @@ bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 4); - return MovementAction_SlideUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 4); + return MovementAction_SlideUp_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5808,17 +5808,17 @@ bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprit } -bool8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 4); - return MovementAction_SlideLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 4); + return MovementAction_SlideLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5827,17 +5827,17 @@ bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Spr } -bool8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 4); - return MovementAction_SlideRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 4); + return MovementAction_SlideRight_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5845,17 +5845,17 @@ bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_SOUTH); - return MovementAction_PlayerRunDown_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_SOUTH); + return MovementAction_PlayerRunDown_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5863,17 +5863,17 @@ bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_NORTH); - return MovementAction_PlayerRunUp_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_NORTH); + return MovementAction_PlayerRunUp_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5881,17 +5881,17 @@ bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_WEST); - return MovementAction_PlayerRunLeft_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_WEST); + return MovementAction_PlayerRunLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5899,17 +5899,17 @@ bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_EAST); - return MovementAction_PlayerRunRight_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_EAST); + return MovementAction_PlayerRunRight_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5917,22 +5917,22 @@ bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struc return FALSE; } -void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) +void StartSpriteAnimInDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum) { SetAndStartSpriteAnim(sprite, animNum, 0); - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[2] = 1; } -bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + StartSpriteAnimInDirection(objectEvent, sprite, objectEvent->movementDirection, sprite->animNum); return FALSE; } bool8 SpriteAnimEnded(struct Sprite *); -bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -5942,457 +5942,457 @@ bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Spri return FALSE; } -void sub_8061F5C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8061F5C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_806113C(eventObject, sprite, direction, 1, 0); + sub_806113C(objectEvent, sprite, direction, 1, 0); StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } -bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_SOUTH); - return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); + sub_8061F5C(objectEvent, sprite, DIR_SOUTH); + return MovementAction_JumpSpecialDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_NORTH); - return MovementAction_JumpSpecialUp_Step1(eventObject, sprite); + sub_8061F5C(objectEvent, sprite, DIR_NORTH); + return MovementAction_JumpSpecialUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_WEST); - return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite); + sub_8061F5C(objectEvent, sprite, DIR_WEST); + return MovementAction_JumpSpecialLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_EAST); - return MovementAction_JumpSpecialRight_Step1(eventObject, sprite); + sub_8061F5C(objectEvent, sprite, DIR_EAST); + return MovementAction_JumpSpecialRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = 0; + objectEvent->landingJump = 0; return TRUE; } return FALSE; } -bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)); + FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y))); + FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = TRUE; + objectEvent->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = FALSE; + objectEvent->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2); - return MovementAction_JumpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 1, 2); + return MovementAction_JumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2); - return MovementAction_JumpUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 1, 2); + return MovementAction_JumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2); - return MovementAction_JumpLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 1, 2); + return MovementAction_JumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2); - return MovementAction_JumpRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 1, 2); + return MovementAction_JumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0); - return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 0); + return MovementAction_JumpInPlaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0); - return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 0); + return MovementAction_JumpInPlaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0); - return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 0); + return MovementAction_JumpInPlaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0); - return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 0); + return MovementAction_JumpInPlaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2); - return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 2); + return MovementAction_JumpInPlaceDownUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2); - return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 2); + return MovementAction_JumpInPlaceUpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2); - return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 2); + return MovementAction_JumpInPlaceLeftRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2); - return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 2); + return MovementAction_JumpInPlaceRightLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); + FaceDirection(objectEvent, sprite, gInitialMovementTypeFacingDirections[objectEvent->movementType]); return TRUE; } -bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, 0x14); return FALSE; } -bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = FALSE; + objectEvent->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = TRUE; + objectEvent->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = TRUE; + objectEvent->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetInvisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetVisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_QUESTION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN) + if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN) { - sub_8084794(eventObject); + sub_8084794(objectEvent); return FALSE; } - else if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) + else if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) { sprite->data[2] = 2; return TRUE; } else { - sub_812869C(eventObject); + sub_812869C(objectEvent); sprite->data[2] = 1; - return MovementAction_RevealTrainer_Step1(eventObject, sprite); + return MovementAction_RevealTrainer_Step1(objectEvent, sprite); } } -bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_81286C4(eventObject)) + if (sub_81286C4(objectEvent)) { sprite->data[2] = 2; return TRUE; @@ -6400,14 +6400,14 @@ bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6417,25 +6417,25 @@ bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; + objectEvent->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6445,32 +6445,32 @@ bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; + objectEvent->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->fixedPriority = TRUE; + objectEvent->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->fixedPriority = FALSE; + objectEvent->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; InitSpriteAffineAnim(sprite); @@ -6479,7 +6479,7 @@ bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struc return TRUE; } -bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = ST_OAM_AFFINE_OFF; @@ -6487,19 +6487,19 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru return TRUE; } -bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_SOUTH); + sub_8060ED8(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = 0; StartSpriteAffineAnimIfDifferent(sprite, 0); - return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownStartAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6508,19 +6508,19 @@ bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_SOUTH); + sub_8060ED8(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = 0; ChangeSpriteAffineAnimIfDifferent(sprite, 1); - return MovementAction_WalkDownAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6529,388 +6529,388 @@ bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -void sub_806295C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_806295C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - sub_805FE64(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + sub_805FE64(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); sprite->animPaused = 1; sprite->data[2] = 1; } -bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_806295C(eventObject, sprite, DIR_SOUTH); + sub_806295C(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_806295C(eventObject, sprite, DIR_NORTH); + sub_806295C(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_806295C(eventObject, sprite, DIR_WEST); + sub_806295C(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_806295C(eventObject, sprite, DIR_EAST); + sub_806295C(objectEvent, sprite, DIR_EAST); return TRUE; } -bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); return FALSE; } -void sub_8062B8C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3, u8 a4) +void sub_8062B8C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 a3, u8 a4) { - sub_806113C(eventObject, sprite, direction, a3, a4); + sub_806113C(objectEvent, sprite, direction, a3, a4); StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); - DoShadowFieldEffect(eventObject); + DoShadowFieldEffect(objectEvent); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_SOUTH, 0, 1); - return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_SOUTH, 0, 1); + return MovementAction_AcroWheelieHopFaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_NORTH, 0, 1); - return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_NORTH, 0, 1); + return MovementAction_AcroWheelieHopFaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_WEST, 0, 1); - return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_WEST, 0, 1); + return MovementAction_AcroWheelieHopFaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_EAST, 0, 1); - return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_EAST, 0, 1); + return MovementAction_AcroWheelieHopFaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_SOUTH, 1, 1); - return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_SOUTH, 1, 1); + return MovementAction_AcroWheelieHopDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_NORTH, 1, 1); - return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_NORTH, 1, 1); + return MovementAction_AcroWheelieHopUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_WEST, 1, 1); - return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_WEST, 1, 1); + return MovementAction_AcroWheelieHopLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_EAST, 1, 1); - return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_EAST, 1, 1); + return MovementAction_AcroWheelieHopRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_AcroWheelieJumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_AcroWheelieJumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_AcroWheelieJumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); + sub_8062B8C(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_AcroWheelieJumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80616CC(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -void sub_80630D0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_80630D0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); + sub_80630D0(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroPopWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6918,17 +6918,17 @@ bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); + sub_80630D0(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroPopWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6936,17 +6936,17 @@ bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); + sub_80630D0(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroPopWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6954,17 +6954,17 @@ bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); + sub_80630D0(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroPopWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6972,23 +6972,23 @@ bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -void sub_8063208(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8063208(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - sub_805FE28(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + sub_805FE28(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection)); } -bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); + sub_8063208(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6996,17 +6996,17 @@ bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); + sub_8063208(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7014,17 +7014,17 @@ bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, st return FALSE; } -bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); + sub_8063208(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7032,17 +7032,17 @@ bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); + sub_8063208(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7050,24 +7050,24 @@ bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, return FALSE; } -void sub_8063338(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8063338(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); + sub_8063338(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroEndWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7075,17 +7075,17 @@ bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); + sub_8063338(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroEndWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7093,17 +7093,17 @@ bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); + sub_8063338(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroEndWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7111,17 +7111,17 @@ bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); + sub_8063338(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroEndWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7129,46 +7129,46 @@ bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } -bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PauseSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->animPaused = TRUE; return TRUE; } -static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->disableAnim) + if (objectEvent->disableAnim) sprite->animPaused = TRUE; } -static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void TryEnableObjectEventAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->enableAnim) + if (objectEvent->enableAnim) { sprite->animPaused = FALSE; - eventObject->disableAnim = FALSE; - eventObject->enableAnim = FALSE; + objectEvent->disableAnim = FALSE; + objectEvent->enableAnim = FALSE; } } -static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - UpdateEventObjectIsOffscreen(eventObject, sprite); - UpdateEventObjSpriteVisibility(eventObject, sprite); + UpdateObjectEventIsOffscreen(objectEvent, sprite); + UpdateObjEventSpriteVisibility(objectEvent, sprite); } -static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventIsOffscreen(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u16 x, y; s16 x2, y2; - const struct EventObjectGraphicsInfo *graphicsInfo; - eventObject->offScreen = FALSE; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo; + objectEvent->offScreen = FALSE; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (sprite->coordOffsetEnabled) { x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -7184,221 +7184,221 @@ static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct y2 = graphicsInfo->height + (s16)y; if ((s16)x >= 0x100 || x2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } if ((s16)y >= 0xB0 || y2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } } -static void UpdateEventObjSpriteVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjEventSpriteVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->invisible = FALSE; - if (eventObject->invisible || eventObject->offScreen) + if (objectEvent->invisible || objectEvent->offScreen) { sprite->invisible = TRUE; } } -static void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_SandPile(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_LongGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_SandPile(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_Tracks(eventObj, flags); - GetGroundEffectFlags_SandPile(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_LongGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_Tracks(objEvent, flags); + GetGroundEffectFlags_SandPile(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnFinishStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_SandPile(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_Ripple(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); - GetGroundEffectFlags_Seaweed(eventObj, flags); - GetGroundEffectFlags_JumpLanding(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_SandPile(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_Ripple(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); + GetGroundEffectFlags_Seaweed(objEvent, flags); + GetGroundEffectFlags_JumpLanding(objEvent, flags); } -static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *objEvent) { - eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); - eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); + objEvent->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->previousCoords.x, objEvent->previousCoords.y); + objEvent->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->currentCoords.x, objEvent->currentCoords.y); } -static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; - u8 type = EventObjectCheckForReflectiveSurface(eventObj); + u8 type = ObjectEventCheckForReflectiveSurface(objEvent); if (type) { - if (!eventObj->hasReflection) + if (!objEvent->hasReflection) { - eventObj->hasReflection = 0; - eventObj->hasReflection = 1; + objEvent->hasReflection = 0; + objEvent->hasReflection = 1; *flags |= reflectionFlags[type - 1]; } } else { - eventObj->hasReflection = 0; + objEvent->hasReflection = 0; } } -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_DEEP_SAND; } - else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior) - || MetatileBehavior_IsFootprints(eventObj->previousMetatileBehavior)) + else if (MetatileBehavior_IsSandOrDeepSand(objEvent->previousMetatileBehavior) + || MetatileBehavior_IsFootprints(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_SAND; } } -static void GetGroundEffectFlags_SandPile(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandPile(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { - if (!eventObj->inSandPile) + if (!objEvent->inSandPile) { - eventObj->inSandPile = 0; - eventObj->inSandPile = 1; + objEvent->inSandPile = 0; + objEvent->inSandPile = 1; *flags |= GROUND_EFFECT_FLAG_SAND_PILE; } } else { - eventObj->inSandPile = 0; + objEvent->inSandPile = 0; } } -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *objEvent, u32 *flags) { - if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) - || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior))) + if ((MetatileBehavior_IsShallowFlowingWater(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShallowFlowingWater(objEvent->previousMetatileBehavior)) + || (MetatileBehavior_IsPacifidlogLog(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPacifidlogLog(objEvent->previousMetatileBehavior))) { - if (!eventObj->inShallowFlowingWater) + if (!objEvent->inShallowFlowingWater) { - eventObj->inShallowFlowingWater = 0; - eventObj->inShallowFlowingWater = 1; + objEvent->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 1; *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER; } } else { - eventObj->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 0; } } -static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsPuddle(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPuddle(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_PUDDLE; } } -static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_HasRipples(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsShortGrass(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShortGrass(objEvent->previousMetatileBehavior)) { - if (!eventObj->inShortGrass) + if (!objEvent->inShortGrass) { - eventObj->inShortGrass = 0; - eventObj->inShortGrass = 1; + objEvent->inShortGrass = 0; + objEvent->inShortGrass = 1; *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS; } } else { - eventObj->inShortGrass = 0; + objEvent->inShortGrass = 0; } } -static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsHotSprings(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsHotSprings(objEvent->previousMetatileBehavior)) { - if (!eventObj->inHotSprings) + if (!objEvent->inHotSprings) { - eventObj->inHotSprings = 0; - eventObj->inHotSprings = 1; + objEvent->inHotSprings = 0; + objEvent->inHotSprings = 1; *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS; } } else { - eventObj->inHotSprings = 0; + objEvent->inHotSprings = 0; } } -static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsSeaweed(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -7420,13 +7420,13 @@ static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 * GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND, }; - if (eventObj->landingJump && !eventObj->disableJumpLandingGroundEffect) + if (objEvent->landingJump && !objEvent->disableJumpLandingGroundEffect) { u8 i; for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++) { - if (metatileFuncs[i](eventObj->currentMetatileBehavior)) + if (metatileFuncs[i](objEvent->currentMetatileBehavior)) { *flags |= jumpLandingFlags[i]; return; @@ -7435,9 +7435,9 @@ static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 * } } -static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *objEvent) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); // ceil div by tile width? s16 width = (info->width + 8) >> 4; @@ -7456,14 +7456,14 @@ static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) for (i = 0, one = 1; i < height; i++) { - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x, objEvent->previousCoords.y + one + i) for (j = 1; j < width; j++) { - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x + j, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x - j, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x + j, eventObj->previousCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x - j, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x + j, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x - j, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x + j, objEvent->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x - j, objEvent->previousCoords.y + one + i) } } return 0; @@ -7507,20 +7507,20 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) return 0; } -static void SetEventObjectSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +static void SetObjectEventSpriteOamTableForLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) return; - if (!MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) return; - if (!MetatileBehavior_IsLongGrass(eventObj->previousMetatileBehavior)) + if (!MetatileBehavior_IsLongGrass(objEvent->previousMetatileBehavior)) return; sprite->subspriteTableNum = 4; - if (ZCoordToPriority(eventObj->previousElevation) == 1) + if (ZCoordToPriority(objEvent->previousElevation) == 1) sprite->subspriteTableNum = 5; } @@ -7546,54 +7546,54 @@ static const u8 sUnknown_08376050[] = { 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 }; -// Each byte corresponds to a sprite priority for an event object. -// This is directly the inverse of gEventObjectPriorities_08376070. -static const u8 sEventObjectPriorities_08376060[] = { +// Each byte corresponds to a sprite priority for an object event. +// This is directly the inverse of gObjectEventPriorities_08376070. +static const u8 sObjectEventPriorities_08376060[] = { 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 }; -// Each byte corresponds to a sprite priority for an event object. -// This is the inverse of gEventObjectPriorities_08376060. +// Each byte corresponds to a sprite priority for an object event. +// This is the inverse of gObjectEventPriorities_08376060. // 1 = Above player sprite // 2 = Below player sprite -static const u8 sEventObjectPriorities_08376070[] = { +static const u8 sObjectEventPriorities_08376070[] = { 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1, }; -void UpdateEventObjectZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite) +void UpdateObjectEventZCoordAndPriority(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->fixedPriority) + if (objEvent->fixedPriority) return; - EventObjectUpdateZCoord(eventObj); + ObjectEventUpdateZCoord(objEvent); - sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation]; - sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation]; + sprite->subspriteTableNum = sObjectEventPriorities_08376070[objEvent->previousElevation]; + sprite->oam.priority = sObjectEventPriorities_08376060[objEvent->previousElevation]; } static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z) { - sprite->subspriteTableNum = sEventObjectPriorities_08376070[z]; - sprite->oam.priority = sEventObjectPriorities_08376060[z]; + sprite->subspriteTableNum = sObjectEventPriorities_08376070[z]; + sprite->oam.priority = sObjectEventPriorities_08376060[z]; } u8 ZCoordToPriority(u8 z) { - return sEventObjectPriorities_08376060[z]; + return sObjectEventPriorities_08376060[z]; } -void EventObjectUpdateZCoord(struct EventObject *eventObj) +void ObjectEventUpdateZCoord(struct ObjectEvent *objEvent) { - u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y); - u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y); + u8 z = MapGridGetZCoordAt(objEvent->currentCoords.x, objEvent->currentCoords.y); + u8 z2 = MapGridGetZCoordAt(objEvent->previousCoords.x, objEvent->previousCoords.y); if (z == 0xF || z2 == 0xF) return; - eventObj->currentElevation = z; + objEvent->currentElevation = z; if (z != 0 && z != 0xF) - eventObj->previousElevation = z; + objEvent->previousElevation = z; } void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) @@ -7606,12 +7606,12 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) sprite->subpriority = tmp3 + sUnknown_08376050[a] + b; } -static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite) +static void ObjectEventUpdateSubpriority(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->fixedPriority) + if (objEvent->fixedPriority) return; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); } bool8 AreZCoordsCompatible(u8 a, u8 b) @@ -7625,94 +7625,94 @@ bool8 AreZCoordsCompatible(u8 a, u8 b) return TRUE; } -void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_MoveOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_MoveOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_MoveOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_MoveOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = (objEvent->localId << 8) | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_WaterReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - InitObjectReflectionSprite(eventObj, sprite, 0); + InitObjectReflectionSprite(objEvent, sprite, 0); } -void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_IceReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - InitObjectReflectionSprite(eventObj, sprite, 1); + InitObjectReflectionSprite(objEvent, sprite, 1); } -void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_FlowingWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_FEET_IN_FLOWING_WATER, objEvent); } -static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = { +static void (*const sGroundEffectTracksFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) = { nullsub, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks, }; -void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 0); } -void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_DeepSandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 1); } -static void nullsub(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void nullsub(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { } -static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_Footprints(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // First half-word is a Field Effect script id. (gFieldEffectScriptPointers) u16 sandFootprints_FieldEffectData[2] = { @@ -7720,15 +7720,15 @@ static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct FLDEFF_DEEP_SAND_FOOTPRINTS }; - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->facingDirection; + gFieldEffectArguments[4] = objEvent->facingDirection; FieldEffectStart(sandFootprints_FieldEffectData[a]); } -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // Specifies which bike track shape to show next. // For example, when the bike turns from up to right, it will show @@ -7743,108 +7743,108 @@ static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, st 6, 7, 3, 4, }; - if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y) + if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y) { - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = - bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5]; + bikeTireTracks_Transitions[objEvent->previousMovementDirection][objEvent->facingDirection - 5]; FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS); } } -void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Ripple(struct ObjectEvent *objEvent, struct Sprite *sprite) { - DoRippleFieldEffect(eventObj, sprite); + DoRippleFieldEffect(objEvent, sprite); } -void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnPuddle(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SPLASH, objEvent); } -void GroundEffect_SandPile(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandPile(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SAND_PILE, objEvent); } -void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { u8 spriteId; - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); spriteId = FindTallGrassFieldEffectSpriteId( - eventObj->localId, - eventObj->mapNum, - eventObj->mapGroup, - eventObj->currentCoords.x, - eventObj->currentCoords.y); + objEvent->localId, + objEvent->mapNum, + objEvent->mapGroup, + objEvent->currentCoords.x, + objEvent->currentCoords.y); if (spriteId == MAX_SPRITES) - GroundEffect_SpawnOnTallGrass(eventObj, sprite); + GroundEffect_SpawnOnTallGrass(objEvent, sprite); } -void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); } -void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnShallowWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); } -void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); } -void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpLandingDust(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_DUST); } -void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_ShortGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SHORT_GRASS, objEvent); } -void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_HotSprings(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_HOT_SPRINGS_WATER, objEvent); } -void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Seaweed(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; FieldEffectStart(FLDEFF_BUBBLES); } -static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = { +static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite) = { GroundEffect_SpawnOnTallGrass, GroundEffect_MoveOnTallGrass, GroundEffect_SpawnOnLongGrass, @@ -7867,22 +7867,22 @@ static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct S GroundEffect_Seaweed }; -static void StartTriggeredGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags) +static void StartTriggeredGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags) { u8 i; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) if (flags & 1) - sGroundEffectFuncs[i](eventObj, sprite); + sGroundEffectFuncs[i](objEvent, sprite); } -void FilterOutDisabledCoveringGroundEffects(struct EventObject *eventObj, u32 *flags) +void FilterOutDisabledCoveringGroundEffects(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) { - eventObj->inShortGrass = 0; - eventObj->inSandPile = 0; - eventObj->inShallowFlowingWater = 0; - eventObj->inHotSprings = 0; + objEvent->inShortGrass = 0; + objEvent->inSandPile = 0; + objEvent->inShallowFlowingWater = 0; + objEvent->inHotSprings = 0; *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS | GROUND_EFFECT_FLAG_SHORT_GRASS | GROUND_EFFECT_FLAG_SAND_PILE @@ -7891,111 +7891,111 @@ void FilterOutDisabledCoveringGroundEffects(struct EventObject *eventObj, u32 *f } } -void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags) +void FilterOutStepOnPuddleGroundEffectIfJumping(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->landingJump) + if (objEvent->landingJump) *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; } -static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnSpawn(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnSpawn(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - StartTriggeredGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnSpawn(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + StartTriggeredGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnBeginStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - FilterOutDisabledCoveringGroundEffects(eventObj, &flags); - StartTriggeredGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnBeginStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutDisabledCoveringGroundEffects(objEvent, &flags); + StartTriggeredGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnFinishStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnStop) + if (objEvent->triggerGroundEffectsOnStop) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags); - StartTriggeredGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnStop = 0; - eventObj->landingJump = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnFinishStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutStepOnPuddleGroundEffectIfJumping(objEvent, &flags); + StartTriggeredGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnStop = 0; + objEvent->landingJump = 0; } } -bool8 FreezeEventObject(struct EventObject *eventObject) +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive || eventObject->frozen) + if (objectEvent->heldMovementActive || objectEvent->frozen) { return TRUE; } else { - eventObject->frozen = 1; - eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused; - eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused; - gSprites[eventObject->spriteId].animPaused = 1; - gSprites[eventObject->spriteId].affineAnimPaused = 1; + objectEvent->frozen = 1; + objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; + objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; + gSprites[objectEvent->spriteId].animPaused = 1; + gSprites[objectEvent->spriteId].affineAnimPaused = 1; return FALSE; } } -void FreezeEventObjects(void) +void FreezeObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + if (gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } -void FreezeEventObjectsExceptOne(u8 eventObjectId) +void FreezeObjectEventsExceptOne(u8 objectEventId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (i != eventObjectId && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + if (i != objectEventId && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } -void UnfreezeEventObject(struct EventObject *eventObject) +void UnfreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->active && eventObject->frozen) + if (objectEvent->active && objectEvent->frozen) { - eventObject->frozen = 0; - gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup; - gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup; + objectEvent->frozen = 0; + gSprites[objectEvent->spriteId].animPaused = objectEvent->spriteAnimPausedBackup; + gSprites[objectEvent->spriteId].affineAnimPaused = objectEvent->spriteAffineAnimPausedBackup; } } -void UnfreezeEventObjects(void) +void UnfreezeObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active) - UnfreezeEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + if (gObjectEvents[i].active) + UnfreezeObjectEvent(&gObjectEvents[i]); } static void Step1(struct Sprite *sprite, u8 dir) @@ -8249,7 +8249,7 @@ bool8 SpriteAnimEnded(struct Sprite *sprite) return FALSE; } -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible) { u16 x, y; s16 x2, y2; @@ -8276,19 +8276,19 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) sprite->invisible = TRUE; } -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *sprite) { SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); } -void TurnEventObject(u8 eventObjectId, u8 direction) +void TurnObjectEvent(u8 objectEventId, u8 direction) { u8 i; for (i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if (sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == eventObjectId) + if (sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == objectEventId) { u8 animNum = GetFaceDirectionAnimNum(direction); StartSpriteAnim(sprite, animNum); @@ -8297,24 +8297,24 @@ void TurnEventObject(u8 eventObjectId, u8 direction) } } -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject) +u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); return FieldEffectStart(fieldEffectId); } -void DoShadowFieldEffect(struct EventObject *eventObject) +void DoShadowFieldEffect(struct ObjectEvent *objectEvent) { - if (!eventObject->hasShadow) + if (!objectEvent->hasShadow) { - eventObject->hasShadow = 1; - StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject); + objectEvent->hasShadow = 1; + StartFieldEffectForObjectEvent(FLDEFF_SHADOW, objectEvent); } } -static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2; gFieldEffectArguments[2] = 151; diff --git a/src/field_camera.c b/src/field_camera.c index 319c8a540..2a314dc2f 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -302,7 +302,7 @@ static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset) gBGTilemapBuffers[2][offset + 0x20] = metatiles[2]; gBGTilemapBuffers[2][offset + 0x21] = metatiles[3]; - // Draw metatile's top layer to the top background layer, which covers event object sprites. + // Draw metatile's top layer to the top background layer, which covers object event sprites. gBGTilemapBuffers[1][offset] = metatiles[4]; gBGTilemapBuffers[1][offset + 1] = metatiles[5]; gBGTilemapBuffers[1][offset + 0x20] = metatiles[6]; @@ -416,7 +416,7 @@ void CameraUpdate(void) if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); RotatingGatePuzzleCameraUpdate(deltaX, deltaY); ResetBerryTreeSparkleFlags(); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); @@ -431,7 +431,7 @@ void CameraUpdate(void) void MoveCameraAndRedrawMap(int deltaX, int deltaY) { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); DrawWholeMapView(); gTotalCameraPixelOffsetX -= deltaX * 16; gTotalCameraPixelOffsetY -= deltaY * 16; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 426e65f06..bca856e9e 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -24,7 +24,7 @@ #include "trainer_see.h" #include "constants/vars.h" #include "wild_encounter.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/map_types.h" struct Coords32 @@ -35,7 +35,7 @@ struct Coords32 extern u16 gSpecialVar_LastTalked; extern u16 gSpecialVar_Facing; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gUnknown_020297ED; @@ -43,7 +43,7 @@ extern u8 gUnknown_020297ED; static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; -u8 gSelectedEventObject; +u8 gSelectedObjectEvent; //scripts extern u8 gUnknown_081A2C51[]; @@ -89,7 +89,7 @@ static void GetInFrontOfPlayerPosition(struct MapPosition *); static u16 GetPlayerCurMetatileBehavior(int); static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8); static const u8 *GetInteractionScript(struct MapPosition*, u8, u8); -static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); +static const u8 *GetInteractedObjectEventScript(struct MapPosition *, u8, u8); static u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); @@ -331,7 +331,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - const u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction); + const u8 *script = GetInteractedObjectEventScript(position, metatileBehavior, direction); if (script != NULL) return script; @@ -352,50 +352,50 @@ static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileB const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; s32 i; if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y))) - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); else - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (objectEventId == 16 || gObjectEvents[objectEventId].localId == 0xFF) return NULL; for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == eventObjectId) + if (gLinkPlayerObjectEvents[i].active == TRUE && gLinkPlayerObjectEvents[i].objEventId == objectEventId) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; - return GetEventObjectScriptPointerByEventObjectId(eventObjectId); + return GetObjectEventScriptPointerByObjectEventId(objectEventId); } -static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; const u8 *script; - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); + if (objectEventId == 16 || gObjectEvents[objectEventId].localId == 0xFF) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; - // Look for an event object on the other side of the counter. - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF) + // Look for an object event on the other side of the counter. + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + if (objectEventId == 16 || gObjectEvents[objectEventId].localId == 0xFF) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; - script = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + script = GetObjectEventScriptPointerByObjectEventId(objectEventId); script = GetRamScript(gSpecialVar_LastTalked, script); return script; } @@ -935,14 +935,14 @@ u8 TrySetDiveWarp(void) return 0; } -const u8 *GetEventObjectScriptPointerPlayerFacing(void) +const u8 *GetObjectEventScriptPointerPlayerFacing(void) { u8 direction; struct MapPosition position; direction = GetPlayerMovementDirection(); GetInFrontOfPlayerPosition(&position); - return GetInteractedEventObjectScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); + return GetInteractedObjectEventScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); } int SetCableClubWarp(void) diff --git a/src/field_effect.c b/src/field_effect.c index 5ce8028ca..a85b32049 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -24,7 +24,7 @@ #include "text.h" #include "trig.h" #include "util.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/songs.h" @@ -269,7 +269,7 @@ bool8 (*const gUnknown_0839F300[])(struct Task *) = { sub_8086ED4 }; -bool8 (*const gUnknown_0839F31C[])(struct Task *, struct EventObject *) = { +bool8 (*const gUnknown_0839F31C[])(struct Task *, struct ObjectEvent *) = { sub_8086FB0, waterfall_1_do_anim_probably, waterfall_2_wait_anim_finish_probably, @@ -283,7 +283,7 @@ bool8 (*const gUnknown_0839F330[])(struct Task *) = { dive_3_unknown }; -bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F33C[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_808722C, sub_8087264, sub_8087298, @@ -292,14 +292,14 @@ bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct S sub_80873F4 }; -bool8 (*const gUnknown_0839F354[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F354[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80874CC, sub_80874FC, sub_8087548, sub_808759C }; -bool8 (*const gUnknown_0839F364[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F364[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80876C8, sub_80876F8, sub_8087774, @@ -1085,7 +1085,7 @@ void mapldr_080842E8(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1122,13 +1122,13 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; if (gPlayerAvatar.flags & 0x08) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); } ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1148,7 +1148,7 @@ void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(taskId); } } @@ -1162,7 +1162,7 @@ void sub_8086748(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8086774, 0); gFieldCallback = NULL; } @@ -1176,14 +1176,14 @@ void sub_8086774(u8 taskId) bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] { - struct EventObject *playerObject; + struct ObjectEvent *playerObject; struct Sprite *playerSprite; - playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; gPlayerAvatar.preventStep = TRUE; - EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1210,7 +1210,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1218,10 +1218,10 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] bool8 sub_80868E4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->pos2.y += task->data[1]; if (task->data[1] < 8) @@ -1235,15 +1235,15 @@ bool8 sub_80868E4(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - eventObject->fixedPriority = 0; + objectEvent->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - eventObject->triggerGroundEffectsOnStop = 1; - eventObject->landingJump = 1; + objectEvent->triggerGroundEffectsOnStop = 1; + objectEvent->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1280,7 +1280,7 @@ bool8 sub_80869F8(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_8086774)); return FALSE; @@ -1319,7 +1319,7 @@ void sub_8086A68(u8 taskId) bool8 sub_8086AA0(struct Task *task) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); sub_80B4824(task->data[1]); task->data[0]++; @@ -1328,11 +1328,11 @@ bool8 sub_8086AA0(struct Task *task) bool8 sub_8086AC0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1443,13 +1443,13 @@ void sub_8086CBC(u8 taskId) bool8 sub_8086CF4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; s16 x; s16 y; u8 behavior; CameraObjectReset2(); - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1541,13 +1541,13 @@ bool8 sub_8086EB0(struct Task *task) bool8 sub_8086ED4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { CameraObjectReset1(); ScriptContext2_Disable(); - EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_8086CBC)); } return FALSE; @@ -1566,10 +1566,10 @@ bool8 FldEff_UseWaterfall(void) void sub_8086F64(u8 taskId) { - while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); + while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])); } -bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject) +bool8 sub_8086FB0(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1577,12 +1577,12 @@ bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject) return FALSE; } -bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) +bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); - if (!EventObjectIsMovementOverridden(eventObject)) + if (!ObjectEventIsMovementOverridden(objectEvent)) { - EventObjectClearHeldMovementIfFinished(eventObject); + ObjectEventClearHeldMovementIfFinished(objectEvent); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1590,7 +1590,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventO return FALSE; } -bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) +bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1600,20 +1600,20 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObjec return TRUE; } -bool8 sub_8087030(struct Task *task, struct EventObject *eventObject) +bool8 sub_8087030(struct Task *task, struct ObjectEvent *objectEvent) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -bool8 sub_8087058(struct Task *task, struct EventObject *eventObject) +bool8 sub_8087058(struct Task *task, struct ObjectEvent *objectEvent) { - if (!EventObjectClearHeldMovementIfFinished(eventObject)) + if (!ObjectEventClearHeldMovementIfFinished(objectEvent)) { return FALSE; } - if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior)) + if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1664,7 +1664,7 @@ bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior); + dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1681,22 +1681,22 @@ void sub_80871B8(u8 priority) void sub_80871D0(u8 taskId) { - while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_808722C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_808722C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; } -bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087264(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1709,12 +1709,12 @@ bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1723,7 +1723,7 @@ bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Spr return TRUE; } -bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80872E4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -1755,7 +1755,7 @@ bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Spr if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -1766,7 +1766,7 @@ bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80873D8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeScreen(); @@ -1774,7 +1774,7 @@ bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_80873F4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80873F4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1799,25 +1799,25 @@ void mapldr_080851BC(void) void sub_8087470(u8 taskId) { - while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80874CC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80874CC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { CameraObjectReset2(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - eventObject->invisible = 1; + objectEvent->invisible = 1; task->data[0]++; return FALSE; } -bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80874FC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1826,27 +1826,27 @@ bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_8087548(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - eventObject->invisible = 0; + objectEvent->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; } -bool8 sub_808759C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_808759C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087470)); } return FALSE; @@ -1882,27 +1882,27 @@ void sub_8087654(u8 priority) void sub_808766C(u8 taskId) { - while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80876C8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80876C8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[0]++; return FALSE; } -bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80876F8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[1] > 3) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1910,24 +1910,24 @@ bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Spr } else { task->data[1]++; - EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -bool8 sub_8087774(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087774(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - eventObject->invisible = 1; + objectEvent->invisible = 1; task->data[0]++; } return FALSE; } -bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80877AC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -1941,7 +1941,7 @@ bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Spr static void DoEscapeRopeFieldEffect(u8); void mapldr_080859D4(void); -bool8 sub_80877D4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80877D4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1974,7 +1974,7 @@ void sub_808788C(struct Sprite *sprite) void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(DoEscapeRopeFieldEffect, 0x50); } @@ -1992,7 +1992,7 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task) static void EscapeRopeFieldEffect_Step1(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; u8 clockwiseDirections[5] = { DIR_SOUTH, DIR_WEST, @@ -2007,12 +2007,12 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) WarpFadeScreen(); } - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { - SetEventObjectDirection(eventObject, task->data[15]); + SetObjectEventDirection(objectEvent, task->data[15]); sub_8053678(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; @@ -2021,7 +2021,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(clockwiseDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(clockwiseDirections[objectEvent->facingDirection])); if (task->data[2] < 12) task->data[2]++; @@ -2042,9 +2042,9 @@ void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; CreateTask(sub_8087A74, 0); } @@ -2065,29 +2065,29 @@ void sub_8087AA4(struct Task *task) void sub_8087AC8(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent)) { return; } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - eventObject->invisible = 0; + objectEvent->invisible = 0; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087A74)); return; } - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - eventObject->invisible ^= 1; + objectEvent->invisible ^= 1; } static void ExecuteTeleportFieldEffectTask(u8); @@ -2117,7 +2117,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; @@ -2126,14 +2126,14 @@ static void TeleportFieldEffectTask1(struct Task *task) static void TeleportFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection) + if (task->data[2] > 7 && task->data[15] == objectEvent->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2146,12 +2146,12 @@ static void TeleportFieldEffectTask2(struct Task *task) static void TeleportFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((--task->data[1]) <= 0) { task->data[1] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2190,9 +2190,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; CameraObjectReset2(); CreateTask(sub_8087E1C, 0); } @@ -2217,7 +2217,7 @@ void sub_8087E4C(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2230,14 +2230,14 @@ void sub_8087E4C(struct Task *task) void sub_8087ED8(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->pos2.y += task->data[1]) >= -8) { if (task->data[13] == 0) { task->data[13]++; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2255,7 +2255,7 @@ void sub_8087ED8(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2269,16 +2269,16 @@ void sub_8087ED8(struct Task *task) void sub_8087FDC(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if ((--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection) + if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087E1C)); } } @@ -2830,31 +2830,31 @@ void sub_8088954(u8 taskId) void sub_8088984(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]); + MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } void sub_80889E4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_8088A30(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectCheckHeldMovementStatus(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventCheckHeldMovementStatus(objectEvent)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2864,32 +2864,32 @@ void sub_8088A30(struct Task *task) void sub_8088A78(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectClearHeldMovementIfFinished(eventObject); - EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventClearHeldMovementIfFinished(objectEvent); + ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } void sub_8088AF4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection)); - sub_8127ED0(eventObject->fieldEffectSpriteId, 1); - UnfreezeEventObjects(); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 1); + UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_8088954)); @@ -2969,24 +2969,24 @@ void sub_8088C70(u8 taskId) void sub_8088CA0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_8088CF8(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -2996,14 +2996,14 @@ void sub_8088CF8(struct Task *task) void sub_8088D3C(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[15] & 0x08) { - sub_8127ED0(eventObject->fieldEffectSpriteId, 2); - sub_8127EFC(eventObject->fieldEffectSpriteId, 0); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 2); + sub_8127EFC(objectEvent->fieldEffectSpriteId, 0); } task->data[1] = sub_8088F60(); task->data[0]++; @@ -3017,15 +3017,15 @@ void sub_8088D94(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT); } } void sub_8088DD8(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; PlaySE(SE_W019); @@ -3035,17 +3035,17 @@ void sub_8088DD8(struct Task *task) void sub_8088E2C(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((++task->data[2]) >= 8) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->inanimate = 1; - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->inanimate = 1; + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); + DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3054,14 +3054,14 @@ void sub_8088E2C(struct Task *task) void sub_8088EB4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((++task->data[2]) >= 10) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(eventObject); - eventObject->inanimate = 0; - eventObject->hasShadow = 0; - sub_8088FFC(task->data[1], eventObject->spriteId); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(objectEvent); + objectEvent->inanimate = 0; + objectEvent->hasShadow = 0; + sub_8088FFC(task->data[1], objectEvent->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3266,9 +3266,9 @@ void sub_8089270(u8 taskId) void sub_80892A0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; task->data[2] = 17; @@ -3277,27 +3277,27 @@ void sub_80892A0(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_8127ED0(eventObject->fieldEffectSpriteId, 0); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 0); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); CameraObjectReset2(); - EventObjectTurn(eventObject, DIR_WEST); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->invisible = 0; + ObjectEventTurn(objectEvent, DIR_WEST); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->invisible = 0; task->data[1] = sub_8088F60(); sub_8088FC0(task->data[1]); - sub_8088FFC(task->data[1], eventObject->spriteId); + sub_8088FFC(task->data[1], objectEvent->spriteId); } } void sub_8089354(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (task->data[2] == 0 || (--task->data[2]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; sub_8088FFC(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3340,26 +3340,26 @@ void sub_80893C0(struct Task *task) void sub_8089414(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (sub_8088FA4(task->data[1])) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->inanimate = 0; - sub_805C058(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->inanimate = 0; + sub_805C058(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_808948C(struct Task *task) { - if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { task->data[0]++; sub_8089230(task->data[1]); @@ -3379,18 +3379,18 @@ void sub_80894C4(struct Task *task) void fishE(struct Task *task) { u8 state; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((--task->data[1]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; state = PLAYER_AVATAR_STATE_NORMAL; if (task->data[15] & 0x08) { state = PLAYER_AVATAR_STATE_SURFING; - sub_8127ED0(eventObject->fieldEffectSpriteId, 1); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 1); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state)); - EventObjectTurn(eventObject, DIR_SOUTH); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state)); + ObjectEventTurn(objectEvent, DIR_SOUTH); gPlayerAvatar.flags = task->data[15]; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 641cbad8f..4e4ff7432 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -12,9 +12,9 @@ #include "constants/songs.h" static void UpdateObjectReflectionSprite(struct Sprite *); -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite); -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *, u8); -static void LoadObjectRegularReflectionPalette(struct EventObject *, u8); +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8); +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8); static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step0(struct Sprite *); @@ -22,13 +22,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step2(struct Sprite *); static void sub_812882C(struct Sprite *, u8, u8); static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); -static void sub_8127FD4(struct EventObject *, struct Sprite *); -static void sub_812800C(struct EventObject *, struct Sprite *); -static void sub_81280A0(struct EventObject *, struct Sprite *, struct Sprite *); +static void sub_8127FD4(struct ObjectEvent *, struct Sprite *); +static void sub_812800C(struct ObjectEvent *, struct Sprite *); +static void sub_81280A0(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void sub_8128174(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); -void InitObjectReflectionSprite(struct EventObject *eventObject, struct Sprite *sprite, bool8 stillReflection) +void InitObjectReflectionSprite(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection) { struct Sprite *reflectionSprite; @@ -43,40 +43,40 @@ void InitObjectReflectionSprite(struct EventObject *eventObject, struct Sprite * reflectionSprite->affineAnimBeginning = TRUE; reflectionSprite->subspriteMode = SUBSPRITES_OFF; reflectionSprite->data[0] = sprite->data[0]; - reflectionSprite->data[1] = eventObject->localId; + reflectionSprite->data[1] = objectEvent->localId; reflectionSprite->data[7] = stillReflection; - LoadObjectReflectionPalette(eventObject, reflectionSprite); + LoadObjectReflectionPalette(objectEvent, reflectionSprite); if (!stillReflection) reflectionSprite->oam.affineMode = ST_OAM_AFFINE_NORMAL; } -static s16 GetReflectionVerticalOffset(struct EventObject *eventObject) +static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent) { - return GetEventObjectGraphicsInfo(eventObject->graphicsId)->height - 2; + return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2; } -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite) +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 bridgeType; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; sprite->data[2] = 0; - if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(eventObject->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(eventObject->currentMetatileBehavior)))) + if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) { sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1]; - LoadObjectHighBridgeReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectHighBridgeReflectionPalette(objectEvent, sprite->oam.paletteNum); } else { - LoadObjectRegularReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectRegularReflectionPalette(objectEvent, sprite->oam.paletteNum); } } -static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, u8 paletteIndex) +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteIndex) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->bridgeReflectionPaletteTag != 0x11ff) { if (graphicsInfo->paletteSlot == 0) @@ -97,11 +97,11 @@ static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, // When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color. // This is so the sprite blends in with the dark water metatile underneath the bridge. -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObject, u8 paletteNum) +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteNum) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->bridgeReflectionPaletteTag != 0x11ff) { PatchObjectPalette(graphicsInfo->bridgeReflectionPaletteTag, paletteNum); @@ -111,12 +111,12 @@ static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObjec static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *mainSprite; - eventObject = &gEventObjects[reflectionSprite->data[0]]; - mainSprite = &gSprites[eventObject->spriteId]; - if (!eventObject->active || !eventObject->hasReflection || eventObject->localId != reflectionSprite->data[1]) + objectEvent = &gObjectEvents[reflectionSprite->data[0]]; + mainSprite = &gSprites[objectEvent->spriteId]; + if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1]) { reflectionSprite->inUse = FALSE; } @@ -132,7 +132,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->invisible = mainSprite->invisible; reflectionSprite->pos1.x = mainSprite->pos1.x; // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 - reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(eventObject) + reflectionSprite->data[2]; + reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; reflectionSprite->pos2.x = mainSprite->pos2.x; @@ -209,12 +209,12 @@ const u16 gShadowVerticalOffsets[] = { u32 FldEff_Shadow(void) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; u8 spriteId; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94); if (spriteId != MAX_SPRITES) { @@ -229,27 +229,27 @@ u32 FldEff_Shadow(void) void UpdateShadowFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; - if (!eventObject->active || !eventObject->hasShadow - || MetatileBehavior_IsPokeGrass(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->previousMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->previousMetatileBehavior)) + if (!objectEvent->active || !objectEvent->hasShadow + || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->previousMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->previousMetatileBehavior)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } @@ -292,8 +292,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -307,21 +307,21 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) sprite->data[7] = TRUE; metatileBehavior = 0; if (sprite->animCmdIndex == 0) metatileBehavior = 4; - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_812882C(sprite, sprite->data[0], metatileBehavior); } } @@ -398,8 +398,8 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -413,18 +413,18 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_LONG_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) { sprite->data[7] = TRUE; } - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_812882C(sprite, sprite->data[0], 0); } } @@ -449,44 +449,44 @@ u32 FldEff_JumpLongGrass(void) u32 FldEff_ShortGrass(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &(gSprites[spriteId]); sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateShortGrassFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShortGrass) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShortGrass) { FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; y = linkedSprite->pos1.y; x = linkedSprite->pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) @@ -503,7 +503,7 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite) sprite->pos2.y = (graphicsInfo->height >> 1) - 8; sprite->subpriority = linkedSprite->subpriority - 1; sprite->oam.priority = linkedSprite->oam.priority; - UpdateEventObjectSpriteVisibility(sprite, linkedSprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible); } } @@ -577,14 +577,14 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite) if (++sprite->data[1] > 40) sprite->data[0] = 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) { sprite->invisible ^= 1; sprite->data[1]++; - UpdateEventObjectSpriteVisibility(sprite, sprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, sprite->invisible); if (sprite->data[1] > 56) { FieldEffectStop(sprite, sprite->data[7]); @@ -593,22 +593,22 @@ static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) u32 FldEff_Splash(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - linkedSprite = &gSprites[eventObject->spriteId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; @@ -621,17 +621,17 @@ u32 FldEff_Splash(void) void UpdateSplashFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; - if (sprite->animEnded || TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (sprite->animEnded || TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SPLASH); } else { - sprite->pos1.x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; - sprite->pos1.y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; + sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -673,22 +673,22 @@ u32 FldEff_JumpBigSplash(void) u32 FldEff_FeetInFlowingWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->callback = UpdateFeetInFlowingWaterFieldEffect; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; @@ -702,26 +702,26 @@ u32 FldEff_FeetInFlowingWater(void) static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *linkedSprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShallowFlowingWater) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShallowFlowingWater) { FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y; sprite->subpriority = linkedSprite->subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); - if (eventObject->currentCoords.x != sprite->data[3] || eventObject->currentCoords.y != sprite->data[4]) + UpdateObjectEventSpriteVisibility(sprite, FALSE); + if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4]) { - sprite->data[3] = eventObject->currentCoords.x; - sprite->data[4] = eventObject->currentCoords.y; + sprite->data[3] = objectEvent->currentCoords.x; + sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { PlaySE(SE_MIZU); @@ -748,46 +748,46 @@ u32 FldEff_Ripple(void) u32 FldEff_HotSpringsWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inHotSprings) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inHotSprings) { FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; sprite->subpriority = linkedSprite->subpriority - 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -919,13 +919,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *sprite) sprite->animPaused = FALSE; MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); - gEventObjects[gPlayerAvatar.eventObjectId].triggerGroundEffectsOnMove = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE; sprite->data[0] = 2; } static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->animEnded) FieldEffectStop(sprite, FLDEFF_ASH); } @@ -984,18 +984,18 @@ static u8 sub_8127F70(struct Sprite *sprite) void UpdateSurfBlobFieldEffect(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - eventObject = &gEventObjects[sprite->data[2]]; - linkedSprite = &gSprites[eventObject->spriteId]; - sub_8127FD4(eventObject, sprite); - sub_812800C(eventObject, sprite); - sub_81280A0(eventObject, linkedSprite, sprite); + objectEvent = &gObjectEvents[sprite->data[2]]; + linkedSprite = &gSprites[objectEvent->spriteId]; + sub_8127FD4(objectEvent, sprite); + sub_812800C(objectEvent, sprite); + sub_81280A0(objectEvent, linkedSprite, sprite); sprite->oam.priority = linkedSprite->oam.priority; } -static void sub_8127FD4(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_8127FD4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { 0, // DIR_NONE @@ -1006,18 +1006,18 @@ static void sub_8127FD4(struct EventObject *eventObject, struct Sprite *sprite) }; if (sub_8127F64(sprite) == 0) - StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[eventObject->movementDirection]); + StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]); } #ifdef NONMATCHING -static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_812800C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 x; s16 y; u8 i; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; if (sprite->pos2.y == 0 && (x != sprite->data[6] || y != sprite->data[7])) { sprite->data[5] = sprite->pos2.y; @@ -1033,7 +1033,7 @@ static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite) } } #else -NAKED static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite) +NAKED static void sub_812800C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r8\n" @@ -1114,7 +1114,7 @@ NAKED static void sub_812800C(struct EventObject *eventObject, struct Sprite *sp } #endif -static void sub_81280A0(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite) +static void sub_81280A0(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite) { u16 unk_8401E5A[] = {3, 7}; u8 v0 = sub_8127F5C(sprite); @@ -1193,26 +1193,26 @@ u32 FldEff_Dust(void) u32 FldEff_SandPile(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; sprite->pos2.y = (graphicsInfo->height >> 1) - 2; SeekSpriteAnim(sprite, 2); } @@ -1221,18 +1221,18 @@ u32 FldEff_SandPile(void) void UpdateSandPileFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inSandPile) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inSandPile) { FieldEffectStop(sprite, FLDEFF_SAND_PILE); } else { - y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; + y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) { sprite->data[3] = x; @@ -1244,8 +1244,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite) } sprite->pos1.x = x; sprite->pos1.y = y; - sprite->subpriority = gSprites[gEventObjects[eventObjectId].spriteId].subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -1270,7 +1270,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite) sprite->data[0] += 0x80; sprite->data[0] &= 0x100; sprite->pos1.y -= sprite->data[0] >> 8; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->invisible || sprite->animEnded) { FieldEffectStop(sprite, FLDEFF_BUBBLES); @@ -1317,7 +1317,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) u8 spriteId; struct Sprite *sprite; - if (TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) + if (TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) { FieldEffectActiveListRemove(fldEff); return MAX_SPRITES; @@ -1338,17 +1338,17 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) void UpdateDisguiseFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &objectEventId)) { FieldEffectStop(sprite, sprite->data[1]); } - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->invisible = linkedSprite->invisible; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; @@ -1368,30 +1368,30 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite) } } -void sub_812869C(struct EventObject *eventObject) +void sub_812869C(struct ObjectEvent *objectEvent) { - if (eventObject->directionSequenceIndex == 1) + if (objectEvent->directionSequenceIndex == 1) { - gSprites[eventObject->fieldEffectSpriteId].data[0]++; + gSprites[objectEvent->fieldEffectSpriteId].data[0]++; } } -bool8 sub_81286C4(struct EventObject *eventObject) +bool8 sub_81286C4(struct ObjectEvent *objectEvent) { struct Sprite *sprite; - if (eventObject->directionSequenceIndex == 2) + if (objectEvent->directionSequenceIndex == 2) { return TRUE; } - if (eventObject->directionSequenceIndex == 0) + if (objectEvent->directionSequenceIndex == 0) { return TRUE; } - sprite = &gSprites[eventObject->fieldEffectSpriteId]; + sprite = &gSprites[objectEvent->fieldEffectSpriteId]; if (sprite->data[7]) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; sprite->data[0]++; return TRUE; } @@ -1440,7 +1440,7 @@ void UpdateJumpLandingFieldEffect(struct Sprite *sprite) } else { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); } } @@ -1450,7 +1450,7 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite) if (sprite->animEnded) FieldEffectStop(sprite, sprite->data[0]); else - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } #ifdef NONMATCHING @@ -1464,18 +1464,18 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) s16 ly; s16 ylo; s16 yhi; - struct EventObject *eventObject; // r4 - const struct EventObjectGraphicsInfo *graphicsInfo; // destroyed + struct ObjectEvent *objectEvent; // r4 + const struct ObjectEventGraphicsInfo *graphicsInfo; // destroyed struct Sprite *linkedSprite; // r5 SetObjectSubpriorityByZCoord(z, sprite, offset); for (i = 0; i < 16; i ++) { - eventObject = &gEventObjects[i]; - if (eventObject->active) + objectEvent = &gObjectEvents[i]; + if (objectEvent->active) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - linkedSprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + linkedSprite = &gSprites[objectEvent->spriteId]; xhi = sprite->pos1.x + sprite->centerToCornerVecX; xlo = sprite->pos1.x - sprite->centerToCornerVecX; lx = linkedSprite->pos1.x; @@ -1514,14 +1514,14 @@ NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) "\tlsls r0, r7, 3\n" "\tadds r0, r7\n" "\tlsls r0, 2\n" - "\tldr r1, _081288DC @ =gEventObjects\n" + "\tldr r1, _081288DC @ =gObjectEvents\n" "\tadds r4, r0, r1\n" "\tldrb r0, [r4]\n" "\tlsls r0, 31\n" "\tcmp r0, 0\n" "\tbeq _081288E4\n" "\tldrb r0, [r4, 0x5]\n" - "\tbl GetEventObjectGraphicsInfo\n" + "\tbl GetObjectEventGraphicsInfo\n" "\tldrb r1, [r4, 0x4]\n" "\tlsls r0, r1, 4\n" "\tadds r0, r1\n" @@ -1588,7 +1588,7 @@ NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) "\tstrb r0, [r2]\n" "\tb _081288EE\n" "\t.align 2, 0\n" - "_081288DC: .4byte gEventObjects\n" + "_081288DC: .4byte gObjectEvents\n" "_081288E0: .4byte gSprites\n" "_081288E4:\n" "\tadds r0, r7, 0x1\n" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 670d8c54b..2fbda69e3 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -11,7 +11,7 @@ #include "fldeff_flash.h" #include "link.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "metatile_behavior.h" #include "palette.h" #include "overworld.h" @@ -19,7 +19,7 @@ #include "sound.h" #include "start_menu.h" #include "task.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/songs.h" void sub_8080B9C(u8); @@ -221,7 +221,7 @@ void sub_8080B9C(u8 taskId) { case 0: sub_8080958(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); task->data[0] = 1; @@ -229,27 +229,27 @@ void sub_8080B9C(u8 taskId) case 1: if (sub_8080E70()) { - u8 eventObjId; + u8 objEventId; sub_8080958(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); task->data[0] = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 4; } break; @@ -270,24 +270,24 @@ void task_map_chg_seq_0807E20C(u8 taskId) { case 0: sub_8080958(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); task->data[0] = 1; break; case 1: if (sub_8080E70()) { - u8 eventObjId; + u8 objEventId; sub_8080958(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 3; } break; @@ -303,14 +303,14 @@ void task_map_chg_seq_0807E2CC(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); gTasks[taskId].data[0]++; break; case 1: if (sub_8080E70()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -340,7 +340,7 @@ void task_mpl_807E3C8(u8 taskId) { ScriptContext2_Disable(); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); } } @@ -532,7 +532,7 @@ void task0A_fade_n_map_maybe(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -559,7 +559,7 @@ void sub_808115C(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); @@ -568,21 +568,21 @@ void sub_808115C(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + u8 objEventId; + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); sub_8080958(0); task->data[0] = 3; } @@ -610,7 +610,7 @@ void sub_80812C8(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index d3b6ba7ed..324dab9c8 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -20,7 +20,7 @@ #include "task.h" #include "tv.h" #include "wild_encounter.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/moves.h" @@ -31,8 +31,8 @@ EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0}; // Static declarations -static bool8 sub_8058854(struct EventObject *, u8); -static void npc_clear_strange_bits(struct EventObject *a); +static bool8 sub_8058854(struct ObjectEvent *, u8); +static void npc_clear_strange_bits(struct ObjectEvent *a); static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c); static void PlayerAllowForcedMovementIfMovingSameDirection(void); static bool8 TryDoMetatileBehaviorForcedMovement(void); @@ -65,13 +65,13 @@ static bool8 ShouldJumpLedge(s16 a, s16 b, u8 c); static u8 sub_8058F6C(s16 a, s16 b, u8 c); static void check_acro_bike_metatile(s16 unused1, s16 unused2, u8 c, u8 *d); static void DoPlayerAvatarTransition(void); -static void nullsub_49(struct EventObject *a); -static void PlayerAvatarTransition_Normal(struct EventObject *a); -static void PlayerAvatarTransition_MachBike(struct EventObject *a); -static void PlayerAvatarTransition_AcroBike(struct EventObject *a); -static void PlayerAvatarTransition_Surfing(struct EventObject *a); -static void PlayerAvatarTransition_Underwater(struct EventObject *a); -static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj); +static void nullsub_49(struct ObjectEvent *a); +static void PlayerAvatarTransition_Normal(struct ObjectEvent *a); +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *a); +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *a); +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent); static bool8 player_is_anim_in_certain_ranges(void); static bool8 sub_80592A4(void); static bool8 PlayerIsAnimActive(void); @@ -79,21 +79,21 @@ static bool8 PlayerCheckIfAnimFinishedOrInactive(void); static void PlayerRun(u8 a); static void PlayerNotOnBikeCollide(u8 a); static void PlayCollisionSoundIfNotFacingWarp(u8 a); -static void sub_8059D60(struct EventObject *a); +static void sub_8059D60(struct ObjectEvent *a); static void StartStrengthAnim(u8 a, u8 b); static void Task_BumpBoulder(u8 taskId); -static bool8 sub_8059E84(struct Task *task, struct EventObject *b, struct EventObject *c); -static bool8 do_boulder_dust(struct Task *task, struct EventObject *b, struct EventObject *c); -static bool8 sub_8059F40(struct Task *task, struct EventObject *b, struct EventObject *c); +static bool8 sub_8059E84(struct Task *task, struct ObjectEvent *b, struct ObjectEvent *c); +static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *b, struct ObjectEvent *c); +static bool8 sub_8059F40(struct Task *task, struct ObjectEvent *b, struct ObjectEvent *c); static void DoPlayerMatJump(void); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent); static void DoPlayerMatSpin(void); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject); +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent); static void sub_805A20C(u8 a); static void taskFF_0805D1D4(u8 taskId); static void sub_805A2D0(u8 taskId); @@ -177,7 +177,7 @@ static bool8 (*const gUnknown_0830FBF8[])(u8) = MetatileBehavior_IsHorizontalRail, }; static const u8 gUnknown_0830FC0C[] = {9, 10, 11, 12, 13}; -static void (*const gUnknown_0830FC14[])(struct EventObject *) = +static void (*const gUnknown_0830FC14[])(struct ObjectEvent *) = { PlayerAvatarTransition_Normal, PlayerAvatarTransition_MachBike, @@ -197,43 +197,43 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) = }; static const u8 sRivalAvatarGfxIds[][2] = { - {EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING, EVENT_OBJ_GFX_RIVAL_MAY_SURFING}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE}, - {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, - {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING, OBJ_EVENT_GFX_RIVAL_MAY_SURFING}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE}, + {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, + {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING}, }; static const u8 sPlayerAvatarGfxIds[][2] = { - {EVENT_OBJ_GFX_BRENDAN_NORMAL, EVENT_OBJ_GFX_MAY_NORMAL}, - {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_MAY_MACH_BIKE}, - {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_MAY_ACRO_BIKE}, - {EVENT_OBJ_GFX_BRENDAN_SURFING, EVENT_OBJ_GFX_MAY_SURFING}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, - {EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_MAY_FIELD_MOVE}, - {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, - {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING}, + {OBJ_EVENT_GFX_BRENDAN_NORMAL, OBJ_EVENT_GFX_MAY_NORMAL}, + {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_MAY_MACH_BIKE}, + {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, OBJ_EVENT_GFX_MAY_ACRO_BIKE}, + {OBJ_EVENT_GFX_BRENDAN_SURFING, OBJ_EVENT_GFX_MAY_SURFING}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, + {OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE}, + {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, + {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING}, }; static const u8 gUnknown_0830FC64[2][5][2] = { //male { - {EVENT_OBJ_GFX_BRENDAN_NORMAL, 1}, - {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, 2}, - {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, 4}, - {EVENT_OBJ_GFX_BRENDAN_SURFING, 8}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, 16}, + {OBJ_EVENT_GFX_BRENDAN_NORMAL, 1}, + {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, 2}, + {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, 4}, + {OBJ_EVENT_GFX_BRENDAN_SURFING, 8}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, 16}, }, //female { - {EVENT_OBJ_GFX_MAY_NORMAL, 1}, - {EVENT_OBJ_GFX_MAY_MACH_BIKE, 2}, - {EVENT_OBJ_GFX_MAY_ACRO_BIKE, 4}, - {EVENT_OBJ_GFX_MAY_SURFING, 8}, - {EVENT_OBJ_GFX_MAY_UNDERWATER, 16}, + {OBJ_EVENT_GFX_MAY_NORMAL, 1}, + {OBJ_EVENT_GFX_MAY_MACH_BIKE, 2}, + {OBJ_EVENT_GFX_MAY_ACRO_BIKE, 4}, + {OBJ_EVENT_GFX_MAY_SURFING, 8}, + {OBJ_EVENT_GFX_MAY_UNDERWATER, 16}, } }; static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of sArrowWarpMetatileBehaviorChecks @@ -243,17 +243,17 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of MetatileBehavior_IsWestArrowWarp, MetatileBehavior_IsEastArrowWarp, }; -static u8 (*const gUnknown_0830FC88[])(struct Task *, struct EventObject *, struct EventObject *) = +static u8 (*const gUnknown_0830FC88[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) = { sub_8059E84, do_boulder_dust, sub_8059F40, }; -static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) = +static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_DoSecretBaseMatJump, }; -static u8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) = +static u8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep1, @@ -265,15 +265,15 @@ movement_type_empty_callback(MovementType_Player); void player_step(u8 direction, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - sub_8059D60(playerEventObj); + sub_8059D60(playerObjEvent); if (gPlayerAvatar.preventStep == FALSE) { Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); - if (!sub_8058854(playerEventObj, direction)) + if (!sub_8058854(playerObjEvent, direction)) { - npc_clear_strange_bits(playerEventObj); + npc_clear_strange_bits(playerObjEvent); DoPlayerAvatarTransition(); if (TryDoMetatileBehaviorForcedMovement() == 0) { @@ -284,15 +284,15 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) } } -static bool8 sub_8058854(struct EventObject *playerEventObj, u8 direction) +static bool8 sub_8058854(struct ObjectEvent *playerObjEvent, u8 direction) { - if (EventObjectIsMovementOverridden(playerEventObj) - && !EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent) + && !ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj); - if (heldMovementActionId > 24 && heldMovementActionId < 29 && direction != DIR_NONE && playerEventObj->movementDirection != direction) + u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerObjEvent); + if (heldMovementActionId > 24 && heldMovementActionId < 29 && direction != DIR_NONE && playerObjEvent->movementDirection != direction) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerObjEvent); return FALSE; } else @@ -303,11 +303,11 @@ static bool8 sub_8058854(struct EventObject *playerEventObj, u8 direction) return FALSE; } -static void npc_clear_strange_bits(struct EventObject *eventObj) +static void npc_clear_strange_bits(struct ObjectEvent *objEvent) { - eventObj->inanimate = 0; - eventObj->disableAnim = 0; - eventObj->facingDirectionLocked = 0; + objEvent->inanimate = 0; + objEvent->disableAnim = 0; + objEvent->facingDirectionLocked = 0; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; } @@ -341,7 +341,7 @@ static u8 GetForcedMovementByMetatileBehavior(void) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5)) { - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; for (i = 0; i < 18; i++) { @@ -356,11 +356,11 @@ static bool8 ForcedMovement_None(void) { if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->facingDirectionLocked = 0; - playerEventObj->enableAnim = 1; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + playerObjEvent->facingDirectionLocked = 0; + playerObjEvent->enableAnim = 1; + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; } return FALSE; @@ -398,10 +398,10 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8)) static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->disableAnim = 1; - return DoForcedMovement(playerEventObj->movementDirection, a); + playerObjEvent->disableAnim = 1; + return DoForcedMovement(playerObjEvent->movementDirection, a); } static bool8 ForcedMovement_Slip(void) @@ -451,10 +451,10 @@ static bool8 ForcedMovement_RideCurrentEast(void) static u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->disableAnim = 1; - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->disableAnim = 1; + playerObjEvent->facingDirectionLocked = 1; return DoForcedMovement(direction, b); } @@ -492,12 +492,12 @@ static bool8 ForcedMovement_SecretBaseSpinMat(void) static bool8 ForcedMovement_MuddySlope(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) + if (playerObjEvent->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) { Bike_UpdateBikeCounterSpeed(0); - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->facingDirectionLocked = 1; return DoForcedMovement(1, PlayerGoSpeed2); } else @@ -565,7 +565,7 @@ static void sub_8058D0C(u8 direction, u16 heldKeys) return; } if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) - && IsRunningDisallowed(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) == 0) + && IsRunningDisallowed(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) == 0) { PlayerRun(direction); gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; @@ -580,15 +580,15 @@ static void sub_8058D0C(u8 direction, u16 heldKeys) static u8 CheckForPlayerAvatarCollision(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - x = playerEventObj->currentCoords.x; - y = playerEventObj->currentCoords.y; + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return CheckForEventObjectCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } -u8 CheckForEventObjectCollision(struct EventObject *a, s16 x, s16 y, u8 direction, u8 e) +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 x, s16 y, u8 direction, u8 e) { u8 collision; @@ -616,7 +616,7 @@ static bool8 sub_8058EF0(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetEventObjectIdByXYZ(x, y, 3) == 16) + && GetObjectEventIdByXYZ(x, y, 3) == 16) { sub_805A20C(direction); return TRUE; @@ -639,17 +639,17 @@ static u8 sub_8058F6C(s16 x, s16 y, u8 direction) { if (FlagGet(FLAG_SYS_USE_STRENGTH)) { - u8 eventObjectId = GetEventObjectIdByXY(x, y); + u8 objectEventId = GetObjectEventIdByXY(x, y); - if (eventObjectId != 16 && gEventObjects[eventObjectId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) + if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER) { - x = gEventObjects[eventObjectId].currentCoords.x; - y = gEventObjects[eventObjectId].currentCoords.y; + x = gObjectEvents[objectEventId].currentCoords.x; + y = gObjectEvents[objectEventId].currentCoords.y; MoveCoords(direction, &x, &y); - if (GetCollisionAtCoords(&gEventObjects[eventObjectId], x, y, direction) == 0 + if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == 0 && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) { - StartStrengthAnim(eventObjectId, direction); + StartStrengthAnim(objectEventId, direction); return 1; } } @@ -689,13 +689,13 @@ static void DoPlayerAvatarTransition(void) #ifdef NONMATCHING if (flags & 1) { - gUnknown_0830FC14[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + gUnknown_0830FC14[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } #else if (flags & 1) { - register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_0830FC14; - funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + register void (*const *funcs)(struct ObjectEvent *) asm("r0") = gUnknown_0830FC14; + funcs[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } #endif } @@ -703,58 +703,58 @@ static void DoPlayerAvatarTransition(void) } } -static void nullsub_49(struct EventObject *eventObj) +static void nullsub_49(struct ObjectEvent *objEvent) { } -static void PlayerAvatarTransition_Normal(struct EventObject *eventObj) +static void PlayerAvatarTransition_Normal(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } -static void PlayerAvatarTransition_MachBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); BikeClearState(0, 0); } -static void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE); BikeClearState(0, 0); Bike_HandleBumpySlopeJump(); } -static void PlayerAvatarTransition_Surfing(struct EventObject *eventObj) +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *objEvent) { u8 spriteId; - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; spriteId = FieldEffectStart(FLDEFF_SURF_BLOB); - eventObj->fieldEffectSpriteId = spriteId; + objEvent->fieldEffectSpriteId = spriteId; sub_8127ED0(spriteId, 1); } -static void PlayerAvatarTransition_Underwater(struct EventObject *eventObj) +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER); - eventObj->fieldEffectSpriteId = sub_8128124(eventObj->spriteId); + objEvent->fieldEffectSpriteId = sub_8128124(objEvent->spriteId); } -static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj) +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent) { gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; } @@ -779,7 +779,7 @@ void sub_8059204(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId; + u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId; if (movementActionId < 4 || (movementActionId >= 16 && movementActionId < 0x15) @@ -801,27 +801,27 @@ static bool8 sub_80592A4(void) static bool8 PlayerIsAnimActive(void) { - return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventIsMovementOverridden(&gObjectEvents[gPlayerAvatar.objectEventId]); } static bool8 PlayerCheckIfAnimFinishedOrInactive(void) { - return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]); } static void PlayerSetCopyableMovement(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a; + gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement = a; } u8 PlayerGetCopyableMovement(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement; + return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement; } static void sub_8059348(u8 a) { - EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a); + ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a); } void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) @@ -829,7 +829,7 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) if (!PlayerIsAnimActive()) { PlayerSetCopyableMovement(copyableMovement); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId); } } @@ -894,7 +894,7 @@ void sub_80594C0(void) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { if (player_should_look_direction_be_enforced_upon_movement()) - sub_8059348(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection)); + sub_8059348(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection)); } } @@ -968,7 +968,7 @@ void sub_8059630(u8 direction) static void PlayCollisionSoundIfNotFacingWarp(u8 a) { s16 x, y; - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior)) { @@ -985,35 +985,35 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; MoveCoords(GetPlayerFacingDirection(), x, y); } void PlayerGetDestCoords(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; } u8 GetPlayerFacingDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].facingDirection; } u8 GetPlayerMovementDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection; } u8 PlayerGetZCoord(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation; + return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation; } void unref_sub_8059790(s16 a, s16 b) { - sub_805C058(&gEventObjects[gPlayerAvatar.eventObjectId], a, b); + sub_805C058(&gObjectEvents[gPlayerAvatar.objectEventId], a, b); } u8 TestPlayerAvatarFlags(u8 a) @@ -1038,10 +1038,10 @@ void sub_80597E8(void) void sub_80597F4(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - npc_clear_strange_bits(playerEventObj); - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + npc_clear_strange_bits(playerObjEvent); + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { Bike_HandleBumpySlopeJump(); @@ -1068,14 +1068,14 @@ u8 unref_GetRivalAvatarGenderByGraphicsId(u8 gfxId) { switch (gfxId) { - case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - case EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE: - case EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE: - case EVENT_OBJ_GFX_RIVAL_MAY_SURFING: - case EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE: - case EVENT_OBJ_GFX_MAY_UNDERWATER: - case EVENT_OBJ_GFX_MAY_FISHING: - case EVENT_OBJ_GFX_MAY_WATERING: + case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: + case OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE: + case OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE: + case OBJ_EVENT_GFX_RIVAL_MAY_SURFING: + case OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE: + case OBJ_EVENT_GFX_MAY_UNDERWATER: + case OBJ_EVENT_GFX_MAY_FISHING: + case OBJ_EVENT_GFX_MAY_WATERING: return FEMALE; default: return MALE; @@ -1086,14 +1086,14 @@ u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId) { switch (gfxId) { - case EVENT_OBJ_GFX_MAY_NORMAL: - case EVENT_OBJ_GFX_MAY_MACH_BIKE: - case EVENT_OBJ_GFX_MAY_ACRO_BIKE: - case EVENT_OBJ_GFX_MAY_SURFING: - case EVENT_OBJ_GFX_MAY_FIELD_MOVE: - case EVENT_OBJ_GFX_MAY_UNDERWATER: - case EVENT_OBJ_GFX_MAY_FISHING: - case EVENT_OBJ_GFX_MAY_WATERING: + case OBJ_EVENT_GFX_MAY_NORMAL: + case OBJ_EVENT_GFX_MAY_MACH_BIKE: + case OBJ_EVENT_GFX_MAY_ACRO_BIKE: + case OBJ_EVENT_GFX_MAY_SURFING: + case OBJ_EVENT_GFX_MAY_FIELD_MOVE: + case OBJ_EVENT_GFX_MAY_UNDERWATER: + case OBJ_EVENT_GFX_MAY_FISHING: + case OBJ_EVENT_GFX_MAY_WATERING: return FEMALE; default: return MALE; @@ -1127,12 +1127,12 @@ bool8 IsPlayerSurfingNorth(void) bool8 IsPlayerFacingSurfableFishableWater(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - s16 x = playerEventObj->currentCoords.x; - s16 y = playerEventObj->currentCoords.y; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + s16 x = playerObjEvent->currentCoords.x; + s16 y = playerObjEvent->currentCoords.y; - MoveCoords(playerEventObj->facingDirection, &x, &y); - if (GetCollisionAtCoords(playerEventObj, x, y, playerEventObj->facingDirection) == 3 && PlayerGetZCoord() == 3 + MoveCoords(playerObjEvent->facingDirection, &x, &y); + if (GetCollisionAtCoords(playerObjEvent, x, y, playerObjEvent->facingDirection) == 3 && PlayerGetZCoord() == 3 && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y))) return TRUE; else @@ -1185,87 +1185,87 @@ void SetPlayerAvatarExtraStateTransition(u8 a, u8 b) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) { - struct EventObjectTemplate playerEventObjTemplate; - u8 eventObjectId; - struct EventObject *eventObject; - - playerEventObjTemplate.localId = 0xFF; - playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); - playerEventObjTemplate.x = x - 7; - playerEventObjTemplate.y = y - 7; - playerEventObjTemplate.elevation = 0; - playerEventObjTemplate.movementType = MOVEMENT_TYPE_PLAYER; - playerEventObjTemplate.movementRangeX = 0; - playerEventObjTemplate.movementRangeY = 0; - playerEventObjTemplate.trainerType = 0; - playerEventObjTemplate.trainerRange_berryTreeId = 0; - playerEventObjTemplate.script = NULL; - playerEventObjTemplate.flagId = 0; - eventObjectId = SpawnSpecialEventObject(&playerEventObjTemplate); - eventObject = &gEventObjects[eventObjectId]; - eventObject->isPlayer = 1; - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); - EventObjectTurn(eventObject, direction); + struct ObjectEventTemplate playerObjEventTemplate; + u8 objectEventId; + struct ObjectEvent *objectEvent; + + playerObjEventTemplate.localId = 0xFF; + playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); + playerObjEventTemplate.x = x - 7; + playerObjEventTemplate.y = y - 7; + playerObjEventTemplate.elevation = 0; + playerObjEventTemplate.movementType = MOVEMENT_TYPE_PLAYER; + playerObjEventTemplate.movementRangeX = 0; + playerObjEventTemplate.movementRangeY = 0; + playerObjEventTemplate.trainerType = 0; + playerObjEventTemplate.trainerRange_berryTreeId = 0; + playerObjEventTemplate.script = NULL; + playerObjEventTemplate.flagId = 0; + objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate); + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->isPlayer = 1; + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); + ObjectEventTurn(objectEvent, direction); ClearPlayerAvatarInfo(); gPlayerAvatar.runningState = NOT_MOVING; gPlayerAvatar.tileTransitionState = T_NOT_MOVING; - gPlayerAvatar.eventObjectId = eventObjectId; - gPlayerAvatar.spriteId = eventObject->spriteId; + gPlayerAvatar.objectEventId = objectEventId; + gPlayerAvatar.spriteId = objectEvent->spriteId; gPlayerAvatar.gender = gender; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT); } void sub_8059B88(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].invisible = a; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = a; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a; + gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = a; } void sub_8059BF4(void) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); } static void sub_8059C3C(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); } void sub_8059C94(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1); } void sub_8059D08(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction)); } -static void sub_8059D60(struct EventObject *eventObject) +static void sub_8059D60(struct ObjectEvent *objectEvent) { s16 x; s16 y; u8 direction; - u8 metatileBehavior = eventObject->currentMetatileBehavior; + u8 metatileBehavior = objectEvent->currentMetatileBehavior; for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++) { - if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection) + if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection) { - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - ShowWarpArrowSprite(eventObject->warpArrowSpriteId, direction, x, y); + ShowWarpArrowSprite(objectEvent->warpArrowSpriteId, direction, x, y); return; } } - SetSpriteInvisible(eventObject->warpArrowSpriteId); + SetSpriteInvisible(objectEvent->warpArrowSpriteId); } /* Strength */ @@ -1282,12 +1282,12 @@ static void StartStrengthAnim(u8 a, u8 b) static void Task_BumpBoulder(u8 taskId) { while (gUnknown_0830FC88[gTasks[taskId].data[0]](&gTasks[taskId], - &gEventObjects[gPlayerAvatar.eventObjectId], - &gEventObjects[gTasks[taskId].data[1]])) + &gObjectEvents[gPlayerAvatar.objectEventId], + &gObjectEvents[gTasks[taskId].data[1]])) ; } -static bool8 sub_8059E84(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_8059E84(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1295,15 +1295,15 @@ static bool8 sub_8059E84(struct Task *task, struct EventObject *playerObject, st return FALSE; } -static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (!EventObjectIsMovementOverridden(playerObject) - && !EventObjectIsMovementOverridden(strengthObject)) + if (!ObjectEventIsMovementOverridden(playerObject) + && !ObjectEventIsMovementOverridden(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); - EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); - EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); + ObjectEventSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); + ObjectEventSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); gFieldEffectArguments[0] = strengthObject->currentCoords.x; gFieldEffectArguments[1] = strengthObject->currentCoords.y; gFieldEffectArguments[2] = strengthObject->previousElevation; @@ -1315,13 +1315,13 @@ static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject return FALSE; } -static bool8 sub_8059F40(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_8059F40(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectCheckHeldMovementStatus(playerObject) - && EventObjectCheckHeldMovementStatus(strengthObject)) + if (ObjectEventCheckHeldMovementStatus(playerObject) + && ObjectEventCheckHeldMovementStatus(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroyTask(FindTaskIdByFunc(Task_BumpBoulder)); @@ -1338,18 +1338,18 @@ static void DoPlayerMatJump(void) static void DoPlayerAvatarSecretBaseMatJump(u8 taskId) { - while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } // because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump. -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject) +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent) { gPlayerAvatar.preventStep = TRUE; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { PlaySE(SE_DANSA); - EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) { @@ -1372,29 +1372,29 @@ static void DoPlayerMatSpin(void) static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId) { - while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent) { task->data[0]++; - task->data[1] = eventObject->movementDirection; + task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); return TRUE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent) { u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { u8 direction; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(direction = directions[objectEvent->movementDirection - 1])); if (direction == (u8)task->data[1]) task->data[2]++; task->data[0]++; @@ -1404,7 +1404,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct Event return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent) { const u8 actions[] = { MOVEMENT_ACTION_DELAY_1, @@ -1414,19 +1414,19 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct Event MOVEMENT_ACTION_DELAY_8, }; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, actions[task->data[2]]); + ObjectEventSetHeldMovement(objectEvent, actions[task->data[2]]); task->data[0] = 1; } return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); ScriptContext2_Disable(); gPlayerAvatar.preventStep = FALSE; DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin)); @@ -1453,29 +1453,29 @@ static void sub_805A20C(u8 a) static void taskFF_0805D1D4(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectIsMovementOverridden(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent)) { - if (!EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent)) return; } - sub_8127ED0(playerEventObj->fieldEffectSpriteId, 2); - EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); + sub_8127ED0(playerObjEvent->fieldEffectSpriteId, 2); + ObjectEventSetHeldMovement(playerObjEvent, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = sub_805A2D0; } static void sub_805A2D0(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - EventObjectSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); + ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventSetHeldMovement(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]); + DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]); DestroyTask(taskId); } } @@ -1542,17 +1542,17 @@ static bool8 Fishing1(struct Task *task) static bool8 Fishing2(struct Task *task) { - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; const s16 arr1[] = {1, 1, 1}; const s16 arr2[] = {1, 3, 6}; task->tRoundsPlayed = 0; task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]); - task->tPlayerGfxId = gEventObjects[gPlayerAvatar.eventObjectId].graphicsId; - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(playerEventObj); - playerEventObj->enableAnim = 1; - sub_8059C3C(playerEventObj->facingDirection); + task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(playerObjEvent); + playerObjEvent->enableAnim = 1; + sub_8059C3C(playerObjEvent->facingDirection); task->tStep++; return FALSE; } @@ -1704,12 +1704,12 @@ static bool8 Fishing11(struct Task *task) { if (Menu_UpdateWindowText()) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId); + ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; Menu_EraseScreen(); @@ -1763,12 +1763,12 @@ static bool8 Fishing15(struct Task *task) AlignFishingAnimationFrames(); if (gSprites[gPlayerAvatar.spriteId].animEnded) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId); + ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; task->tStep++; @@ -1782,7 +1782,7 @@ static bool8 Fishing16(struct Task *task) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); Menu_EraseScreen(); sub_80BE97C(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); @@ -1826,7 +1826,7 @@ static void AlignFishingAnimationFrames(void) if (animType == 10 || animType == 11) playerSprite->pos2.y = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } #if DEBUG @@ -1842,8 +1842,8 @@ u8 debug_sub_805F2B0(u8 a) u8 debug_sub_805F2DC(u8 a) { if (a == 0) - PlayerFaceDirection(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection); - else if (gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera && !CanCameraMoveInDirection(a)) + PlayerFaceDirection(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection); + else if (gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera && !CanCameraMoveInDirection(a)) PlayerOnBikeCollide(a); else PlayerGoSpeed4(a); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 8f98d8187..78c425bc5 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -27,8 +27,8 @@ enum STEP_END = 0xFE, }; -const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/19.gbapal"); +const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); static const s8 gTruckCamera_HorizontalTable[] = { @@ -349,7 +349,7 @@ void Task_HandlePorthole(u8 taskId) void sub_80C78A0(void) { - u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoObjectEvent(0x8C, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; @@ -366,7 +366,7 @@ void sub_80C78A0(void) void sub_80C791C(void) { sub_80C78A0(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/field_specials.c b/src/field_specials.c index c23a8c44c..972b63a0d 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -33,7 +33,7 @@ #include "pokemon_summary_screen.h" #include "random.h" #include "constants/abilities.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/metatile_labels.h" #include "constants/moves.h" #include "constants/species.h" @@ -365,7 +365,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void) if (myLinkPlayerNumber != i) { rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gLinkPlayers[i].gender); - SpawnSpecialEventObjectParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); + SpawnSpecialObjectEventParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); j++; if (j == 4) { @@ -769,7 +769,7 @@ u8 GetLeadMonFriendshipScore(void) void CB2_FieldShowRegionMap(void) { - FieldInitRegionMap(c2_exit_to_overworld_1_continue_scripts_restart_music); + FieldInitRegionMap(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void FieldShowRegionMap(void) @@ -1134,7 +1134,7 @@ void sub_810E984(u8 taskId) gSpecialVar_Result = 1; gSpecialVar_0x8005 = gUnknown_0203925B; ShakeScreenInElevator(); - EventObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); + ObjectEventTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); sub_810EEDC(); Menu_EraseScreen(); DestroyTask(taskId); @@ -1595,15 +1595,15 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { - u8 eventObjectId = SpawnSpecialEventObjectParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gEventObjects[eventObjectId].invisible = 1; - CameraObjectSetFollowedObjectId(gEventObjects[eventObjectId].spriteId); + u8 objectEventId = SpawnSpecialObjectEventParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); + gObjectEvents[objectEventId].invisible = 1; + CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } void RemoveCameraDummy(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1871,9 +1871,9 @@ u16 ScriptGetPartyMonSpecies(void) return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL); } -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - TryInitLocalEventObject(6); + TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) diff --git a/src/field_weather.c b/src/field_weather.c index 9a5a83737..340445fd2 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -216,21 +216,21 @@ static const u8 sBasePaletteGammaTypes[32] = #if DEBUG -static const u8 sDebugText_Weather_None[] = _("なし "); // "none" -static const u8 sDebugText_Weather_Clear[] = _("はれ "); // "clear" -static const u8 sDebugText_Weather_Clear2[] = _("はれ2 "); // "clear2" -static const u8 sDebugText_Weather_Rain[] = _("あめ "); // "rain" -static const u8 sDebugText_Weather_Snow[] = _("ゆき "); // "snow" -static const u8 sDebugText_Weather_Lightning[] = _("かみなり "); // "lightning" -static const u8 sDebugText_Weather_Fog[] = _("きり "); // "fog" -static const u8 sDebugText_Weather_VolcanicAsh[] = _("かざんばい"); // "volcanic ash" -static const u8 sDebugText_Weather_Sandstorm[] = _("すなあらし"); // "sandstorm -static const u8 sDebugText_Weather_Fog2[] = _("きり2 "); // "fog2" -static const u8 sDebugText_Weather_Underwater[] = _("かいてい "); // "undersea" -static const u8 sDebugText_Weather_Cloudy[] = _("くもり "); // "cloudy" -static const u8 sDebugText_Weather_Clear3[] = _("はれ3 "); // "clear3" -static const u8 sDebugText_Weather_HeavyRain[] = _("おおあめ"); // "heavy rain" -static const u8 sDebugText_Weather_Underwater2[] = _("かいてい2"); // "undersea2" +static const u8 sDebugText_Weather_None[] = DTR("なし ", "NONE "); +static const u8 sDebugText_Weather_Clear[] = DTR("はれ ", "CLOUDY "); +static const u8 sDebugText_Weather_Clear2[] = DTR("はれ2 ", "SUNNY "); +static const u8 sDebugText_Weather_Rain[] = DTR("あめ ", "RAIN "); +static const u8 sDebugText_Weather_Snow[] = DTR("ゆき ", "SNOW "); +static const u8 sDebugText_Weather_Lightning[] = DTR("かみなり ", "LIGHTNING "); +static const u8 sDebugText_Weather_Fog[] = DTR("きり ", "FOG 1 "); +static const u8 sDebugText_Weather_VolcanicAsh[] = DTR("かざんばい", "ASH "); +static const u8 sDebugText_Weather_Sandstorm[] = DTR("すなあらし", "SANDSTORM "); +static const u8 sDebugText_Weather_Fog2[] = DTR("きり2 ", "FOG 2 "); +static const u8 sDebugText_Weather_Underwater[] = DTR("かいてい ", "FOG 3 "); +static const u8 sDebugText_Weather_Cloudy[] = DTR("くもり ", "SHADE "); +static const u8 sDebugText_Weather_Clear3[] = DTR("はれ3 ", "DROUGHT "); +static const u8 sDebugText_Weather_HeavyRain[] = DTR("おおあめ", "HEAVY RAIN"); +static const u8 sDebugText_Weather_Underwater2[] = DTR("かいてい2", "UNDERWATER"); static const u8 *const sDebugText_Weather[] = { diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c index a319c959b..b46ba5f54 100644 --- a/src/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c @@ -16,26 +16,26 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(playerEventObj) - || EventObjectClearHeldMovementIfFinished(playerEventObj)) + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(playerObjEvent) + || ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { sub_8059D08(GetPlayerFacingDirection()); - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) { - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); } else { diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 8d76ecccb..567e75f2a 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -4,7 +4,7 @@ #include "event_object_movement.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "metatile_behavior.h" #include "pokemon_menu.h" #include "overworld.h" @@ -92,7 +92,7 @@ void Debug_SetUpFieldMove_Cut(void) u8 i, j; u8 metatileBehavior; - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE) { gLastFieldPokeMenuOpened = 0; FieldCallback_CutTree(); @@ -131,7 +131,7 @@ bool8 SetUpFieldMove_Cut(void) u8 i, j; u8 tileBehavior; - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE) { // Standing in front of cuttable tree. gFieldCallback = FieldCallback_PrepareFadeInFromMenu; @@ -377,7 +377,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) for (i = 1; i < 8; i++) DestroySprite(&gSprites[eCutGrassSpriteArray[i]]); FieldEffectStop(&gSprites[eCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c index d65a23e95..62e02df12 100644 --- a/src/fldeff_decoration.c +++ b/src/fldeff_decoration.c @@ -236,8 +236,8 @@ void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) void DoSecretBaseGlitterMatSparkle(void) { - s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + s16 x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + s16 y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; u8 spriteId; sub_8060470(&x, &y, 8, 4); diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index e10e18cc1..b7e19fe51 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -31,7 +31,7 @@ void debug_sub_8130318(void) gSpecialVar_Result = 0; sub_811AA38(); } - else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + else if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) == TRUE) { gLastFieldPokeMenuOpened = 0; gSpecialVar_Result = 0; @@ -54,7 +54,7 @@ bool8 SetUpFieldMove_Strength(void) } else { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) != TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) != TRUE) return 0; gSpecialVar_Result = gLastFieldPokeMenuOpened; gFieldCallback = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/item_menu.c b/src/item_menu.c index b69866453..f782bafef 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -53,7 +53,7 @@ extern void Shop_FadeReturnToMartMenu(void); extern void sub_80546B8(u8); extern void sub_804E990(u8); extern void sub_802E424(u8); -extern void ScriptUnfreezeEventObjects(void); +extern void ScriptUnfreezeObjectEvents(void); struct UnknownStruct2 { @@ -2518,7 +2518,7 @@ void CleanUpOverworldMessage(u8 taskId) { Menu_EraseWindowRect(0, 13, 29, 19); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } @@ -3141,7 +3141,7 @@ bool32 UseRegisteredKeyItem(void) u8 taskId; ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80594C0(); sub_80597F4(); gSpecialVar_ItemId = gSaveBlock1.registeredItem; diff --git a/src/item_use.c b/src/item_use.c index d927b5937..348806e06 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -17,7 +17,7 @@ #include "constants/items.h" #include "mail.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "menu_helpers.h" #include "metatile_behavior.h" @@ -34,7 +34,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/map_types.h" #include "constants/species.h" #include "constants/vars.h" @@ -213,7 +213,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) if (ItemId_GetSecondaryId(gSpecialVar_ItemId) == 1) GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -321,7 +321,7 @@ void RunItemfinderResults(u8 taskId) void ExitItemfinder(u8 taskId) { Menu_EraseWindowRect(0, 14, 29, 19); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -420,8 +420,6 @@ bool8 sub_80C9688(struct MapConnection *connection, int x, int y) return HiddenItemAtPos(mapHeader->events, localX, localY); } -// weird math -#ifdef NONMATCHING void sub_80C9720(u8 taskId) { s16 x, y; @@ -429,15 +427,18 @@ void sub_80C9720(u8 taskId) s16 width = gMapHeader.mapLayout->width + 7; s16 height = gMapHeader.mapLayout->height + 7; + s16 var1 = 7; + s16 var2 = 7; + PlayerGetDestCoords(&x, &y); for (curX = x - 7; curX <= x + 7; curX++) { for (curY = y - 5; curY <= y + 5; curY++) { - if (7 > curX + if (var1 > curX || curX >= width - || 7 > curY + || var2 > curY || curY >= height) { struct MapConnection *conn = sub_8056BA0(curX, curY); @@ -447,156 +448,6 @@ void sub_80C9720(u8 taskId) } } } -#else -NAKED -void sub_80C9720(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x14\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - str r0, [sp, 0x4]\n\ - ldr r0, _080C9834 @ =gMapHeader\n\ - ldr r1, [r0]\n\ - ldr r0, [r1]\n\ - adds r0, 0x7\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - str r0, [sp, 0x8]\n\ - ldr r0, [r1, 0x4]\n\ - adds r0, 0x7\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - str r0, [sp, 0xC]\n\ - mov r4, sp\n\ - adds r4, 0x2\n\ - mov r0, sp\n\ - adds r1, r4, 0\n\ - bl PlayerGetDestCoords\n\ - mov r0, sp\n\ - ldrh r0, [r0]\n\ - subs r0, 0x7\n\ - lsls r0, 16\n\ - lsrs r3, r0, 16\n\ - asrs r0, 16\n\ - mov r1, sp\n\ - movs r2, 0\n\ - ldrsh r1, [r1, r2]\n\ - adds r1, 0x7\n\ - cmp r0, r1\n\ - bgt _080C9824\n\ -_080C976E:\n\ - mov r5, sp\n\ - ldrh r0, [r5, 0x2]\n\ - subs r0, 0x5\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - lsls r2, r4, 16\n\ - asrs r1, r2, 16\n\ - movs r6, 0x2\n\ - ldrsh r0, [r5, r6]\n\ - adds r0, 0x5\n\ - lsls r3, 16\n\ - mov r8, r3\n\ - cmp r1, r0\n\ - bgt _080C980E\n\ - movs r0, 0x7\n\ - str r0, [sp, 0x10]\n\ - mov r1, r8\n\ - asrs r1, 16\n\ - mov r9, r1\n\ - mov r10, r0\n\ -_080C9796:\n\ - ldr r3, [sp, 0x10]\n\ - cmp r3, r9\n\ - bgt _080C97B8\n\ - ldr r5, [sp, 0x8]\n\ - lsls r0, r5, 16\n\ - asrs r0, 16\n\ - cmp r9, r0\n\ - bge _080C97B8\n\ - asrs r1, r2, 16\n\ - cmp r10, r1\n\ - bgt _080C97B8\n\ - ldr r6, [sp, 0xC]\n\ - lsls r0, r6, 16\n\ - asrs r0, 16\n\ - lsls r7, r4, 16\n\ - cmp r1, r0\n\ - blt _080C97F6\n\ -_080C97B8:\n\ - mov r0, r8\n\ - asrs r5, r0, 16\n\ - lsls r4, 16\n\ - asrs r6, r4, 16\n\ - adds r0, r5, 0\n\ - adds r1, r6, 0\n\ - bl sub_8056BA0\n\ - adds r7, r4, 0\n\ - cmp r0, 0\n\ - beq _080C97F6\n\ - adds r1, r5, 0\n\ - adds r2, r6, 0\n\ - bl sub_80C9688\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x1\n\ - bne _080C97F6\n\ - mov r0, sp\n\ - ldrh r1, [r0]\n\ - subs r1, r5, r1\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - ldrh r2, [r0, 0x2]\n\ - subs r2, r6, r2\n\ - lsls r2, 16\n\ - asrs r2, 16\n\ - ldr r0, [sp, 0x4]\n\ - bl sub_80C9838\n\ -_080C97F6:\n\ - movs r1, 0x80\n\ - lsls r1, 9\n\ - adds r0, r7, r1\n\ - lsrs r4, r0, 16\n\ - lsls r2, r4, 16\n\ - asrs r1, r2, 16\n\ - mov r3, sp\n\ - movs r5, 0x2\n\ - ldrsh r0, [r3, r5]\n\ - adds r0, 0x5\n\ - cmp r1, r0\n\ - ble _080C9796\n\ -_080C980E:\n\ - movs r1, 0x80\n\ - lsls r1, 9\n\ - add r1, r8\n\ - lsrs r3, r1, 16\n\ - asrs r1, 16\n\ - mov r0, sp\n\ - movs r6, 0\n\ - ldrsh r0, [r0, r6]\n\ - adds r0, 0x7\n\ - cmp r1, r0\n\ - ble _080C976E\n\ -_080C9824:\n\ - add sp, 0x14\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080C9834: .4byte gMapHeader\n\ - .syntax divided"); -} -#endif void sub_80C9838(u8 taskId, s16 x, s16 y) { @@ -697,15 +548,15 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY) void SetPlayerDirectionTowardsItem(u8 direction) { - EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); + UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); PlayerTurnInPlace(direction); } void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gOtherText_ItemfinderResponding, ExitItemfinder, 0); } @@ -713,7 +564,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId) { s16 *data = gTasks[taskId].data; - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE || data[2] == FALSE) { SetPlayerDirectionTowardsItem(gItemFinderDirections[data[5]]); diff --git a/src/load_save.c b/src/load_save.c index a1ca7ce76..94a39857f 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -81,32 +81,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1.playerParty[i]; } -static void SaveEventObjects(void) +static void SaveObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gSaveBlock1.eventObjects[i] = gEventObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gSaveBlock1.objectEvents[i] = gObjectEvents[i]; } -static void LoadEventObjects(void) +static void LoadObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gEventObjects[i] = gSaveBlock1.eventObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gObjectEvents[i] = gSaveBlock1.objectEvents[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveEventObjects(); + SaveObjectEvents(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadEventObjects(); + LoadObjectEvents(); } void LoadPlayerBag(void) diff --git a/src/mail.c b/src/mail.c index 8b4647532..9a56d73cc 100644 --- a/src/mail.c +++ b/src/mail.c @@ -242,9 +242,9 @@ const struct MailLayout gUnknown_083E57A4[] = #if DEBUG -const u8 Str_8411540[] = _("レイアウトを にほんごで ひょうじ？"); // Display using Japanese layout? -const u8 Str_8411553[] = _("にほんご "); // Japanese -const u8 Str_8411559[] = _("かいがい "); // Overseas +const u8 Str_8411540[] = DTR("レイアウトを にほんごで ひょうじ？", "Display using JAPANESE layout?"); +const u8 Str_8411553[] = DTR("にほんご ", "JAPANESE"); +const u8 Str_8411559[] = DTR("かいがい ", "OVERSEAS"); const u8 *const _8411560[] = { @@ -252,20 +252,20 @@ const u8 *const _8411560[] = Str_8411559, }; -const u8 Str_8411568[] = _("イメージ タイプを えらんでね"); // Choose an image type +const u8 Str_8411568[] = DTR("イメージ タイプを えらんでね", "Choose an image type"); const u8 Str_8411578[] = _("{STR_VAR_1}"); -const u8 Str_841157B[] = _("オレンジ "); // Orange -const u8 Str_8411581[] = _("ハーバー "); // Harbor -const u8 Str_8411587[] = _("キラキラ "); // Glitter -const u8 Str_841158D[] = _("メカニカル"); // Mech -const u8 Str_8411593[] = _("ウッディー"); // Wood -const u8 Str_8411599[] = _("クロス "); // Wave -const u8 Str_841159F[] = _("トレジャー"); // Bead -const u8 Str_84115A5[] = _("シャドウ "); // Shadow -const u8 Str_84115AB[] = _("トロピカル"); // Tropic -const u8 Str_84115B1[] = _("ドリーム "); // Dream -const u8 Str_84115B7[] = _("ミラクル "); // Fab -const u8 Str_84115BD[] = _("レトロ "); // Retro +const u8 Str_841157B[] = DTR("オレンジ ", "ORANGE "); +const u8 Str_8411581[] = DTR("ハーバー ", "HARBOR "); +const u8 Str_8411587[] = DTR("キラキラ ", "GLITTER"); +const u8 Str_841158D[] = DTR("メカニカル", "MECH "); +const u8 Str_8411593[] = DTR("ウッディー", "WOOD "); +const u8 Str_8411599[] = DTR("クロス ", "WAVE "); +const u8 Str_841159F[] = DTR("トレジャー", "BEAD "); +const u8 Str_84115A5[] = DTR("シャドウ ", "SHADOW "); +const u8 Str_84115AB[] = DTR("トロピカル", "TROPIC "); +const u8 Str_84115B1[] = DTR("ドリーム ", "DREAM "); +const u8 Str_84115B7[] = DTR("ミラクル ", "FAB "); +const u8 Str_84115BD[] = DTR("レトロ ", "RETRO "); const u8 *const _84115C4[] = { @@ -283,10 +283,10 @@ const u8 *const _84115C4[] = Str_84115BD, }; -const u8 Str_84115F4[] = _("メールをみる"); // View Mail -const u8 Str_84115FB[] = _("メールとうろく"); // Register Mail -const u8 Str_8411603[] = _("もたせる"); // Give to Pokémon -const u8 Str_8411608[] = _("メールをけす"); // Delete Mail +const u8 Str_84115F4[] = DTR("メールをみる", "View MAIL"); +const u8 Str_84115FB[] = DTR("メールとうろく", "Register MAIL"); +const u8 Str_8411603[] = DTR("もたせる", "Give MAIL"); +const u8 Str_8411608[] = DTR("メールをけす", "Delete MAIL"); #endif @@ -744,7 +744,7 @@ void debug_sub_810CA7C(u8 taskId) void debug_sub_810CB50(u8 taskId) { u8 sp0[] = _("{STR_VAR_1} {STR_VAR_2}"); - u8 sp8[] = _("メール{STR_VAR_1} {STR_VAR_2}"); + u8 sp8[] = DTR("メール{STR_VAR_1} {STR_VAR_2}", "MAIL{STR_VAR_1} {STR_VAR_2}"); bool8 r2 = FALSE; if (gMain.newKeys & A_BUTTON) @@ -791,7 +791,7 @@ void debug_sub_810CB50(u8 taskId) void debug_sub_810CCEC(u8 taskId) { - u8 string1[] = _("メール{STR_VAR_1}を だれに もたせる？"); + u8 string1[] = DTR("メール{STR_VAR_1}を だれに もたせる？", "Give MAIL {STR_VAR_1} to who?"); u8 string2[] = _("000 {STR_VAR_1}"); ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_0x8005, 1, 1); @@ -876,8 +876,10 @@ u8 debug_sub_810CEA4(void) u8 debug_sub_810CED0(void) { - u8 text[] = _("せいきの データが とうろくずみ です\n" - "しんき とうろく できません"); + u8 text[] = DTR("せいきの データが とうろくずみ です\n" + "しんき とうろく できません", + "Normal data is registered.\n" + "Cannot register new data."); s8 input = Menu_ProcessInput(); switch (input) @@ -911,8 +913,10 @@ u8 debug_sub_810CED0(void) u8 debug_sub_810CFA4(void) { - u8 text[] = _("せいきに とうろくされたメールデータは\n" - "へんこう できません"); + u8 text[] = DTR("せいきに とうろくされたメールデータは\n" + "へんこう できません", + "Regularly, registered MAIL data\n" + "cannot be changed."); s8 input = Menu_ProcessInput(); switch (input) @@ -943,9 +947,11 @@ u8 debug_sub_810CFA4(void) u8 debug_sub_810D030(void) { - const u8 text1[] = _("メール{STR_VAR_1} とうろく かいじょ"); - const u8 text2[] = _("デバッグメニューから とうろくした\n" - "メール いがいは けせません"); + const u8 text1[] = DTR("メール{STR_VAR_1} とうろく かいじょ", "UNREGISTER MAIL{STR_VAR_1}"); + const u8 text2[] = DTR("デバッグメニューから とうろくした\n" + "メール いがいは けせません", + "You cannot delete REGISTERED MAIL\n" + "from the DEBUG MENU"); s8 input = Menu_ProcessInput(); switch (input) @@ -990,7 +996,7 @@ u8 debug_sub_810D030(void) void debug_sub_810D174(u8 a) { - u8 string[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); + u8 string[] = DTR("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}", "MAIL{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); u8 buffer[9][20]; struct MenuAction menuActions[9]; u8 i; diff --git a/src/main.c b/src/main.c index d7ef91df0..972c8486f 100644 --- a/src/main.c +++ b/src/main.c @@ -2,13 +2,13 @@ #include "gba/flash_internal.h" #include "gba/m4a_internal.h" #include "main.h" +#include "battle_controllers.h" #include "intro.h" #include "link.h" #include "load_save.h" #include "m4a.h" #include "play_time.h" #include "random.h" -#include "rom3.h" #include "overworld.h" #include "rtc.h" #include "siirtc.h" @@ -34,10 +34,12 @@ const u8 gGameVersion = GAME_VERSION; const u8 gGameLanguage = GAME_LANGUAGE; -#if defined(ENGLISH) -const char BuildDateTime[] = "2002 10 15 20:34"; -#elif defined(GERMAN) +// The debug menu expects this exact format. With the English build string, it +// will overflow on the title debug menu, outputting '9999ィ'. +#if defined(GERMAN) || DEBUG const char BuildDateTime[] = "$Name: debug-Euro-2003-05-09-A $"; +#elif defined(ENGLISH) +const char BuildDateTime[] = "2002 10 15 20:34"; #endif const IntrFunc gIntrTableTemplate[] = diff --git a/src/mauville_man.c b/src/mauville_man.c index 7eab67823..64c41f3bf 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -806,7 +806,7 @@ static void Task_BardSong(u8 taskId) void sub_80F83D0(void) { - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD + GetCurrentMauvilleOldMan()); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD + GetCurrentMauvilleOldMan()); } struct Story diff --git a/src/menu.c b/src/menu.c index d50fb4f22..5bb5f96d1 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "menu.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu_cursor.h" #include "script.h" #include "constants/songs.h" @@ -54,7 +54,7 @@ void CloseMenu(void) { PlaySE(SE_SELECT); Menu_EraseScreen(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); Menu_DestroyCursor(); } diff --git a/src/naming_screen.c b/src/naming_screen.c index 1f904be1b..bfd9cd54f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1302,7 +1302,7 @@ static void sub_80B6E68(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, namingScreenDataPtr->speciesOrPlayerGender); - spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); + spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index 19fe5f377..67bf498c5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -97,7 +97,7 @@ EWRAM_DATA struct WarpData gFixedHoleWarp = {0}; EWRAM_DATA struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0}; EWRAM_DATA static u16 sAmbientCrySpecies = 0; EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE; -EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0}; +EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {0}; static u8 gUnknown_03000580[4]; static u16 (*gUnknown_03000584)(u32); @@ -113,8 +113,8 @@ static void InitOverworldGraphicsRegisters(void); static void ChooseAmbientCrySpecies(void); static void SetFieldVBlankCallback(void); static void VBlankCB_Field(void); -static void SpawnLinkPlayerEventObject(u8, s16, s16, u8); -static void InitLinkPlayerEventObjectPos(struct EventObject *, s16, s16); +static void SpawnLinkPlayerObjectEvent(u8, s16, s16, u8); +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *, s16, s16); static u8 GetLinkPlayerIdAt(s16, s16); static u8 npc_something3(u8, u8); static u8 LinkPlayerDetectCollision(u8, u8, s16, s16); @@ -166,22 +166,22 @@ static const struct ScanlineEffectParams sFlashEffectParams = 0, }; -static u8 sub_8055C68(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055C88(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055C8C(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_8055C68(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055C88(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055C8C(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gUnknown_082166A0[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gUnknown_082166A0[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { sub_8055C68, sub_8055C88, sub_8055C8C, }; -static u8 sub_8055CAC(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055CB0(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055D18(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_8055CAC(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055CB0(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055D18(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gUnknown_082166AC[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gUnknown_082166AC[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { sub_8055CAC, sub_8055CB0, @@ -196,10 +196,10 @@ static u8 (*const gUnknown_082166AC[])(struct LinkPlayerEventObject *, struct Ev sub_8055D18, }; -static void sub_8055D30(struct LinkPlayerEventObject *, struct EventObject *); -static void sub_8055D38(struct LinkPlayerEventObject *, struct EventObject *); +static void sub_8055D30(struct LinkPlayerObjectEvent *, struct ObjectEvent *); +static void sub_8055D38(struct LinkPlayerObjectEvent *, struct ObjectEvent *); -static void (*const gUnknown_082166D8[])(struct LinkPlayerEventObject *, struct EventObject *) = +static void (*const gUnknown_082166D8[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) = { sub_8055D30, sub_8055D38, @@ -299,51 +299,51 @@ void SetGameStat(u8 stat, u32 value) gSaveBlock1.gameStats[stat] = value; } -void LoadEventObjTemplatesFromHeader(void) +void LoadObjEventTemplatesFromHeader(void) { - // Clear event object templates - CpuFill32(0, gSaveBlock1.eventObjectTemplates, sizeof(gSaveBlock1.eventObjectTemplates)); + // Clear object event templates + CpuFill32(0, gSaveBlock1.objectEventTemplates, sizeof(gSaveBlock1.objectEventTemplates)); // Copy map header events to save block - CpuCopy32(gMapHeader.events->eventObjects, - gSaveBlock1.eventObjectTemplates, - gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); + CpuCopy32(gMapHeader.events->objectEvents, + gSaveBlock1.objectEventTemplates, + gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate)); } -static void LoadSaveblockEventObjScripts(void) +static void LoadSaveblockObjEventScripts(void) { - struct EventObjectTemplate *eventObjectTemplates = gSaveBlock1.eventObjectTemplates; + struct ObjectEventTemplate *objectEventTemplates = gSaveBlock1.objectEventTemplates; s32 i; for (i = 0; i < 64; i++) - eventObjectTemplates[i].script = gMapHeader.events->eventObjects[i].script; + objectEventTemplates[i].script = gMapHeader.events->objectEvents[i].script; } -void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) +void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; for (i = 0; i < 64; i++) { - struct EventObjectTemplate *eventObjectTemplate = &gSaveBlock1.eventObjectTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &gSaveBlock1.objectEventTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->x = x; - eventObjectTemplate->y = y; + objectEventTemplate->x = x; + objectEventTemplate->y = y; return; } } } -void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) +void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType) { s32 i; for (i = 0; i < 64; i++) { - struct EventObjectTemplate *eventObjectTemplate = &gSaveBlock1.eventObjectTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &gSaveBlock1.objectEventTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; return; } } @@ -610,7 +610,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) sub_8053F0C(); ApplyCurrentWarp(); LoadCurrentMapData(); - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); RestartWildEncounterImmunitySteps(); @@ -643,7 +643,7 @@ void sub_8053994(u32 a1) bool8 v3; LoadCurrentMapData(); - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType); v3 = Overworld_MapTypeIsIndoors(gMapHeader.mapType); ClearTempFieldEventData(); @@ -1441,7 +1441,7 @@ void sub_80546B8(void) CB2_ReturnToField(); } -void c2_exit_to_overworld_1_continue_scripts_restart_music(void) +void CB2_ReturnToFieldContinueScriptPlayMapMusic(void) { FieldClearVBlankHBlankCallbacks(); gFieldCallback = sub_8080990; @@ -1472,8 +1472,8 @@ void CB2_ContinueSavedGame(void) #endif ResetSafariZoneFlag_(); LoadSaveblockMapHeader(); - LoadSaveblockEventObjScripts(); - UnfreezeEventObjects(); + LoadSaveblockObjEventScripts(); + UnfreezeObjectEvents(); DoTimeBasedEvents(); sub_805308C(); sub_8055FC0(); @@ -1822,7 +1822,7 @@ void sub_8054D4C(u32 a1) ScanlineEffect_Clear(); ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); - InitEventObjectPalettes(0); + InitObjectEventPalettes(0); FieldEffectActiveListClear(); InitFieldMessageBox(); StartWeather(); @@ -1836,8 +1836,8 @@ void sub_8054D90(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); - TrySpawnEventObjects(0, 0); + ResetObjectEvents(); + TrySpawnObjectEvents(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -1847,13 +1847,13 @@ void mli4_mapscripts_and_other(void) struct InitialPlayerAvatarState *initialPlayerAvatarState; gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); + ResetObjectEvents(); sav1_camera_get_focus_coords(&x, &y); initialPlayerAvatarState = GetInitialPlayerAvatarState(); InitPlayerAvatar(x, y, initialPlayerAvatarState->direction, gSaveBlock2.playerGender); SetPlayerAvatarTransitionFlags(initialPlayerAvatarState->transitionFlags); ResetInitialPlayerAvatarState(); - TrySpawnEventObjects(0, 0); + TrySpawnObjectEvents(0, 0); ResetBerryTreeSparkleFlags(); mapheader_run_first_tag4_script_list_match(); } @@ -1866,7 +1866,7 @@ void sub_8054E20(void) void sub_8054E34(void) { - gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; + gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -1897,7 +1897,7 @@ void sub_8054EC8(void) for (i = 0; i < gFieldLinkPlayerCount; i++) { - SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender); + SpawnLinkPlayerObjectEvent(i, i + x, y, gLinkPlayers[i].gender); CreateLinkPlayerSprite(i); } @@ -2285,7 +2285,7 @@ void sub_80555B0(int linkPlayerId, int a2, struct UnkStruct_8054FF8 *a3) a3->a = linkPlayerId; a3->b = (linkPlayerId == a2) ? 1 : 0; - a3->c = gLinkPlayerEventObjects[linkPlayerId].mode; + a3->c = gLinkPlayerObjectEvents[linkPlayerId].mode; a3->d = sub_8055B30(linkPlayerId); sub_8055B08(linkPlayerId, &x, &y); a3->sub.x = x; @@ -2487,109 +2487,109 @@ bool32 sub_8055940(void) return TRUE; } -void ClearLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) +void ClearLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerObjEvent) { - memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); + memset(linkPlayerObjEvent, 0, sizeof(struct LinkPlayerObjectEvent)); } -void ClearLinkPlayerEventObjects(void) +void ClearLinkPlayerObjectEvents(void) { - memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); + memset(gLinkPlayerObjectEvents, 0, sizeof(gLinkPlayerObjectEvents)); } -static void ClearEventObject(struct EventObject *eventObj) +static void ClearObjectEvent(struct ObjectEvent *objEvent) { - memset(eventObj, 0, sizeof(struct EventObject)); + memset(objEvent, 0, sizeof(struct ObjectEvent)); } -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4) { - u8 eventObjId = GetFirstInactiveEventObjectId(); - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + u8 objEventId = GetFirstInactiveObjectEventId(); + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - ClearLinkPlayerEventObject(linkPlayerEventObj); - ClearEventObject(eventObj); + ClearLinkPlayerObjectEvent(linkPlayerObjEvent); + ClearObjectEvent(objEvent); - linkPlayerEventObj->active = 1; - linkPlayerEventObj->linkPlayerId = linkPlayerId; - linkPlayerEventObj->eventObjId = eventObjId; - linkPlayerEventObj->mode = 0; + linkPlayerObjEvent->active = 1; + linkPlayerObjEvent->linkPlayerId = linkPlayerId; + linkPlayerObjEvent->objEventId = objEventId; + linkPlayerObjEvent->mode = 0; - eventObj->active = 1; - eventObj->singleMovementActive = a4; - eventObj->range.as_byte = 2; - eventObj->spriteId = 64; + objEvent->active = 1; + objEvent->singleMovementActive = a4; + objEvent->range.as_byte = 2; + objEvent->spriteId = 64; - InitLinkPlayerEventObjectPos(eventObj, x, y); + InitLinkPlayerObjectEventPos(objEvent, x, y); } -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y) +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y) { - eventObj->currentCoords.x = x; - eventObj->currentCoords.y = y; - eventObj->previousCoords.x = x; - eventObj->previousCoords.y = y; - sub_80603CC(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - eventObj->initialCoords.x += 8; - EventObjectUpdateZCoord(eventObj); + objEvent->currentCoords.x = x; + objEvent->currentCoords.y = y; + objEvent->previousCoords.x = x; + objEvent->previousCoords.y = y; + sub_80603CC(x, y, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + objEvent->initialCoords.x += 8; + ObjectEventUpdateZCoord(objEvent); } void unref_sub_8055A6C(u8 linkPlayerId, u8 a2) { - if (gLinkPlayerEventObjects[linkPlayerId].active) + if (gLinkPlayerObjectEvents[linkPlayerId].active) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - eventObj->range.as_byte = a2; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + objEvent->range.as_byte = a2; } } void unref_sub_8055A9C(u8 linkPlayerId) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (eventObj->spriteId != 64 ) - DestroySprite(&gSprites[eventObj->spriteId]); - linkPlayerEventObj->active = 0; - eventObj->active = 0; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + if (objEvent->spriteId != 64 ) + DestroySprite(&gSprites[objEvent->spriteId]); + linkPlayerObjEvent->active = 0; + objEvent->active = 0; } u8 sub_8055AE8(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->spriteId; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->spriteId; } void sub_8055B08(u8 linkPlayerId, u16 *x, u16 *y) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - *x = eventObj->currentCoords.x; - *y = eventObj->currentCoords.y; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + *x = objEvent->currentCoords.x; + *y = objEvent->currentCoords.y; } u8 sub_8055B30(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->range.as_byte; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->range.as_byte; } u8 sub_8055B50(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->currentElevation; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->currentElevation; } s32 unref_sub_8055B74(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return 16 - (s8)eventObj->directionSequenceIndex; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return 16 - (s8)objEvent->directionSequenceIndex; } static u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -2597,11 +2597,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) u8 i; for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active - && (gLinkPlayerEventObjects[i].mode == 0 || gLinkPlayerEventObjects[i].mode == 2)) + if (gLinkPlayerObjectEvents[i].active + && (gLinkPlayerObjectEvents[i].mode == 0 || gLinkPlayerObjectEvents[i].mode == 2)) { - struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; - if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) + struct ObjectEvent *objEvent = &gObjectEvents[gLinkPlayerObjectEvents[i].objEventId]; + if (objEvent->currentCoords.x == x && objEvent->currentCoords.y == y) return i; } } @@ -2610,79 +2610,79 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) void sub_8055BFC(u8 linkPlayerId, u8 a2) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - if (linkPlayerEventObj->active) + if (linkPlayerObjEvent->active) { if (a2 > 10) - eventObj->triggerGroundEffectsOnMove = 1; + objEvent->triggerGroundEffectsOnMove = 1; else - gUnknown_082166D8[gUnknown_082166A0[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj); + gUnknown_082166D8[gUnknown_082166A0[linkPlayerObjEvent->mode](linkPlayerObjEvent, objEvent, a2)](linkPlayerObjEvent, objEvent); } } -static u8 sub_8055C68(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055C68(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gUnknown_082166AC[a3](linkPlayerEventObj, eventObj, a3); + return gUnknown_082166AC[a3](linkPlayerObjEvent, objEvent, a3); } -static u8 sub_8055C88(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055C88(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return 1; } -static u8 sub_8055C8C(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055C8C(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gUnknown_082166AC[a3](linkPlayerEventObj, eventObj, a3); + return gUnknown_082166AC[a3](linkPlayerObjEvent, objEvent, a3); } -static u8 sub_8055CAC(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055CAC(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return 0; } -static u8 sub_8055CB0(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055CB0(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { s16 x, y; - eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); - EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); + objEvent->range.as_byte = npc_something3(a3, objEvent->range.as_byte); + ObjectEventMoveDestCoords(objEvent, objEvent->range.as_byte, &x, &y); - if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) + if (LinkPlayerDetectCollision(linkPlayerObjEvent->objEventId, objEvent->range.as_byte, x, y)) { return 0; } else { - eventObj->directionSequenceIndex = 16; - ShiftEventObjectCoords(eventObj, x, y); - EventObjectUpdateZCoord(eventObj); + objEvent->directionSequenceIndex = 16; + ShiftObjectEventCoords(objEvent, x, y); + ObjectEventUpdateZCoord(objEvent); return 1; } } -static u8 sub_8055D18(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055D18(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); + objEvent->range.as_byte = npc_something3(a3, objEvent->range.as_byte); return 0; } -static void sub_8055D30(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void sub_8055D30(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - linkPlayerEventObj->mode = 0; + linkPlayerObjEvent->mode = 0; } -static void sub_8055D38(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void sub_8055D38(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - eventObj->directionSequenceIndex--; - linkPlayerEventObj->mode = 1; - MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - if (!eventObj->directionSequenceIndex) + objEvent->directionSequenceIndex--; + linkPlayerObjEvent->mode = 1; + MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + if (!objEvent->directionSequenceIndex) { - ShiftStillEventObjectCoords(eventObj); - linkPlayerEventObj->mode = 2; + ShiftStillObjectEventCoords(objEvent); + linkPlayerObjEvent->mode = 2; } } @@ -2706,15 +2706,15 @@ static u8 npc_something3(u8 a1, u8 a2) return a2; } -static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) +static u8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 a2, s16 x, s16 y) { u8 i; for (i = 0; i < 16; i++) { - if (i != selfEventObjId) + if (i != selfObjEventId) { - if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) - || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y)) + if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) + || (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y)) { return 1; } @@ -2725,36 +2725,36 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; struct Sprite *sprite; - if (linkPlayerEventObj->active) + if (linkPlayerObjEvent->active) { - u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive); - eventObj->spriteId = AddPseudoEventObject(val, SpriteCB_LinkPlayer, 0, 0, 0); - sprite = &gSprites[eventObj->spriteId]; + u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, objEvent->singleMovementActive); + objEvent->spriteId = AddPseudoObjectEvent(val, SpriteCB_LinkPlayer, 0, 0, 0); + sprite = &gSprites[objEvent->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - eventObj->triggerGroundEffectsOnMove = 0; + objEvent->triggerGroundEffectsOnMove = 0; } } static void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]]; - struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId]; - sprite->pos1.x = eventObj->initialCoords.x; - sprite->pos1.y = eventObj->initialCoords.y; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); - if (!linkPlayerEventObj->mode) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[sprite->data[0]]; + struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerObjEvent->objEventId]; + sprite->pos1.x = objEvent->initialCoords.x; + sprite->pos1.y = objEvent->initialCoords.y; + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); + if (!linkPlayerObjEvent->mode) + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); - UpdateEventObjectSpriteVisibility(sprite, 0); - if (eventObj->triggerGroundEffectsOnMove) + StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte)); + UpdateObjectEventSpriteVisibility(sprite, 0); + if (objEvent->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c index 2542e42c3..d59e8d77c 100644 --- a/src/pokemon_item_effect.c +++ b/src/pokemon_item_effect.c @@ -367,7 +367,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo SetMonData(pkmn, MON_DATA_PP1 + r5, &data); if (gMain.inBattle && sp34 != 4 && !(gBattleMons[sp34].status2 & 0x200000) - && !(gDisableStructs[sp34].unk18_b & gBitTable[r5])) + && !(gDisableStructs[sp34].mimickedMoves & gBitTable[r5])) gBattleMons[sp34].pp[r5] = data; retVal = FALSE; } @@ -392,7 +392,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo SetMonData(pkmn, MON_DATA_PP1 + moveIndex, &data); if (gMain.inBattle && sp34 != 4 && !(gBattleMons[sp34].status2 & 0x200000) - && !(gDisableStructs[sp34].unk18_b & gBitTable[moveIndex])) + && !(gDisableStructs[sp34].mimickedMoves & gBitTable[moveIndex])) gBattleMons[sp34].pp[moveIndex] = data; retVal = FALSE; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index e970cc3bc..ef8360681 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -4772,15 +4772,15 @@ void sub_80A1C30(u8 a) u8 GetPrimaryStatus(u32 status) { - if (status & (STATUS_POISON | STATUS_TOXIC_POISON)) + if (status & (STATUS1_POISON | STATUS1_TOXIC_POISON)) return STATUS_PRIMARY_POISON; - if (status & STATUS_PARALYSIS) + if (status & STATUS1_PARALYSIS) return STATUS_PRIMARY_PARALYSIS; - if (status & STATUS_SLEEP) + if (status & STATUS1_SLEEP) return STATUS_PRIMARY_SLEEP; - if (status & STATUS_FREEZE) + if (status & STATUS1_FREEZE) return STATUS_PRIMARY_FREEZE; - if (status & STATUS_BURN) + if (status & STATUS1_BURN) return STATUS_PRIMARY_BURN; return STATUS_PRIMARY_NONE; diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 7bccddde5..c87a5ed72 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -635,10 +635,10 @@ void debug_sub_806F9B8(void) ScriptContext2_Enable(); } -static const u8 sDebugText_Days[] = _("にっすう"); // "days" -static const u8 sDebugText_Time[] = _("じかん"); // "time" -static const u8 sDebugText_GameTime[] = _("ゲームない じかん"); // "game time" -static const u8 sDebugText_RTCTime[] = _("RTC じかん"); // "RTC time" +static const u8 sDebugText_Days[] = DTR("にっすう", "days"); +static const u8 sDebugText_Time[] = DTR("じかん", "time"); +static const u8 sDebugText_GameTime[] = DTR("ゲームない じかん", "game time"); +static const u8 sDebugText_RTCTime[] = DTR("RTC じかん", "RTC time"); void debug_sub_806F9E4(u8 taskId) { diff --git a/src/rom6.c b/src/rom6.c index f28216529..af823ae9c 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -11,7 +11,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/map_types.h" @@ -36,18 +36,18 @@ static void sub_810B634(void); bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) { - u8 eventObjId; + u8 objEventId; GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gEventObjects[eventObjId].graphicsId != graphicsId) + objEventId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[objEventId].graphicsId != graphicsId) { return FALSE; } else { - gSpecialVar_LastTalked = gEventObjects[eventObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[objEventId].localId; return TRUE; } } @@ -60,13 +60,13 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { - u8 eventObjId; + u8 objEventId; ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; - eventObjId = gPlayerAvatar.eventObjectId; - if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId]) - || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + objEventId = gPlayerAvatar.objectEventId; + if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -76,7 +76,7 @@ static void task08_080C9820(u8 taskId) else { sub_8059BF4(); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); gTasks[taskId].func = sub_810B3DC; } } @@ -84,7 +84,7 @@ static void task08_080C9820(u8 taskId) static void sub_810B3DC(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_810B428; @@ -104,7 +104,7 @@ static void sub_810B428(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_810B4CC; @@ -123,7 +123,7 @@ static void sub_810B4CC(u8 taskId) #if DEBUG void debug_sub_8120968(void) { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE) { gLastFieldPokeMenuOpened = 0; sub_810B53C(); @@ -137,7 +137,7 @@ void debug_sub_8120968(void) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_810B53C; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index e7c49144e..036209fbf 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -62,7 +62,7 @@ extern u8 gBattleMonSprites[NUM_BATTLE_SLOTS]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern s16 gBattleAnimArgs[8]; -extern u8 gBanksBySide[NUM_BATTLE_SLOTS]; +extern u8 gBattlerPositions[NUM_BATTLE_SLOTS]; extern u8 gBattlersCount; // gNumBattleMons? extern struct OamMatrix gOamMatrices[]; extern struct Struct_2017810 unk_2017810[]; @@ -815,12 +815,12 @@ void InitAnimSpritePos(struct Sprite *sprite, u8 a2) u8 GetBattlerSide(u8 slot) { - return gBanksBySide[slot] & 1; + return gBattlerPositions[slot] & 1; } u8 GetBattlerPosition(u8 slot) { - return gBanksBySide[slot]; + return gBattlerPositions[slot]; } u8 GetBattlerAtPosition(u8 slot) @@ -829,7 +829,7 @@ u8 GetBattlerAtPosition(u8 slot) for (i = 0; i < gBattlersCount; i++) { - if (gBanksBySide[i] == slot) + if (gBattlerPositions[i] == slot) break; } return i; @@ -847,7 +847,7 @@ bool8 IsBankSpritePresent(u8 slot) } else { - if (gBanksBySide[slot] == 0xff) + if (gBattlerPositions[slot] == 0xff) return FALSE; if (GetBattlerSide(slot) != B_SIDE_PLAYER) { diff --git a/src/safari_zone.c b/src/safari_zone.c index 7aa05c7dc..8e5f3c692 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -110,7 +110,7 @@ void sub_80C824C(void) { ScriptContext1_SetupScript(&gUnknown_081C3459); ScriptContext1_Stop(); - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } } diff --git a/src/scrcmd.c b/src/scrcmd.c index 6084cfc5d..ec3d2c1bc 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -22,7 +22,7 @@ #include "fieldmap.h" #include "item.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "money.h" #include "mystery_event_script.h" @@ -1013,7 +1013,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); return FALSE; } @@ -1023,7 +1023,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup); + RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup); return FALSE; } @@ -1061,7 +1061,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetEventObjTemplateCoords(localId, x, y); + Overworld_SetObjEventTemplateCoords(localId, x, y); return FALSE; } @@ -1069,7 +1069,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - TryOverrideTemplateCoordsForEventObject(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); return FALSE; } @@ -1116,9 +1116,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], GetPlayerFacingDirection()); } return FALSE; @@ -1129,7 +1129,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction); + ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction); return FALSE; } @@ -1138,7 +1138,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 movementType = ScriptReadByte(ctx); - Overworld_SetEventObjTemplateMovementType(localId, movementType); + Overworld_SetObjEventTemplateMovementType(localId, movementType); return FALSE; } @@ -1157,10 +1157,10 @@ bool8 ScrCmd_createvobject(struct ScriptContext *ctx) bool8 ScrCmd_turnvobject(struct ScriptContext *ctx) { - u8 eventObjectId = ScriptReadByte(ctx); + u8 objectEventId = ScriptReadByte(ctx); u8 direction = ScriptReadByte(ctx); - TurnEventObject(eventObjectId, direction); + TurnObjectEvent(objectEventId, direction); return FALSE; } @@ -1172,7 +1172,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_8064CFC); return TRUE; } @@ -1186,14 +1186,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - LockSelectedEventObject(); + LockSelectedObjectEvent(); SetupNativeScript(ctx, sub_8064DB4); } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_8064CFC); } return TRUE; @@ -1205,10 +1205,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 objectId; HideFieldMessageBox(); - objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); + objectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); return FALSE; } @@ -1217,12 +1217,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 objectId; HideFieldMessageBox(); - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + objectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); return FALSE; } @@ -1782,7 +1782,7 @@ bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx) { u8 v2 = VarGet(ScriptReadHalfword(ctx)); - PlaySlotMachine(v2, c2_exit_to_overworld_1_continue_scripts_restart_music); + PlaySlotMachine(v2, CB2_ReturnToFieldContinueScriptPlayMapMusic); ScriptContext1_Stop(); return TRUE; } diff --git a/src/script_movement.c b/src/script_movement.c index fec3da88e..72e23e938 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -18,25 +18,25 @@ static void sub_80A2490(u8, u8, u8, const u8 *); bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; if (!FuncIsActiveTask(Task_80A244C)) sub_80A2198(50); - return sub_80A21F4(sub_80A21E0(), eventObjId, movementScript); + return sub_80A21F4(sub_80A21E0(), objEventId, movementScript); } bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank) { - u8 eventObjId; + u8 objEventId; u8 r4; u8 r1; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapBank, &objEventId)) return TRUE; r4 = sub_80A21E0(); - r1 = sub_80A2260(r4, eventObjId); + r1 = sub_80A2260(r4, objEventId); if (r1 == 16) return TRUE; return sub_80A2370(r4, r1); @@ -69,11 +69,11 @@ static u8 sub_80A21E0(void) return FindTaskIdByFunc(Task_80A244C); } -static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript) +static bool8 sub_80A21F4(u8 taskId, u8 objEventId, const u8 *movementScript) { u8 r4; - r4 = sub_80A2260(taskId, eventObjId); + r4 = sub_80A2260(taskId, objEventId); if (r4 != 16) { if (sub_80A2370(taskId, r4) == 0) @@ -82,7 +82,7 @@ static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript) } else { - sub_80A23C8(taskId, r4, eventObjId, movementScript); + sub_80A23C8(taskId, r4, objEventId, movementScript); return FALSE; } } @@ -93,7 +93,7 @@ static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript) } else { - sub_80A23C8(taskId, r4, eventObjId, movementScript); + sub_80A23C8(taskId, r4, objEventId, movementScript); return FALSE; } } @@ -169,23 +169,23 @@ static const u8 *sub_80A23B8(u8 a) return gUnknown_020384F8[a]; } -static void sub_80A23C8(u8 taskId, u8 b, u8 eventObjId, const u8 *movementScript) +static void sub_80A23C8(u8 taskId, u8 b, u8 objEventId, const u8 *movementScript) { sub_80A2318(taskId, b); npc_obj_offscreen_culling_and_flag_update(b, movementScript); - sub_80A22D0(taskId, b, eventObjId); + sub_80A22D0(taskId, b, objEventId); } static void UnfreezeObjects(u8 taskId) { - u8 *pEventObjId; + u8 *pObjEventId; u8 i; - pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < 16; i++, pEventObjId++) + pObjEventId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < 16; i++, pObjEventId++) { - if (*pEventObjId != 0xFF) - UnfreezeEventObject(&gEventObjects[*pEventObjId]); + if (*pObjEventId != 0xFF) + UnfreezeObjectEvent(&gObjectEvents[*pObjEventId]); } } @@ -202,23 +202,23 @@ static void Task_80A244C(u8 taskId) } } -static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d) +static void sub_80A2490(u8 taskId, u8 b, u8 objEventId, const u8 *d) { u8 var; - if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) - && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId]) + && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) return; var = *d; if (var == 0xFE) { sub_80A2348(taskId, b); - FreezeEventObject(&gEventObjects[eventObjId]); + FreezeObjectEvent(&gObjectEvents[objEventId]); } else { - if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], var)) + if (!ObjectEventSetHeldMovement(&gObjectEvents[objEventId], var)) { d++; npc_obj_offscreen_culling_and_flag_update(b, d); diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index f6cb8ae0a..ce6c01439 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -214,7 +214,7 @@ void sub_80C4D80(void) void ShowContestWinnerCleanup(void) { - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void ShowContestWinner(void) @@ -521,7 +521,7 @@ void sub_80C5580(void) break; } - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void ChooseBattleTowerPlayerParty(void) @@ -546,7 +546,7 @@ void SetBattleTowerPlayerParty(void) break; } - SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } void ReducePlayerPartyToThree(void) diff --git a/src/secret_base.c b/src/secret_base.c index 0892016d9..097d95cfe 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -29,7 +29,7 @@ #include "strings.h" #include "task.h" #include "text.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/decorations.h" #include "constants/items.h" #include "constants/map_types.h" @@ -387,7 +387,7 @@ bool8 sub_80BBB24(void) void sub_80BBB50(u8 taskid) { - EventObjectTurn(&(gEventObjects[gPlayerAvatar.eventObjectId]), 2); + ObjectEventTurn(&(gObjectEvents[gPlayerAvatar.objectEventId]), 2); if (IsWeatherNotFadingIn() == 1) { EnableBothScriptContexts(); @@ -500,25 +500,25 @@ void sub_80BBDD0(void) permission = gDecorations[roomdecor[decidx]].permission; if (permission == DECORPERM_SOLID_MAT) { - for (objid = 0; objid < gMapHeader.events->eventObjectCount; objid++) + for (objid = 0; objid < gMapHeader.events->objectEventCount; objid++) { - if (gMapHeader.events->eventObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE) + if (gMapHeader.events->objectEvents[objid].flagId == gSpecialVar_0x8004 + 0xAE) break; } - if (objid != gMapHeader.events->eventObjectCount) + if (objid != gMapHeader.events->objectEventCount) { gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4; gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF; metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->objectEvents[objid].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->eventObjects[objid].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[objid].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); show_sprite(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); sub_805C0F8(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideTemplateCoordsForEventObject(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); gSpecialVar_0x8004 ++; } } diff --git a/src/shop.c b/src/shop.c index e2b796a75..3e399f0da 100644 --- a/src/shop.c +++ b/src/shop.c @@ -447,25 +447,25 @@ static void Shop_LoadViewportObjects(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); playerHeight = PlayerGetZCoord(); for (y = 0; y < 16; y++) - gMartViewportObjects[y][EVENT_OBJ_ID] = 16; + gMartViewportObjects[y][OBJ_EVENT_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) { - u8 eventObjId = GetEventObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight); + u8 objEventId = GetObjectEventIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight); - if (eventObjId != 16) + if (objEventId != 16) { - gMartViewportObjects[r8][EVENT_OBJ_ID] = eventObjId; + gMartViewportObjects[r8][OBJ_EVENT_ID] = objEventId; gMartViewportObjects[r8][X_COORD] = x; gMartViewportObjects[r8][Y_COORD] = y; - if (gEventObjects[eventObjId].facingDirection == DIR_SOUTH) + if (gObjectEvents[objEventId].facingDirection == DIR_SOUTH) gMartViewportObjects[r8][ANIM_NUM] = 0; - if (gEventObjects[eventObjId].facingDirection == DIR_NORTH) + if (gObjectEvents[objEventId].facingDirection == DIR_NORTH) gMartViewportObjects[r8][ANIM_NUM] = 1; - if (gEventObjects[eventObjId].facingDirection == DIR_WEST) + if (gObjectEvents[objEventId].facingDirection == DIR_WEST) gMartViewportObjects[r8][ANIM_NUM] = 2; - if (gEventObjects[eventObjId].facingDirection == DIR_EAST) + if (gObjectEvents[objEventId].facingDirection == DIR_EAST) gMartViewportObjects[r8][ANIM_NUM] = 3; r8++; } @@ -479,11 +479,11 @@ static void Shop_AnimViewportObjects(void) for (i = 0; i < 16; i++) // max objects? { - if (gMartViewportObjects[i][EVENT_OBJ_ID] == 16) + if (gMartViewportObjects[i][OBJ_EVENT_ID] == 16) continue; - StartSpriteAnim(&gSprites[AddPseudoEventObject( - gEventObjects[gMartViewportObjects[i][EVENT_OBJ_ID]].graphicsId, + StartSpriteAnim(&gSprites[AddPseudoObjectEvent( + gObjectEvents[gMartViewportObjects[i][OBJ_EVENT_ID]].graphicsId, SpriteCallbackDummy, (u16)gMartViewportObjects[i][X_COORD] * 16 + 8, (u16)gMartViewportObjects[i][Y_COORD] * 16 + 32, diff --git a/src/slot_machine.c b/src/slot_machine.c index 3de87e0f7..c03ae0dfa 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -5616,29 +5616,30 @@ static void debug_sub_811B2E8(void) Menu_PrintText(text, 6, 1); } -static const u8 Str_841B1C4[] = _("SETTEI"); -static const u8 Str_841B1CB[] = _("MAWASITA"); -static const u8 Str_841B1D4[] = _("MODOSI"); -static const u8 Str_841B1DB[] = _("NOMARE"); -static const u8 Str_841B1E2[] = _("MAE 7"); -static const u8 Str_841B1E8[] = _("LR HENKOU"); -static const u8 Str_841B1F3[] = _("START JIDOUSU"); -static const u8 Str_841B202[] = _("SELECT SETTEI"); -static const u8 Str_841B211[] = _("TYUHSEN"); +static const u8 Str_841B1C4[] = DTR("SETTEI", "SET"); +static const u8 Str_841B1CB[] = DTR("MAWASITA", "TURNED"); +static const u8 Str_841B1D4[] = DTR("MODOSI", "RETURN"); +static const u8 Str_841B1DB[] = DTR("NOMARE", "CONSUMED"); +static const u8 Str_841B1E2[] = DTR("MAE 7", "BEFORE 7"); +static const u8 Str_841B1E8[] = DTR("LR HENKOU", "LR: CHANGE"); +static const u8 Str_841B1F3[] = DTR("START JIDOUSU", "START: AUTO"); +static const u8 Str_841B202[] = DTR("SELECT SETTEI", "SELECT: FORCE"); +// Irregular Romaji: 抽選 (ちゅうせん/chuusen) +static const u8 Str_841B211[] = DTR("TYUHSEN", "DRAWINGS"); static const u8 Str_841B219[] = _("CHERRY"); static const u8 Str_841B220[] = _("REPLAY"); -static const u8 Str_841B227[] = _("HASUBO"); -static const u8 Str_841B22E[] = _("RURIRI"); -static const u8 Str_841B235[] = _("INAZU"); +static const u8 Str_841B227[] = DTR("HASUBO", "LOTAD"); +static const u8 Str_841B22E[] = DTR("RURIRI", "AZURILL"); +static const u8 Str_841B235[] = DTR("INAZU", "LIGHTNING"); static const u8 Str_841B23B[] = _("REG"); static const u8 Str_841B23F[] = _("BIG"); -static const u8 Str_841B243[] = _("BD"); +static const u8 Str_841B243[] = DTR("BD", "REEL TIME"); static const u8 Str_841B246[] = _("R7"); static const u8 Str_841B249[] = _("B7"); -static const u8 Str_841B24C[] = _("A COIN"); -static const u8 Str_841B254[] = _("TYUHSEN"); -static const u8 Str_841B25C[] = _("UD 100"); -static const u8 Str_841B264[] = _("LR 1000"); +static const u8 Str_841B24C[] = DTR("A COIN", "A: COIN"); +static const u8 Str_841B254[] = DTR("TYUHSEN", "DRAWINGS"); +static const u8 Str_841B25C[] = _("UD 100"); +static const u8 Str_841B264[] = _("LR 1000"); static const u8 Str_841B26D[] = _("×"); void debug_sub_811B310(void) @@ -5675,15 +5676,21 @@ void debug_sub_811B310(void) PRINT_NUMBER(eSlotMachine->unk68, 10, 3); PRINT_NUMBER(eSlotMachine->unk6C, 10, 5); PRINT_NUMBER(eSlotMachine->unk10, 10, 7); - PRINT_NUMBER(eSlotMachine->unk70, 20, 3); - PRINT_NUMBER(eSlotMachine->unk74, 20, 5); - PRINT_NUMBER(eSlotMachine->unk78, 20, 7); - PRINT_NUMBER(eSlotMachine->unk7C, 20, 9); - PRINT_NUMBER(eSlotMachine->unk80, 20, 11); - PRINT_NUMBER(eSlotMachine->unk84, 20, 13); - PRINT_NUMBER(eSlotMachine->unk88, 20, 15); - PRINT_NUMBER(eSlotMachine->unk8C, 20, 17); +#if DEBUG_TRANSLATE +#define OFFSET 24 // wider window +#else +#define OFFSET 20 +#endif + PRINT_NUMBER(eSlotMachine->unk70, OFFSET, 3); + PRINT_NUMBER(eSlotMachine->unk74, OFFSET, 5); + PRINT_NUMBER(eSlotMachine->unk78, OFFSET, 7); + PRINT_NUMBER(eSlotMachine->unk7C, OFFSET, 9); + PRINT_NUMBER(eSlotMachine->unk80, OFFSET, 11); + PRINT_NUMBER(eSlotMachine->unk84, OFFSET, 13); + PRINT_NUMBER(eSlotMachine->unk88, OFFSET, 15); + PRINT_NUMBER(eSlotMachine->unk8C, OFFSET, 17); +#undef OFFSET #undef PRINT_NUMBER if (unk_debug_bss_1_0 != 0) @@ -5778,7 +5785,12 @@ static void debug_sub_811B654(u8 taskId) switch (task->data[0]) { case 0: +#if DEBUG_TRANSLATE + Menu_DrawStdWindowFrame(0, 0, 28, 19); // wider window +#else Menu_DrawStdWindowFrame(0, 0, 24, 19); +#endif + debug_sub_811B310(); task->data[0]++; break; @@ -5882,10 +5894,10 @@ static void debug_sub_811B654(u8 taskId) } } -static const u8 Str_841B2B0[] = _("·カウントエラーがおきました"); -static const u8 Str_841B2BF[] = _("·リールそうさで エラーが おきました"); -static const u8 Str_841B2D3[] = _("·フラグオフエラーが おきました"); -static const u8 Str_841B2E4[] = _("·ボーナスこやくの エラーが おきました"); +static const u8 Str_841B2B0[] = DTR("·カウントエラーがおきました", "Count error occured."); +static const u8 Str_841B2BF[] = DTR("·リールそうさで エラーが おきました", "Reel processing error occurred."); +static const u8 Str_841B2D3[] = DTR("·フラグオフエラーが おきました", "FLAG OFF error occurred."); +static const u8 Str_841B2E4[] = DTR("·ボーナスこやくの エラーが おきました", "BONUS use error occurred."); // TRN static void debug_sub_811B894(void) { diff --git a/src/start_menu.c b/src/start_menu.c index 2024ba89a..747f13b3a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -9,7 +9,7 @@ #include "load_save.h" #include "m4a.h" #include "main.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "menu.h" #include "new_game.h" #include "option_menu.h" @@ -405,7 +405,7 @@ void sub_8071310(void) { if (!is_c1_link_related_active()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_80594C0(); sub_80597F4(); } @@ -588,7 +588,7 @@ static u8 SaveCallback2(void) case SAVE_SUCCESS: case SAVE_ERROR: Menu_EraseScreen(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); return TRUE; } diff --git a/src/trainer_card.c b/src/trainer_card.c index b34517def..b6eb28005 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -49,7 +49,7 @@ struct Struct2000000 /*0x9C*/ u8 language; // 0x9C }; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0}; @@ -87,7 +87,7 @@ const struct TrainerCard sTestTrainerCard = .pokemonTrades = 0xFFFF, .money = 99999, .var_28 = {1, 2, 3, 4}, - .playerName = _("てすと"), // "test" + .playerName = DTR("てすと", "TEST"), }; #endif @@ -225,7 +225,7 @@ void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2) #endif TrainerCard_InitScreenForLinkPlayer(playerIndex, arg2); SetMainCallback2(sub_8093174); - ewram0_2.language = gLinkPlayers[gLinkPlayerEventObjects[playerIndex].linkPlayerId].language; + ewram0_2.language = gLinkPlayers[gLinkPlayerObjectEvents[playerIndex].linkPlayerId].language; } #if DEBUG diff --git a/src/trainer_see.c b/src/trainer_see.c index edb178c4e..5fc0a346d 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -8,27 +8,27 @@ #include "sprite.h" #include "task.h" #include "util.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" static bool8 CheckTrainer(u8); static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3); static void objc_exclamation_mark_probably(struct Sprite *sprite); -static bool8 TrainerCanApproachPlayer(struct EventObject *); -static void sub_80842C8(struct EventObject *, u8); -static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); +static bool8 TrainerCanApproachPlayer(struct ObjectEvent *); +static void sub_80842C8(struct ObjectEvent *, u8); +static bool8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction); static void RunTrainerSeeFuncList(u8 taskId); const u8 gSpriteImage_839B308[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/0.4bpp"); const u8 gSpriteImage_839B388[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/1.4bpp"); const u8 gSpriteImage_839B408[] = INCBIN_U8("graphics/unknown_sprites/839B408.4bpp"); -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); -static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *, s16, s16, s16) = +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *, s16, s16, s16) = { GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceNorth, @@ -38,21 +38,21 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *, s16 bool8 CheckTrainers(void) { - u8 eventObjId; + u8 objEventId; - for (eventObjId = 0; eventObjId < 16; eventObjId++) + for (objEventId = 0; objEventId < 16; objEventId++) { - if (gEventObjects[eventObjId].active - && (gEventObjects[eventObjId].trainerType == 1 || gEventObjects[eventObjId].trainerType == 3) - && CheckTrainer(eventObjId)) + if (gObjectEvents[objEventId].active + && (gObjectEvents[objEventId].trainerType == 1 || gObjectEvents[objEventId].trainerType == 3) + && CheckTrainer(objEventId)) return TRUE; } return FALSE; } -static bool8 CheckTrainer(u8 eventObjId) +static bool8 CheckTrainer(u8 objEventId) { - const u8 *scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjId); + const u8 *scriptPtr = GetObjectEventScriptPointerByObjectEventId(objEventId); if (GetTrainerFlagFromScriptPointer(scriptPtr)) { @@ -60,12 +60,12 @@ static bool8 CheckTrainer(u8 eventObjId) } else { - struct EventObject *trainerObj = &gEventObjects[eventObjId]; + struct ObjectEvent *trainerObj = &gObjectEvents[objEventId]; bool8 canApproach = TrainerCanApproachPlayer(trainerObj); if (canApproach) { - TrainerWantsBattle(eventObjId, scriptPtr); + TrainerWantsBattle(objEventId, scriptPtr); sub_80842C8(trainerObj, (canApproach - 1)); return TRUE; } @@ -76,7 +76,7 @@ static bool8 CheckTrainer(u8 eventObjId) } } -static bool8 TrainerCanApproachPlayer(struct EventObject *trainerObj) +static bool8 TrainerCanApproachPlayer(struct ObjectEvent *trainerObj) { s16 x, y; u8 i; @@ -101,7 +101,7 @@ static bool8 TrainerCanApproachPlayer(struct EventObject *trainerObj) } // Returns how far south the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y > trainerObj->currentCoords.y @@ -112,7 +112,7 @@ static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 ra } // Returns how far north the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y < trainerObj->currentCoords.y @@ -123,7 +123,7 @@ static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 ra } // Returns how far west the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x < trainerObj->currentCoords.x @@ -134,7 +134,7 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran } // Returns how far east the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x > trainerObj->currentCoords.x @@ -150,7 +150,7 @@ static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 ran #define COLLISION_MASK 1 #endif -static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) +static bool8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction) { s16 x, y; u8 unk19_temp; @@ -177,7 +177,7 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 trainerObj->range.as_nybbles.x = 0; trainerObj->range.as_nybbles.y = 0; - collision = GetCollisionAtCoords((struct EventObject *)trainerObj, x, y, direction); + collision = GetCollisionAtCoords((struct ObjectEvent *)trainerObj, x, y, direction); trainerObj->range.as_nybbles.x = unk19_temp; trainerObj->range.as_nybbles.y = unk19b_temp; @@ -190,7 +190,7 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 #define tTrainerObjHi data[1] #define tTrainerObjLo data[2] -static void sub_80842C8(struct EventObject *trainerObj, u8 b) +static void sub_80842C8(struct ObjectEvent *trainerObj, u8 b) { u8 taskId = CreateTask(RunTrainerSeeFuncList, 0x50); struct Task *task = &gTasks[taskId]; @@ -210,20 +210,20 @@ static void sub_80842FC(TaskFunc followupFunc) taskFunc(taskId); } -static bool8 sub_8084394(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084398(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084478(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084534(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084578(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80845AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_8084394(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084398(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80843DC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_808441C(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084478(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084534(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084578(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80845AC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80845C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80845FC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084654(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80846C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); -static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { sub_8084394, sub_8084398, @@ -242,7 +242,7 @@ static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct static void RunTrainerSeeFuncList(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *trainerObj = (struct EventObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo)); + struct ObjectEvent *trainerObj = (struct ObjectEvent *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo)); if (!trainerObj->active) { @@ -255,24 +255,24 @@ static void RunTrainerSeeFuncList(u8 taskId) } } -static bool8 sub_8084394(u8 taskId, struct Task *task, struct EventObject *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments. +static bool8 sub_8084394(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments. { return FALSE; } -static bool8 sub_8084398(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084398(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { u8 direction; - EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); direction = GetFaceDirectionMovementAction(trainerObj->facingDirection); - EventObjectSetHeldMovement(trainerObj, direction); + ObjectEventSetHeldMovement(trainerObj, direction); task->data[0]++; return TRUE; } -static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80843DC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -289,88 +289,88 @@ static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *train } } -static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_808441C(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!(ObjectEventIsMovementOverridden(trainerObj)) || ObjectEventClearHeldMovementIfFinished(trainerObj)) { if (task->data[3]) { - EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); + ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); task->data[3]--; } else { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->data[0]++; } } return FALSE; } -static bool8 sub_8084478(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084478(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj; + struct ObjectEvent *playerObj; - if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj)) return FALSE; SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - OverrideMovementTypeForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - OverrideTemplateCoordsForEventObject(trainerObj); + OverrideMovementTypeForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + OverrideTemplateCoordsForObjectEvent(trainerObj); - playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj)) + playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; sub_80597E8(); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->data[0]++; return FALSE; } -static bool8 sub_8084534(u8 taskId, struct Task *task, struct EventObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call. +static bool8 sub_8084534(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call. { - struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerObj) - || EventObjectClearHeldMovementIfFinished(playerObj)) + if (!ObjectEventIsMovementOverridden(playerObj) + || ObjectEventClearHeldMovementIfFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } -static bool8 sub_8084578(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084578(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); task->data[0]++; } return FALSE; } -static bool8 sub_80845AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80845AC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventClearHeldMovementIfFinished(trainerObj)) task->data[0] = 3; return FALSE; } -static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80845C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->data[0]++; } return FALSE; } -static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80845FC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectCheckHeldMovementStatus(trainerObj)) + if (ObjectEventCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -382,7 +382,7 @@ static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084654(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { struct Sprite *sprite; @@ -393,14 +393,14 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *train sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - EventObjectClearHeldMovementIfFinished(trainerObj); - EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); + ObjectEventClearHeldMovementIfFinished(trainerObj); + ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); task->data[0]++; } return FALSE; } -static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80846C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->data[0] = 3; @@ -408,7 +408,7 @@ static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct EventObject *) = +static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct ObjectEvent *) = { sub_80845C8, sub_80845FC, @@ -419,29 +419,29 @@ static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct EventObje void sub_80846E4(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *eventObj; + struct ObjectEvent *objEvent; - // another eventObj loaded into by loadword? - LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); + // another objEvent loaded into by loadword? + LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent); if (!task->data[7]) { - EventObjectClearHeldMovement(eventObj); + ObjectEventClearHeldMovement(objEvent); task->data[7]++; } - gTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); + gTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); - OverrideMovementTypeForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); + SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); + OverrideMovementTypeForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); DestroyTask(taskId); } else { - eventObj->heldMovementFinished = 0; + objEvent->heldMovementFinished = 0; } } -void sub_8084794(struct EventObject *var) +void sub_8084794(struct ObjectEvent *var) { StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], (u32)var); } @@ -540,21 +540,21 @@ static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3) static void objc_exclamation_mark_probably(struct Sprite *sprite) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjId) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objEventId) || sprite->animEnded) { FieldEffectStop(sprite, (u8)sprite->data[7]); } else { - struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; + struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId]; sprite->data[4] += sprite->data[3]; - sprite->pos1.x = eventObjSprite->pos1.x; - sprite->pos1.y = eventObjSprite->pos1.y - 16; - sprite->pos2.x = eventObjSprite->pos2.x; - sprite->pos2.y = eventObjSprite->pos2.y + sprite->data[4]; + sprite->pos1.x = objEventSprite->pos1.x; + sprite->pos1.y = objEventSprite->pos1.y - 16; + sprite->pos2.x = objEventSprite->pos2.x; + sprite->pos2.y = objEventSprite->pos2.y + sprite->data[4]; if (sprite->data[4]) sprite->data[3]++; else @@ -635,7 +635,7 @@ void GabbyAndTyBeforeInterview(void) gSaveBlock1.gabbyAndTyData.lastMove = gBattleResults.lastUsedMove; if (gSaveBlock1.gabbyAndTyData.battleNum != 0xff) gSaveBlock1.gabbyAndTyData.battleNum ++; - gSaveBlock1.gabbyAndTyData.valA_0 = gBattleResults.unk5_0; + gSaveBlock1.gabbyAndTyData.valA_0 = gBattleResults.playerMonWasDamaged; if (gBattleResults.playerFaintCounter) gSaveBlock1.gabbyAndTyData.valA_1 = 1; @@ -720,7 +720,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) return 0; } -void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) +void GabbyAndTySetScriptVarsToObjectEventLocalIds(void) { switch (GabbyAndTyGetBattleNum()) { @@ -2074,7 +2074,7 @@ void ChangePokemonNickname(void) void ChangePokemonNickname_CB(void) { SetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, gStringVar2); - c2_exit_to_overworld_1_continue_scripts_restart_music(); + CB2_ReturnToFieldContinueScriptPlayMapMusic(); } void TV_CopyNicknameToStringVar1AndEnsureTerminated(void) @@ -2185,7 +2185,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80BFD20(void) { VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); - RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } typedef union ewramStruct_02007000 diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 0680570fc..47eb81541 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -203,34 +203,35 @@ enum static u8 ChooseWildMonIndex_Fishing(u8 rod) { u8 wildMonIndex = 0; - u8 rand = Random() % 100; + u8 rand = Random() % max(max(ENCOUNTER_CHANCE_FISHING_MONS_OLD_ROD_TOTAL, ENCOUNTER_CHANCE_FISHING_MONS_GOOD_ROD_TOTAL), + ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_TOTAL);; switch (rod) { case OLD_ROD: - if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_0) + if (rand < ENCOUNTER_CHANCE_FISHING_MONS_OLD_ROD_SLOT_0) wildMonIndex = 0; else wildMonIndex = 1; break; case GOOD_ROD: - if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_2) + if (rand < ENCOUNTER_CHANCE_FISHING_MONS_GOOD_ROD_SLOT_2) wildMonIndex = 2; - if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_2 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_3) + if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_GOOD_ROD_SLOT_2 && rand < ENCOUNTER_CHANCE_FISHING_MONS_GOOD_ROD_SLOT_3) wildMonIndex = 3; - if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_3 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_4) + if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_GOOD_ROD_SLOT_3 && rand < ENCOUNTER_CHANCE_FISHING_MONS_GOOD_ROD_SLOT_4) wildMonIndex = 4; break; case SUPER_ROD: - if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_5) + if (rand < ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_5) wildMonIndex = 5; - if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_5 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_6) + if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_5 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_6) wildMonIndex = 6; - if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_6 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_7) + if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_6 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_7) wildMonIndex = 7; - if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SLOT_7 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SLOT_8) + if (rand >= ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_7 && rand < ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_8) wildMonIndex = 8; - if (rand == ENCOUNTER_CHANCE_FISHING_MONS_SLOT_8) + if (rand == ENCOUNTER_CHANCE_FISHING_MONS_SUPER_ROD_SLOT_8) wildMonIndex = 9; break; } |