From fa34dd62c023e51c074a9ce397872caafd829a01 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 9 May 2026 23:26:04 -0500 Subject: [PATCH 01/33] base sprite group constants --- data/rom_2.s | 2 +- include/constants/spriteGroups.h | 105 +++++++++ include/global.h | 2 +- include/main.h | 2 +- include/titlescreen.h | 4 +- include/variables.h | 4 +- src/all_board_mode_change_and_debug_menu.c | 42 ++-- src/all_board_pause_game.c | 12 +- src/all_board_process0_sprite_init.c | 262 ++++++++++----------- src/all_board_process2.c | 12 +- src/all_board_process4.c | 4 +- src/all_board_process7.c | 2 +- src/bonus_complete_scoring_transition.c | 15 +- src/bonus_field_select.c | 6 +- src/dusclops_process3.c | 36 +-- src/ereader.c | 58 ++--- src/field_select.c | 54 ++--- src/groudon_process3.c | 64 ++--- src/high_scores.c | 54 ++--- src/intro.c | 54 ++--- src/kecleon_process3.c | 39 ++- src/kyogre_process3.c | 48 ++-- src/main_board_bumpers.c | 12 +- src/main_board_edge.c | 4 +- src/main_board_evolution_mode.c | 2 +- src/main_board_to_be_split.c | 20 +- src/pokedex.c | 36 +-- src/rayquaza_process3.c | 190 +++++++-------- src/ruby_process3_entities_2.c | 12 +- src/ruby_ramp.c | 10 +- src/ruby_trigger_targets.c | 16 +- src/sapphire_collision.c | 4 +- src/sapphire_pond_and_zigzagoon.c | 14 +- src/sapphire_seedot_egg_shop.c | 14 +- src/spheal_process3.c | 42 ++-- src/titlescreen.c | 38 +-- sym_ewram.txt | 8 +- 37 files changed, 700 insertions(+), 603 deletions(-) create mode 100644 include/constants/spriteGroups.h diff --git a/data/rom_2.s b/data/rom_2.s index f11e9afb..e6cab026 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -2564,7 +2564,7 @@ gTitleMenuSlideInAnimData:: @ 0x086A9666 .byte 0x01, 0x05 .byte 0x03, 0x05 -gTitleMenuSlideOutAnimData:: @ 0x086A9672 +gTitleMenuSlideOutAnimSpriteGroupData:: @ 0x086A9672 .byte 0x00, 0x10 .byte 0x01, 0x04 .byte 0x02, 0x10 diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h new file mode 100644 index 00000000..8a10bede --- /dev/null +++ b/include/constants/spriteGroups.h @@ -0,0 +1,105 @@ +#ifndef GUARD_CONSTANTS_SPRITE_GROUPS_H +#define GUARD_CONSTANTS_SPRITE_GROUPS_H + +#define SG_0 0 +#define SG_1 1 +#define SG_2 2 +#define SG_3 3 +#define SG_4 4 +#define SG_5 5 +#define SG_6 6 +#define SG_7 7 +#define SG_8 8 +#define SG_9 9 +#define SG_10 10 +#define SG_11 11 +#define SG_12 12 +#define SG_13 13 +#define SG_14 14 +#define SG_15 15 +#define SG_16 16 +#define SG_17 17 +#define SG_18 18 +#define SG_19 19 +#define SG_20 20 +#define SG_21 21 +#define SG_22 22 +#define SG_23 23 +#define SG_24 24 +#define SG_25 25 +#define SG_26 26 +#define SG_27 27 +#define SG_28 28 +#define SG_29 29 +#define SG_30 30 +#define SG_31 31 +#define SG_32 32 +#define SG_33 33 +#define SG_34 34 +#define SG_35 35 +#define SG_36 36 +#define SG_37 37 +#define SG_38 38 +#define SG_39 39 +#define SG_40 40 +#define SG_41 41 +#define SG_42 42 +#define SG_43 43 +#define SG_44 44 +#define SG_45 45 +#define SG_46 46 +#define SG_47 47 +#define SG_48 48 +#define SG_49 49 +#define SG_50 50 +#define SG_51 51 +#define SG_52 52 +#define SG_53 53 +#define SG_54 54 +#define SG_55 55 +#define SG_56 56 +#define SG_57 57 +#define SG_58 58 +#define SG_59 59 +#define SG_60 60 +#define SG_61 61 +#define SG_62 62 +#define SG_63 63 +#define SG_64 64 +#define SG_65 65 +#define SG_66 66 +#define SG_67 67 +#define SG_68 68 +#define SG_69 69 +#define SG_70 70 +#define SG_71 71 +#define SG_72 72 +#define SG_73 73 +#define SG_74 74 +#define SG_75 75 +#define SG_76 76 +#define SG_77 77 +#define SG_78 78 +#define SG_79 79 +#define SG_80 80 +#define SG_81 81 +#define SG_82 82 +#define SG_83 83 +#define SG_84 84 +#define SG_85 85 +#define SG_86 86 +#define SG_87 87 +#define SG_88 88 +#define SG_89 89 +#define SG_90 90 +#define SG_91 91 +#define SG_92 92 +#define SG_93 93 +#define SG_94 94 +#define SG_95 95 +#define SG_96 96 +#define SG_97 97 +#define SG_98 98 +#define SG_99 99 + +#endif //GUARD_CONSTANTS_SPRITE_GROUPS_H \ No newline at end of file diff --git a/include/global.h b/include/global.h index ae311f00..e0652d20 100644 --- a/include/global.h +++ b/include/global.h @@ -939,7 +939,7 @@ extern struct PinballGame *gCurrentPinballGame; extern const StateFunc gIdlePinballGameStateFuncs[]; extern u32 gReplayFrameCounter; extern struct BoardConfig gBoardConfig; -extern u8 gKecleonSpriteOrderMap[]; +extern u8 gKecleonSpriteGroupOrderMap[]; extern u16 gFieldPaletteVariants[][6][16]; extern u16 gDusclopsBossGuardReadyTileOffsets[]; extern const u8 gBallPalettes[][0x20]; diff --git a/include/main.h b/include/main.h index 996232e7..29667ecd 100644 --- a/include/main.h +++ b/include/main.h @@ -6,6 +6,7 @@ #include "constants/high_scores.h" #include "constants/pinball_inputs.h" #include "constants/species.h" +#include "constants/spriteGroups.h" struct HighScoreEntry { @@ -123,7 +124,6 @@ struct Main }; extern struct Main gMain; -extern struct SpriteGroup gMain_spriteGroups[]; extern u32 IntrMain_Buffer[0x200]; extern u32 IntrMain[]; extern IntrFunc *gVBlankIntrFuncPtr; diff --git a/include/titlescreen.h b/include/titlescreen.h index 53749c10..f98847fe 100644 --- a/include/titlescreen.h +++ b/include/titlescreen.h @@ -8,7 +8,7 @@ struct TitlescreenStruct /*0x04*/ s16 animTimer; /*0x06*/ s8 menuAction; /*0x07*/ u8 hasSavedGame; - /*0x08*/ s8 pressStartAnimFrame; + /*0x08*/ s8 pressStartAnimSpriteGroupId; /*0x09*/ s8 pressStartAndFlippersVisible; /*0x0A*/ s8 menuSpriteGroupId; /*0x0B*/ s8 menuVisible; @@ -16,7 +16,7 @@ struct TitlescreenStruct /*0x0D*/ s8 cursorArrowVisible; /*0x0E*/ s8 selectorSpriteGroupId; /*0x0F*/ s8 selectorVisible; - /*0x10*/ s8 deleteSaveGroupId; + /*0x10*/ s8 deleteSaveSpriteGroupId; /*0x11*/ s8 deleteSaveWindowVisible; /*0x12*/ s16 idleFadeoutCounter; /*0x14*/ s16 idleFramesCounter; diff --git a/include/variables.h b/include/variables.h index da60c9a3..b675782b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -156,7 +156,7 @@ extern const s8 gScorePaletteResetOffsets[3]; //Same as above extern const s16 gTitleMenuStateTable[11]; extern const s8 gTitlePressStartAnimDurations[4]; extern const s8 gTitleMenuSlideInAnimData[6][2]; -extern const s8 gTitleMenuSlideOutAnimData[9][2]; +extern const s8 gTitleMenuSlideOutAnimSpriteGroupData[9][2]; extern const u16 gTitleNoSaveMenuActions[4]; extern const u16 gTitleSavedMenuActions[]; extern const struct SpriteSet *const gTitlePressStartSpriteSets[]; @@ -354,8 +354,6 @@ extern s16 gIntroScene1_TileOffsets[0x8]; extern s16 gIntroBGParams[]; extern s32 gIntroPalFadeLevel; extern const struct SpriteSet *const gIntroScene1_SpriteSets[]; -extern struct SpriteGroup gMain_spriteGroups_40[]; -extern struct SpriteGroup gMain_spriteGroups_48; extern struct Vector16 gIntroScene1_ScaleOffsets[0x4]; extern s32 gIntroScaleY; diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index 92adf505..a1208a70 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -201,10 +201,10 @@ void EndOfBallSequence(void) if (gMain.animationTimer == 199) { gCurrentPinballGame->bonusSummarySlideY = 128; - gMain.spriteGroups[9].active = TRUE; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[7].active = TRUE; - gMain.spriteGroups[8].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_7].active = TRUE; + gMain.spriteGroups[SG_8].active = TRUE; DmaCopy16(3, gMainBoardEndOfBall_Gfx, (void *)0x6015800, 0x2800); if (gMain.selectedField == FIELD_RUBY) { @@ -222,10 +222,10 @@ void EndOfBallSequence(void) } else if (gMain.animationTimer == 1) { - gMain.spriteGroups[9].active = FALSE; - gMain.spriteGroups[6].active = FALSE; - gMain.spriteGroups[7].active = FALSE; - gMain.spriteGroups[8].active = FALSE; + gMain.spriteGroups[SG_9].active = FALSE; + gMain.spriteGroups[SG_6].active = FALSE; + gMain.spriteGroups[SG_7].active = FALSE; + gMain.spriteGroups[SG_8].active = FALSE; } } else @@ -289,7 +289,7 @@ void BallSaverAnimation(void) if (gMain.animationTimer) { - group = &gMain.spriteGroups[5]; + group = &gMain.spriteGroups[SG_5]; if (group->active) { group->baseX = 88; @@ -304,7 +304,7 @@ void BallSaverAnimation(void) } } - group = &gMain.spriteGroups[4]; + group = &gMain.spriteGroups[SG_4]; if (group->active) { group->baseX = 24 + gCurrentPinballGame->ballSaverPosX / 100; @@ -317,7 +317,7 @@ void BallSaverAnimation(void) gOamBuffer[oamSimple->oamId].matrixNum = 4; } - group = &gMain.spriteGroups[3]; + group = &gMain.spriteGroups[SG_3]; if (group->active) { group->baseX = 56 + gCurrentPinballGame->ballSaverPosX / 100; @@ -354,7 +354,7 @@ void BallSaverAnimation(void) { mat4Scale = 0x100; if (gMain.animationTimer < 30) - gMain.spriteGroups[4].active = FALSE; + gMain.spriteGroups[SG_4].active = FALSE; } if (gMain.animationTimer < 31) @@ -366,7 +366,7 @@ void BallSaverAnimation(void) else { mat3Scale = 8; - gMain.spriteGroups[5].active = FALSE; + gMain.spriteGroups[SG_5].active = FALSE; } } else @@ -400,7 +400,7 @@ void BallSaverAnimation(void) gCurrentPinballGame->ballSaverBallVelY += 6; gCurrentPinballGame->ballSaverBallPosX += gCurrentPinballGame->ballSaverBallVelX; gCurrentPinballGame->ballSaverBallPosY += gCurrentPinballGame->ballSaverBallVelY; - gMain.spriteGroups[3].active = FALSE; + gMain.spriteGroups[SG_3].active = FALSE; if (gMain.animationTimer == 32) { gCurrentPinballGame->boardEntityActive = 0; @@ -450,9 +450,9 @@ void BallSaverAnimation(void) gCurrentPinballGame->ballSaverVelX = 0; gCurrentPinballGame->ballSaverVelY = 0; gCurrentPinballGame->ballSaverSlideY = 100; - gMain.spriteGroups[5].active = TRUE; - gMain.spriteGroups[4].active = TRUE; - gMain.spriteGroups[3].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_4].active = TRUE; + gMain.spriteGroups[SG_3].active = TRUE; if (gMain.selectedField == FIELD_RUBY) { DmaCopy16(3, gMainBoardBallSave_Gfx, (void *)0x06015800, 0x2400); @@ -474,8 +474,8 @@ void BallSaverAnimation(void) } else if (gMain.animationTimer == 0) { - gMain.spriteGroups[5].active = FALSE; - gMain.spriteGroups[4].active = FALSE; + gMain.spriteGroups[SG_5].active = FALSE; + gMain.spriteGroups[SG_4].active = FALSE; } } else @@ -1024,7 +1024,7 @@ void EndOfBallBonusSummary(void) if (gCurrentPinballGame->bonusSummaryTimer) gCurrentPinballGame->bonusSummaryTimer--; - group = &gMain.spriteGroups[9]; + group = &gMain.spriteGroups[SG_9]; if (group->active) { group->baseX = 120; @@ -1038,7 +1038,7 @@ void EndOfBallBonusSummary(void) for (i = 0; i < 3; i++) { - group = &gMain.spriteGroups[6 + i]; + group = &gMain.spriteGroups[SG_6 + i]; group->baseX = 104; group->baseY = 64 + i * 16 + gCurrentPinballGame->bonusSummarySlideY + sp10; for (j = 0; j < 5; j++) diff --git a/src/all_board_pause_game.c b/src/all_board_pause_game.c index 59d254e0..8003e86c 100644 --- a/src/all_board_pause_game.c +++ b/src/all_board_pause_game.c @@ -100,7 +100,7 @@ void PositionPauseMenuSprites(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[0]; + group = &gMain.spriteGroups[SG_0]; oamSimple = &group->oam[0]; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset; @@ -125,7 +125,7 @@ void PositionPauseMenuSprites(void) gOamBuffer[oamSimple->oamId].matrixNum = 0; } - group = &gMain.spriteGroups[1]; + group = &gMain.spriteGroups[SG_1]; for (i = 0; i < 2; i++) { oamSimple = &group->oam[i]; @@ -133,7 +133,7 @@ void PositionPauseMenuSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset; } - group = &gMain.spriteGroups[2]; + group = &gMain.spriteGroups[SG_2]; for (i = 0; i < 3; i++) { oamSimple = &group->oam[i]; @@ -226,7 +226,7 @@ void AnimatePauseMenuOverlay(void) yScale = 256; } - group = &gMain.spriteGroups[0]; + group = &gMain.spriteGroups[SG_0]; if (var0 >= 0) { s16 index; @@ -275,7 +275,7 @@ void AnimatePauseMenuOverlay(void) SetMatrixScale(0x100, yScale, 5); - group = &gMain.spriteGroups[1]; + group = &gMain.spriteGroups[SG_1]; group->baseX = 100 - xOffset; group->baseY = 80 + yOffset; for (i = 0; i < 2; i++) @@ -285,7 +285,7 @@ void AnimatePauseMenuOverlay(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[2]; + group = &gMain.spriteGroups[SG_2]; group->baseX = 68 + xOffset; group->baseY = 108 - yOffset; for (i = 0; i < 3; i++) diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index a87b86e3..3c8a5dd8 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -10,22 +10,22 @@ void RubyBoardProcess_0A_50848(void) for (i = 0; i < 84; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[64].active = TRUE; - group = &gMain.spriteGroups[48]; // fake match? - gMain.spriteGroups[70].active = TRUE; - gMain.spriteGroups[0].active = TRUE; - gMain.spriteGroups[1].active = TRUE; - gMain.spriteGroups[2].active = TRUE; - gMain.spriteGroups[28].active = TRUE; - gMain.spriteGroups[81].active = TRUE; - gMain.spriteGroups[65].active = TRUE; - gMain.spriteGroups[71].active = TRUE; - gMain.spriteGroups[66].active = TRUE; - gMain.spriteGroups[51].active = TRUE; - gMain.spriteGroups[61].active = TRUE; + gMain.spriteGroups[SG_64].active = TRUE; + group = &gMain.spriteGroups[SG_48]; // fake match? + gMain.spriteGroups[SG_70].active = TRUE; + gMain.spriteGroups[SG_0].active = TRUE; + gMain.spriteGroups[SG_1].active = TRUE; + gMain.spriteGroups[SG_2].active = TRUE; + gMain.spriteGroups[SG_28].active = TRUE; + gMain.spriteGroups[SG_81].active = TRUE; + gMain.spriteGroups[SG_65].active = TRUE; + gMain.spriteGroups[SG_71].active = TRUE; + gMain.spriteGroups[SG_66].active = TRUE; + gMain.spriteGroups[SG_51].active = TRUE; + gMain.spriteGroups[SG_61].active = TRUE; group->active = TRUE; - gMain.spriteGroups[52].active = TRUE; - gMain.spriteGroups[62].active = TRUE; + gMain.spriteGroups[SG_52].active = TRUE; + gMain.spriteGroups[SG_62].active = TRUE; LoadSpriteSets( gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -36,60 +36,60 @@ void RubyBoardProcess_0B_50918(void) { s16 i; - gMain.spriteGroups[10].active = FALSE; - gMain.spriteGroups[11].active = FALSE; - gMain.spriteGroups[48].active = FALSE; - gMain.spriteGroups[71].active = FALSE; + gMain.spriteGroups[SG_10].active = FALSE; + gMain.spriteGroups[SG_11].active = FALSE; + gMain.spriteGroups[SG_48].active = FALSE; + gMain.spriteGroups[SG_71].active = FALSE; for (i = 51; i < 67; i++) gMain.spriteGroups[i].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 110) { - gMain.spriteGroups[65].active = TRUE; - gMain.spriteGroups[71].active = TRUE; - gMain.spriteGroups[66].active = TRUE; + gMain.spriteGroups[SG_65].active = TRUE; + gMain.spriteGroups[SG_71].active = TRUE; + gMain.spriteGroups[SG_66].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 168) { - gMain.spriteGroups[48].active = TRUE; - gMain.spriteGroups[52].active = TRUE; + gMain.spriteGroups[SG_48].active = TRUE; + gMain.spriteGroups[SG_52].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 220) { - gMain.spriteGroups[51].active = TRUE; - gMain.spriteGroups[61].active = TRUE; - gMain.spriteGroups[64].active = TRUE; + gMain.spriteGroups[SG_51].active = TRUE; + gMain.spriteGroups[SG_61].active = TRUE; + gMain.spriteGroups[SG_64].active = TRUE; if (gCurrentPinballGame->shouldProcessWhiscash) - gMain.spriteGroups[63].active = TRUE; + gMain.spriteGroups[SG_63].active = TRUE; else - gMain.spriteGroups[62].active = TRUE; + gMain.spriteGroups[SG_62].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 63) { - gMain.spriteGroups[53].active = TRUE; - gMain.spriteGroups[57].active = TRUE; + gMain.spriteGroups[SG_53].active = TRUE; + gMain.spriteGroups[SG_57].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 115) - gMain.spriteGroups[58].active = TRUE; + gMain.spriteGroups[SG_58].active = TRUE; if (gCurrentPinballGame->cameraYViewport > 130) { - gMain.spriteGroups[59].active = TRUE; - gMain.spriteGroups[60].active = TRUE; + gMain.spriteGroups[SG_59].active = TRUE; + gMain.spriteGroups[SG_60].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) { - gMain.spriteGroups[56].active = TRUE; - gMain.spriteGroups[54].active = TRUE; - gMain.spriteGroups[55].active = TRUE; - gMain.spriteGroups[10].active = TRUE; - gMain.spriteGroups[11].active = TRUE; + gMain.spriteGroups[SG_56].active = TRUE; + gMain.spriteGroups[SG_54].active = TRUE; + gMain.spriteGroups[SG_55].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; } LoadSpriteSets( @@ -105,17 +105,17 @@ void SapphireBoardProcess_0A_50AD4(void) for (i = 0; i < 87; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[72].active = TRUE; - gMain.spriteGroups[63].active = TRUE; - gMain.spriteGroups[60].active = TRUE; - gMain.spriteGroups[69].active = TRUE; - gMain.spriteGroups[52].active = TRUE; - gMain.spriteGroups[74].active = TRUE; - gMain.spriteGroups[0].active = TRUE; - gMain.spriteGroups[1].active = TRUE; - gMain.spriteGroups[2].active = TRUE; - gMain.spriteGroups[25].active = TRUE; - gMain.spriteGroups[85].active = TRUE; + gMain.spriteGroups[SG_72].active = TRUE; + gMain.spriteGroups[SG_63].active = TRUE; + gMain.spriteGroups[SG_60].active = TRUE; + gMain.spriteGroups[SG_69].active = TRUE; + gMain.spriteGroups[SG_52].active = TRUE; + gMain.spriteGroups[SG_74].active = TRUE; + gMain.spriteGroups[SG_0].active = TRUE; + gMain.spriteGroups[SG_1].active = TRUE; + gMain.spriteGroups[SG_2].active = TRUE; + gMain.spriteGroups[SG_25].active = TRUE; + gMain.spriteGroups[SG_85].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, gMain.spriteGroups); @@ -128,59 +128,59 @@ void SapphireBoardProcess_0B_50B80(void) for (i = 55; i < 71; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[52].active = FALSE; - gMain.spriteGroups[72].active = FALSE; - gMain.spriteGroups[26].active = FALSE; - gMain.spriteGroups[51].active = FALSE; - gMain.spriteGroups[76].active = FALSE; - gMain.spriteGroups[75].active = FALSE; - gMain.spriteGroups[10].active = FALSE; - gMain.spriteGroups[11].active = FALSE; + gMain.spriteGroups[SG_52].active = FALSE; + gMain.spriteGroups[SG_72].active = FALSE; + gMain.spriteGroups[SG_26].active = FALSE; + gMain.spriteGroups[SG_51].active = FALSE; + gMain.spriteGroups[SG_76].active = FALSE; + gMain.spriteGroups[SG_75].active = FALSE; + gMain.spriteGroups[SG_10].active = FALSE; + gMain.spriteGroups[SG_11].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 90) { - gMain.spriteGroups[52].active = TRUE; - gMain.spriteGroups[51].active = TRUE; + gMain.spriteGroups[SG_52].active = TRUE; + gMain.spriteGroups[SG_51].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 220) { - gMain.spriteGroups[72].active = TRUE; + gMain.spriteGroups[SG_72].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 150) { - gMain.spriteGroups[60].active = TRUE; - gMain.spriteGroups[69].active = TRUE; + gMain.spriteGroups[SG_60].active = TRUE; + gMain.spriteGroups[SG_69].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 196) { - gMain.spriteGroups[63].active = TRUE; - gMain.spriteGroups[75].active = TRUE; + gMain.spriteGroups[SG_63].active = TRUE; + gMain.spriteGroups[SG_75].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 202) { - gMain.spriteGroups[61].active = TRUE; - gMain.spriteGroups[58].active = TRUE; - gMain.spriteGroups[62].active = TRUE; - gMain.spriteGroups[59].active = TRUE; - gMain.spriteGroups[76].active = TRUE; + gMain.spriteGroups[SG_61].active = TRUE; + gMain.spriteGroups[SG_58].active = TRUE; + gMain.spriteGroups[SG_62].active = TRUE; + gMain.spriteGroups[SG_59].active = TRUE; + gMain.spriteGroups[SG_76].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 118) { - gMain.spriteGroups[70].active = TRUE; - gMain.spriteGroups[26].active = TRUE; - gMain.spriteGroups[64].active = TRUE; - gMain.spriteGroups[68].active = TRUE; - gMain.spriteGroups[65].active = TRUE; - gMain.spriteGroups[66].active = TRUE; - gMain.spriteGroups[67].active = TRUE; + gMain.spriteGroups[SG_70].active = TRUE; + gMain.spriteGroups[SG_26].active = TRUE; + gMain.spriteGroups[SG_64].active = TRUE; + gMain.spriteGroups[SG_68].active = TRUE; + gMain.spriteGroups[SG_65].active = TRUE; + gMain.spriteGroups[SG_66].active = TRUE; + gMain.spriteGroups[SG_67].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) { - gMain.spriteGroups[57].active = TRUE; - gMain.spriteGroups[55].active = TRUE; - gMain.spriteGroups[56].active = TRUE; - gMain.spriteGroups[10].active = TRUE; - gMain.spriteGroups[11].active = TRUE; + gMain.spriteGroups[SG_57].active = TRUE; + gMain.spriteGroups[SG_55].active = TRUE; + gMain.spriteGroups[SG_56].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; } LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, gMain.spriteGroups); @@ -225,30 +225,30 @@ void KecleonBoardProcess_0A_50DE0(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[23].active = TRUE; - gMain.spriteGroups[9].active = TRUE; - gMain.spriteGroups[24].active = TRUE; - gMain.spriteGroups[16].active = TRUE; - gMain.spriteGroups[17].active = TRUE; - gMain.spriteGroups[7].active = TRUE; - gMain.spriteGroups[10].active = TRUE; - gMain.spriteGroups[11].active = TRUE; - gMain.spriteGroups[12].active = TRUE; - gMain.spriteGroups[13].active = TRUE; - gMain.spriteGroups[14].active = TRUE; - gMain.spriteGroups[15].active = TRUE; - gMain.spriteGroups[18].active = TRUE; - gMain.spriteGroups[19].active = TRUE; - gMain.spriteGroups[20].active = TRUE; - gMain.spriteGroups[21].active = TRUE; - gMain.spriteGroups[25].active = TRUE; - gMain.spriteGroups[26].active = TRUE; - gMain.spriteGroups[27].active = TRUE; - gMain.spriteGroups[28].active = TRUE; - gMain.spriteGroups[31].active = TRUE; - gMain.spriteGroups[32].active = TRUE; - gMain.spriteGroups[29].active = TRUE; - gMain.spriteGroups[30].active = TRUE; + gMain.spriteGroups[SG_23].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_24].active = TRUE; + gMain.spriteGroups[SG_16].active = TRUE; + gMain.spriteGroups[SG_17].active = TRUE; + gMain.spriteGroups[SG_7].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_12].active = TRUE; + gMain.spriteGroups[SG_13].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_15].active = TRUE; + gMain.spriteGroups[SG_18].active = TRUE; + gMain.spriteGroups[SG_19].active = TRUE; + gMain.spriteGroups[SG_20].active = TRUE; + gMain.spriteGroups[SG_21].active = TRUE; + gMain.spriteGroups[SG_25].active = TRUE; + gMain.spriteGroups[SG_26].active = TRUE; + gMain.spriteGroups[SG_27].active = TRUE; + gMain.spriteGroups[SG_28].active = TRUE; + gMain.spriteGroups[SG_31].active = TRUE; + gMain.spriteGroups[SG_32].active = TRUE; + gMain.spriteGroups[SG_29].active = TRUE; + gMain.spriteGroups[SG_30].active = TRUE; LoadSpriteSets( gFieldSpriteSets[gMain.selectedField].spriteSets, @@ -273,14 +273,14 @@ void KyogreBoardProcess_0A_50F04() } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[11].active = TRUE; - gMain.spriteGroups[12].active = TRUE; - gMain.spriteGroups[13].active = TRUE; - gMain.spriteGroups[14].active = TRUE; - gMain.spriteGroups[21].active = TRUE; - gMain.spriteGroups[22].active = TRUE; - gMain.spriteGroups[23].active = TRUE; - gMain.spriteGroups[15].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_12].active = TRUE; + gMain.spriteGroups[SG_13].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_21].active = TRUE; + gMain.spriteGroups[SG_22].active = TRUE; + gMain.spriteGroups[SG_23].active = TRUE; + gMain.spriteGroups[SG_15].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -308,11 +308,11 @@ void GroudonBoardProcess_0A_50FD4(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[11].active = TRUE; - gMain.spriteGroups[12].active = TRUE; - gMain.spriteGroups[13].active = TRUE; - gMain.spriteGroups[14].active = TRUE; - gMain.spriteGroups[29].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_12].active = TRUE; + gMain.spriteGroups[SG_13].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_29].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -339,11 +339,11 @@ void RayquazaBoardProcess_0A_51090(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[42].active = TRUE; - gMain.spriteGroups[11].active = TRUE; - gMain.spriteGroups[12].active = TRUE; - gMain.spriteGroups[13].active = TRUE; - gMain.spriteGroups[21].active = TRUE; + gMain.spriteGroups[SG_42].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_12].active = TRUE; + gMain.spriteGroups[SG_13].active = TRUE; + gMain.spriteGroups[SG_21].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -370,13 +370,13 @@ void SphealBoardProcess_0A_51150(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[18].active = TRUE; - gMain.spriteGroups[21].active = TRUE; - gMain.spriteGroups[22].active = TRUE; - gMain.spriteGroups[14].active = TRUE; - gMain.spriteGroups[15].active = TRUE; - gMain.spriteGroups[16].active = TRUE; - gMain.spriteGroups[17].active = TRUE; + gMain.spriteGroups[SG_18].active = TRUE; + gMain.spriteGroups[SG_21].active = TRUE; + gMain.spriteGroups[SG_22].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_15].active = TRUE; + gMain.spriteGroups[SG_16].active = TRUE; + gMain.spriteGroups[SG_17].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, diff --git a/src/all_board_process2.c b/src/all_board_process2.c index 81a9cc07..3029ade0 100644 --- a/src/all_board_process2.c +++ b/src/all_board_process2.c @@ -251,32 +251,32 @@ void BonusBoardProcess_2B_4DBFC(void) switch (gMain.selectedField) { - case 2: + case FIELD_DUSCLOPS: gMain.bgOffsets[3].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[3].yOffset = gMain.bgOffsets[2].yOffset; gMain.bgOffsets[1].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[1].yOffset = gCurrentPinballGame->scrollEffectX / 2; break; - case 3: + case FIELD_KECLEON: gMain.bgOffsets[3].xOffset = gMain.bgOffsets[2].xOffset + (gCurrentPinballGame->globalAnimFrameCounter & 0x7FF) / 8; gMain.bgOffsets[3].yOffset = gMain.bgOffsets[2].yOffset; gMain.bgOffsets[1].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[1].yOffset = 0; break; - case 4: - case 5: + case FIELD_KYOGRE: + case FIELD_GROUDON: gMain.bgOffsets[3].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[3].yOffset = gMain.bgOffsets[2].yOffset; gMain.bgOffsets[1].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[1].yOffset = gMain.bgOffsets[2].yOffset; break; - case 6: + case FIELD_RAYQUAZA: gMain.bgOffsets[3].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[3].yOffset = gMain.bgOffsets[2].yOffset / 4; gMain.bgOffsets[1].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[1].yOffset = gMain.bgOffsets[2].yOffset; break; - case 7: + case FIELD_SPHEAL: gMain.bgOffsets[3].xOffset = gMain.bgOffsets[2].xOffset; gMain.bgOffsets[3].yOffset = gMain.bgOffsets[2].yOffset; break; diff --git a/src/all_board_process4.c b/src/all_board_process4.c index 8e194808..98621331 100644 --- a/src/all_board_process4.c +++ b/src/all_board_process4.c @@ -64,7 +64,7 @@ void MainBoardProcess_4B_19490(void) else if (gCurrentPinballGame->flipper[i].position < 0) gCurrentPinballGame->flipper[i].position = 0; - spriteGroup = &gMain.spriteGroups[10 + i]; + spriteGroup = &gMain.spriteGroups[SG_10 + i]; if (spriteGroup->active) { s8 flipperTileIndex; @@ -175,7 +175,7 @@ void BonusBoardProcess_4B_19734(void) else if (gCurrentPinballGame->flipper[i].position < 0) gCurrentPinballGame->flipper[i].position = 0; - spriteGroup = &gMain.spriteGroups[3 + i]; + spriteGroup = &gMain.spriteGroups[SG_3 + i]; if (spriteGroup->active) { s8 flipperTileIndex; diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 7b619124..ea904a25 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -248,7 +248,7 @@ void BonusBoardProcess_7B_12BF8() { case FIELD_KECLEON: primaryBall->oamPriority = 2; - spriteGroup = &gMain_spriteGroups[gKecleonSpriteOrderMap[22]]; + spriteGroup = &gMain.spriteGroups[gKecleonSpriteGroupOrderMap[22]]; break; case FIELD_KYOGRE: case FIELD_GROUDON: diff --git a/src/bonus_complete_scoring_transition.c b/src/bonus_complete_scoring_transition.c index 25627115..70935978 100644 --- a/src/bonus_complete_scoring_transition.c +++ b/src/bonus_complete_scoring_transition.c @@ -9,9 +9,6 @@ #include "constants/board/kyogre_states.h" #include "constants/board/rayquaza_states.h" -extern struct SpriteGroup gMain_spriteGroups_12; -extern struct SpriteGroup gMain_spriteGroups_14; - extern const u8 gKecleonBonusClear_Gfx[]; extern const u8 gKyogreBonusClear_Gfx[]; extern const u8 gGroudonBonusClear_Gfx[]; @@ -45,8 +42,8 @@ void FadeToMainBoard(void) { gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState = DEFAULT_MODE_SUBSTATE_INIT; - gMain.spriteGroups[6].active = FALSE; - gMain.spriteGroups[5].active = FALSE; + gMain.spriteGroups[SG_6].active = FALSE; + gMain.spriteGroups[SG_5].active = FALSE; if (gMain.tempField != gMain.selectedField) { TransitionFromBonusToMainBoard(); @@ -73,7 +70,7 @@ void ProcessBonusBannerAndScoring(void) var0 = 8; var1 = 0; - group = &gMain.spriteGroups[6]; + group = &gMain.spriteGroups[SG_6]; if (gCurrentPinballGame->bannerSlideYOffset > 0) { gCurrentPinballGame->bannerSlideYOffset -= 6; @@ -125,7 +122,7 @@ void ProcessBonusBannerAndScoring(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[5]; + group = &gMain.spriteGroups[SG_5]; group->baseX = 120; group->baseY = gCurrentPinballGame->bannerSlideYOffset + 50; for (i = 0; i < 18; i++) @@ -196,7 +193,7 @@ void RenderBonusStageOverlaySprites(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain_spriteGroups_14; + group = &gMain.spriteGroups[SG_14]; switch (gCurrentPinballGame->bossEntityState) { case 0: @@ -234,7 +231,7 @@ void RenderBonusStageOverlaySprites(void) break; } - group = &gMain_spriteGroups_12; + group = &gMain.spriteGroups[SG_12]; if (!group->active) return; diff --git a/src/bonus_field_select.c b/src/bonus_field_select.c index ea752934..0a281b37 100644 --- a/src/bonus_field_select.c +++ b/src/bonus_field_select.c @@ -223,8 +223,8 @@ void RenderBonusFieldSelectSprites(void) { sgptrs[i] = &gMain.spriteGroups[i]; } - r10 = &gMain.spriteGroups[6 + gSelectedBonusField]; - r8 = &gMain.spriteGroups[12 + gSelectedBallSpeed * 2 + gBallSpeedDisplayToggle]; + r10 = &gMain.spriteGroups[SG_6 + gSelectedBonusField]; + r8 = &gMain.spriteGroups[SG_12 + gSelectedBallSpeed * 2 + gBallSpeedDisplayToggle]; for (j = 0; j < 6; j++) { sgptrs[j]->active = TRUE; @@ -232,7 +232,7 @@ void RenderBonusFieldSelectSprites(void) sgptrs[gSelectedBonusField]->active = FALSE; r10->active = TRUE; r8->active = gBallSpeedSubmenuVisible; - LoadSpriteSets(gBonusFieldSelectSpriteSets, 16, gMain_spriteGroups); + LoadSpriteSets(gBonusFieldSelectSpriteSets, 16, gMain.spriteGroups); for (i = 0; i < 6; i++) { if (sgptrs[i]->active == TRUE) diff --git a/src/dusclops_process3.c b/src/dusclops_process3.c index 1922656d..46215ca5 100644 --- a/src/dusclops_process3.c +++ b/src/dusclops_process3.c @@ -97,9 +97,9 @@ void DusclopsBoardProcess_3B_33130(void) else { gCurrentPinballGame->cameraYAdjust = 0; - gMain.spriteGroups[7].active = TRUE; - gMain.spriteGroups[8].active = TRUE; - gMain.spriteGroups[9].active = TRUE; + gMain.spriteGroups[SG_7].active = TRUE; + gMain.spriteGroups[SG_8].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_1_DUSKULL_PHASE; gCurrentPinballGame->stageTimer = 0; } @@ -117,9 +117,9 @@ void DusclopsBoardProcess_3B_33130(void) break; case DUSCLOPS_BOARD_STATE_2_INIT_DUSCLOPS_PHASE: gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_3_DUSCLOPS_PHASE; - gMain.spriteGroups[13].active = TRUE; - gMain.spriteGroups[14].active = TRUE; - gMain.spriteGroups[12].active = TRUE; + gMain.spriteGroups[SG_13].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_12].active = TRUE; gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE; gCurrentPinballGame->bonusModeHitCount = 0; m4aSongNumStart(MUS_BONUS_FIELD_DUSCLOPS); @@ -141,8 +141,8 @@ void DusclopsBoardProcess_3B_33130(void) { gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_SCORE_PHASE; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gDusclopsBonusClear_Gfx, OBJ_VRAM1+0x1800, 8192); gCurrentPinballGame->bannerSlideYOffset = 136; } @@ -273,9 +273,9 @@ void DuskullPhase_ProcessEntityLogic(void) { if (r4) { gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_2_INIT_DUSCLOPS_PHASE; - gMain.spriteGroups[7].active = FALSE; - gMain.spriteGroups[8].active = FALSE; - gMain.spriteGroups[9].active = FALSE; + gMain.spriteGroups[SG_7].active = FALSE; + gMain.spriteGroups[SG_8].active = FALSE; + gMain.spriteGroups[SG_9].active = FALSE; } } @@ -568,7 +568,7 @@ void DuskullPhase_ProcessGraphics() { s16 spriteVariant = gCurrentPinballGame->minionSpriteVariant[i]; DmaCopy16(3, gDusclopsBoardDuskull_Gfx + spriteVariant * 0x280, OBJ_VRAM0 + 0x920 + i * 0x280, 0x280); oamIx = gCurrentPinballGame->minionOamIx[i]; - spriteGroup = &gMain_spriteGroups[7 + i]; + spriteGroup = &gMain.spriteGroups[SG_7 + i]; if (gCurrentPinballGame->minionDrawInFrame[i]) { s32 x = 0; // Scrub C to get the compiler to add before subtracting @@ -638,7 +638,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) struct SpriteGroup *spriteGroup; tileOffset = 0; - spriteGroup = &gMain.spriteGroups[14]; + spriteGroup = &gMain.spriteGroups[SG_14]; switch(gCurrentPinballGame->bossEntityState) { case DUSCLOPS_ENTITY_STATE_INIT: @@ -995,9 +995,9 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) break; } - gMain.spriteGroups[13].active = FALSE; - gMain.spriteGroups[14].active = FALSE; - gMain.spriteGroups[12].active = FALSE; + gMain.spriteGroups[SG_13].active = FALSE; + gMain.spriteGroups[SG_14].active = FALSE; + gMain.spriteGroups[SG_12].active = FALSE; gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_4_INIT_SCORE_PHASE; gCurrentPinballGame->stageTimer = 0; break; @@ -1035,7 +1035,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) } // Blend appearance Lines - spriteGroup = &gMain.spriteGroups[12]; + spriteGroup = &gMain.spriteGroups[SG_12]; if (spriteGroup->active) { if (gCurrentPinballGame->returnToMainBoardFlag == 0) @@ -1068,7 +1068,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) } // Draw ball capture vortex - spriteGroup = &gMain.spriteGroups[13]; + spriteGroup = &gMain.spriteGroups[SG_13]; if (spriteGroup->active) { diff --git a/src/ereader.c b/src/ereader.c index 8563ec3a..a481c0c7 100644 --- a/src/ereader.c +++ b/src/ereader.c @@ -14,9 +14,9 @@ extern s8 gEReaderTextAnimDelay; extern s8 gEReaderTextBlinkToggle; extern s8 gEReaderTextPageIndex; -extern s8 gEReaderStatusSpriteIndex; +extern s8 gEReaderStatusAnimSpriteGroup; extern s8 gEReaderStatusSpriteVisible; -extern s8 gEReaderHeaderSpriteIndex; +extern s8 gEReaderHeaderAnimSpriteGroup; extern s8 gEReaderTransitionStep; extern s16 gEReaderTransitionTimer; extern s16 gEReaderGeneralTimer; @@ -102,9 +102,9 @@ void LoadEReaderGraphics(void) void InitEReaderTextState(void) { - gEReaderStatusSpriteIndex = 0; + gEReaderStatusAnimSpriteGroup = SG_0; gEReaderStatusSpriteVisible = 0; - gEReaderHeaderSpriteIndex = 4; + gEReaderHeaderAnimSpriteGroup = SG_4; gEReaderTransitionStep = 0; gEReaderTransitionTimer = 0; gEReaderGeneralTimer = 0; @@ -176,8 +176,8 @@ void Ereader_State2_2FC0(void) gMain.subState = EREADER_STATE_3; } } - gEReaderStatusSpriteIndex = 0; - gEReaderHeaderSpriteIndex = gEReaderTransitionStep + 4; + gEReaderStatusAnimSpriteGroup = SG_0; + gEReaderHeaderAnimSpriteGroup = SG_4 + gEReaderTransitionStep; UpdateEReaderSpritesViaOam(); } @@ -214,8 +214,8 @@ void Ereader_State3_304C(void) } else { gEReaderGeneralTimer = 0; - gEReaderStatusSpriteIndex = 2; - gEReaderHeaderSpriteIndex = 10; + gEReaderStatusAnimSpriteGroup = SG_2; + gEReaderHeaderAnimSpriteGroup = SG_10; gEReaderTextCharIndex = 0; gEReaderTextBlinkToggle = 0; gEReaderTextPageIndex = 13; @@ -224,17 +224,17 @@ void Ereader_State3_304C(void) m4aSongNumStart(SE_FAILURE); } } - if (gEReaderStatusSpriteIndex == 1) { + if (gEReaderStatusAnimSpriteGroup == SG_1) { gEReaderGeneralTimer++; temp = gEReaderGeneralTimer; // TODO: FAKEMATCH if ((gEReaderGeneralTimer & 7) == 0) { - gEReaderHeaderSpriteIndex = 21 - gEReaderHeaderSpriteIndex; + gEReaderHeaderAnimSpriteGroup = SG_21 - gEReaderHeaderAnimSpriteGroup; } if (((gLinkStatusResult & 0x7f0000) != 0) && (gLinkTimeoutCounter++, 0xb4 < gLinkTimeoutCounter)) { gEReaderGeneralTimer = 0; - gEReaderStatusSpriteIndex = 2; - gEReaderHeaderSpriteIndex = 10; + gEReaderStatusAnimSpriteGroup = SG_2; + gEReaderHeaderAnimSpriteGroup = SG_10; gEReaderTextCharIndex = 0; gEReaderTextBlinkToggle = 0; gEReaderTextPageIndex = 13; @@ -251,7 +251,7 @@ void Ereader_State4_3208(void) gEReaderGeneralTimer++; if (8 < gEReaderGeneralTimer) { gEReaderGeneralTimer = 0; - gEReaderHeaderSpriteIndex = 22 - gEReaderHeaderSpriteIndex; + gEReaderHeaderAnimSpriteGroup = SG_22 - gEReaderHeaderAnimSpriteGroup; } if (gEReaderTextCharIndex <= gEReaderTextLengths[gEReaderTextPageIndex]) { gEReaderTextAnimDelay++; @@ -311,7 +311,7 @@ void Ereader_State5_33A0(void) DisableSerial(); break; case 0x96: - gEReaderStatusSpriteIndex = 3; + gEReaderStatusAnimSpriteGroup = SG_3; m4aSongNumStart(SE_MENU_SELECT); break; case 0x10e: @@ -323,8 +323,8 @@ void Ereader_State5_33A0(void) break; } - if ((gEReaderStatusSpriteIndex == 1) && ((temp = gEReaderGeneralTimer, gEReaderGeneralTimer & 7) == 0)) { - gEReaderHeaderSpriteIndex = 21 - gEReaderHeaderSpriteIndex; + if ((gEReaderStatusAnimSpriteGroup == SG_1) && ((temp = gEReaderGeneralTimer, gEReaderGeneralTimer & 7) == 0)) { + gEReaderHeaderAnimSpriteGroup = SG_21 - gEReaderHeaderAnimSpriteGroup; } gEReaderGeneralTimer++; } @@ -506,15 +506,15 @@ void UpdateEReaderSprites(void) const struct SpriteSet *puVar8; struct OamDataSimple *test2; - puVar9 = &gMain_spriteGroups[gEReaderStatusSpriteIndex]; - puVar5 = &gMain_spriteGroups[gEReaderHeaderSpriteIndex]; + puVar9 = &gMain.spriteGroups[gEReaderStatusAnimSpriteGroup]; + puVar5 = &gMain.spriteGroups[gEReaderHeaderAnimSpriteGroup]; puVar9->active = gEReaderStatusSpriteVisible; puVar5->active = TRUE; - LoadSpriteSets(gCatchHatchSpriteSets, 13, gMain_spriteGroups); + LoadSpriteSets(gCatchHatchSpriteSets, 13, gMain.spriteGroups); if (puVar9->active == TRUE) { - if (gEReaderStatusSpriteIndex == 0) + if (gEReaderStatusAnimSpriteGroup == SG_0) { puVar9->baseX = 0x78; puVar9->baseY = 100; @@ -525,7 +525,7 @@ void UpdateEReaderSprites(void) puVar9->baseY = 0x50; } - puVar8 = gCatchHatchSpriteSets[gEReaderStatusSpriteIndex]; + puVar8 = gCatchHatchSpriteSets[gEReaderStatusAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -537,7 +537,7 @@ void UpdateEReaderSprites(void) puVar5->baseX = 0x78; puVar5->baseY = 0x18; - puVar8 = gCatchHatchSpriteSets[gEReaderHeaderSpriteIndex]; + puVar8 = gCatchHatchSpriteSets[gEReaderHeaderAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -557,15 +557,15 @@ void UpdateEReaderSpritesViaOam(void) { const struct SpriteSet *puVar8; struct OamDataSimple *test2; - puVar9 = &gMain_spriteGroups[gEReaderStatusSpriteIndex]; - puVar5 = &gMain_spriteGroups[gEReaderHeaderSpriteIndex]; + puVar9 = &gMain.spriteGroups[gEReaderStatusAnimSpriteGroup]; + puVar5 = &gMain.spriteGroups[gEReaderHeaderAnimSpriteGroup]; puVar9->active = gEReaderStatusSpriteVisible; puVar5->active = TRUE; - LoadSpriteSetsWithCpuCopy(gCatchHatchSpriteSets, 13, gMain_spriteGroups); + LoadSpriteSetsWithCpuCopy(gCatchHatchSpriteSets, 13, gMain.spriteGroups); if (puVar9->active == TRUE) { - if (gEReaderStatusSpriteIndex == 0) + if (gEReaderStatusAnimSpriteGroup == SG_0) { puVar9->baseX = 0x78; puVar9->baseY = 100; @@ -576,7 +576,7 @@ void UpdateEReaderSpritesViaOam(void) { puVar9->baseY = 0x50; } - puVar8 = gCatchHatchSpriteSets[gEReaderStatusSpriteIndex]; + puVar8 = gCatchHatchSpriteSets[gEReaderStatusAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -588,7 +588,7 @@ void UpdateEReaderSpritesViaOam(void) { puVar5->baseX = 0x78; puVar5->baseY = 0x18; - puVar8 = gCatchHatchSpriteSets[gEReaderHeaderSpriteIndex]; + puVar8 = gCatchHatchSpriteSets[gEReaderHeaderAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -662,7 +662,7 @@ s16 ProcessEReaderLinkReceive(void) { gEReaderLinkHandshakeStarted = -1; gEReaderLinkAckSent = -1; - gEReaderStatusSpriteIndex = 1; + gEReaderStatusAnimSpriteGroup = SG_1; } } diff --git a/src/field_select.c b/src/field_select.c index f080e9a3..a37160f1 100644 --- a/src/field_select.c +++ b/src/field_select.c @@ -18,8 +18,8 @@ enum FieldSelectStates struct FieldSelectData { - u16 rubyFieldSpriteId; - u16 sapphireFieldSpriteId; + u16 rubyFieldSpriteGroup; + u16 sapphireFieldSpriteGroup; u16 rubyHighlightVisible; u16 sapphireHighlightVisible; u16 selectedField; @@ -74,8 +74,8 @@ void LoadFieldSelectGraphics(void) static void InitFieldSelectData(void) { - gFieldSelectData.rubyFieldSpriteId = 2; - gFieldSelectData.sapphireFieldSpriteId = 3; + gFieldSelectData.rubyFieldSpriteGroup = SG_2; + gFieldSelectData.sapphireFieldSpriteGroup = SG_3; gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; gFieldSelectData.selectedField = FIELD_RUBY; @@ -139,16 +139,16 @@ void FieldSelect_State1_8C7C(void) { gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; - gFieldSelectData.rubyFieldSpriteId = 2; - gFieldSelectData.sapphireFieldSpriteId = 3; + gFieldSelectData.rubyFieldSpriteGroup = SG_2; + gFieldSelectData.sapphireFieldSpriteGroup = SG_3; gFieldSelectData.transitionFrame = 0; } else { gFieldSelectData.rubyHighlightVisible = 1; gFieldSelectData.sapphireHighlightVisible = 0; - gFieldSelectData.rubyFieldSpriteId = 7; - gFieldSelectData.sapphireFieldSpriteId = 11; + gFieldSelectData.rubyFieldSpriteGroup = SG_7; + gFieldSelectData.sapphireFieldSpriteGroup = SG_11; gFieldSelectData.transitionFrame = 0; } } @@ -161,16 +161,16 @@ void FieldSelect_State1_8C7C(void) { gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; - gFieldSelectData.rubyFieldSpriteId = 2; - gFieldSelectData.sapphireFieldSpriteId = 3; + gFieldSelectData.rubyFieldSpriteGroup = SG_2; + gFieldSelectData.sapphireFieldSpriteGroup = SG_3; gFieldSelectData.transitionFrame = 0; } else { gFieldSelectData.rubyHighlightVisible = 1; gFieldSelectData.sapphireHighlightVisible = 0; - gFieldSelectData.rubyFieldSpriteId = 7; - gFieldSelectData.sapphireFieldSpriteId = 11; + gFieldSelectData.rubyFieldSpriteGroup = SG_7; + gFieldSelectData.sapphireFieldSpriteGroup = SG_11; gFieldSelectData.transitionFrame = 0; } } @@ -210,13 +210,13 @@ void FieldSelect_State1_8C7C(void) case FIELD_SELECT_STATE_1: if (gFieldSelectData.selectedField == FIELD_RUBY) { - gFieldSelectData.rubyFieldSpriteId = gFieldTransitionAnimData.rubyTransitionFrames[4 - gFieldSelectData.transitionFrame]; - gFieldSelectData.sapphireFieldSpriteId = gFieldTransitionAnimData.sapphireTransitionFrames[4 - gFieldSelectData.transitionFrame]; + gFieldSelectData.rubyFieldSpriteGroup = gFieldTransitionAnimData.rubyTransitionFrames[4 - gFieldSelectData.transitionFrame]; + gFieldSelectData.sapphireFieldSpriteGroup = gFieldTransitionAnimData.sapphireTransitionFrames[4 - gFieldSelectData.transitionFrame]; } else { - gFieldSelectData.rubyFieldSpriteId = gFieldTransitionAnimData.rubyTransitionFrames[gFieldSelectData.transitionFrame]; - gFieldSelectData.sapphireFieldSpriteId = gFieldTransitionAnimData.sapphireTransitionFrames[gFieldSelectData.transitionFrame]; + gFieldSelectData.rubyFieldSpriteGroup = gFieldTransitionAnimData.rubyTransitionFrames[gFieldSelectData.transitionFrame]; + gFieldSelectData.sapphireFieldSpriteGroup = gFieldTransitionAnimData.sapphireTransitionFrames[gFieldSelectData.transitionFrame]; } if (!(gMain.systemFrameCount & 1)) { @@ -238,8 +238,8 @@ void FieldSelect_State1_8C7C(void) gFieldSelectData.selectedField = FIELD_RUBY; gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; - gFieldSelectData.rubyFieldSpriteId = 2; - gFieldSelectData.sapphireFieldSpriteId = 3; + gFieldSelectData.rubyFieldSpriteGroup = SG_2; + gFieldSelectData.sapphireFieldSpriteGroup = SG_3; gFieldSelectData.transitionFrame = 0; gFieldSelectData.state = FIELD_SELECT_STATE_CHOOSE_FIELD; } @@ -252,8 +252,8 @@ void FieldSelect_State1_8C7C(void) gFieldSelectData.selectedField = FIELD_SAPPHIRE; gFieldSelectData.rubyHighlightVisible = 1; gFieldSelectData.sapphireHighlightVisible = 0; - gFieldSelectData.rubyFieldSpriteId = 7; - gFieldSelectData.sapphireFieldSpriteId = 11; + gFieldSelectData.rubyFieldSpriteGroup = SG_7; + gFieldSelectData.sapphireFieldSpriteGroup = SG_11; gFieldSelectData.transitionFrame = 0; gFieldSelectData.state = FIELD_SELECT_STATE_CHOOSE_FIELD; } @@ -306,11 +306,11 @@ static void RenderFieldSelectSprites(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - r6 = &gMain.spriteGroups[0]; - r9 = &gMain.spriteGroups[1]; - sp0 = &gMain.spriteGroups[gFieldSelectData.rubyFieldSpriteId]; - r10 = &gMain.spriteGroups[gFieldSelectData.sapphireFieldSpriteId]; - r8 = &gMain.spriteGroups[12 + gFieldSelectData.ballSpeed * 2 + gFieldSelectData.speedBlinkToggle]; + r6 = &gMain.spriteGroups[SG_0]; + r9 = &gMain.spriteGroups[SG_1]; + sp0 = &gMain.spriteGroups[gFieldSelectData.rubyFieldSpriteGroup]; + r10 = &gMain.spriteGroups[gFieldSelectData.sapphireFieldSpriteGroup]; + r8 = &gMain.spriteGroups[SG_12 + gFieldSelectData.ballSpeed * 2 + gFieldSelectData.speedBlinkToggle]; r6->active = gFieldSelectData.rubyHighlightVisible; r9->active = gFieldSelectData.sapphireHighlightVisible; @@ -344,7 +344,7 @@ static void RenderFieldSelectSprites(void) sp0->baseX = 32; sp0->baseY = 32; - spriteSet = gFieldSelectSpriteSets[gFieldSelectData.rubyFieldSpriteId]; + spriteSet = gFieldSelectSpriteSets[gFieldSelectData.rubyFieldSpriteGroup]; for (i = 0; i < spriteSet->count; i++) { gOamBuffer[sp0->oam[i].oamId].objMode = 1; @@ -354,7 +354,7 @@ static void RenderFieldSelectSprites(void) r10->baseX = 0x88; r10->baseY = 32; - spriteSet = gFieldSelectSpriteSets[gFieldSelectData.sapphireFieldSpriteId]; + spriteSet = gFieldSelectSpriteSets[gFieldSelectData.sapphireFieldSpriteGroup]; for (i = 0; i < spriteSet->count; i++) { gOamBuffer[r10->oam[i].oamId].objMode = 1; diff --git a/src/groudon_process3.c b/src/groudon_process3.c index 9b2a3ba4..edbc5d78 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -173,8 +173,8 @@ void GroudonBoardProcess_3B_3B49C(void) { gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SUCCESS_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gGroudonBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -215,8 +215,8 @@ void GroudonBoardProcess_3B_3B49C(void) case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; gCurrentPinballGame->stageTimer = 140; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gGroudonBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -483,7 +483,7 @@ void UpdateGroudonEntityLogic(void) MPlayStart(&gMPlayInfo_SE1, &se_unk_11c); gCurrentPinballGame->projectileAttackAnimTimer = 8; gCurrentPinballGame->projectileFlightTimer = 35; - gMain.spriteGroups[22].active = TRUE; + gMain.spriteGroups[SG_22].active = TRUE; gCurrentPinballGame->projectilePosition.x = 1200; gCurrentPinballGame->projectilePosition.y = 1240; tempVector.x = gCurrentPinballGame->projectilePosition.x / 10 - gCurrentPinballGame->ball->positionQ0.x; @@ -560,7 +560,7 @@ void UpdateGroudonEntityLogic(void) { if (gCurrentPinballGame->bossFrameTimer == 0) { - gMain.spriteGroups[30].active = TRUE; + gMain.spriteGroups[SG_30].active = TRUE; gCurrentPinballGame->shockwaveAnimTimer = 0; MPlayStart(&gMPlayInfo_SE1, &se_unk_11d); } @@ -607,8 +607,8 @@ void UpdateGroudonEntityLogic(void) // catch groudon gCurrentPinballGame->bossEntityState = GROUDON_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[10].active = TRUE; - gMain.spriteGroups[9].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_GROUDON; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -628,7 +628,7 @@ void UpdateGroudonEntityLogic(void) gCurrentPinballGame->bossMovementPhase = 0; gCurrentPinballGame->bossFrameTimer = 0; - if (gMain.spriteGroups[24].active) + if (gMain.spriteGroups[SG_24].active) gCurrentPinballGame->ballGrabTimer = 1; break; case GROUDON_ENTITY_STATE_PREPARE_LEAVING: @@ -764,7 +764,7 @@ void UpdateGroudonEntityLogic(void) if (gCurrentPinballGame->impactShakeTimer == 8) { i = 0; - gMain.spriteGroups[15 + i].active = TRUE; + gMain.spriteGroups[SG_15 + i].active = TRUE; gCurrentPinballGame->boulderState[i] = GROUDON_BOULDER_STATE_SPAWN; gCurrentPinballGame->boulderSpriteFrame[i] = 0; gCurrentPinballGame->boulderAnimTimer[i] = 0; @@ -773,7 +773,7 @@ void UpdateGroudonEntityLogic(void) if (gCurrentPinballGame->impactShakeTimer == 20) { i = 1; - gMain.spriteGroups[15 + i].active = TRUE; + gMain.spriteGroups[SG_15 + i].active = TRUE; gCurrentPinballGame->boulderState[i] = GROUDON_BOULDER_STATE_SPAWN; gCurrentPinballGame->boulderSpriteFrame[i] = 13; gCurrentPinballGame->boulderAnimTimer[i] = 0; @@ -782,7 +782,7 @@ void UpdateGroudonEntityLogic(void) if (gCurrentPinballGame->impactShakeTimer == 53) { i = 2; - gMain.spriteGroups[15 + i].active = TRUE; + gMain.spriteGroups[SG_15 + i].active = TRUE; gCurrentPinballGame->boulderState[i] = GROUDON_BOULDER_STATE_SPAWN; gCurrentPinballGame->boulderSpriteFrame[i] = 22; gCurrentPinballGame->boulderAnimTimer[i] = 0; @@ -830,7 +830,7 @@ void RenderGroudonSprites(void) s16 var0; int palette; - group = &gMain.spriteGroups[29]; + group = &gMain.spriteGroups[SG_29]; if (group->active) { var0 = gGroudonAnimFramesetTable[gCurrentPinballGame->bossFramesetIndex][0]; @@ -907,7 +907,7 @@ void RenderGroudonSprites(void) } } - group = &gMain.spriteGroups[23]; + group = &gMain.spriteGroups[SG_23]; if (group->active) { if (gCurrentPinballGame->projectileAttackAnimTimer > 0) @@ -935,7 +935,7 @@ void RenderGroudonSprites(void) if (gCurrentPinballGame->captureState == MON_CAPTURE_SPECIAL_STATE_CAPTURE_CUTSCENE) { - gMain.spriteGroups[23].active = FALSE; + gMain.spriteGroups[SG_23].active = FALSE; gCurrentPinballGame->projectileAttackAnimTimer = 0; } } @@ -960,7 +960,7 @@ void UpdateGroudonFieldEntities(void) s8 var0; varSL = 0; - group = &gMain.spriteGroups[10]; + group = &gMain.spriteGroups[SG_10]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -988,7 +988,7 @@ void UpdateGroudonFieldEntities(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[9]; + group = &gMain.spriteGroups[SG_9]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) @@ -1003,7 +1003,7 @@ void UpdateGroudonFieldEntities(void) } } - group = &gMain.spriteGroups[24]; + group = &gMain.spriteGroups[SG_24]; if (group->active) { gCurrentPinballGame->ballGrabTimer--; @@ -1055,7 +1055,7 @@ void UpdateGroudonFieldEntities(void) if (gCurrentPinballGame->ballGrabTimer == 0) { - gMain.spriteGroups[24].active = FALSE; + gMain.spriteGroups[SG_24].active = FALSE; gCurrentPinballGame->ballGrabFlashTimer = 0; gCurrentPinballGame->ballGrabbed = 0; } @@ -1083,7 +1083,7 @@ void UpdateGroudonFieldEntities(void) } } - group = &gMain.spriteGroups[22]; + group = &gMain.spriteGroups[SG_22]; if (group->active) { tempVector.x = gCurrentPinballGame->projectilePosition.x / 10 - gCurrentPinballGame->ball->positionQ0.x; @@ -1101,7 +1101,7 @@ void UpdateGroudonFieldEntities(void) { MPlayStart(&gMPlayInfo_SE1, &se_unk_11f); gCurrentPinballGame->projectileFlightTimer = 10; - gMain.spriteGroups[24].active = TRUE; + gMain.spriteGroups[SG_24].active = TRUE; gCurrentPinballGame->ballGrabTimer = 612; PlayRumble(9); } @@ -1144,7 +1144,7 @@ void UpdateGroudonFieldEntities(void) } if (gCurrentPinballGame->projectileFlightTimer == 0) - gMain.spriteGroups[22].active = FALSE; + gMain.spriteGroups[SG_22].active = FALSE; } group->baseX = gCurrentPinballGame->projectilePosition.x / 10 - gCurrentPinballGame->cameraXOffset - 12; @@ -1164,14 +1164,14 @@ void UpdateGroudonFieldEntities(void) if (gCurrentPinballGame->captureState == MON_CAPTURE_SPECIAL_STATE_CAPTURE_CUTSCENE) { - gMain.spriteGroups[22].active = FALSE; + gMain.spriteGroups[SG_22].active = FALSE; gCurrentPinballGame->projectileFlightTimer = 0; } } for (i = 0; i < 3; i++) { - group = &gMain.spriteGroups[15 + i]; + group = &gMain.spriteGroups[SG_15 + i]; if (group->active) { switch (gCurrentPinballGame->boulderState[i]) @@ -1334,7 +1334,7 @@ void UpdateGroudonFieldEntities(void) case GROUDON_BOULDER_STATE_CLEANUP: gCurrentPinballGame->boulderCollisionPos[i].x = 0; gCurrentPinballGame->boulderCollisionPos[i].y = 0; - gMain.spriteGroups[15 + i].active = FALSE; + gMain.spriteGroups[SG_15 + i].active = FALSE; break; } @@ -1372,7 +1372,7 @@ void UpdateGroudonFieldEntities(void) */ for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[18 + i]; + group = &gMain.spriteGroups[SG_18 + i]; if (group->active) { switch(gCurrentPinballGame->firePillarState[i]) @@ -1476,7 +1476,7 @@ void UpdateGroudonFieldEntities(void) gCurrentPinballGame->firePillarAnimLoopCount[i] = 0; break; case GROUDON_FIRE_PILLAR_STATE_CLEANUP: - gMain.spriteGroups[18 + i].active = FALSE; + gMain.spriteGroups[SG_18 + i].active = FALSE; break; } @@ -1568,7 +1568,7 @@ void UpdateGroudonFieldEntities(void) m4aSongNumStart(SE_GROUDON_DUSTORM_LIFT); } - group = &gMain.spriteGroups[30]; + group = &gMain.spriteGroups[SG_30]; if (group->active) { s16 scale; @@ -1601,7 +1601,7 @@ void UpdateGroudonFieldEntities(void) { for (i = 0; i < 4; i++) { - gMain.spriteGroups[i + 18].active = TRUE; + gMain.spriteGroups[SG_18 + i].active = TRUE; gCurrentPinballGame->firePillarState[i] = GROUDON_FIRE_PILLAR_STATE_SPAWN; gCurrentPinballGame->firePillarAnimFrame[i] = 0; gCurrentPinballGame->firePillarFrameTimer[i] = 0; @@ -1656,7 +1656,7 @@ void UpdateGroudonFieldEntities(void) } if ((gMain.modeChangeFlags & MODE_CHANGE_EXPIRED_BONUS_BANNER) != 0) - gMain.spriteGroups[30].active = FALSE; + gMain.spriteGroups[SG_30].active = FALSE; } } @@ -1666,7 +1666,7 @@ void HideGroudonShockwaveSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[30]; + group = &gMain.spriteGroups[SG_30]; if (group->active) { group->baseX = 240; @@ -1694,7 +1694,7 @@ void AnimateGroudonBackground(void) var0 = gGroudonBgTileAnimIndices[(gMain.systemFrameCount % 96) / 24]; for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[11 + i]; + group = &gMain.spriteGroups[SG_11 + i]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = 128 - gCurrentPinballGame->cameraYOffset; for (j = 0; j < 3; j++) diff --git a/src/high_scores.c b/src/high_scores.c index c32bba7c..0e20e1ea 100644 --- a/src/high_scores.c +++ b/src/high_scores.c @@ -17,7 +17,7 @@ extern s8 gCompletionBannerDone; extern s8 gCompletionBannerVisible; extern s16 gCompletionBannerY; extern s8 gCompletionBannerPhase; -extern s8 gCompletionBannerFrame; +extern s8 gCompletionBannerSpriteGroup; extern s8 gShowDialogFlag; extern u8 gDialogType; extern u16 gLinkExchangeCommand; @@ -40,7 +40,7 @@ struct HighScoreScreenState u8 mainField; s32 highScoreIndex; s16 currentNameCharIndex; - s16 nameFlashToggle; + s16 nameFlashSpriteGroup; s16 flashFrameCounter; s16 currentNameChar; s16 flashDuration; @@ -50,7 +50,7 @@ struct HighScoreScreenState s16 inputRepeatDelay; s16 linkWaitTimer; s8 nextIdleState; - u8 arrowBlinkToggle; + s8 arrowBlinkToggle; s8 displayModeVisible; }; @@ -141,7 +141,7 @@ void InitHighScoreData(void) } } gHighScoreScreenState.currentNameCharIndex = 0; - gHighScoreScreenState.nameFlashToggle = 0; + gHighScoreScreenState.nameFlashSpriteGroup = SG_0; gHighScoreScreenState.flashFrameCounter = 0; gHighScoreScreenState.flashDuration = 0; gHighScoreScreenState.flashElapsedFrames = 0; @@ -188,7 +188,7 @@ void InitHighScoreData(void) { gCompletionBannerVisible = 1; gCompletionBannerY = 0xB8; - gCompletionBannerFrame = 0; + gCompletionBannerSpriteGroup = SG_0; gCompletionBannerPhase = 0; gHighScoreScreenState.nextSubState = 1; } @@ -235,22 +235,22 @@ void HighScore_ShowCompletionBanner(void) temp = gHighScoreScreenState.flashDuration; if((gHighScoreScreenState.flashDuration & 3) == 0) { - gCompletionBannerFrame++; - if(gCompletionBannerFrame > 4) + gCompletionBannerSpriteGroup++; + if(gCompletionBannerSpriteGroup > SG_4) { - gCompletionBannerFrame = 0; + gCompletionBannerSpriteGroup = SG_0; } } if(gCompletionBannerY == 0x50) { - gCompletionBannerFrame = 0; + gCompletionBannerSpriteGroup = SG_0; gCompletionBannerPhase++; } break; case 2: if(JOY_NEW(A_BUTTON | B_BUTTON)) { - gCompletionBannerFrame = 0; + gCompletionBannerSpriteGroup = SG_0; gCompletionBannerPhase++; } break; @@ -296,15 +296,15 @@ void HighScore_FlashNewEntry(void) if(gHighScoreScreenState.flashFrameCounter > 8) { gHighScoreScreenState.flashFrameCounter = 0; - if(!gHighScoreScreenState.nameFlashToggle) + if(!gHighScoreScreenState.nameFlashSpriteGroup) { - gHighScoreScreenState.nameFlashToggle = 1; + gHighScoreScreenState.nameFlashSpriteGroup = SG_1; CopyString(6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] + (gHighScoreScreenState.mainField << 5), 0, 0x15, 4, 2); CopyString(0, 0x17, 6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] + (gHighScoreScreenState.mainField << 5), 4, 2); } else { - gHighScoreScreenState.nameFlashToggle = 0; + gHighScoreScreenState.nameFlashSpriteGroup = SG_0; CopyString(0, 0x15, 6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] + (gHighScoreScreenState.mainField << 5), 4, 2); } } @@ -324,9 +324,9 @@ void HighScore_FlashNewEntry(void) if(gHighScoreScreenState.flashElapsedFrames > gHighScoreScreenState.flashDuration) { gHighScoreScreenState.flashElapsedFrames = 0; - if(gHighScoreScreenState.nameFlashToggle == 1) + if(gHighScoreScreenState.nameFlashSpriteGroup == SG_1) { - gHighScoreScreenState.nameFlashToggle = 0; + gHighScoreScreenState.nameFlashSpriteGroup = SG_0; gHighScoreScreenState.flashFrameCounter = 0; CopyString(0, 0x15, 6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] +(gHighScoreScreenState.mainField << 5), 4, 2); } @@ -436,7 +436,7 @@ void HighScore_NameEntry(void) if (++gHighScoreScreenState.flashFrameCounter > 12) { gHighScoreScreenState.flashFrameCounter = 0; - gHighScoreScreenState.nameFlashToggle = 1 - gHighScoreScreenState.nameFlashToggle; + gHighScoreScreenState.nameFlashSpriteGroup = SG_1 - gHighScoreScreenState.nameFlashSpriteGroup; } if (++gHighScoreScreenState.paletteAnimTimer > 8) @@ -481,7 +481,7 @@ void HighScore_NameEntry(void) else { m4aSongNumStart(SE_MENU_MOVE); - gHighScoreScreenState.nameFlashToggle = 1; + gHighScoreScreenState.nameFlashSpriteGroup = SG_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; gHighScoreScreenState.currentNameCharIndex++; @@ -497,7 +497,7 @@ void HighScore_NameEntry(void) else { m4aSongNumStart(SE_MENU_MOVE); - gHighScoreScreenState.nameFlashToggle = 1; + gHighScoreScreenState.nameFlashSpriteGroup = SG_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; gHighScoreScreenState.currentNameCharIndex--; @@ -507,7 +507,7 @@ void HighScore_NameEntry(void) if (JOY_NEW(A_BUTTON)) { - gHighScoreScreenState.nameFlashToggle = 1; + gHighScoreScreenState.nameFlashSpriteGroup = SG_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; if (gHighScoreScreenState.currentNameCharIndex == HIGH_SCORE_NAME_LENGTH - 1) @@ -545,7 +545,7 @@ void HighScore_NameEntry(void) else { m4aSongNumStart(SE_SCORE_ENTRY_A_B_MOVE); - gHighScoreScreenState.nameFlashToggle = 1; + gHighScoreScreenState.nameFlashSpriteGroup = SG_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; gHighScoreScreenState.currentNameCharIndex--; @@ -939,9 +939,9 @@ void UpdateNameEntryCursor(void) int i; struct SpriteGroup *spriteGroup; - spriteGroup = &gMain_spriteGroups[gHighScoreScreenState.nameFlashToggle]; + spriteGroup = &gMain.spriteGroups[gHighScoreScreenState.nameFlashSpriteGroup]; spriteGroup->active = TRUE; - LoadSpriteSets(gNameEntryCursorSpriteSets, 2, gMain_spriteGroups); + LoadSpriteSets(gNameEntryCursorSpriteSets, 2, gMain.spriteGroups); spriteGroup->baseX = gHighScoreNamePixelPositions[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].x + gHighScoreScreenState.currentNameCharIndex * 8; spriteGroup->baseY = gHighScoreNamePixelPositions[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].y; @@ -987,7 +987,7 @@ void RenderHighScoreSprites(void) const struct SpriteSet *spriteSet; struct OamDataSimple *oamData; - spriteGroups = gMain_spriteGroups; + spriteGroups = gMain.spriteGroups; spriteGroup1 = spriteGroups; spriteGroup2 = &spriteGroups[1]; spriteGroup3 = &spriteGroups[2 + (s8)gDialogType]; @@ -1043,7 +1043,7 @@ void RenderHighScoreSprites(void) spriteGroup2->active = TRUE; spriteGroup3->active = gShowDialogFlag; spriteGroup4->active = var1_02002858->collisionCooldownTimer; - LoadSpriteSets(gHighScoreScreenSpriteSets, 2, gMain_spriteGroups); + LoadSpriteSets(gHighScoreScreenSpriteSets, 2, gMain.spriteGroups); RenderHighScoreSprites_HELPER(4, spriteGroup2, spriteGroup4, spriteGroup3); if (spriteGroup4->active == TRUE) { @@ -1084,7 +1084,7 @@ void RenderHighScoreSprites(void) { spriteGroup1->active = FALSE; spriteGroup2->active = FALSE; - LoadSpriteSets(gHighScoreScreenSpriteSets, 9, gMain_spriteGroups); + LoadSpriteSets(gHighScoreScreenSpriteSets, 9, gMain.spriteGroups); } spriteGroup3->active = FALSE; @@ -1603,9 +1603,9 @@ void RenderCompletionBanner(void) int i; struct SpriteGroup *spriteGroup; - spriteGroup = &gMain_spriteGroups[gCompletionBannerFrame]; + spriteGroup = &gMain.spriteGroups[gCompletionBannerSpriteGroup]; spriteGroup->active = gCompletionBannerVisible; - LoadSpriteSets(gCompletionBannerSpriteSets, 5, gMain_spriteGroups); + LoadSpriteSets(gCompletionBannerSpriteSets, 5, gMain.spriteGroups); if (spriteGroup->active == TRUE) { spriteGroup->baseX = 120; diff --git a/src/intro.c b/src/intro.c index 20293efe..ac0f89c8 100644 --- a/src/intro.c +++ b/src/intro.c @@ -521,7 +521,7 @@ void IntroScene1_RenderTitleSprite(void) struct SpriteGroup *puVar4; const struct SpriteSet *puVar6; - puVar4 = &gMain.spriteGroups[4 + gIntroSpriteEntities[0].animFrame]; + puVar4 = &gMain.spriteGroups[SG_4 + gIntroSpriteEntities[0].animFrame]; puVar4->active = gIntroSpriteEntities[0].visible; LoadSpriteSets(gIntroScene1_SpriteSets, 0x31, gMain.spriteGroups); @@ -548,7 +548,7 @@ void IntroScene1_RenderScaledTitle(void) struct SpriteGroup *puVar4; struct OamDataSimple *puVar2; - puVar4 = &gMain.spriteGroups[40]; + puVar4 = &gMain.spriteGroups[SG_40]; puVar4->active = gIntroSpriteEntities[0].visible; LoadSpriteSets(gIntroScene1_SpriteSets, 0x31, gMain.spriteGroups); @@ -586,10 +586,10 @@ void IntroScene1_RenderAllSprites(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - puVar1 = &gMain.spriteGroups[gIntroSpriteEntities[1].animFrame]; - mainSg3 = &gMain.spriteGroups[3]; - mainSg2 = &gMain.spriteGroups[2]; - otherSg = &gMain_spriteGroups_48; + puVar1 = &gMain.spriteGroups[SG_0 + gIntroSpriteEntities[1].animFrame]; + mainSg3 = &gMain.spriteGroups[SG_3]; + mainSg2 = &gMain.spriteGroups[SG_2]; + otherSg = &gMain.spriteGroups[SG_48]; puVar1->active = gIntroSpriteEntities[1].visible; mainSg3->active = gIntroSpriteEntities[2].visible; @@ -946,7 +946,7 @@ void IntroScene3_RenderPokeball(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - puVar4 = &gMain.spriteGroups[0]; + puVar4 = &gMain.spriteGroups[SG_0]; puVar4->active = TRUE; LoadSpriteSets(gIntroScene3_SpriteSets, 0x1, puVar4); @@ -1262,9 +1262,9 @@ void IntroScene5_RenderAllSprites(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - mainSg1 = &gMain.spriteGroups[1]; - mainSg0 = &gMain.spriteGroups[0]; - mainSg2 = &gMain.spriteGroups[2]; + mainSg1 = &gMain.spriteGroups[SG_1]; + mainSg0 = &gMain.spriteGroups[SG_0]; + mainSg2 = &gMain.spriteGroups[SG_2]; mainSg1->active = TRUE; mainSg0->active = TRUE; @@ -1497,12 +1497,12 @@ void IntroScene6_RenderStarSprites(void) const struct SpriteSet *p; struct SpriteGroup *spriteGroups[6]; - spriteGroups[0] = &gMain.spriteGroups[6 * gIntroSpriteEntities[0].animFrame]; - spriteGroups[1] = &gMain.spriteGroups[6 * gIntroSpriteEntities[1].animFrame + 1]; - spriteGroups[2] = &gMain.spriteGroups[6 * gIntroSpriteEntities[2].animFrame + 2]; - spriteGroups[3] = &gMain.spriteGroups[6 * gIntroSpriteEntities[3].animFrame + 3]; - spriteGroups[4] = &gMain.spriteGroups[6 * gIntroSpriteEntities[4].animFrame + 4]; - spriteGroups[5] = &gMain.spriteGroups[6 * gIntroSpriteEntities[5].animFrame + 5]; + spriteGroups[0] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[0].animFrame]; + spriteGroups[1] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[1].animFrame + 1]; + spriteGroups[2] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[2].animFrame + 2]; + spriteGroups[3] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[3].animFrame + 3]; + spriteGroups[4] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[4].animFrame + 4]; + spriteGroups[5] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[5].animFrame + 5]; spriteGroups[0]->active = gIntroSpriteEntities[0].visible; spriteGroups[1]->active = gIntroSpriteEntities[1].visible; @@ -1511,7 +1511,7 @@ void IntroScene6_RenderStarSprites(void) spriteGroups[4]->active = gIntroSpriteEntities[4].visible; spriteGroups[5]->active = gIntroSpriteEntities[5].visible; - LoadSpriteSets(gIntroScene6_SpriteSets, 0x12, &gMain.spriteGroups[0]); + LoadSpriteSets(gIntroScene6_SpriteSets, 0x12, &gMain.spriteGroups[SG_0]); for (i = 0; i < 6; i++) { if (spriteGroups[i]->active != TRUE) @@ -1805,7 +1805,7 @@ void IntroScene7_RenderWailmer(void) struct SpriteGroup *spriteGroup; struct OamDataSimple *oamData; - spriteGroup = &gMain.spriteGroups[0]; + spriteGroup = &gMain.spriteGroups[SG_0]; spriteGroup->active = TRUE; LoadSpriteSets(gIntroScene7_SpriteSets, 0x1, gMain.spriteGroups); if (spriteGroup->active == TRUE) @@ -1985,14 +1985,14 @@ void IntroScene8a_RenderAllSprites(void) s8 cVar2; - sg0 = &gMain.spriteGroups[0]; - sg1 = &gMain.spriteGroups[1]; + sg0 = &gMain.spriteGroups[SG_0]; + sg1 = &gMain.spriteGroups[SG_1]; - spriteGroups[0] = &gMain.spriteGroups[2 + (5 * gIntroSpriteEntities[2].animFrame)]; - spriteGroups[1] = &gMain.spriteGroups[3 + (5 * gIntroSpriteEntities[3].animFrame)]; - spriteGroups[2] = &gMain.spriteGroups[4 + (5 * gIntroSpriteEntities[4].animFrame)]; - spriteGroups[3] = &gMain.spriteGroups[5 + (5 * gIntroSpriteEntities[5].animFrame)]; - spriteGroups[4] = &gMain.spriteGroups[6 + (5 * gIntroSpriteEntities[6].animFrame)]; + spriteGroups[0] = &gMain.spriteGroups[SG_2 + (5 * gIntroSpriteEntities[2].animFrame)]; + spriteGroups[1] = &gMain.spriteGroups[SG_3 + (5 * gIntroSpriteEntities[3].animFrame)]; + spriteGroups[2] = &gMain.spriteGroups[SG_4 + (5 * gIntroSpriteEntities[4].animFrame)]; + spriteGroups[3] = &gMain.spriteGroups[SG_5 + (5 * gIntroSpriteEntities[5].animFrame)]; + spriteGroups[4] = &gMain.spriteGroups[SG_6 + (5 * gIntroSpriteEntities[6].animFrame)]; sg0->active = gIntroSpriteEntities[0].visible; @@ -2277,8 +2277,8 @@ void IntroScene8b_RenderBallAndCloud(void) struct SpriteGroup *spriteGroup1; struct OamDataSimple *oamData; - spriteGroup0 = &gMain.spriteGroups[gIntroSpriteEntities[0].animFrame]; - spriteGroup1 = &gMain.spriteGroups[0]; + spriteGroup0 = &gMain.spriteGroups[SG_0 + gIntroSpriteEntities[0].animFrame]; + spriteGroup1 = &gMain.spriteGroups[SG_0]; spriteGroup0->active = gIntroSpriteEntities[0].visible; spriteGroup1->active = gIntroSpriteEntities[1].visible; LoadSpriteSets(gIntroScene8b_SpriteSets, 11, gMain.spriteGroups); diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index 37328855..5aecf9b7 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -6,9 +6,6 @@ #define BONUS_KECLEON_COMPLETE_POINTS 30000000 -extern struct SpriteGroup gMain_spriteGroups_9; -extern struct SpriteGroup gMain_spriteGroups_31; - extern void UpdateKecleonEntityLogic(void); extern void RenderKecleonSprites(void); extern void UpdateKecleonScopeItem(void); @@ -170,8 +167,8 @@ void KecleonBoardProcess_3B_35AA4(void) { gCurrentPinballGame->boardState = KECLEON_BOARD_STATE_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gKecleonBonusClear_Gfx, (void *)0x6015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 0x88; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -786,7 +783,7 @@ void RenderKecleonSprites(void) int baseX = 104; int baseY = 28; - spriteGroup = &gMain_spriteGroups[gKecleonSpriteOrderMap[23]]; + spriteGroup = &gMain.spriteGroups[gKecleonSpriteGroupOrderMap[23]]; if (!spriteGroup->active) return; @@ -860,7 +857,7 @@ void RenderKecleonSprites(void) baseX = 104; baseY = 60; - spriteGroup = &gMain_spriteGroups_31; + spriteGroup = &gMain.spriteGroups[SG_31]; spriteGroup->baseX = gCurrentPinballGame->bossPositionX / 10 + baseX - gCurrentPinballGame->cameraXOffset; spriteGroup->baseY = gCurrentPinballGame->bossPositionY / 10 + baseY - gCurrentPinballGame->cameraYOffset; @@ -898,7 +895,7 @@ void RenderKecleonSprites(void) baseX = 104; baseY = 26; - spriteGroup = &gMain_spriteGroups_9; + spriteGroup = &gMain.spriteGroups[SG_9]; var0 = gCurrentPinballGame->kecleonCollisionEnabled * 3; var1 = gCurrentPinballGame->kecleonDustGfxFrame / 8 - 2; @@ -934,7 +931,7 @@ void UpdateKecleonScopeItem(void) int xx, yy; int squaredMagnitude; - group = &gMain.spriteGroups[24]; + group = &gMain.spriteGroups[SG_24]; if (!group->active) return; @@ -1109,7 +1106,7 @@ void RenderKecleonBoardElements(void) tempVector.y = gCurrentPinballGame->kecleonCollisionPos.y * 2; ProcessKecleonSkulkingDisturbanceCollisionEvent(&tempVector); - group = &gMain.spriteGroups[gKecleonSpriteOrderMap[16]]; + group = &gMain.spriteGroups[gKecleonSpriteGroupOrderMap[16]]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; for (j = 0; j < 4; j++) @@ -1119,14 +1116,14 @@ void RenderKecleonBoardElements(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[gKecleonSpriteOrderMap[17]]; + group = &gMain.spriteGroups[gKecleonSpriteGroupOrderMap[17]]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; oamSimple = &group->oam[0]; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[7]; + group = &gMain.spriteGroups[SG_7]; var0 = 5 - gCurrentPinballGame->kecleonCollisionY % 10; if (gCurrentPinballGame->kecleonCollisionY > 30) var1 = 20; @@ -1158,7 +1155,7 @@ void RenderKecleonBoardElements(void) for (i = 0; i < 6; i++) { - group = &gMain.spriteGroups[gKecleonSpriteOrderMap[10 + i]]; + group = &gMain.spriteGroups[gKecleonSpriteGroupOrderMap[10 + i]]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; var2 = 0; @@ -1179,7 +1176,7 @@ void RenderKecleonBoardElements(void) for (i = 6; i < 10; i++) { - group = &gMain.spriteGroups[gKecleonSpriteOrderMap[12 + i]]; + group = &gMain.spriteGroups[gKecleonSpriteGroupOrderMap[12 + i]]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; var2 = 0; @@ -1198,7 +1195,7 @@ void RenderKecleonBoardElements(void) } } - group = &gMain.spriteGroups[25]; + group = &gMain.spriteGroups[SG_25]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; var2 = 0; @@ -1218,7 +1215,7 @@ void RenderKecleonBoardElements(void) for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[26 + i]; + group = &gMain.spriteGroups[SG_26 + i]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; @@ -1238,7 +1235,7 @@ void RenderKecleonBoardElements(void) } } - group = &gMain.spriteGroups[28]; + group = &gMain.spriteGroups[SG_28]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; var2 = 0; @@ -1256,7 +1253,7 @@ void RenderKecleonBoardElements(void) gOamBuffer[oamSimple->oamId].tileNum = 0x132 + var2 * 12 + j * 8; } - group = &gMain.spriteGroups[32]; + group = &gMain.spriteGroups[SG_32]; group->baseX = gCurrentPinballGame->ball->screenPosition.x; group->baseY = gCurrentPinballGame->ball->screenPosition.y + 14; oamSimple = &group->oam[0]; @@ -1266,7 +1263,7 @@ void RenderKecleonBoardElements(void) else gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[29]; + group = &gMain.spriteGroups[SG_29]; if (gCurrentPinballGame->kecleonWaterBallCollisionTimer < 12) gCurrentPinballGame->kecleonWaterBallCollisionTimer++; else @@ -1293,7 +1290,7 @@ void RenderKecleonBoardElements(void) gOamBuffer[oamSimple->oamId].tileNum = 0x16E + var2; } - group = &gMain.spriteGroups[30]; + group = &gMain.spriteGroups[SG_30]; if (gCurrentPinballGame->kecleonWaterCollisionTimer < 24) gCurrentPinballGame->kecleonWaterCollisionTimer++; else @@ -1364,7 +1361,7 @@ void SortKecleonSpritesByY(void) for (i = 0; i < 14; i++) { - gKecleonSpriteOrderMap[sp0[i].spriteIndex + 10] = i + 10; + gKecleonSpriteGroupOrderMap[10 + sp0[i].spriteIndex] = SG_10 + i; gKecleonSpriteSets[i + 10] = sp0[i].spriteSet; } diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 170a5181..cf653069 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -153,8 +153,8 @@ void KyogreBoardProcess_3B_3869C(void) { gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SUCCESS_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gKyogreBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -195,8 +195,8 @@ void KyogreBoardProcess_3B_3869C(void) case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; gCurrentPinballGame->stageTimer = 140; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gKyogreBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -476,7 +476,7 @@ void UpdateKyogreEntityLogic(void) if (gCurrentPinballGame->shockwaveAlreadyHit == 0 && gCurrentPinballGame->bossFramesetIndex == 42) { - gMain.spriteGroups[24].active = TRUE; + gMain.spriteGroups[SG_24].active = TRUE; gCurrentPinballGame->shockwaveAnimTimer = 0; MPlayStart(&gMPlayInfo_SE1, &se_unk_10e); } @@ -494,8 +494,8 @@ void UpdateKyogreEntityLogic(void) // catch kyogre gCurrentPinballGame->bossEntityState = KYOGRE_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[10].active = TRUE; - gMain.spriteGroups[9].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_KYOGRE; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -512,7 +512,7 @@ void UpdateKyogreEntityLogic(void) gCurrentPinballGame->ballRespawnTimer = 0; } - if (gMain.spriteGroups[16].active) + if (gMain.spriteGroups[SG_16].active) { gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_DESPAWN; gCurrentPinballGame->freezeTrapPauseTimer = 1; @@ -679,7 +679,7 @@ void RenderKyogreSprites(void) s16 index; s16 palette; - group = &gMain.spriteGroups[21]; + group = &gMain.spriteGroups[SG_21]; if (group->active) { index = gCurrentPinballGame->bossVulnerable; @@ -755,7 +755,7 @@ void RenderKyogreSprites(void) } } - group = &gMain.spriteGroups[26]; + group = &gMain.spriteGroups[SG_26]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10 + 108 - gCurrentPinballGame->cameraXOffset; @@ -779,7 +779,7 @@ void RenderKyogreSprites(void) else { gCurrentPinballGame->shockwaveAnimTimer = 0; - gMain.spriteGroups[26].active = FALSE; + gMain.spriteGroups[SG_26].active = FALSE; } } else @@ -813,7 +813,7 @@ void UpdateKyogreFieldEntities(void) index = 0; //Portrait display (during catch) - group = &gMain.spriteGroups[10]; + group = &gMain.spriteGroups[SG_10]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -841,7 +841,7 @@ void UpdateKyogreFieldEntities(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[9]; + group = &gMain.spriteGroups[SG_9]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) @@ -857,7 +857,7 @@ void UpdateKyogreFieldEntities(void) } //Freeze trap - group = &gMain.spriteGroups[16]; + group = &gMain.spriteGroups[SG_16]; if (group->active) { // General handling: Processes through a number of loops of animation frames. @@ -941,7 +941,7 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapNextPhase = KYOGRE_FREEZE_PHASE_DESPAWN; break; case KYOGRE_FREEZE_PHASE_DESPAWN: - gMain.spriteGroups[16].active = FALSE; + gMain.spriteGroups[SG_16].active = FALSE; break; } @@ -1025,7 +1025,7 @@ void UpdateKyogreFieldEntities(void) // Whirlpool processing for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[22 + i]; + group = &gMain.spriteGroups[SG_22 + i]; if ((gMain.modeChangeFlags & MODE_CHANGE_BONUS_BANNER) == 0) { switch (gCurrentPinballGame->vortexEntityState[i]) { @@ -1210,7 +1210,7 @@ void UpdateKyogreFieldEntities(void) } //Shockwave processing - group = &gMain.spriteGroups[24]; + group = &gMain.spriteGroups[SG_24]; if (group->active) { s16 scale; @@ -1283,16 +1283,16 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_ENCLOSE_BALL; gCurrentPinballGame->freezeTrapAnimFrame = 0; gCurrentPinballGame->freezeTrapFrameTimer = 0; - if (!gMain.spriteGroups[16].active) + if (!gMain.spriteGroups[SG_16].active) PlayRumble(8); //Activate the 'ice trap' sprite + logic. - gMain.spriteGroups[16].active = TRUE; + gMain.spriteGroups[SG_16].active = TRUE; } } if (gMain.modeChangeFlags & MODE_CHANGE_EXPIRED_BONUS_BANNER) - gMain.spriteGroups[24].active = FALSE; + gMain.spriteGroups[SG_24].active = FALSE; } } @@ -1302,7 +1302,7 @@ void HideKyogreSplashSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[24]; + group = &gMain.spriteGroups[SG_24]; if (group->active) { group->baseX = 240; @@ -1350,7 +1350,7 @@ void AnimateKyogreBackground(void) for (j = 0; j < 4; j++) { - group = &gMain.spriteGroups[11 + j]; + group = &gMain.spriteGroups[SG_11 + j]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = 128 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 3; i++) @@ -1362,7 +1362,7 @@ void AnimateKyogreBackground(void) } } - group = &gMain.spriteGroups[15]; + group = &gMain.spriteGroups[SG_15]; if (group->active) { group->baseX = 120 - gCurrentPinballGame->cameraXOffset; @@ -1375,6 +1375,6 @@ void AnimateKyogreBackground(void) } if (gCurrentPinballGame->stageTimer == 480) - gMain.spriteGroups[15].active = FALSE; + gMain.spriteGroups[SG_15].active = FALSE; } } diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index 125bc74e..292448e2 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -218,7 +218,7 @@ void DrawSapphireBumperSprites(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[61]; + group = &gMain.spriteGroups[SG_61]; if (!group->active) return; @@ -233,7 +233,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[58]; + group = &gMain.spriteGroups[SG_58]; group->baseX = 68 - gCurrentPinballGame->cameraXOffset; if (gCurrentPinballGame->sapphireBumperHitFxTimer[0] < 14) { @@ -250,7 +250,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[62]; + group = &gMain.spriteGroups[SG_62]; group->baseX = 36 - gCurrentPinballGame->cameraXOffset; group->baseY = 163 - gCurrentPinballGame->cameraYOffset; index = gSapphireBumperAnimFrames[gCurrentPinballGame->sapphireBumperAnimKeyframe[1]][0]; @@ -262,7 +262,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[59]; + group = &gMain.spriteGroups[SG_59]; group->baseX = 36 - gCurrentPinballGame->cameraXOffset; if (gCurrentPinballGame->sapphireBumperHitFxTimer[1] < 14) { @@ -279,7 +279,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[76]; + group = &gMain.spriteGroups[SG_76]; group->baseX = 61 - gCurrentPinballGame->cameraXOffset; group->baseY = 186 - gCurrentPinballGame->cameraYOffset; if (gCurrentPinballGame->eggHatchShockWallOverride) @@ -330,7 +330,7 @@ void HandleRubyBumperHit(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[63]; + group = &gMain.spriteGroups[SG_63]; if (gCurrentPinballGame->bumperHitCountdown > 0) { if (gCurrentPinballGame->bumperHitCountdown == 2) diff --git a/src/main_board_edge.c b/src/main_board_edge.c index 5f5b8933..c7685241 100644 --- a/src/main_board_edge.c +++ b/src/main_board_edge.c @@ -13,9 +13,9 @@ void DrawBoardEdgeBanner(void) struct SpriteGroup *group; if (gMain.selectedField == FIELD_RUBY) - group = &gMain.spriteGroups[81]; + group = &gMain.spriteGroups[SG_81]; else - group = &gMain.spriteGroups[85]; + group = &gMain.spriteGroups[SG_85]; if (group->active) { diff --git a/src/main_board_evolution_mode.c b/src/main_board_evolution_mode.c index 0fbe0032..8b16d326 100644 --- a/src/main_board_evolution_mode.c +++ b/src/main_board_evolution_mode.c @@ -192,7 +192,7 @@ void UpdateEvolutionMode(void) if (gCurrentPinballGame->modeAnimTimer == 148) { gCurrentPinballGame->modeAnimTimer++; - if (gMain.spriteGroups[13].active) + if (gMain.spriteGroups[SG_13].active) { if (gCurrentPinballGame->chikoritaProjectileTimer >= 80) { diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index d7913860..775bd2be 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -498,7 +498,7 @@ void UpdateEvolutionShopSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[78]; + group = &gMain.spriteGroups[SG_78]; if (gCurrentPinballGame->shopTransitionActive == 0) { if (gCurrentPinballGame->evoArrowProgress > 2) @@ -554,7 +554,7 @@ void UpdateEvolutionShopSprite(void) { LoadShopItemGraphics(gCurrentPinballGame->evolutionShopActive); gCurrentPinballGame->shopTransitionActive = 0; - gMain.spriteGroups[78].active = FALSE; + gMain.spriteGroups[SG_78].active = FALSE; } } } @@ -846,7 +846,7 @@ void InitTotodileEggDelivery(void) gCurrentPinballGame->eggDeliveryY = 2080; gCurrentPinballGame->totodileDeliveryFrame = 0; gCurrentPinballGame->totodileDeliveryTimer = 0; - gMain.spriteGroups[82].active = TRUE; + gMain.spriteGroups[SG_82].active = TRUE; gCurrentPinballGame->eggAnimationPhase = 1; gCurrentPinballGame->portraitOffsetX = 240; gCurrentPinballGame->portraitOffsetY = 160; @@ -865,7 +865,7 @@ void AnimateTotodileEggDelivery(void) s16 var0; var0 = 0; - group = &gMain.spriteGroups[82]; + group = &gMain.spriteGroups[SG_82]; if (gPikaSaverFrameData[gCurrentPinballGame->totodileDeliveryFrame][1] > gCurrentPinballGame->totodileDeliveryTimer) { gCurrentPinballGame->totodileDeliveryTimer++; @@ -929,7 +929,7 @@ void InitAerodactylEggDelivery(void) gCurrentPinballGame->eggDeliveryY = -40; gCurrentPinballGame->eggDeliveryVelX = -36; gCurrentPinballGame->eggDeliveryVelY = 60; - gMain.spriteGroups[12].active = TRUE; + gMain.spriteGroups[SG_12].active = TRUE; gCurrentPinballGame->eggAnimationPhase = 1; gCurrentPinballGame->portraitOffsetX = gCurrentPinballGame->eggDeliveryX / 20 - gFlyingCreatureCameraOffsets[0].x; gCurrentPinballGame->portraitOffsetY = gCurrentPinballGame->eggDeliveryY / 20 - gFlyingCreatureCameraOffsets[0].y; @@ -947,7 +947,7 @@ void AnimateAerodactylEggDelivery(void) s16 var0; var0 = (gCurrentPinballGame->eggDropTimer % 56) / 8; - group = &gMain.spriteGroups[12]; + group = &gMain.spriteGroups[SG_12]; if (gCurrentPinballGame->eggDropTimer < 130) { if (gCurrentPinballGame->eggDropTimer % 36U == 0) @@ -1292,7 +1292,7 @@ void UpdateRubyEggHatchAnimation(void) var0 = 0; var1 = 0; var2 = 0; - group = &gMain.spriteGroups[48]; + group = &gMain.spriteGroups[SG_48]; var3 = 0; switch (gCurrentPinballGame->eggAnimationPhase) { @@ -1412,12 +1412,12 @@ void UpdateRubyEggHatchAnimation(void) gOamBuffer[oamSimple->oamId].y += group->baseY; } - group = &gMain.spriteGroups[52]; + group = &gMain.spriteGroups[SG_52]; group->baseX = gCurrentPinballGame->eggBasePosX; group->baseY = gCurrentPinballGame->eggBasePosY; for (i = 0; i < 4; i++) { - oamSimple = &gMain.spriteGroups[52].oam[i]; + oamSimple = &gMain.spriteGroups[SG_52].oam[i]; gOamBuffer[oamSimple->oamId].priority = priority; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; @@ -1433,7 +1433,7 @@ void UpdateHatchCave(void) s16 var0; priority = 1; - group = &gMain.spriteGroups[51]; + group = &gMain.spriteGroups[SG_51]; var0 = gMain.systemFrameCount % 36; gCurrentPinballGame->cyndaquilFrame = 0; gCurrentPinballGame->cyndaquilCollisionEnabled = 1; diff --git a/src/pokedex.c b/src/pokedex.c index cdf0d475..0ab5751c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1004,16 +1004,16 @@ void RenderPokedexSprites(void) const struct SpriteSet *spriteSet; int var0, var1; - group0 = &gMain_spriteGroups[0]; - group1 = &gMain_spriteGroups[1]; - group2 = &gMain_spriteGroups[2]; - group3 = &gMain_spriteGroups[3]; - group4 = &gMain_spriteGroups[4]; - group5 = &gMain_spriteGroups[5 + gPokedexAnimatedIconFrame]; - group6 = &gMain_spriteGroups[17 + gPokedexPopupTypeIndex]; - group7 = &gMain_spriteGroups[22 + gPokedexButtonPromptFrame]; - group8 = &gMain_spriteGroups[24]; - group9 = &gMain_spriteGroups[25 + gPokedexSpriteIndexBase * 2 + gPokedexPageIndicatorBlink]; + group0 = &gMain.spriteGroups[SG_0]; + group1 = &gMain.spriteGroups[SG_1]; + group2 = &gMain.spriteGroups[SG_2]; + group3 = &gMain.spriteGroups[SG_3]; + group4 = &gMain.spriteGroups[SG_4]; + group5 = &gMain.spriteGroups[SG_5 + gPokedexAnimatedIconFrame]; + group6 = &gMain.spriteGroups[SG_17 + gPokedexPopupTypeIndex]; + group7 = &gMain.spriteGroups[SG_22 + gPokedexButtonPromptFrame]; + group8 = &gMain.spriteGroups[SG_24]; + group9 = &gMain.spriteGroups[SG_25 + gPokedexSpriteIndexBase * 2 + gPokedexPageIndicatorBlink]; group0->active = TRUE; group1->active = TRUE; @@ -1220,14 +1220,14 @@ static void RenderLinkGraphics(void) struct OamDataSimple *groupOam; const struct SpriteSet *spriteSet; - group0 = &gMain_spriteGroups[0]; - group1 = &gMain_spriteGroups[1]; - group2 = &gMain_spriteGroups[2]; - group3 = &gMain_spriteGroups[3]; - group4 = &gMain_spriteGroups[4]; - group6 = &gMain_spriteGroups[5 + gPokedexAnimatedIconFrame]; - group7 = &gMain_spriteGroups[17 + gPokedexPopupTypeIndex]; - group5 = &gMain_spriteGroups[24]; + group0 = &gMain.spriteGroups[SG_0]; + group1 = &gMain.spriteGroups[SG_1]; + group2 = &gMain.spriteGroups[SG_2]; + group3 = &gMain.spriteGroups[SG_3]; + group4 = &gMain.spriteGroups[SG_4]; + group6 = &gMain.spriteGroups[SG_5 + gPokedexAnimatedIconFrame]; + group7 = &gMain.spriteGroups[SG_17 + gPokedexPopupTypeIndex]; + group5 = &gMain.spriteGroups[SG_24]; group0->active = TRUE; group1->active = TRUE; diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index e3856df2..d71acd6d 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -151,8 +151,8 @@ void RayquazaBoardProcess_3B_3EB2C(void) case LEGENDARY_BOARD_STATE_SUCCESS_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SUCCESS_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gRayquazaBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -192,8 +192,8 @@ void RayquazaBoardProcess_3B_3EB2C(void) case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; gCurrentPinballGame->stageTimer = 140; - gMain.spriteGroups[6].active = TRUE; - gMain.spriteGroups[5].active = TRUE; + gMain.spriteGroups[SG_6].active = TRUE; + gMain.spriteGroups[SG_5].active = TRUE; DmaCopy16(3, gRayquazaBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -469,9 +469,9 @@ void UpdateRayquazaEntityLogic(void) { if (gCurrentPinballGame->bossMovementPhase == 0) { - gMain.spriteGroups[17].active = TRUE; - gMain.spriteGroups[18].active = TRUE; - gMain.spriteGroups[19].active = TRUE; + gMain.spriteGroups[SG_17].active = TRUE; + gMain.spriteGroups[SG_18].active = TRUE; + gMain.spriteGroups[SG_19].active = TRUE; gCurrentPinballGame->lightningAttackState = RAYQUAZA_LIGHTNING_STATE_CHARGING; } } @@ -494,15 +494,15 @@ void UpdateRayquazaEntityLogic(void) DmaCopy16(3, gRayquazaWindBoardGfx, (void *)0x06015800, 0x1C00); if (gCurrentPinballGame->windAttackCount & 1) { - gMain.spriteGroups[22].active = TRUE; - gMain.spriteGroups[24].active = TRUE; - gMain.spriteGroups[25].active = TRUE; + gMain.spriteGroups[SG_22].active = TRUE; + gMain.spriteGroups[SG_24].active = TRUE; + gMain.spriteGroups[SG_25].active = TRUE; } else { - gMain.spriteGroups[23].active = TRUE; - gMain.spriteGroups[30].active = TRUE; - gMain.spriteGroups[31].active = TRUE; + gMain.spriteGroups[SG_23].active = TRUE; + gMain.spriteGroups[SG_30].active = TRUE; + gMain.spriteGroups[SG_31].active = TRUE; } gCurrentPinballGame->windAttackCount++; @@ -516,12 +516,12 @@ void UpdateRayquazaEntityLogic(void) } break; case RAYQUAZA_ENTITY_STATE_FLYBY: - if (gMain.spriteGroups[22].active) + if (gMain.spriteGroups[SG_22].active) { if (gCurrentPinballGame->windEntityPosition.x < 4800) gCurrentPinballGame->windEntityPosition.x += 140; else - gMain.spriteGroups[22].active = FALSE; + gMain.spriteGroups[SG_22].active = FALSE; if (gCurrentPinballGame->windEntityPosition.x > 2400) { @@ -536,7 +536,7 @@ void UpdateRayquazaEntityLogic(void) if (gCurrentPinballGame->windEntityPosition.x > -4800) gCurrentPinballGame->windEntityPosition.x -= 140; else - gMain.spriteGroups[23].active = FALSE; + gMain.spriteGroups[SG_23].active = FALSE; if (gCurrentPinballGame->windEntityPosition.x < -2400) { @@ -565,8 +565,8 @@ void UpdateRayquazaEntityLogic(void) // Catch Rayquaza gCurrentPinballGame->bossEntityState = RAYQUAZA_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[10].active = TRUE; - gMain.spriteGroups[9].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_RAYQUAZA; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -584,7 +584,7 @@ void UpdateRayquazaEntityLogic(void) } gCurrentPinballGame->bossFrameTimer = 0; - if (gMain.spriteGroups[36].active) + if (gMain.spriteGroups[SG_36].active) gCurrentPinballGame->ballGrabTimer = 1; break; case RAYQUAZA_ENTITY_STATE_YELLS: @@ -648,7 +648,7 @@ void UpdateRayquazaEntityLogic(void) gCurrentPinballGame->introFrameCounter = 0; gCurrentPinballGame->boardEntityActive = 1; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gMain.spriteGroups[14].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; gCurrentPinballGame->minionLogicPosition[0].x = 0; gCurrentPinballGame->minionLogicPosition[0].y = -5000; gCurrentPinballGame->minionLogicPosition[1].x = 1400; @@ -714,7 +714,7 @@ void RenderRayquazaSprites(void) varSL = 0; sp0 = 0; - group = &gMain.spriteGroups[43]; + group = &gMain.spriteGroups[SG_43]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10; @@ -736,7 +736,7 @@ void RenderRayquazaSprites(void) } } - group = &gMain.spriteGroups[42]; + group = &gMain.spriteGroups[SG_42]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10; @@ -760,13 +760,13 @@ void RenderRayquazaSprites(void) if (gCurrentPinballGame->introFrameCounter == 671) { group->active = FALSE; - gMain.spriteGroups[41].active = TRUE; - gMain.spriteGroups[45].active = TRUE; + gMain.spriteGroups[SG_41].active = TRUE; + gMain.spriteGroups[SG_45].active = TRUE; } } else { - group = &gMain.spriteGroups[41]; + group = &gMain.spriteGroups[SG_41]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10 - (gCurrentPinballGame->cameraXOffset - 88); @@ -843,7 +843,7 @@ void RenderRayquazaSprites(void) DmaCopy16(3, gRayquazaBodyVariantTiles[varSL], (void *)0x06011620, 0x800); } - group = &gMain.spriteGroups[21]; + group = &gMain.spriteGroups[SG_21]; if (group->active) { if (varSL >= 8) @@ -874,7 +874,7 @@ void RenderRayquazaSprites(void) } } - group = &gMain.spriteGroups[45]; + group = &gMain.spriteGroups[SG_45]; if (group->active) { s16 var2 = (gCurrentPinballGame->bossHeadScreenY - 70) / 3 + 1; @@ -909,16 +909,16 @@ void RenderRayquazaSprites(void) if (gCurrentPinballGame->bossEntityState == RAYQUAZA_ENTITY_STATE_BOARD_CLEANUP) { - gMain.spriteGroups[43].active = TRUE; - gMain.spriteGroups[41].active = FALSE; - gMain.spriteGroups[45].active = FALSE; - gMain.spriteGroups[21].active = FALSE; + gMain.spriteGroups[SG_43].active = TRUE; + gMain.spriteGroups[SG_41].active = FALSE; + gMain.spriteGroups[SG_45].active = FALSE; + gMain.spriteGroups[SG_21].active = FALSE; } if (gCurrentPinballGame->captureSequenceTimer == 21) { - gMain.spriteGroups[45].active = FALSE; - gMain.spriteGroups[21].active = FALSE; + gMain.spriteGroups[SG_45].active = FALSE; + gMain.spriteGroups[SG_21].active = FALSE; } } } @@ -947,7 +947,7 @@ void UpdateRayquazaMinionsAndEffects(void) sp0 = 0; //screen, used for catch mon display. - group = &gMain.spriteGroups[10]; + group = &gMain.spriteGroups[SG_10]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -975,7 +975,7 @@ void UpdateRayquazaMinionsAndEffects(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[9]; + group = &gMain.spriteGroups[SG_9]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) @@ -1101,7 +1101,7 @@ void UpdateRayquazaMinionsAndEffects(void) && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->ballRespawnState == 0 && squaredMagnitude < 200) { - gMain.spriteGroups[36].active = TRUE; + gMain.spriteGroups[SG_36].active = TRUE; gCurrentPinballGame->ballGrabTimer = 600; m4aSongNumStart(SE_UNKNOWN_0x12A); PlayRumble(9); @@ -1122,7 +1122,7 @@ void UpdateRayquazaMinionsAndEffects(void) break; } - group = &gMain.spriteGroups[17]; + group = &gMain.spriteGroups[SG_17]; if (group->active) { // ! odd behavior in the assembly with the addition and subtraction @@ -1142,10 +1142,10 @@ void UpdateRayquazaMinionsAndEffects(void) } if (gCurrentPinballGame->lightningAttackState == RAYQUAZA_LIGHTNING_STATE_4) - gMain.spriteGroups[17].active = FALSE; + gMain.spriteGroups[SG_17].active = FALSE; } - group = &gMain.spriteGroups[18]; + group = &gMain.spriteGroups[SG_18]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10 - (gCurrentPinballGame->cameraXOffset - 88); @@ -1164,10 +1164,10 @@ void UpdateRayquazaMinionsAndEffects(void) } if (gCurrentPinballGame->lightningAttackState == RAYQUAZA_LIGHTNING_STATE_4) - gMain.spriteGroups[18].active = FALSE; + gMain.spriteGroups[SG_18].active = FALSE; } - group = &gMain.spriteGroups[19]; + group = &gMain.spriteGroups[SG_19]; if (group->active) { group->baseX = gCurrentPinballGame->lightningTargetPosition.x - gCurrentPinballGame->cameraXOffset; @@ -1194,10 +1194,10 @@ void UpdateRayquazaMinionsAndEffects(void) } if (gCurrentPinballGame->lightningAttackState == RAYQUAZA_LIGHTNING_STATE_4) - gMain.spriteGroups[19].active = FALSE; + gMain.spriteGroups[SG_19].active = FALSE; } - group = &gMain.spriteGroups[22]; + group = &gMain.spriteGroups[SG_22]; if (group->active) { group->baseX = gCurrentPinballGame->windEntityPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 120); @@ -1210,7 +1210,7 @@ void UpdateRayquazaMinionsAndEffects(void) } } - group = &gMain.spriteGroups[23]; + group = &gMain.spriteGroups[SG_23]; if (group->active) { group->baseX = gCurrentPinballGame->windEntityPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 360); @@ -1230,7 +1230,7 @@ void UpdateRayquazaMinionsAndEffects(void) for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[15 + i]; + group = &gMain.spriteGroups[SG_15 + i]; switch (gCurrentPinballGame->vortexEntityState[i]) { case RAYQUAZA_WHIRLWIND_STATE_INIT: @@ -1410,7 +1410,7 @@ void UpdateRayquazaMinionsAndEffects(void) } RenderWindCloudSprites(); - group = &gMain.spriteGroups[20]; + group = &gMain.spriteGroups[SG_20]; if (group->active) { s16 a; @@ -1455,7 +1455,7 @@ void UpdateLightningGrabEntity(void) u16 *dst; const u16 *src; - group = &gMain.spriteGroups[36]; + group = &gMain.spriteGroups[SG_36]; if (!group->active) return; @@ -1509,7 +1509,7 @@ void UpdateLightningGrabEntity(void) if (gCurrentPinballGame->ballGrabTimer == 0) { - gMain.spriteGroups[36].active = FALSE; + gMain.spriteGroups[SG_36].active = FALSE; gCurrentPinballGame->ballGrabFlashTimer = 0; gCurrentPinballGame->ballGrabbed = 0; } @@ -1545,7 +1545,7 @@ void RenderWindCloudSprites(void) u32 rand; u16 var0; - group = &gMain.spriteGroups[24]; + group = &gMain.spriteGroups[SG_24]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); @@ -1557,7 +1557,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[25]; + group = &gMain.spriteGroups[SG_25]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 14; i++) @@ -1568,7 +1568,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[26]; + group = &gMain.spriteGroups[SG_26]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); @@ -1580,7 +1580,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[27]; + group = &gMain.spriteGroups[SG_27]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 9; i++) @@ -1591,7 +1591,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[28]; + group = &gMain.spriteGroups[SG_28]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); @@ -1603,7 +1603,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[29]; + group = &gMain.spriteGroups[SG_29]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 12; i++) @@ -1614,7 +1614,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[30]; + group = &gMain.spriteGroups[SG_30]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); @@ -1626,7 +1626,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[31]; + group = &gMain.spriteGroups[SG_31]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 14; i++) @@ -1637,7 +1637,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[32]; + group = &gMain.spriteGroups[SG_32]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); @@ -1649,7 +1649,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[33]; + group = &gMain.spriteGroups[SG_33]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 9; i++) @@ -1660,7 +1660,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[34]; + group = &gMain.spriteGroups[SG_34]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); @@ -1672,7 +1672,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[35]; + group = &gMain.spriteGroups[SG_35]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 12; i++) @@ -1683,14 +1683,14 @@ void RenderWindCloudSprites(void) } } - if (gMain.spriteGroups[22].active) + if (gMain.spriteGroups[SG_22].active) { if (gCurrentPinballGame->windCloudSpawnTimer == 6) { - gMain.spriteGroups[24].active = FALSE; - gMain.spriteGroups[25].active = FALSE; - gMain.spriteGroups[26].active = TRUE; - gMain.spriteGroups[27].active = TRUE; + gMain.spriteGroups[SG_24].active = FALSE; + gMain.spriteGroups[SG_25].active = FALSE; + gMain.spriteGroups[SG_26].active = TRUE; + gMain.spriteGroups[SG_27].active = TRUE; if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->ballRespawnState == 0) @@ -1702,26 +1702,26 @@ void RenderWindCloudSprites(void) if (gCurrentPinballGame->windCloudSpawnTimer == 11) { - gMain.spriteGroups[26].active = FALSE; - gMain.spriteGroups[27].active = FALSE; - gMain.spriteGroups[28].active = TRUE; - gMain.spriteGroups[29].active = TRUE; + gMain.spriteGroups[SG_26].active = FALSE; + gMain.spriteGroups[SG_27].active = FALSE; + gMain.spriteGroups[SG_28].active = TRUE; + gMain.spriteGroups[SG_29].active = TRUE; } if (gCurrentPinballGame->windCloudSpawnTimer == 14) { - gMain.spriteGroups[28].active = FALSE; - gMain.spriteGroups[29].active = FALSE; + gMain.spriteGroups[SG_28].active = FALSE; + gMain.spriteGroups[SG_29].active = FALSE; } } else { if (gCurrentPinballGame->windCloudSpawnTimer == 6) { - gMain.spriteGroups[30].active = FALSE; - gMain.spriteGroups[31].active = FALSE; - gMain.spriteGroups[32].active = TRUE; - gMain.spriteGroups[33].active = TRUE; + gMain.spriteGroups[SG_30].active = FALSE; + gMain.spriteGroups[SG_31].active = FALSE; + gMain.spriteGroups[SG_32].active = TRUE; + gMain.spriteGroups[SG_33].active = TRUE; if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->ballRespawnState == 0) @@ -1733,16 +1733,16 @@ void RenderWindCloudSprites(void) if (gCurrentPinballGame->windCloudSpawnTimer == 11) { - gMain.spriteGroups[32].active = FALSE; - gMain.spriteGroups[33].active = FALSE; - gMain.spriteGroups[34].active = TRUE; - gMain.spriteGroups[35].active = TRUE; + gMain.spriteGroups[SG_32].active = FALSE; + gMain.spriteGroups[SG_33].active = FALSE; + gMain.spriteGroups[SG_34].active = TRUE; + gMain.spriteGroups[SG_35].active = TRUE; } if (gCurrentPinballGame->windCloudSpawnTimer == 14) { - gMain.spriteGroups[34].active = FALSE; - gMain.spriteGroups[35].active = FALSE; + gMain.spriteGroups[SG_34].active = FALSE; + gMain.spriteGroups[SG_35].active = FALSE; } } @@ -1752,7 +1752,7 @@ void RenderWindCloudSprites(void) { gCurrentPinballGame->vortexAnimTimer[0] = 0; gCurrentPinballGame->vortexEntityState[0] = RAYQUAZA_WHIRLWIND_STATE_SPAWN; - gMain.spriteGroups[15].active = TRUE; + gMain.spriteGroups[SG_15].active = TRUE; rand = Random() % 8; var0 = ((gMain.systemFrameCount % 240) << 0x10) / 240; gCurrentPinballGame->vortexOrbitCenter[0].x = gRayquazaTornadoSpawnPos[rand].x; @@ -1769,7 +1769,7 @@ void RenderWindCloudSprites(void) { gCurrentPinballGame->vortexAnimTimer[1] = 0; gCurrentPinballGame->vortexEntityState[1] = RAYQUAZA_WHIRLWIND_STATE_SPAWN; - gMain.spriteGroups[16].active = TRUE; + gMain.spriteGroups[SG_16].active = TRUE; rand = (Random() % 8 + 8) % 32; // Force 8 to be added to r1 var0 = (((gMain.systemFrameCount + 120) % 240) << 0x10) / 240; gCurrentPinballGame->vortexOrbitCenter[1].x = gRayquazaTornadoSpawnPos[rand].x; @@ -1900,7 +1900,7 @@ void UpdateRayquazaIntroSequence(void) gCurrentPinballGame->minionLogicPosition[2].y = 1800; } - group = &gMain.spriteGroups[11]; + group = &gMain.spriteGroups[SG_11]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[0].x / 10; @@ -1921,7 +1921,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[12]; + group = &gMain.spriteGroups[SG_12]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[1].x / 10; @@ -1942,7 +1942,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[13]; + group = &gMain.spriteGroups[SG_13]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[2].x / 10; @@ -1965,12 +1965,12 @@ void UpdateRayquazaIntroSequence(void) if (gCurrentPinballGame->introFrameCounter == 660) { - gMain.spriteGroups[11].active = FALSE; - gMain.spriteGroups[12].active = FALSE; - gMain.spriteGroups[13].active = FALSE; + gMain.spriteGroups[SG_11].active = FALSE; + gMain.spriteGroups[SG_12].active = FALSE; + gMain.spriteGroups[SG_13].active = FALSE; } - group = &gMain.spriteGroups[14]; + group = &gMain.spriteGroups[SG_14]; if (group->active) { if (gCurrentPinballGame->introFrameCounter >= 195 && gCurrentPinballGame->introFrameCounter < 205) @@ -1994,7 +1994,7 @@ void UpdateRayquazaIntroSequence(void) if (gCurrentPinballGame->introFrameCounter == 150) { - gMain.spriteGroups[14].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; gCurrentPinballGame->orbCollisionPosition.x = 1600; gCurrentPinballGame->orbCollisionPosition.y = -100; gCurrentPinballGame->orbLogicPosition.x = -21; @@ -2014,7 +2014,7 @@ void UpdateRayquazaIntroSequence(void) } if (gCurrentPinballGame->introFrameCounter == 350) - gMain.spriteGroups[14].active = FALSE; + gMain.spriteGroups[SG_14].active = FALSE; } } @@ -2026,7 +2026,7 @@ void UpdateRayquazaIntroSequence(void) gCurrentPinballGame->introFrameCounter++; } - group = &gMain.spriteGroups[11]; + group = &gMain.spriteGroups[SG_11]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[0].x / 10; @@ -2047,7 +2047,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[12]; + group = &gMain.spriteGroups[SG_12]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[1].x / 10; @@ -2068,7 +2068,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[14]; + group = &gMain.spriteGroups[SG_14]; if (group->active) { if (gCurrentPinballGame->introFrameCounter >= 190 && gCurrentPinballGame->introFrameCounter < 200) diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index ba0014bd..2d7c6c0a 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -40,7 +40,7 @@ void UpdateNuzleafEntity(void) s16 var0; s16 var1; - group = &gMain.spriteGroups[71]; + group = &gMain.spriteGroups[SG_71]; var0 = 0; var1 = 0; switch (gCurrentPinballGame->nuzleafAnimState) @@ -185,7 +185,7 @@ void AnimateRubyShopDoor(void) struct OamDataSimple *oamSimple; s16 priority; - group = &gMain.spriteGroups[65]; + group = &gMain.spriteGroups[SG_65]; if ((gCurrentPinballGame->shopDoorTargetFrame & 0xF) != gCurrentPinballGame->shopDoorCurrentFrame) { if (gCurrentPinballGame->shopDoorAnimDelay) @@ -232,7 +232,7 @@ void AnimateRubyShopDoor(void) group->baseY = 80 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 2; i++) { - oamSimple = &gMain.spriteGroups[65].oam[i]; + oamSimple = &gMain.spriteGroups[SG_65].oam[i]; gOamBuffer[oamSimple->oamId].priority = priority; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; @@ -247,7 +247,7 @@ void DrawWhiscash(void) s16 var0; const s16 *var1; - group = &gMain.spriteGroups[63]; + group = &gMain.spriteGroups[SG_63]; var1 = gWhiscashFramesetData[gCurrentPinballGame->whiscashFrameIx]; if (group->active) { @@ -795,7 +795,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->bumperHitCountdown--; } - group = &gMain.spriteGroups[62]; + group = &gMain.spriteGroups[SG_62]; if (gCurrentPinballGame->rubyPondState == RUBY_POND_STATE_LOTAD) { for (i = 0; i < 3; i++) @@ -885,7 +885,7 @@ void AnimateSharpedoEntity(void) s16 var0; index = (gMain.systemFrameCount % 55) / 11; - group = &gMain.spriteGroups[61]; + group = &gMain.spriteGroups[SG_61]; DmaCopy16(3, gRubyBoardSharpedo_Gfx[gCurrentPinballGame->catchHoleTileVariant], (void *)0x06012C20, 0x260); if (gCurrentPinballGame->catchHoleAnimFrame) index = gCurrentPinballGame->catchHoleAnimFrame; diff --git a/src/ruby_ramp.c b/src/ruby_ramp.c index e8142f27..c75ba5ec 100644 --- a/src/ruby_ramp.c +++ b/src/ruby_ramp.c @@ -86,7 +86,7 @@ void UpdateRubyRampPrizeGate(void) break; } - group = &gMain.spriteGroups[68]; + group = &gMain.spriteGroups[SG_68]; if (group->active) { if (gCurrentPinballGame->rampGateState < 3) @@ -104,7 +104,7 @@ void UpdateRubyRampPrizeGate(void) { gCurrentPinballGame->rampPrizeVisibilityTimer--; if (gCurrentPinballGame->rampPrizeVisibilityTimer == 0) - gMain.spriteGroups[68].active = FALSE; + gMain.spriteGroups[SG_68].active = FALSE; } oamSimple = &group->oam[0]; @@ -126,14 +126,14 @@ void UpdateRubyRampPrizeGate(void) gCurrentPinballGame->ball->velocity.x = -600; gCurrentPinballGame->ball->velocity.y = -300; gCurrentPinballGame->ball->spinSpeed = 0; - gMain.spriteGroups[68].active = TRUE; + gMain.spriteGroups[SG_68].active = TRUE; gCurrentPinballGame->rampPrizeVisibilityTimer = 6; PlayRumble(8); } } } - group = &gMain.spriteGroups[58]; + group = &gMain.spriteGroups[SG_58]; if (group->active) { group->baseX = 184 - gCurrentPinballGame->cameraXOffset; @@ -154,7 +154,7 @@ void DrawRubyNuzleafPlatformSprite(void) struct SpriteGroup *group; s16 index; - group = &gMain.spriteGroups[66]; + group = &gMain.spriteGroups[SG_66]; if (group->active) { if (gCurrentPinballGame->rampPrizeType) diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index e437131a..a81b4b9a 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -27,7 +27,7 @@ void UpdateChikoritaAttackAnimation(void) s16 var0; index = 0; - group = &gMain.spriteGroups[14]; + group = &gMain.spriteGroups[SG_14]; if (gCurrentPinballGame->chikoritaProjectileTimer < 60) { if (gCurrentPinballGame->chikoritaProjectileTimer >= 27 && gCurrentPinballGame->chikoritaProjectileTimer < 47) @@ -72,7 +72,7 @@ void UpdateChikoritaAttackAnimation(void) } } - group = &gMain.spriteGroups[13]; + group = &gMain.spriteGroups[SG_13]; if (group->active) { if (gCurrentPinballGame->chikoritaProjectileTimer < 120) @@ -93,7 +93,7 @@ void UpdateChikoritaAttackAnimation(void) gCurrentPinballGame->chikoritaProjectileTimer++; if (gCurrentPinballGame->chikoritaProjectileTimer == 27) { - gMain.spriteGroups[14].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; m4aSongNumStart(SE_UNKNOWN_0xC7); if (gCurrentPinballGame->sideBumperBounceCount[1] > 0) { @@ -108,7 +108,7 @@ void UpdateChikoritaAttackAnimation(void) if (gCurrentPinballGame->chikoritaProjectileTimer == 100) { - gMain.spriteGroups[14].active = TRUE; + gMain.spriteGroups[SG_14].active = TRUE; m4aSongNumStart(SE_UNKNOWN_0xC7); if (gCurrentPinballGame->sideBumperBounceCount[0] > 0) { @@ -149,7 +149,7 @@ void AnimateChikoritaSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[53]; + group = &gMain.spriteGroups[SG_53]; if (gCurrentPinballGame->chikoritaFlashActive) { index = gChikoritaFlashFrameIndices[gCurrentPinballGame->chikoritaFlashTimer / 5]; @@ -160,7 +160,7 @@ void AnimateChikoritaSprite(void) gCurrentPinballGame->chikoritaProjectileY = 0; gCurrentPinballGame->chikoritaProjectileVelX = 100; gCurrentPinballGame->chikoritaProjectileUnused = 0; - gMain.spriteGroups[13].active = TRUE; + gMain.spriteGroups[SG_13].active = TRUE; } if (gCurrentPinballGame->chikoritaFlashTimer < 54) @@ -200,7 +200,7 @@ void UpdateGulpinBossState(void) s16 index; var0 = gGulpinAnimData[gCurrentPinballGame->gulpinAnimFrameIndex]; - group = &gMain.spriteGroups[57]; + group = &gMain.spriteGroups[SG_57]; group->baseX = 9 - gCurrentPinballGame->cameraXOffset; group->baseY = 288 - gCurrentPinballGame->cameraYOffset; if (gCurrentPinballGame->gulpinCurrentLevel > gCurrentPinballGame->seedotCount) @@ -441,7 +441,7 @@ void DrawRubySideBumperSprites(void) { index = gSideBumperGfxFrameIndices[gCurrentPinballGame->sideBumperAnimPhase[i]][0]; DmaCopy16(3, gSideBumperGfx[index], (void *)0x06012A20 + i * 0x100, 0x100); - group = &gMain.spriteGroups[59 + i]; + group = &gMain.spriteGroups[SG_59 + i]; if (group->active) { int var0 = i * 120 - (gCurrentPinballGame->cameraXOffset - 48); diff --git a/src/sapphire_collision.c b/src/sapphire_collision.c index a8a4ce31..2fc504f9 100644 --- a/src/sapphire_collision.c +++ b/src/sapphire_collision.c @@ -598,7 +598,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) gCurrentPinballGame->secondaryBall = gCurrentPinballGame->ballStates; modRes = (gCurrentPinballGame->targetBumperHitCounter - 1) % 4; - gMain.spriteGroups[47 + modRes].active = TRUE; + gMain.spriteGroups[SG_47 + modRes].active = TRUE; gCurrentPinballGame->splashEffectFrameIndex[modRes] = 0; gCurrentPinballGame->splashEffectFrameTimer[modRes] = 0; gCurrentPinballGame->splashEffectPositionIndex[modRes] = gCurrentPinballGame->targetBumperHitCounter - 1; @@ -622,7 +622,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) gCurrentPinballGame->targetBumperHitCounter++; modRes = (gCurrentPinballGame->targetBumperHitCounter -1) % 4; - gMain.spriteGroups[47 + modRes].active = TRUE; + gMain.spriteGroups[SG_47 + modRes].active = TRUE; gCurrentPinballGame->splashEffectFrameIndex[modRes] = 0; gCurrentPinballGame->splashEffectFrameTimer[modRes] = 0; gCurrentPinballGame->splashEffectPositionIndex[modRes] = gCurrentPinballGame->targetBumperHitCounter - 1; diff --git a/src/sapphire_pond_and_zigzagoon.c b/src/sapphire_pond_and_zigzagoon.c index 1a44639a..308b0ab1 100644 --- a/src/sapphire_pond_and_zigzagoon.c +++ b/src/sapphire_pond_and_zigzagoon.c @@ -35,7 +35,7 @@ void DecrementPelipperTimer(void) void UpdatePelipperPondEntity(void) { s16 i; - struct SpriteGroup *group = &gMain.spriteGroups[60]; + struct SpriteGroup *group = &gMain.spriteGroups[SG_60]; struct OamDataSimple *oamSimple; u16 *dst; const u16 *src; @@ -340,7 +340,7 @@ void AnimateWailmerEntity(void) s16 var0; index = (gCurrentPinballGame->globalAnimFrameCounter % 32) / 16; - group = &gMain.spriteGroups[75]; + group = &gMain.spriteGroups[SG_75]; if (gCurrentPinballGame->catchHoleAnimFrame) index = gCurrentPinballGame->catchHoleAnimFrame; @@ -406,7 +406,7 @@ void UpdateZigzagoonEntity(void) gCurrentPinballGame->sapphireBumperAnimFrame = 0; gCurrentPinballGame->zigzagoonState = 3; gCurrentPinballGame->zigzagoonFxFrame = 0; - gMain.spriteGroups[27].active = TRUE; + gMain.spriteGroups[SG_27].active = TRUE; gCurrentPinballGame->activePortraitType = 22; DmaCopy16(3, gSapphireBoardZigzagoonFx_Gfx, (void *)0x06015800, 0xC00); m4aSongNumStart(SE_UNKNOWN_0xEC); @@ -437,7 +437,7 @@ void UpdateZigzagoonEntity(void) break; case 4: gCurrentPinballGame->activePortraitType = 0; - gMain.spriteGroups[27].active = FALSE; + gMain.spriteGroups[SG_27].active = FALSE; gCurrentPinballGame->zigzagoonState = 0; break; } @@ -452,7 +452,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) const u16 *src; s16 index; - group = &gMain.spriteGroups[26]; + group = &gMain.spriteGroups[SG_26]; if (group->active) { group->baseX = 198 - gCurrentPinballGame->cameraXOffset; @@ -474,7 +474,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) } } - group = &gMain.spriteGroups[27]; + group = &gMain.spriteGroups[SG_27]; if (group->active) { group->baseX = 198 - gCurrentPinballGame->cameraXOffset; @@ -494,7 +494,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) } } - group = &gMain.spriteGroups[70]; + group = &gMain.spriteGroups[SG_70]; if (group->active) { group->baseX = 206 - gCurrentPinballGame->cameraXOffset; diff --git a/src/sapphire_seedot_egg_shop.c b/src/sapphire_seedot_egg_shop.c index af782716..ea1a374b 100644 --- a/src/sapphire_seedot_egg_shop.c +++ b/src/sapphire_seedot_egg_shop.c @@ -52,7 +52,7 @@ void UpdateSapphireEggHatchAnimation(void) var3 = 0; var1 = 0; var2 = 0; - group = &gMain.spriteGroups[52]; + group = &gMain.spriteGroups[SG_52]; sp0 = 0; switch (gCurrentPinballGame->eggAnimationPhase) { @@ -167,7 +167,7 @@ void UpdateSapphireEggHatchAnimation(void) gOamBuffer[oamSimple->oamId].y += group->baseY; } - group = &gMain.spriteGroups[51]; + group = &gMain.spriteGroups[SG_51]; if (group->active) { group->baseX = 192 - gCurrentPinballGame->cameraXOffset; @@ -392,7 +392,7 @@ void DrawSapphireSeedotAndBasketSprites(void) s16 index; int var0; - group = &gMain.spriteGroups[64]; + group = &gMain.spriteGroups[SG_64]; if (!group->active) return; @@ -408,7 +408,7 @@ void DrawSapphireSeedotAndBasketSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[68]; + group = &gMain.spriteGroups[SG_68]; group->baseX = 10 - gCurrentPinballGame->cameraXOffset; group->baseY = 298 - gCurrentPinballGame->cameraYOffset; oamSimple = &group->oam[0]; @@ -417,7 +417,7 @@ void DrawSapphireSeedotAndBasketSprites(void) for (j = 0; j < 3; j++) { - group = &gMain.spriteGroups[65 + j]; + group = &gMain.spriteGroups[SG_65 + j]; var0 = gSeedotBaseXPositions[j] - j; group->baseX = var0 - gCurrentPinballGame->cameraXOffset; @@ -545,7 +545,7 @@ void DrawSapphireShopSignSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[69]; + group = &gMain.spriteGroups[SG_69]; if (group->active) { group->baseX = 16 - gCurrentPinballGame->cameraXOffset; @@ -727,7 +727,7 @@ void UpdateSapphireEggMachine(void) for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[47 + i]; + group = &gMain.spriteGroups[SG_47 + i]; if (group->active) { if (gSplashEffectFrameDurations[gCurrentPinballGame->splashEffectFrameIndex[i]][0] > gCurrentPinballGame->splashEffectFrameTimer[i]) diff --git a/src/spheal_process3.c b/src/spheal_process3.c index 1509448a..834e859e 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -206,10 +206,10 @@ void SphealBoardProcess_3B_43228(void) { gCurrentPinballGame->boardState = SPHEAL_BOARD_STATE_SCORE_DISPLAY; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[7].active = TRUE; - gMain.spriteGroups[8].active = TRUE; - gMain.spriteGroups[9].active = TRUE; - gMain.spriteGroups[10].active = TRUE; + gMain.spriteGroups[SG_7].active = TRUE; + gMain.spriteGroups[SG_8].active = TRUE; + gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_10].active = TRUE; DmaCopy16(3, gSphealResultsScreenGfx, (void *)0x06015800, 0x800); gCurrentPinballGame->bannerSlideYOffset = -126; gCurrentPinballGame->boardEntityActive = 1; @@ -374,7 +374,7 @@ void UpdateSealeoEntityLogic(void) } } - group = &gMain.spriteGroups[22]; + group = &gMain.spriteGroups[SG_22]; if (group->active) { group->baseX = 100 - gCurrentPinballGame->cameraXOffset; @@ -390,7 +390,7 @@ void UpdateSealeoEntityLogic(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[21]; + group = &gMain.spriteGroups[SG_21]; if (group->active) { group->baseX = 140 - gCurrentPinballGame->cameraXOffset; @@ -855,7 +855,7 @@ void UpdateSphealEntityLogic(void) // Draw Spheals; set collision position. for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[14 + i]; + group = &gMain.spriteGroups[SG_14 + i]; if (group->active) { sphealFrameIx = gCurrentPinballGame->sphealNextFrameIx[i]; @@ -910,7 +910,7 @@ void UpdateSphealEntityLogic(void) gCurrentPinballGame->sphealHitYPosition[i] = gCurrentPinballGame->sphealPositionQ8[i].y / 256 + gCurrentPinballGame->sphealOamYOffset[i]; - group = &gMain.spriteGroups[16 + i]; + group = &gMain.spriteGroups[SG_16 + i]; //Note: left/right are separated by 30 if (sphealFrameIx == 12 || sphealFrameIx == 42) @@ -947,7 +947,7 @@ void UpdateSphealScoreAndDelivery(void) struct OamDataSimple *oamSimple; var0 = 0; - group = &gMain.spriteGroups[18]; + group = &gMain.spriteGroups[SG_18]; if (group->active) { group->baseX = 104 - gCurrentPinballGame->cameraXOffset; @@ -961,7 +961,7 @@ void UpdateSphealScoreAndDelivery(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[11]; + group = &gMain.spriteGroups[SG_11]; if (group->active) { group->baseX = 104 - gCurrentPinballGame->cameraXOffset; @@ -976,7 +976,7 @@ void UpdateSphealScoreAndDelivery(void) } if (gCurrentPinballGame->boardState == SPHEAL_BOARD_STATE_ACTIVE_PHASE) - gMain.spriteGroups[11].active = TRUE; + gMain.spriteGroups[SG_11].active = TRUE; if (gCurrentPinballGame->boardState < SPHEAL_BOARD_STATE_ENDING && gMain.modeChangeFlags == MODE_CHANGE_NONE && gCurrentPinballGame->scoreCountdownTimer) { @@ -1005,7 +1005,7 @@ void SphealBoard_WhiscashDeliversBall(void) const u16 *offsets; s16 var0; - group = &gMain.spriteGroups[19]; + group = &gMain.spriteGroups[SG_19]; if (group->active) { offsets = gSphealWhiscashAnimFrameset[gCurrentPinballGame->deliveryAnimFrameIndex]; @@ -1030,12 +1030,12 @@ void SphealBoard_WhiscashDeliversBall(void) gCurrentPinballGame->deliveryAnimTimer = 0; gCurrentPinballGame->deliveryAnimFrameIndex++; if (gCurrentPinballGame->deliveryAnimFrameIndex == 1) - gMain.spriteGroups[19].active = TRUE; + gMain.spriteGroups[SG_19].active = TRUE; if (gCurrentPinballGame->deliveryAnimFrameIndex == 19) { gCurrentPinballGame->deliveryAnimFrameIndex = 18; - gMain.spriteGroups[19].active = FALSE; + gMain.spriteGroups[SG_19].active = FALSE; gCurrentPinballGame->ballDeliveryActive = 0; } @@ -1079,7 +1079,7 @@ void SphealBoard_PelipperDeliversBall(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[20]; + group = &gMain.spriteGroups[SG_20]; if (group->active) { group->baseX = (gCurrentPinballGame->pelipperPosX / 10) - (gCurrentPinballGame->cameraXOffset - 146); @@ -1105,7 +1105,7 @@ void SphealBoard_PelipperDeliversBall(void) gCurrentPinballGame->pelipperFrameTimer = 0; gCurrentPinballGame->pelipperState = 8; gCurrentPinballGame->deliveryAnimFrameIndex = 13; - gMain.spriteGroups[20].active = TRUE; + gMain.spriteGroups[SG_20].active = TRUE; gCurrentPinballGame->boardEntityActive = 1; } } @@ -1123,7 +1123,7 @@ void SphealBoard_PelipperDeliversBall(void) } else { - gMain.spriteGroups[20].active = FALSE; + gMain.spriteGroups[SG_20].active = FALSE; } if (gCurrentPinballGame->pelipperFrameTimer == 13) @@ -1551,7 +1551,7 @@ void UpdateSphealResultsScreen(void) gCurrentPinballGame->resultsAnimTimer++; - group = &gMain.spriteGroups[7]; + group = &gMain.spriteGroups[SG_7]; if (!group->active) return; @@ -1602,7 +1602,7 @@ void UpdateSphealResultsScreen(void) sp18[10] = sp0[0] * 2 + 0x2D0; sp18[11] = sp0[1] * 2 + 0x2D0; - group = &gMain.spriteGroups[8]; + group = &gMain.spriteGroups[SG_8]; group->baseX = 120; group->baseY = 60 + gCurrentPinballGame->bannerSlideYOffset; for (i = 0; i < 12; i++) @@ -1651,7 +1651,7 @@ void UpdateSphealResultsScreen(void) sp18[10] = sp0[0] * 2 + 0x2D0; sp18[11] = sp0[1] * 2 + 0x2D0; - group = &gMain.spriteGroups[9]; + group = &gMain.spriteGroups[SG_9]; group->baseX = 120; group->baseY = 60 + gCurrentPinballGame->bannerSlideYOffset; for (i = 0; i < 12; i++) @@ -1699,7 +1699,7 @@ void UpdateSphealResultsScreen(void) sp0[0] = value; sp18[11] = sp0[0] * 2 + 0x2D0; - group = &gMain.spriteGroups[10]; + group = &gMain.spriteGroups[SG_10]; group->baseX = 120; group->baseY = 60 + gCurrentPinballGame->bannerSlideYOffset; for (i = 0; i < 12; i++) diff --git a/src/titlescreen.c b/src/titlescreen.c index 0aba8242..f355b8c8 100644 --- a/src/titlescreen.c +++ b/src/titlescreen.c @@ -103,13 +103,13 @@ void InitTitlescreenStates(void) gTitlescreen.animTimer = 0; gTitlescreen.animPhase = 0; gTitlescreen.menuAction = 0; - gTitlescreen.pressStartAnimFrame = 0; - gTitlescreen.deleteSaveGroupId = 4; + gTitlescreen.pressStartAnimSpriteGroupId = SG_0; + gTitlescreen.deleteSaveSpriteGroupId = SG_4; gTitlescreen.pressStartAndFlippersVisible = TRUE; gTitlescreen.deleteSaveWindowVisible = FALSE; - gTitlescreen.menuSpriteGroupId = 6; - gTitlescreen.cursorSpriteGroupId = 0; - gTitlescreen.selectorSpriteGroupId = 3; + gTitlescreen.menuSpriteGroupId = SG_6; + gTitlescreen.cursorSpriteGroupId = SG_0; + gTitlescreen.selectorSpriteGroupId = SG_3; gTitlescreen.menuVisible = FALSE; gTitlescreen.cursorArrowVisible = 0; gTitlescreen.selectorVisible = 0; @@ -167,11 +167,11 @@ void TitleScreen1_WaitForStartButton(void) if (!gTitleTransitionActive) { gTitlescreen.animTimer++; - if (gTitlescreen.animTimer >= gTitlePressStartAnimDurations[gTitlescreen.pressStartAnimFrame]) + if (gTitlescreen.animTimer >= gTitlePressStartAnimDurations[gTitlescreen.pressStartAnimSpriteGroupId]) { gTitlescreen.animTimer = 0; - if (++gTitlescreen.pressStartAnimFrame > 3) - gTitlescreen.pressStartAnimFrame = 0; + if (++gTitlescreen.pressStartAnimSpriteGroupId > SG_3) + gTitlescreen.pressStartAnimSpriteGroupId = SG_0; } if (JOY_HELD(KEYS_MASK)) @@ -224,7 +224,7 @@ void TitleScreen2_AnimOpenMenu(void) if (gTitlescreen.animTimer >= gTitleMenuSlideInAnimData[gTitlescreen.animPhase][1]) { gTitlescreen.animTimer = 0; - gTitlescreen.pressStartAnimFrame = gTitleMenuSlideInAnimData[gTitlescreen.animPhase][0]; + gTitlescreen.pressStartAnimSpriteGroupId = gTitleMenuSlideInAnimData[gTitlescreen.animPhase][0]; if (++gTitlescreen.animPhase > 5) { gTitlescreen.animPhase = 0; @@ -332,14 +332,14 @@ void TitleScreen4_MenuInputNoSavedGame(void) if (!gTitleTransitionActive) { gTitlescreen.animTimer++; - if (gTitlescreen.animTimer >= gTitleMenuSlideOutAnimData[gTitlescreen.animPhase][1]) + if (gTitlescreen.animTimer >= gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][1]) { gTitlescreen.animTimer = 0; if (++gTitlescreen.animPhase > 6) gTitlescreen.animPhase = 0; - gTitlescreen.cursorSpriteGroupId = gTitleMenuSlideOutAnimData[gTitlescreen.animPhase][0]; - gTitlescreen.selectorSpriteGroupId = gTitleMenuSlideOutAnimData[gTitlescreen.animPhase][0] + 3; + gTitlescreen.cursorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0]; + gTitlescreen.selectorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0] + 3; } if (JOY_NEW(DPAD_UP)) @@ -431,14 +431,14 @@ void TitleScreen5_MenuInputSavedGame(void) if (!gTitleTransitionActive) { gTitlescreen.animTimer++; - if (gTitlescreen.animTimer >= gTitleMenuSlideOutAnimData[gTitlescreen.animPhase][1]) + if (gTitlescreen.animTimer >= gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][1]) { gTitlescreen.animTimer = 0; if (++gTitlescreen.animPhase > 6) gTitlescreen.animPhase = 0; - gTitlescreen.cursorSpriteGroupId = gTitleMenuSlideOutAnimData[gTitlescreen.animPhase][0]; - gTitlescreen.selectorSpriteGroupId = gTitleMenuSlideOutAnimData[gTitlescreen.animPhase][0] + 3; + gTitlescreen.cursorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0]; + gTitlescreen.selectorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0] + 3; } if (JOY_NEW(DPAD_UP)) @@ -676,19 +676,19 @@ static void RenderTitlePressStartSprites(void) { int i; const struct SpriteSet *spriteSet; - struct SpriteGroup *startAndFlippersGroup = &gMain_spriteGroups[gTitlescreen.pressStartAnimFrame]; - struct SpriteGroup *deleteMenuGroup = &gMain_spriteGroups[gTitlescreen.deleteSaveGroupId]; + struct SpriteGroup *startAndFlippersGroup = &gMain.spriteGroups[gTitlescreen.pressStartAnimSpriteGroupId]; + struct SpriteGroup *deleteMenuGroup = &gMain.spriteGroups[gTitlescreen.deleteSaveSpriteGroupId]; startAndFlippersGroup->active = gTitlescreen.pressStartAndFlippersVisible; deleteMenuGroup->active = gTitlescreen.deleteSaveWindowVisible; - LoadSpriteSets(gTitlePressStartSpriteSets, 5, gMain_spriteGroups); + LoadSpriteSets(gTitlePressStartSpriteSets, 5, gMain.spriteGroups); if (startAndFlippersGroup->active == TRUE) { startAndFlippersGroup->baseX = 120; startAndFlippersGroup->baseY = 102; - spriteSet = gTitlePressStartSpriteSets[gTitlescreen.pressStartAnimFrame]; + spriteSet = gTitlePressStartSpriteSets[gTitlescreen.pressStartAnimSpriteGroupId]; for (i = 0; i < spriteSet->count; i++) { gOamBuffer[startAndFlippersGroup->oam[i].oamId].x = startAndFlippersGroup->oam[i].xOffset + startAndFlippersGroup->baseX; diff --git a/sym_ewram.txt b/sym_ewram.txt index 917bfc07..af5063d1 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -393,7 +393,7 @@ gEReaderTextAnimDelay: @ 0x0202A580 .space 0x8 gPokedexShowAnimSprite: @ 0x0202A588 .space 0x4 -gEReaderStatusSpriteIndex: @ 0x0202A58C +gEReaderStatusAnimSpriteGroup: @ 0x0202A58C .space 0x4 gPokedexInfoWindowBackupTiles: @ 0x0202A590 .space 0x800 @@ -437,7 +437,7 @@ gPokedexNumSeen: @ 0x0202BEB8 .space 0x4 gDialogType: @ 0x0202BEBC .space 0x4 -gEReaderHeaderSpriteIndex: @ 0x0202BEC0 +gEReaderHeaderAnimSpriteGroup: @ 0x0202BEC0 .space 0x4 gPokedexShowPopupWindow: @ 0x0202BEC4 .space 0x4 @@ -491,7 +491,7 @@ gLinkExchangeTimeout: @ 0x0202C54C .space 0x4 gRemoteTopScores: @ 0x0202C550 .space 0x30 -gCompletionBannerFrame: @ 0x0202C580 +gCompletionBannerSpriteGroup: @ 0x0202C580 .space 0x4 gEReaderStatusSpriteVisible: @ 0x0202C584 .space 0x4 @@ -573,7 +573,7 @@ gReplayFrameCounter: @ 0x02031510 .space 0x10 gBoardConfig: @ 0x2031520 .space 0x70 -gKecleonSpriteOrderMap: @ 0x02031590 +gKecleonSpriteGroupOrderMap: @ 0x02031590 .space 0x40 gCatchSpritePaletteBuffer: @ 0x020315D0 .space 0x520 From 2f5cd288f6e1484b03314fa107e9529980ddbb07 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sun, 10 May 2026 00:25:01 -0500 Subject: [PATCH 02/33] all dusclops sprite groups --- include/constants/spriteGroups.h | 9 ++++++ include/functions.h | 2 +- src/all_board_pause_game.c | 2 +- src/all_board_pinball_game_main.c | 4 +-- src/bonus_complete_scoring_transition.c | 37 +++++++++++----------- src/dusclops_process3.c | 42 ++++++++++++------------- src/game_idle.c | 4 +-- src/groudon_process3.c | 8 ++--- src/kecleon_process3.c | 4 +-- src/kyogre_process3.c | 8 ++--- src/rayquaza_process3.c | 8 ++--- 11 files changed, 69 insertions(+), 59 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index 8a10bede..6998bd6c 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -7,15 +7,24 @@ #define SG_3 3 #define SG_4 4 #define SG_5 5 +#define SG_BONUS_COMPLETE_BANNER_SCORE 5 #define SG_6 6 +#define SG_BONUS_COMPLETE_BANNER 6 #define SG_7 7 +#define SG_DUSKULL_BASE 7 +#define SG_DUSKULL_0 7 #define SG_8 8 +#define SG_DUSKULL_1 8 #define SG_9 9 +#define SG_DUSKULL_2 9 #define SG_10 10 #define SG_11 11 #define SG_12 12 +#define SG_DUSCLOPS_PHASING_FX 12 #define SG_13 13 +#define SG_DUSCLOPS_CAPTURE_VORTEX 13 #define SG_14 14 +#define SG_DUSCLOPS_ENTITY 14 #define SG_15 15 #define SG_16 16 #define SG_17 17 diff --git a/include/functions.h b/include/functions.h index dbe8af03..835c9edc 100644 --- a/include/functions.h +++ b/include/functions.h @@ -578,7 +578,7 @@ extern void DuskullPhase_ProcessGraphics(); extern void DusclopsPhase_ProcessEntityLogicAndGraphics(); extern void FadeToMainBoard(); extern void ProcessBonusBannerAndScoring(); -extern void RenderBonusStageOverlaySprites(); +extern void HideDusclopsSprites(); extern void TransitionFromBonusToMainBoard(void); //extern ? KecleonBoardProcess_3A_35860(); //extern ? KecleonBoardProcess_3B_35AA4(); diff --git a/src/all_board_pause_game.c b/src/all_board_pause_game.c index 8003e86c..d92c8201 100644 --- a/src/all_board_pause_game.c +++ b/src/all_board_pause_game.c @@ -68,7 +68,7 @@ void PauseGame(void) if (gMain.selectedField < MAIN_FIELD_COUNT) ClampPortraitSpritesToOffscreen(); else if (gMain.selectedField == FIELD_DUSCLOPS) - RenderBonusStageOverlaySprites(); + HideDusclopsSprites(); else if (gMain.selectedField == FIELD_KYOGRE) HideKyogreSplashSprite(); else if (gMain.selectedField == FIELD_GROUDON) diff --git a/src/all_board_pinball_game_main.c b/src/all_board_pinball_game_main.c index 8633b4a8..3233109a 100644 --- a/src/all_board_pinball_game_main.c +++ b/src/all_board_pinball_game_main.c @@ -93,7 +93,7 @@ void PinballGame_State0_49ED4(void) if (gMain.selectedField == FIELD_RUBY || gMain.selectedField == FIELD_SAPPHIRE) ClampPortraitSpritesToOffscreen(); else if (gMain.selectedField == FIELD_DUSCLOPS) - RenderBonusStageOverlaySprites(); + HideDusclopsSprites(); else if (gMain.selectedField == FIELD_KYOGRE) HideKyogreSplashSprite(); else if (gMain.selectedField == FIELD_GROUDON) @@ -497,7 +497,7 @@ void PinballGame_State1_4AAD8(void) } else if (gMain.selectedField == FIELD_DUSCLOPS) { - RenderBonusStageOverlaySprites(); + HideDusclopsSprites(); } else if (gMain.selectedField == FIELD_KYOGRE) { diff --git a/src/bonus_complete_scoring_transition.c b/src/bonus_complete_scoring_transition.c index 70935978..a1ccb4a3 100644 --- a/src/bonus_complete_scoring_transition.c +++ b/src/bonus_complete_scoring_transition.c @@ -42,8 +42,8 @@ void FadeToMainBoard(void) { gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState = DEFAULT_MODE_SUBSTATE_INIT; - gMain.spriteGroups[SG_6].active = FALSE; - gMain.spriteGroups[SG_5].active = FALSE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = FALSE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = FALSE; if (gMain.tempField != gMain.selectedField) { TransitionFromBonusToMainBoard(); @@ -70,7 +70,7 @@ void ProcessBonusBannerAndScoring(void) var0 = 8; var1 = 0; - group = &gMain.spriteGroups[SG_6]; + group = &gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER]; if (gCurrentPinballGame->bannerSlideYOffset > 0) { gCurrentPinballGame->bannerSlideYOffset -= 6; @@ -122,7 +122,7 @@ void ProcessBonusBannerAndScoring(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_5]; + group = &gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE]; group->baseX = 120; group->baseY = gCurrentPinballGame->bannerSlideYOffset + 50; for (i = 0; i < 18; i++) @@ -187,18 +187,18 @@ void ProcessBonusBannerAndScoring(void) } } -void RenderBonusStageOverlaySprites(void) +void HideDusclopsSprites(void) { s16 i; struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[SG_14]; + group = &gMain.spriteGroups[SG_DUSCLOPS_ENTITY]; switch (gCurrentPinballGame->bossEntityState) { - case 0: - case 1: - case 8: + case DUSCLOPS_ENTITY_STATE_INIT: + case DUSCLOPS_ENTITY_STATE_INTRO_APPEARANCE: + case DUSCLOPS_ENTITY_STATE_VANISH: if (!group->active) break; @@ -206,10 +206,10 @@ void RenderBonusStageOverlaySprites(void) group->baseY = 160; oamSimple = &group->oam[0]; - gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + 240; + gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; break; - case 2: + case DUSCLOPS_ENTITY_STATE_GUARD_READY: if (gCurrentPinballGame->bossAnimLoopCount <= 0) break; @@ -220,23 +220,24 @@ void RenderBonusStageOverlaySprites(void) group->baseY = 160; oamSimple = &group->oam[0]; - gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + 240; + gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; break; - case 3: - case 4: - case 5: - case 6: - case 7: + case DUSCLOPS_ENTITY_STATE_WALKING: + case DUSCLOPS_ENTITY_STATE_HIT: + case DUSCLOPS_ENTITY_STATE_HIT_STUN: + case DUSCLOPS_ENTITY_STATE_HIT_ABSORB_ZONE: + case DUSCLOPS_ENTITY_STATE_ABSORBED_BALL: break; } - group = &gMain.spriteGroups[SG_12]; + group = &gMain.spriteGroups[SG_DUSCLOPS_PHASING_FX]; if (!group->active) return; group->baseX = 240; group->baseY = 160; + for (i = 0; i < 2; i++) { oamSimple = &group->oam[i]; diff --git a/src/dusclops_process3.c b/src/dusclops_process3.c index 46215ca5..b34fbdc6 100644 --- a/src/dusclops_process3.c +++ b/src/dusclops_process3.c @@ -97,9 +97,9 @@ void DusclopsBoardProcess_3B_33130(void) else { gCurrentPinballGame->cameraYAdjust = 0; - gMain.spriteGroups[SG_7].active = TRUE; - gMain.spriteGroups[SG_8].active = TRUE; - gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_DUSKULL_0].active = TRUE; + gMain.spriteGroups[SG_DUSKULL_1].active = TRUE; + gMain.spriteGroups[SG_DUSKULL_2].active = TRUE; gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_1_DUSKULL_PHASE; gCurrentPinballGame->stageTimer = 0; } @@ -117,9 +117,9 @@ void DusclopsBoardProcess_3B_33130(void) break; case DUSCLOPS_BOARD_STATE_2_INIT_DUSCLOPS_PHASE: gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_3_DUSCLOPS_PHASE; - gMain.spriteGroups[SG_13].active = TRUE; - gMain.spriteGroups[SG_14].active = TRUE; - gMain.spriteGroups[SG_12].active = TRUE; + gMain.spriteGroups[SG_DUSCLOPS_CAPTURE_VORTEX].active = TRUE; + gMain.spriteGroups[SG_DUSCLOPS_ENTITY].active = TRUE; + gMain.spriteGroups[SG_DUSCLOPS_PHASING_FX].active = TRUE; gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE; gCurrentPinballGame->bonusModeHitCount = 0; m4aSongNumStart(MUS_BONUS_FIELD_DUSCLOPS); @@ -141,8 +141,8 @@ void DusclopsBoardProcess_3B_33130(void) { gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_SCORE_PHASE; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gDusclopsBonusClear_Gfx, OBJ_VRAM1+0x1800, 8192); gCurrentPinballGame->bannerSlideYOffset = 136; } @@ -258,7 +258,7 @@ void SwapDuskullEntityIndex(s16 index1, s16 index2) void DuskullPhase_ProcessEntityLogic(void) { s16 i, j; - bool32 r4 = TRUE; + bool32 should_draw_duskull = TRUE; u16 oamIx = 0; u16 tileOffset = 0; @@ -268,14 +268,14 @@ void DuskullPhase_ProcessEntityLogic(void) { for (i = 0; i < DUSKULL_CONCURRENT_MAX; i++) { if (gCurrentPinballGame->minionDrawInFrame[i]) - r4 = FALSE; + should_draw_duskull = FALSE; } - if (r4) + if (should_draw_duskull) { gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_2_INIT_DUSCLOPS_PHASE; - gMain.spriteGroups[SG_7].active = FALSE; - gMain.spriteGroups[SG_8].active = FALSE; - gMain.spriteGroups[SG_9].active = FALSE; + gMain.spriteGroups[SG_DUSKULL_0].active = FALSE; + gMain.spriteGroups[SG_DUSKULL_1].active = FALSE; + gMain.spriteGroups[SG_DUSKULL_2].active = FALSE; } } @@ -568,7 +568,7 @@ void DuskullPhase_ProcessGraphics() { s16 spriteVariant = gCurrentPinballGame->minionSpriteVariant[i]; DmaCopy16(3, gDusclopsBoardDuskull_Gfx + spriteVariant * 0x280, OBJ_VRAM0 + 0x920 + i * 0x280, 0x280); oamIx = gCurrentPinballGame->minionOamIx[i]; - spriteGroup = &gMain.spriteGroups[SG_7 + i]; + spriteGroup = &gMain.spriteGroups[SG_DUSKULL_BASE + i]; if (gCurrentPinballGame->minionDrawInFrame[i]) { s32 x = 0; // Scrub C to get the compiler to add before subtracting @@ -638,7 +638,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) struct SpriteGroup *spriteGroup; tileOffset = 0; - spriteGroup = &gMain.spriteGroups[SG_14]; + spriteGroup = &gMain.spriteGroups[SG_DUSCLOPS_ENTITY]; switch(gCurrentPinballGame->bossEntityState) { case DUSCLOPS_ENTITY_STATE_INIT: @@ -995,9 +995,9 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) break; } - gMain.spriteGroups[SG_13].active = FALSE; - gMain.spriteGroups[SG_14].active = FALSE; - gMain.spriteGroups[SG_12].active = FALSE; + gMain.spriteGroups[SG_DUSCLOPS_CAPTURE_VORTEX].active = FALSE; + gMain.spriteGroups[SG_DUSCLOPS_ENTITY].active = FALSE; + gMain.spriteGroups[SG_DUSCLOPS_PHASING_FX].active = FALSE; gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_4_INIT_SCORE_PHASE; gCurrentPinballGame->stageTimer = 0; break; @@ -1035,7 +1035,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) } // Blend appearance Lines - spriteGroup = &gMain.spriteGroups[SG_12]; + spriteGroup = &gMain.spriteGroups[SG_DUSCLOPS_PHASING_FX]; if (spriteGroup->active) { if (gCurrentPinballGame->returnToMainBoardFlag == 0) @@ -1068,7 +1068,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) } // Draw ball capture vortex - spriteGroup = &gMain.spriteGroups[SG_13]; + spriteGroup = &gMain.spriteGroups[SG_DUSCLOPS_CAPTURE_VORTEX]; if (spriteGroup->active) { diff --git a/src/game_idle.c b/src/game_idle.c index b3946564..54a61202 100644 --- a/src/game_idle.c +++ b/src/game_idle.c @@ -105,9 +105,9 @@ void PinballGameIdle1_19190(void) ClampPortraitSpritesToOffscreen(); RestoreBoardObjPalettes(0); } - else if (gMain.selectedField == FIELD_KECLEON) + else if (gMain.selectedField == FIELD_KECLEON) // bug? other references are Dusclops { - RenderBonusStageOverlaySprites(); + HideDusclopsSprites(); } if ((gMain.modeChangeFlags & MODE_CHANGE_PAUSE) != 0) diff --git a/src/groudon_process3.c b/src/groudon_process3.c index edbc5d78..30c73a53 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -173,8 +173,8 @@ void GroudonBoardProcess_3B_3B49C(void) { gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SUCCESS_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gGroudonBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -215,8 +215,8 @@ void GroudonBoardProcess_3B_3B49C(void) case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; gCurrentPinballGame->stageTimer = 140; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gGroudonBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index 5aecf9b7..083b8861 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -167,8 +167,8 @@ void KecleonBoardProcess_3B_35AA4(void) { gCurrentPinballGame->boardState = KECLEON_BOARD_STATE_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gKecleonBonusClear_Gfx, (void *)0x6015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 0x88; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index cf653069..0e399488 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -153,8 +153,8 @@ void KyogreBoardProcess_3B_3869C(void) { gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SUCCESS_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gKyogreBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -195,8 +195,8 @@ void KyogreBoardProcess_3B_3869C(void) case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; gCurrentPinballGame->stageTimer = 140; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gKyogreBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index d71acd6d..1493ddfb 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -151,8 +151,8 @@ void RayquazaBoardProcess_3B_3EB2C(void) case LEGENDARY_BOARD_STATE_SUCCESS_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SUCCESS_SCORING; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gRayquazaBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; @@ -192,8 +192,8 @@ void RayquazaBoardProcess_3B_3EB2C(void) case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; gCurrentPinballGame->stageTimer = 140; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_5].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BONUS_COMPLETE_BANNER_SCORE].active = TRUE; DmaCopy16(3, gRayquazaBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; From 0ed781a4ab016c7da001a11d436b609f5003358f Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 11 May 2026 00:49:36 -0500 Subject: [PATCH 03/33] groudon Sprite Groups --- include/constants/spriteGroups.h | 16 +++++++- src/all_board_process0_sprite_init.c | 10 ++--- src/groudon_process3.c | 57 ++++++++++++++-------------- src/kyogre_process3.c | 8 ++-- src/rayquaza_process3.c | 8 ++-- 5 files changed, 57 insertions(+), 42 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index 6998bd6c..f0f29ad9 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -11,36 +11,50 @@ #define SG_6 6 #define SG_BONUS_COMPLETE_BANNER 6 #define SG_7 7 -#define SG_DUSKULL_BASE 7 +#define SG_DUSKULL_BASE 7 // Of 3 #define SG_DUSKULL_0 7 #define SG_8 8 #define SG_DUSKULL_1 8 #define SG_9 9 #define SG_DUSKULL_2 9 +#define SG_LEGENDARY_CATCH_PORTRAIT 9 #define SG_10 10 +#define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 #define SG_11 11 +#define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left +#define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 #define SG_12 12 #define SG_DUSCLOPS_PHASING_FX 12 +#define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 #define SG_13 13 #define SG_DUSCLOPS_CAPTURE_VORTEX 13 +#define SG_GROUDON_CRYSTAL_TOP_LEFT 13 #define SG_14 14 #define SG_DUSCLOPS_ENTITY 14 +#define SG_GROUDON_CRYSTAL_BOTTOM_LEFT 14 #define SG_15 15 +#define SG_GROUDON_BOULDER_BASE 15 // Of 3 #define SG_16 16 #define SG_17 17 #define SG_18 18 +#define SG_GROUDON_FILE_PILLAR_BASE 18 // Of 4 #define SG_19 19 #define SG_20 20 #define SG_21 21 #define SG_22 22 +#define SG_GROUDON_FIREBALL 22 #define SG_23 23 +#define SG_GROUDON_FIREBALL_LAUNCH_FX 23 #define SG_24 24 +#define SG_GROUDON_FIREBALL_CAUGHT_BALL 24 #define SG_25 25 #define SG_26 26 #define SG_27 27 #define SG_28 28 #define SG_29 29 +#define SG_GROUDON_ENTITY 29 #define SG_30 30 +#define SG_GROUDON_SHOCKWAVE 30 #define SG_31 31 #define SG_32 32 #define SG_33 33 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 3c8a5dd8..2cdda3f8 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -308,11 +308,11 @@ void GroudonBoardProcess_0A_50FD4(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[SG_11].active = TRUE; - gMain.spriteGroups[SG_12].active = TRUE; - gMain.spriteGroups[SG_13].active = TRUE; - gMain.spriteGroups[SG_14].active = TRUE; - gMain.spriteGroups[SG_29].active = TRUE; + gMain.spriteGroups[SG_GROUDON_CRYSTAL_TOP_RIGHT].active = TRUE; + gMain.spriteGroups[SG_GROUDON_CRYSTAL_BOTTOM_RIGHT].active = TRUE; + gMain.spriteGroups[SG_GROUDON_CRYSTAL_TOP_LEFT].active = TRUE; + gMain.spriteGroups[SG_GROUDON_CRYSTAL_BOTTOM_LEFT].active = TRUE; + gMain.spriteGroups[SG_GROUDON_ENTITY].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, diff --git a/src/groudon_process3.c b/src/groudon_process3.c index 30c73a53..ae9216ed 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -483,7 +483,7 @@ void UpdateGroudonEntityLogic(void) MPlayStart(&gMPlayInfo_SE1, &se_unk_11c); gCurrentPinballGame->projectileAttackAnimTimer = 8; gCurrentPinballGame->projectileFlightTimer = 35; - gMain.spriteGroups[SG_22].active = TRUE; + gMain.spriteGroups[SG_GROUDON_FIREBALL].active = TRUE; gCurrentPinballGame->projectilePosition.x = 1200; gCurrentPinballGame->projectilePosition.y = 1240; tempVector.x = gCurrentPinballGame->projectilePosition.x / 10 - gCurrentPinballGame->ball->positionQ0.x; @@ -560,7 +560,7 @@ void UpdateGroudonEntityLogic(void) { if (gCurrentPinballGame->bossFrameTimer == 0) { - gMain.spriteGroups[SG_30].active = TRUE; + gMain.spriteGroups[SG_GROUDON_SHOCKWAVE].active = TRUE; gCurrentPinballGame->shockwaveAnimTimer = 0; MPlayStart(&gMPlayInfo_SE1, &se_unk_11d); } @@ -607,8 +607,8 @@ void UpdateGroudonEntityLogic(void) // catch groudon gCurrentPinballGame->bossEntityState = GROUDON_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[SG_10].active = TRUE; - gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_GROUDON; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -628,7 +628,7 @@ void UpdateGroudonEntityLogic(void) gCurrentPinballGame->bossMovementPhase = 0; gCurrentPinballGame->bossFrameTimer = 0; - if (gMain.spriteGroups[SG_24].active) + if (gMain.spriteGroups[SG_GROUDON_FIREBALL_CAUGHT_BALL].active) gCurrentPinballGame->ballGrabTimer = 1; break; case GROUDON_ENTITY_STATE_PREPARE_LEAVING: @@ -764,7 +764,7 @@ void UpdateGroudonEntityLogic(void) if (gCurrentPinballGame->impactShakeTimer == 8) { i = 0; - gMain.spriteGroups[SG_15 + i].active = TRUE; + gMain.spriteGroups[SG_GROUDON_BOULDER_BASE + i].active = TRUE; gCurrentPinballGame->boulderState[i] = GROUDON_BOULDER_STATE_SPAWN; gCurrentPinballGame->boulderSpriteFrame[i] = 0; gCurrentPinballGame->boulderAnimTimer[i] = 0; @@ -773,7 +773,7 @@ void UpdateGroudonEntityLogic(void) if (gCurrentPinballGame->impactShakeTimer == 20) { i = 1; - gMain.spriteGroups[SG_15 + i].active = TRUE; + gMain.spriteGroups[SG_GROUDON_BOULDER_BASE + i].active = TRUE; gCurrentPinballGame->boulderState[i] = GROUDON_BOULDER_STATE_SPAWN; gCurrentPinballGame->boulderSpriteFrame[i] = 13; gCurrentPinballGame->boulderAnimTimer[i] = 0; @@ -782,7 +782,7 @@ void UpdateGroudonEntityLogic(void) if (gCurrentPinballGame->impactShakeTimer == 53) { i = 2; - gMain.spriteGroups[SG_15 + i].active = TRUE; + gMain.spriteGroups[SG_GROUDON_BOULDER_BASE + i].active = TRUE; gCurrentPinballGame->boulderState[i] = GROUDON_BOULDER_STATE_SPAWN; gCurrentPinballGame->boulderSpriteFrame[i] = 22; gCurrentPinballGame->boulderAnimTimer[i] = 0; @@ -830,7 +830,7 @@ void RenderGroudonSprites(void) s16 var0; int palette; - group = &gMain.spriteGroups[SG_29]; + group = &gMain.spriteGroups[SG_GROUDON_ENTITY]; if (group->active) { var0 = gGroudonAnimFramesetTable[gCurrentPinballGame->bossFramesetIndex][0]; @@ -907,7 +907,8 @@ void RenderGroudonSprites(void) } } - group = &gMain.spriteGroups[SG_23]; + // Special effect that appears for a small number of frames around groudon's face, when launching a fireball + group = &gMain.spriteGroups[SG_GROUDON_FIREBALL_LAUNCH_FX]; if (group->active) { if (gCurrentPinballGame->projectileAttackAnimTimer > 0) @@ -935,7 +936,7 @@ void RenderGroudonSprites(void) if (gCurrentPinballGame->captureState == MON_CAPTURE_SPECIAL_STATE_CAPTURE_CUTSCENE) { - gMain.spriteGroups[SG_23].active = FALSE; + gMain.spriteGroups[SG_GROUDON_FIREBALL_LAUNCH_FX].active = FALSE; gCurrentPinballGame->projectileAttackAnimTimer = 0; } } @@ -960,7 +961,7 @@ void UpdateGroudonFieldEntities(void) s8 var0; varSL = 0; - group = &gMain.spriteGroups[SG_10]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -988,7 +989,7 @@ void UpdateGroudonFieldEntities(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_9]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) @@ -1003,7 +1004,7 @@ void UpdateGroudonFieldEntities(void) } } - group = &gMain.spriteGroups[SG_24]; + group = &gMain.spriteGroups[SG_GROUDON_FIREBALL_CAUGHT_BALL]; if (group->active) { gCurrentPinballGame->ballGrabTimer--; @@ -1055,7 +1056,7 @@ void UpdateGroudonFieldEntities(void) if (gCurrentPinballGame->ballGrabTimer == 0) { - gMain.spriteGroups[SG_24].active = FALSE; + gMain.spriteGroups[SG_GROUDON_FIREBALL_CAUGHT_BALL].active = FALSE; gCurrentPinballGame->ballGrabFlashTimer = 0; gCurrentPinballGame->ballGrabbed = 0; } @@ -1083,7 +1084,7 @@ void UpdateGroudonFieldEntities(void) } } - group = &gMain.spriteGroups[SG_22]; + group = &gMain.spriteGroups[SG_GROUDON_FIREBALL]; if (group->active) { tempVector.x = gCurrentPinballGame->projectilePosition.x / 10 - gCurrentPinballGame->ball->positionQ0.x; @@ -1101,7 +1102,7 @@ void UpdateGroudonFieldEntities(void) { MPlayStart(&gMPlayInfo_SE1, &se_unk_11f); gCurrentPinballGame->projectileFlightTimer = 10; - gMain.spriteGroups[SG_24].active = TRUE; + gMain.spriteGroups[SG_GROUDON_FIREBALL_CAUGHT_BALL].active = TRUE; gCurrentPinballGame->ballGrabTimer = 612; PlayRumble(9); } @@ -1144,7 +1145,7 @@ void UpdateGroudonFieldEntities(void) } if (gCurrentPinballGame->projectileFlightTimer == 0) - gMain.spriteGroups[SG_22].active = FALSE; + gMain.spriteGroups[SG_GROUDON_FIREBALL].active = FALSE; } group->baseX = gCurrentPinballGame->projectilePosition.x / 10 - gCurrentPinballGame->cameraXOffset - 12; @@ -1164,14 +1165,14 @@ void UpdateGroudonFieldEntities(void) if (gCurrentPinballGame->captureState == MON_CAPTURE_SPECIAL_STATE_CAPTURE_CUTSCENE) { - gMain.spriteGroups[SG_22].active = FALSE; + gMain.spriteGroups[SG_GROUDON_FIREBALL].active = FALSE; gCurrentPinballGame->projectileFlightTimer = 0; } } for (i = 0; i < 3; i++) { - group = &gMain.spriteGroups[SG_15 + i]; + group = &gMain.spriteGroups[SG_GROUDON_BOULDER_BASE + i]; if (group->active) { switch (gCurrentPinballGame->boulderState[i]) @@ -1334,7 +1335,7 @@ void UpdateGroudonFieldEntities(void) case GROUDON_BOULDER_STATE_CLEANUP: gCurrentPinballGame->boulderCollisionPos[i].x = 0; gCurrentPinballGame->boulderCollisionPos[i].y = 0; - gMain.spriteGroups[SG_15 + i].active = FALSE; + gMain.spriteGroups[SG_GROUDON_BOULDER_BASE + i].active = FALSE; break; } @@ -1372,7 +1373,7 @@ void UpdateGroudonFieldEntities(void) */ for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[SG_18 + i]; + group = &gMain.spriteGroups[SG_GROUDON_FILE_PILLAR_BASE + i]; if (group->active) { switch(gCurrentPinballGame->firePillarState[i]) @@ -1476,7 +1477,7 @@ void UpdateGroudonFieldEntities(void) gCurrentPinballGame->firePillarAnimLoopCount[i] = 0; break; case GROUDON_FIRE_PILLAR_STATE_CLEANUP: - gMain.spriteGroups[SG_18 + i].active = FALSE; + gMain.spriteGroups[SG_GROUDON_FILE_PILLAR_BASE + i].active = FALSE; break; } @@ -1568,7 +1569,7 @@ void UpdateGroudonFieldEntities(void) m4aSongNumStart(SE_GROUDON_DUSTORM_LIFT); } - group = &gMain.spriteGroups[SG_30]; + group = &gMain.spriteGroups[SG_GROUDON_SHOCKWAVE]; if (group->active) { s16 scale; @@ -1601,7 +1602,7 @@ void UpdateGroudonFieldEntities(void) { for (i = 0; i < 4; i++) { - gMain.spriteGroups[SG_18 + i].active = TRUE; + gMain.spriteGroups[SG_GROUDON_FILE_PILLAR_BASE + i].active = TRUE; gCurrentPinballGame->firePillarState[i] = GROUDON_FIRE_PILLAR_STATE_SPAWN; gCurrentPinballGame->firePillarAnimFrame[i] = 0; gCurrentPinballGame->firePillarFrameTimer[i] = 0; @@ -1656,7 +1657,7 @@ void UpdateGroudonFieldEntities(void) } if ((gMain.modeChangeFlags & MODE_CHANGE_EXPIRED_BONUS_BANNER) != 0) - gMain.spriteGroups[SG_30].active = FALSE; + gMain.spriteGroups[SG_GROUDON_SHOCKWAVE].active = FALSE; } } @@ -1666,7 +1667,7 @@ void HideGroudonShockwaveSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[SG_30]; + group = &gMain.spriteGroups[SG_GROUDON_SHOCKWAVE]; if (group->active) { group->baseX = 240; @@ -1694,7 +1695,7 @@ void AnimateGroudonBackground(void) var0 = gGroudonBgTileAnimIndices[(gMain.systemFrameCount % 96) / 24]; for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[SG_11 + i]; + group = &gMain.spriteGroups[SG_GROUDON_CRYSTAL_BASE + i]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = 128 - gCurrentPinballGame->cameraYOffset; for (j = 0; j < 3; j++) diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 0e399488..a09e87fc 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -494,8 +494,8 @@ void UpdateKyogreEntityLogic(void) // catch kyogre gCurrentPinballGame->bossEntityState = KYOGRE_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[SG_10].active = TRUE; - gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_KYOGRE; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -813,7 +813,7 @@ void UpdateKyogreFieldEntities(void) index = 0; //Portrait display (during catch) - group = &gMain.spriteGroups[SG_10]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -841,7 +841,7 @@ void UpdateKyogreFieldEntities(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_9]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 1493ddfb..0e3d3d5d 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -565,8 +565,8 @@ void UpdateRayquazaEntityLogic(void) // Catch Rayquaza gCurrentPinballGame->bossEntityState = RAYQUAZA_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[SG_10].active = TRUE; - gMain.spriteGroups[SG_9].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_RAYQUAZA; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -947,7 +947,7 @@ void UpdateRayquazaMinionsAndEffects(void) sp0 = 0; //screen, used for catch mon display. - group = &gMain.spriteGroups[SG_10]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -975,7 +975,7 @@ void UpdateRayquazaMinionsAndEffects(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_9]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) From 5d0318af484f5ce409b7b5272172a917b08f3390 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 11 May 2026 01:47:48 -0500 Subject: [PATCH 04/33] kecleon sprite groups --- include/constants/spriteGroups.h | 12 +++++++ src/all_board_process0_sprite_init.c | 48 ++++++++++++++-------------- src/kecleon_process3.c | 22 ++++++------- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index f0f29ad9..431ab4e2 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -13,13 +13,16 @@ #define SG_7 7 #define SG_DUSKULL_BASE 7 // Of 3 #define SG_DUSKULL_0 7 +#define SG_KECLEON_TREE_LEAVES 7 #define SG_8 8 #define SG_DUSKULL_1 8 #define SG_9 9 #define SG_DUSKULL_2 9 #define SG_LEGENDARY_CATCH_PORTRAIT 9 +#define SG_KECLEON_DUST_FX 9 #define SG_10 10 #define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 +#define SG_KECLEON_DRAW_ORDER_SPRITES_BASE 10 // Includes bushes, ball, kecleon entity -- 14 total reserved #define SG_11 11 #define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left #define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 @@ -47,16 +50,25 @@ #define SG_GROUDON_FIREBALL_LAUNCH_FX 23 #define SG_24 24 #define SG_GROUDON_FIREBALL_CAUGHT_BALL 24 +#define SG_KECLEON_SCOPE_ITEM 24 #define SG_25 25 +#define SG_KECLEON_FLOWER_BY_TREE 25 #define SG_26 26 +#define SG_KECLEON_FLOWER_PAIR_LEFT 26 #define SG_27 27 +#define SG_KECLEON_FLOWER_PAIR_BOTTOM_RIGHT 27 #define SG_28 28 +#define SG_KECLEON_FLOWER_TRIPLE_RIGHT 28 #define SG_29 29 #define SG_GROUDON_ENTITY 29 +#define SG_KECLEON_BALL_RIPPLE_FX 29 #define SG_30 30 #define SG_GROUDON_SHOCKWAVE 30 +#define SG_KECLEON_STEP_RIPPLE_FX 30 #define SG_31 31 +#define SG_KECLEON_REFLECTION_HEAD 31 #define SG_32 32 +#define SG_KECLEON_REFLECTION_BALL 32 #define SG_33 33 #define SG_34 34 #define SG_35 35 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 2cdda3f8..1cfc30f2 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -225,30 +225,30 @@ void KecleonBoardProcess_0A_50DE0(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[SG_23].active = TRUE; - gMain.spriteGroups[SG_9].active = TRUE; - gMain.spriteGroups[SG_24].active = TRUE; - gMain.spriteGroups[SG_16].active = TRUE; - gMain.spriteGroups[SG_17].active = TRUE; - gMain.spriteGroups[SG_7].active = TRUE; - gMain.spriteGroups[SG_10].active = TRUE; - gMain.spriteGroups[SG_11].active = TRUE; - gMain.spriteGroups[SG_12].active = TRUE; - gMain.spriteGroups[SG_13].active = TRUE; - gMain.spriteGroups[SG_14].active = TRUE; - gMain.spriteGroups[SG_15].active = TRUE; - gMain.spriteGroups[SG_18].active = TRUE; - gMain.spriteGroups[SG_19].active = TRUE; - gMain.spriteGroups[SG_20].active = TRUE; - gMain.spriteGroups[SG_21].active = TRUE; - gMain.spriteGroups[SG_25].active = TRUE; - gMain.spriteGroups[SG_26].active = TRUE; - gMain.spriteGroups[SG_27].active = TRUE; - gMain.spriteGroups[SG_28].active = TRUE; - gMain.spriteGroups[SG_31].active = TRUE; - gMain.spriteGroups[SG_32].active = TRUE; - gMain.spriteGroups[SG_29].active = TRUE; - gMain.spriteGroups[SG_30].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +13].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DUST_FX].active = TRUE; + gMain.spriteGroups[SG_KECLEON_SCOPE_ITEM].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +6].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +7].active = TRUE; + gMain.spriteGroups[SG_KECLEON_TREE_LEAVES].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +0].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +1].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +2].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +3].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +4].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +5].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +8].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +9].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +10].active = TRUE; + gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +11].active = TRUE; + gMain.spriteGroups[SG_KECLEON_FLOWER_BY_TREE].active = TRUE; + gMain.spriteGroups[SG_KECLEON_FLOWER_PAIR_LEFT].active = TRUE; + gMain.spriteGroups[SG_KECLEON_FLOWER_PAIR_BOTTOM_RIGHT].active = TRUE; + gMain.spriteGroups[SG_KECLEON_FLOWER_TRIPLE_RIGHT].active = TRUE; + gMain.spriteGroups[SG_KECLEON_REFLECTION_HEAD].active = TRUE; + gMain.spriteGroups[SG_KECLEON_REFLECTION_BALL].active = TRUE; + gMain.spriteGroups[SG_KECLEON_BALL_RIPPLE_FX].active = TRUE; + gMain.spriteGroups[SG_KECLEON_STEP_RIPPLE_FX].active = TRUE; LoadSpriteSets( gFieldSpriteSets[gMain.selectedField].spriteSets, diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index 083b8861..3c1c858a 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -857,7 +857,7 @@ void RenderKecleonSprites(void) baseX = 104; baseY = 60; - spriteGroup = &gMain.spriteGroups[SG_31]; + spriteGroup = &gMain.spriteGroups[SG_KECLEON_REFLECTION_HEAD]; spriteGroup->baseX = gCurrentPinballGame->bossPositionX / 10 + baseX - gCurrentPinballGame->cameraXOffset; spriteGroup->baseY = gCurrentPinballGame->bossPositionY / 10 + baseY - gCurrentPinballGame->cameraYOffset; @@ -895,7 +895,7 @@ void RenderKecleonSprites(void) baseX = 104; baseY = 26; - spriteGroup = &gMain.spriteGroups[SG_9]; + spriteGroup = &gMain.spriteGroups[SG_KECLEON_DUST_FX]; var0 = gCurrentPinballGame->kecleonCollisionEnabled * 3; var1 = gCurrentPinballGame->kecleonDustGfxFrame / 8 - 2; @@ -931,7 +931,7 @@ void UpdateKecleonScopeItem(void) int xx, yy; int squaredMagnitude; - group = &gMain.spriteGroups[SG_24]; + group = &gMain.spriteGroups[SG_KECLEON_SCOPE_ITEM]; if (!group->active) return; @@ -1123,7 +1123,7 @@ void RenderKecleonBoardElements(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[SG_7]; + group = &gMain.spriteGroups[SG_KECLEON_TREE_LEAVES]; var0 = 5 - gCurrentPinballGame->kecleonCollisionY % 10; if (gCurrentPinballGame->kecleonCollisionY > 30) var1 = 20; @@ -1195,7 +1195,7 @@ void RenderKecleonBoardElements(void) } } - group = &gMain.spriteGroups[SG_25]; + group = &gMain.spriteGroups[SG_KECLEON_FLOWER_BY_TREE]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; var2 = 0; @@ -1215,7 +1215,7 @@ void RenderKecleonBoardElements(void) for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[SG_26 + i]; + group = &gMain.spriteGroups[SG_KECLEON_FLOWER_PAIR_LEFT + i]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; @@ -1235,7 +1235,7 @@ void RenderKecleonBoardElements(void) } } - group = &gMain.spriteGroups[SG_28]; + group = &gMain.spriteGroups[SG_KECLEON_FLOWER_TRIPLE_RIGHT]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = -gCurrentPinballGame->cameraYOffset - 128; var2 = 0; @@ -1253,7 +1253,7 @@ void RenderKecleonBoardElements(void) gOamBuffer[oamSimple->oamId].tileNum = 0x132 + var2 * 12 + j * 8; } - group = &gMain.spriteGroups[SG_32]; + group = &gMain.spriteGroups[SG_KECLEON_REFLECTION_BALL]; group->baseX = gCurrentPinballGame->ball->screenPosition.x; group->baseY = gCurrentPinballGame->ball->screenPosition.y + 14; oamSimple = &group->oam[0]; @@ -1263,7 +1263,7 @@ void RenderKecleonBoardElements(void) else gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[SG_29]; + group = &gMain.spriteGroups[SG_KECLEON_BALL_RIPPLE_FX]; if (gCurrentPinballGame->kecleonWaterBallCollisionTimer < 12) gCurrentPinballGame->kecleonWaterBallCollisionTimer++; else @@ -1290,7 +1290,7 @@ void RenderKecleonBoardElements(void) gOamBuffer[oamSimple->oamId].tileNum = 0x16E + var2; } - group = &gMain.spriteGroups[SG_30]; + group = &gMain.spriteGroups[SG_KECLEON_STEP_RIPPLE_FX]; if (gCurrentPinballGame->kecleonWaterCollisionTimer < 24) gCurrentPinballGame->kecleonWaterCollisionTimer++; else @@ -1361,7 +1361,7 @@ void SortKecleonSpritesByY(void) for (i = 0; i < 14; i++) { - gKecleonSpriteGroupOrderMap[10 + sp0[i].spriteIndex] = SG_10 + i; + gKecleonSpriteGroupOrderMap[10 + sp0[i].spriteIndex] = SG_KECLEON_DRAW_ORDER_SPRITES_BASE + i; gKecleonSpriteSets[i + 10] = sp0[i].spriteSet; } From e28821d490b5d3041abe31aa917723d4d37e2051 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 11 May 2026 02:17:25 -0500 Subject: [PATCH 05/33] kyogre sprite groups --- include/constants/spriteGroups.h | 12 +++++++++++ src/all_board_process0_sprite_init.c | 16 +++++++------- src/kyogre_process3.c | 32 ++++++++++++++-------------- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index 431ab4e2..e124fe30 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -26,35 +26,47 @@ #define SG_11 11 #define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left #define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 +#define SG_KYOGRE_CRYSTAL_BASE 11 // Of 4. Top right; top left, bottom right, bottom left. +#define SG_KYOGRE_CRYSTAL_TOP_RIGHT 11 #define SG_12 12 #define SG_DUSCLOPS_PHASING_FX 12 #define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 +#define SG_KYOGRE_CRYSTAL_TOP_LEFT 12 #define SG_13 13 #define SG_DUSCLOPS_CAPTURE_VORTEX 13 #define SG_GROUDON_CRYSTAL_TOP_LEFT 13 +#define SG_KYOGRE_CRYSTAL_BOTTOM_RIGHT 13 #define SG_14 14 #define SG_DUSCLOPS_ENTITY 14 #define SG_GROUDON_CRYSTAL_BOTTOM_LEFT 14 +#define SG_KYOGRE_CRYSTAL_BOTTOM_LEFT 14 #define SG_15 15 #define SG_GROUDON_BOULDER_BASE 15 // Of 3 +#define SG_KYOGRE_INTRO_CRYSTAL_GROUND 15 #define SG_16 16 +#define SG_KYOGRE_FREEZE_TRAP 16 #define SG_17 17 #define SG_18 18 #define SG_GROUDON_FILE_PILLAR_BASE 18 // Of 4 #define SG_19 19 #define SG_20 20 #define SG_21 21 +#define SG_KYOGRE_ENTITY 21 #define SG_22 22 #define SG_GROUDON_FIREBALL 22 +#define SG_KYOGRE_WHIRLPOOL_0 22 #define SG_23 23 #define SG_GROUDON_FIREBALL_LAUNCH_FX 23 +#define SG_KYOGRE_WHIRLPOOL_1 23 #define SG_24 24 #define SG_GROUDON_FIREBALL_CAUGHT_BALL 24 #define SG_KECLEON_SCOPE_ITEM 24 +#define SG_KYOGRE_SHOCKWAVE 24 #define SG_25 25 #define SG_KECLEON_FLOWER_BY_TREE 25 #define SG_26 26 #define SG_KECLEON_FLOWER_PAIR_LEFT 26 +#define SG_KYOGRE_SURFACING_FX 26 #define SG_27 27 #define SG_KECLEON_FLOWER_PAIR_BOTTOM_RIGHT 27 #define SG_28 28 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 1cfc30f2..b484fce4 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -273,14 +273,14 @@ void KyogreBoardProcess_0A_50F04() } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[SG_11].active = TRUE; - gMain.spriteGroups[SG_12].active = TRUE; - gMain.spriteGroups[SG_13].active = TRUE; - gMain.spriteGroups[SG_14].active = TRUE; - gMain.spriteGroups[SG_21].active = TRUE; - gMain.spriteGroups[SG_22].active = TRUE; - gMain.spriteGroups[SG_23].active = TRUE; - gMain.spriteGroups[SG_15].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_CRYSTAL_TOP_RIGHT].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_CRYSTAL_TOP_LEFT].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_CRYSTAL_BOTTOM_RIGHT].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_CRYSTAL_BOTTOM_LEFT].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_ENTITY].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_WHIRLPOOL_0].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_WHIRLPOOL_1].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_INTRO_CRYSTAL_GROUND].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index a09e87fc..8519e11f 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -476,7 +476,7 @@ void UpdateKyogreEntityLogic(void) if (gCurrentPinballGame->shockwaveAlreadyHit == 0 && gCurrentPinballGame->bossFramesetIndex == 42) { - gMain.spriteGroups[SG_24].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_SHOCKWAVE].active = TRUE; gCurrentPinballGame->shockwaveAnimTimer = 0; MPlayStart(&gMPlayInfo_SE1, &se_unk_10e); } @@ -512,7 +512,7 @@ void UpdateKyogreEntityLogic(void) gCurrentPinballGame->ballRespawnTimer = 0; } - if (gMain.spriteGroups[SG_16].active) + if (gMain.spriteGroups[SG_KYOGRE_FREEZE_TRAP].active) { gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_DESPAWN; gCurrentPinballGame->freezeTrapPauseTimer = 1; @@ -679,7 +679,7 @@ void RenderKyogreSprites(void) s16 index; s16 palette; - group = &gMain.spriteGroups[SG_21]; + group = &gMain.spriteGroups[SG_KYOGRE_ENTITY]; if (group->active) { index = gCurrentPinballGame->bossVulnerable; @@ -755,7 +755,7 @@ void RenderKyogreSprites(void) } } - group = &gMain.spriteGroups[SG_26]; + group = &gMain.spriteGroups[SG_KYOGRE_SURFACING_FX]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10 + 108 - gCurrentPinballGame->cameraXOffset; @@ -779,7 +779,7 @@ void RenderKyogreSprites(void) else { gCurrentPinballGame->shockwaveAnimTimer = 0; - gMain.spriteGroups[SG_26].active = FALSE; + gMain.spriteGroups[SG_KYOGRE_SURFACING_FX].active = FALSE; } } else @@ -857,7 +857,7 @@ void UpdateKyogreFieldEntities(void) } //Freeze trap - group = &gMain.spriteGroups[SG_16]; + group = &gMain.spriteGroups[SG_KYOGRE_FREEZE_TRAP]; if (group->active) { // General handling: Processes through a number of loops of animation frames. @@ -941,7 +941,7 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapNextPhase = KYOGRE_FREEZE_PHASE_DESPAWN; break; case KYOGRE_FREEZE_PHASE_DESPAWN: - gMain.spriteGroups[SG_16].active = FALSE; + gMain.spriteGroups[SG_KYOGRE_FREEZE_TRAP].active = FALSE; break; } @@ -1025,7 +1025,7 @@ void UpdateKyogreFieldEntities(void) // Whirlpool processing for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[SG_22 + i]; + group = &gMain.spriteGroups[SG_KYOGRE_WHIRLPOOL_0 + i]; if ((gMain.modeChangeFlags & MODE_CHANGE_BONUS_BANNER) == 0) { switch (gCurrentPinballGame->vortexEntityState[i]) { @@ -1210,7 +1210,7 @@ void UpdateKyogreFieldEntities(void) } //Shockwave processing - group = &gMain.spriteGroups[SG_24]; + group = &gMain.spriteGroups[SG_KYOGRE_SHOCKWAVE]; if (group->active) { s16 scale; @@ -1283,16 +1283,16 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_ENCLOSE_BALL; gCurrentPinballGame->freezeTrapAnimFrame = 0; gCurrentPinballGame->freezeTrapFrameTimer = 0; - if (!gMain.spriteGroups[SG_16].active) + if (!gMain.spriteGroups[SG_KYOGRE_FREEZE_TRAP].active) PlayRumble(8); //Activate the 'ice trap' sprite + logic. - gMain.spriteGroups[SG_16].active = TRUE; + gMain.spriteGroups[SG_KYOGRE_FREEZE_TRAP].active = TRUE; } } if (gMain.modeChangeFlags & MODE_CHANGE_EXPIRED_BONUS_BANNER) - gMain.spriteGroups[SG_24].active = FALSE; + gMain.spriteGroups[SG_KYOGRE_SHOCKWAVE].active = FALSE; } } @@ -1302,7 +1302,7 @@ void HideKyogreSplashSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[SG_24]; + group = &gMain.spriteGroups[SG_KYOGRE_SHOCKWAVE]; if (group->active) { group->baseX = 240; @@ -1350,7 +1350,7 @@ void AnimateKyogreBackground(void) for (j = 0; j < 4; j++) { - group = &gMain.spriteGroups[SG_11 + j]; + group = &gMain.spriteGroups[SG_KYOGRE_CRYSTAL_BASE + j]; group->baseX = 120 - gCurrentPinballGame->cameraXOffset; group->baseY = 128 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 3; i++) @@ -1362,7 +1362,7 @@ void AnimateKyogreBackground(void) } } - group = &gMain.spriteGroups[SG_15]; + group = &gMain.spriteGroups[SG_KYOGRE_INTRO_CRYSTAL_GROUND]; if (group->active) { group->baseX = 120 - gCurrentPinballGame->cameraXOffset; @@ -1375,6 +1375,6 @@ void AnimateKyogreBackground(void) } if (gCurrentPinballGame->stageTimer == 480) - gMain.spriteGroups[SG_15].active = FALSE; + gMain.spriteGroups[SG_KYOGRE_INTRO_CRYSTAL_GROUND].active = FALSE; } } From a0a7139420f8c2bd2be042179db1c9a3b0305605 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 11 May 2026 02:40:39 -0500 Subject: [PATCH 06/33] flippers --- include/constants/spriteGroups.h | 6 ++++++ src/all_board_process0_sprite_init.c | 16 ++++++++-------- src/all_board_process4.c | 4 ++-- src/intro.c | 12 ++++++------ 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index e124fe30..c75d7c04 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -5,7 +5,10 @@ #define SG_1 1 #define SG_2 2 #define SG_3 3 +#define SG_BONUS_BOARD_FLIPPER_BASE 3 // Of 2. Left, Right +#define SG_BONUS_BOARD_LEFT_FLIPPER 3 #define SG_4 4 +#define SG_BONUS_BOARD_RIGHT_FLIPPER 4 #define SG_5 5 #define SG_BONUS_COMPLETE_BANNER_SCORE 5 #define SG_6 6 @@ -23,11 +26,14 @@ #define SG_10 10 #define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 #define SG_KECLEON_DRAW_ORDER_SPRITES_BASE 10 // Includes bushes, ball, kecleon entity -- 14 total reserved +#define SG_MAIN_BOARD_FLIPPER_BASE 10 // Of 2. Left, Right +#define SG_MAIN_BOARD_LEFT_FLIPPER 10 #define SG_11 11 #define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left #define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 #define SG_KYOGRE_CRYSTAL_BASE 11 // Of 4. Top right; top left, bottom right, bottom left. #define SG_KYOGRE_CRYSTAL_TOP_RIGHT 11 +#define SG_MAIN_BOARD_RIGHT_FLIPPER 11 #define SG_12 12 #define SG_DUSCLOPS_PHASING_FX 12 #define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index b484fce4..0d3bc569 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -36,8 +36,8 @@ void RubyBoardProcess_0B_50918(void) { s16 i; - gMain.spriteGroups[SG_10].active = FALSE; - gMain.spriteGroups[SG_11].active = FALSE; + gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = FALSE; + gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = FALSE; gMain.spriteGroups[SG_48].active = FALSE; gMain.spriteGroups[SG_71].active = FALSE; for (i = 51; i < 67; i++) @@ -88,8 +88,8 @@ void RubyBoardProcess_0B_50918(void) gMain.spriteGroups[SG_56].active = TRUE; gMain.spriteGroups[SG_54].active = TRUE; gMain.spriteGroups[SG_55].active = TRUE; - gMain.spriteGroups[SG_10].active = TRUE; - gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = TRUE; + gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = TRUE; } LoadSpriteSets( @@ -134,8 +134,8 @@ void SapphireBoardProcess_0B_50B80(void) gMain.spriteGroups[SG_51].active = FALSE; gMain.spriteGroups[SG_76].active = FALSE; gMain.spriteGroups[SG_75].active = FALSE; - gMain.spriteGroups[SG_10].active = FALSE; - gMain.spriteGroups[SG_11].active = FALSE; + gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = FALSE; + gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 90) { @@ -179,8 +179,8 @@ void SapphireBoardProcess_0B_50B80(void) gMain.spriteGroups[SG_57].active = TRUE; gMain.spriteGroups[SG_55].active = TRUE; gMain.spriteGroups[SG_56].active = TRUE; - gMain.spriteGroups[SG_10].active = TRUE; - gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = TRUE; + gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = TRUE; } LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, gMain.spriteGroups); diff --git a/src/all_board_process4.c b/src/all_board_process4.c index 98621331..b40160ad 100644 --- a/src/all_board_process4.c +++ b/src/all_board_process4.c @@ -64,7 +64,7 @@ void MainBoardProcess_4B_19490(void) else if (gCurrentPinballGame->flipper[i].position < 0) gCurrentPinballGame->flipper[i].position = 0; - spriteGroup = &gMain.spriteGroups[SG_10 + i]; + spriteGroup = &gMain.spriteGroups[SG_MAIN_BOARD_FLIPPER_BASE + i]; if (spriteGroup->active) { s8 flipperTileIndex; @@ -175,7 +175,7 @@ void BonusBoardProcess_4B_19734(void) else if (gCurrentPinballGame->flipper[i].position < 0) gCurrentPinballGame->flipper[i].position = 0; - spriteGroup = &gMain.spriteGroups[SG_3 + i]; + spriteGroup = &gMain.spriteGroups[SG_BONUS_BOARD_FLIPPER_BASE + i]; if (spriteGroup->active) { s8 flipperTileIndex; diff --git a/src/intro.c b/src/intro.c index ac0f89c8..0748d089 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1497,12 +1497,12 @@ void IntroScene6_RenderStarSprites(void) const struct SpriteSet *p; struct SpriteGroup *spriteGroups[6]; - spriteGroups[0] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[0].animFrame]; - spriteGroups[1] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[1].animFrame + 1]; - spriteGroups[2] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[2].animFrame + 2]; - spriteGroups[3] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[3].animFrame + 3]; - spriteGroups[4] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[4].animFrame + 4]; - spriteGroups[5] = &gMain.spriteGroups[SG_6 * gIntroSpriteEntities[5].animFrame + 5]; + spriteGroups[0] = &gMain.spriteGroups[SG_0 + (6 * gIntroSpriteEntities[0].animFrame)]; + spriteGroups[1] = &gMain.spriteGroups[SG_1 + (6 * gIntroSpriteEntities[1].animFrame)]; + spriteGroups[2] = &gMain.spriteGroups[SG_2 + (6 * gIntroSpriteEntities[2].animFrame)]; + spriteGroups[3] = &gMain.spriteGroups[SG_3 + (6 * gIntroSpriteEntities[3].animFrame)]; + spriteGroups[4] = &gMain.spriteGroups[SG_4 + (6 * gIntroSpriteEntities[4].animFrame)]; + spriteGroups[5] = &gMain.spriteGroups[SG_5 + (6 * gIntroSpriteEntities[5].animFrame)]; spriteGroups[0]->active = gIntroSpriteEntities[0].visible; spriteGroups[1]->active = gIntroSpriteEntities[1].visible; From e3e313cbc0c7162db69b07e6cc2a6eed44f9d4ce Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Tue, 12 May 2026 01:14:47 -0500 Subject: [PATCH 07/33] rayquaza sprite groups --- data/rom_2.s | 6 +- include/constants/spriteGroups.h | 31 +++++ src/all_board_process0_sprite_init.c | 10 +- src/kyogre_process3.c | 2 +- src/rayquaza_process3.c | 186 +++++++++++++-------------- 5 files changed, 133 insertions(+), 102 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index e6cab026..64205f7e 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -9162,7 +9162,7 @@ gRayquazaWhirlwindGrabOamData:: @ 0x086B5D56 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x18c, priority=0x1, paletteNum=0xc -gRayquazaSwoopAttackOamData:: @ 0x086B5DCE +gRayquazaLightningStrikeOamData:: @ 0x086B5DCE packed_sprite_oam x=-0x18, y=-0x60, spriteSize=SPRITE_SIZE_16x32, tileNum=0x208, priority=0x1, paletteNum=0xc packed_sprite_oam x=-0x8, y=-0x50, spriteSize=SPRITE_SIZE_8x16, tileNum=0x210, priority=0x1, paletteNum=0xc packed_sprite_oam x=-0x10, y=-0x40, spriteSize=SPRITE_SIZE_16x32, tileNum=0x212, priority=0x1, paletteNum=0xc @@ -9207,7 +9207,7 @@ gRayquazaSwoopAttackOamData:: @ 0x086B5DCE packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x18c, priority=0x1, paletteNum=0xc -gRayquazaNeckSegmentOamData:: @ 0x086B5ECA +gRayquazaLightningWarningStrikeOamData:: @ 0x086B5ECA packed_sprite_oam x=-0x3, y=-0x3D, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1da, priority=0x1, paletteNum=0xc packed_sprite_oam x=-0x2, y=-0x1D, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1de, priority=0x1, paletteNum=0xc packed_sprite_oam x=0x5, y=-0xD, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1e0, priority=0x1, paletteNum=0xc @@ -9288,7 +9288,7 @@ gRayquazaNeckSegmentOamData:: @ 0x086B5ECA packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x18c, priority=0x1, paletteNum=0xc -gRayquazaHeadOamData:: @ 0x086B609E +gRayquazaLightningChargeRingOamData:: @ 0x086B609E packed_sprite_oam x=0x0, y=0x2B, spriteSize=SPRITE_SIZE_32x16, tileNum=0x18a, priority=0x1, paletteNum=0xc packed_sprite_oam x=0x20, y=0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x192, priority=0x1, paletteNum=0xc packed_sprite_oam x=0x20, y=0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x192, priority=0x1, paletteNum=0xc diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index c75d7c04..b978ac6d 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -34,72 +34,103 @@ #define SG_KYOGRE_CRYSTAL_BASE 11 // Of 4. Top right; top left, bottom right, bottom left. #define SG_KYOGRE_CRYSTAL_TOP_RIGHT 11 #define SG_MAIN_BOARD_RIGHT_FLIPPER 11 +#define SG_RAYQUAZA_INTRO_CLOUD_0 11 #define SG_12 12 #define SG_DUSCLOPS_PHASING_FX 12 #define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 #define SG_KYOGRE_CRYSTAL_TOP_LEFT 12 +#define SG_RAYQUAZA_INTRO_CLOUD_1 12 #define SG_13 13 #define SG_DUSCLOPS_CAPTURE_VORTEX 13 #define SG_GROUDON_CRYSTAL_TOP_LEFT 13 #define SG_KYOGRE_CRYSTAL_BOTTOM_RIGHT 13 +#define SG_RAYQUAZA_INTRO_CLOUD_2 13 #define SG_14 14 #define SG_DUSCLOPS_ENTITY 14 #define SG_GROUDON_CRYSTAL_BOTTOM_LEFT 14 #define SG_KYOGRE_CRYSTAL_BOTTOM_LEFT 14 +#define SG_RAYQUAZA_FLYING_SPARKLE 14 #define SG_15 15 #define SG_GROUDON_BOULDER_BASE 15 // Of 3 #define SG_KYOGRE_INTRO_CRYSTAL_GROUND 15 +#define SG_RAYQUAZA_TORNADO_BASE 15 // Of 2 +#define SG_RAYQUAZA_TORNADO_0 15 #define SG_16 16 #define SG_KYOGRE_FREEZE_TRAP 16 +#define SG_RAYQUAZA_TORNADO_1 16 #define SG_17 17 +#define SG_RAYQUAZA_LIGHTNING_CHARGE_RING 17 #define SG_18 18 #define SG_GROUDON_FILE_PILLAR_BASE 18 // Of 4 +#define SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE 18 #define SG_19 19 +#define SG_RAYQUAZA_LIGHTNING_STRIKE 19 #define SG_20 20 +#define SG_RAYQUAZA_WHIRLWIND_BALL_FLY_UP 20 #define SG_21 21 #define SG_KYOGRE_ENTITY 21 +#define SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION 21 #define SG_22 22 #define SG_GROUDON_FIREBALL 22 #define SG_KYOGRE_WHIRLPOOL_0 22 +#define SG_RAYQUAZA_ENTITY_FLYBY_RIGHT 22 // Left to right #define SG_23 23 #define SG_GROUDON_FIREBALL_LAUNCH_FX 23 #define SG_KYOGRE_WHIRLPOOL_1 23 +#define SG_RAYQUAZA_ENTITY_FLYBY_LEFT 23 // Right to left #define SG_24 24 #define SG_GROUDON_FIREBALL_CAUGHT_BALL 24 #define SG_KECLEON_SCOPE_ITEM 24 #define SG_KYOGRE_SHOCKWAVE 24 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0A 24 #define SG_25 25 #define SG_KECLEON_FLOWER_BY_TREE 25 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0B 25 #define SG_26 26 #define SG_KECLEON_FLOWER_PAIR_LEFT 26 #define SG_KYOGRE_SURFACING_FX 26 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1A 26 #define SG_27 27 #define SG_KECLEON_FLOWER_PAIR_BOTTOM_RIGHT 27 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B 27 #define SG_28 28 #define SG_KECLEON_FLOWER_TRIPLE_RIGHT 28 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2A 28 #define SG_29 29 #define SG_GROUDON_ENTITY 29 #define SG_KECLEON_BALL_RIPPLE_FX 29 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2B 29 #define SG_30 30 #define SG_GROUDON_SHOCKWAVE 30 #define SG_KECLEON_STEP_RIPPLE_FX 30 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0A 30 #define SG_31 31 #define SG_KECLEON_REFLECTION_HEAD 31 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0B 31 #define SG_32 32 #define SG_KECLEON_REFLECTION_BALL 32 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1A 32 #define SG_33 33 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B 33 #define SG_34 34 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2A 34 #define SG_35 35 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2B 35 #define SG_36 36 +#define SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX 36 #define SG_37 37 #define SG_38 38 #define SG_39 39 #define SG_40 40 #define SG_41 41 +#define SG_RAYQUAZA_ENTITY_BOUNCING 41 #define SG_42 42 +#define SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_UP 42 #define SG_43 43 +#define SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_DOWN 43 #define SG_44 44 #define SG_45 45 +#define SG_RAYQUAZA_ENTITY_SHADOW_FX 45 #define SG_46 46 #define SG_47 47 #define SG_48 48 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 0d3bc569..1efce001 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -339,11 +339,11 @@ void RayquazaBoardProcess_0A_51090(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[SG_42].active = TRUE; - gMain.spriteGroups[SG_11].active = TRUE; - gMain.spriteGroups[SG_12].active = TRUE; - gMain.spriteGroups[SG_13].active = TRUE; - gMain.spriteGroups[SG_21].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_UP].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_0].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_1].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_2].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 8519e11f..98b4aeb3 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -1189,7 +1189,7 @@ void UpdateKyogreFieldEntities(void) } } - DmaCopy16(3, gKyogreWhirlpoolMinionSprites[index], (void *)0x06011520 + i * 0x200, 0x200); + DmaCopy16(3, gKyogreWhirlpoolMinionSprites[index], (void *)(0x06011520 + i * 0x200), 0x200); if (group->active) { if (gCurrentPinballGame->vortexEntityState[i] > KYOGRE_WHIRLPOOL_PHASE_INIT) diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 0e3d3d5d..ac1d41e4 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -16,11 +16,11 @@ extern const s16 gScreenShakeOscillationValues[]; extern const u16 gRayquazaAnimFramesetTable[][3]; extern const struct Vector16 gRayquazaTornadoSpawnPos[32]; extern const s16 gRayquazaCloudScrollPositions[]; -extern const u16 gRayquazaNeckSegmentOamData[39][6][3]; +extern const u16 gRayquazaLightningWarningStrikeOamData[39][6][3]; extern const u16 gRayquazaHitBurstOamData[10][5][3]; extern const u16 gRayquazaWhirlwindGrabOamData[20][2][3]; -extern const u16 gRayquazaSwoopAttackOamData[12][7][3]; -extern const u16 gRayquazaHeadOamData[10][3][3]; +extern const u16 gRayquazaLightningStrikeOamData[12][7][3]; +extern const u16 gRayquazaLightningChargeRingOamData[10][3][3]; extern const u16 gRayquazaMainBodyOamData[212][3]; void RayquazaBoardProcess_3A_3E79C(void) @@ -469,9 +469,9 @@ void UpdateRayquazaEntityLogic(void) { if (gCurrentPinballGame->bossMovementPhase == 0) { - gMain.spriteGroups[SG_17].active = TRUE; - gMain.spriteGroups[SG_18].active = TRUE; - gMain.spriteGroups[SG_19].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_CHARGE_RING].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_STRIKE].active = TRUE; gCurrentPinballGame->lightningAttackState = RAYQUAZA_LIGHTNING_STATE_CHARGING; } } @@ -494,15 +494,15 @@ void UpdateRayquazaEntityLogic(void) DmaCopy16(3, gRayquazaWindBoardGfx, (void *)0x06015800, 0x1C00); if (gCurrentPinballGame->windAttackCount & 1) { - gMain.spriteGroups[SG_22].active = TRUE; - gMain.spriteGroups[SG_24].active = TRUE; - gMain.spriteGroups[SG_25].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_RIGHT].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0A].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0B].active = TRUE; } else { - gMain.spriteGroups[SG_23].active = TRUE; - gMain.spriteGroups[SG_30].active = TRUE; - gMain.spriteGroups[SG_31].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_LEFT].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0A].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0B].active = TRUE; } gCurrentPinballGame->windAttackCount++; @@ -516,12 +516,12 @@ void UpdateRayquazaEntityLogic(void) } break; case RAYQUAZA_ENTITY_STATE_FLYBY: - if (gMain.spriteGroups[SG_22].active) + if (gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_RIGHT].active) { if (gCurrentPinballGame->windEntityPosition.x < 4800) gCurrentPinballGame->windEntityPosition.x += 140; else - gMain.spriteGroups[SG_22].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_RIGHT].active = FALSE; if (gCurrentPinballGame->windEntityPosition.x > 2400) { @@ -536,7 +536,7 @@ void UpdateRayquazaEntityLogic(void) if (gCurrentPinballGame->windEntityPosition.x > -4800) gCurrentPinballGame->windEntityPosition.x -= 140; else - gMain.spriteGroups[SG_23].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_LEFT].active = FALSE; if (gCurrentPinballGame->windEntityPosition.x < -2400) { @@ -584,7 +584,7 @@ void UpdateRayquazaEntityLogic(void) } gCurrentPinballGame->bossFrameTimer = 0; - if (gMain.spriteGroups[SG_36].active) + if (gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX].active) gCurrentPinballGame->ballGrabTimer = 1; break; case RAYQUAZA_ENTITY_STATE_YELLS: @@ -648,7 +648,7 @@ void UpdateRayquazaEntityLogic(void) gCurrentPinballGame->introFrameCounter = 0; gCurrentPinballGame->boardEntityActive = 1; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYING_SPARKLE].active = TRUE; gCurrentPinballGame->minionLogicPosition[0].x = 0; gCurrentPinballGame->minionLogicPosition[0].y = -5000; gCurrentPinballGame->minionLogicPosition[1].x = 1400; @@ -714,7 +714,7 @@ void RenderRayquazaSprites(void) varSL = 0; sp0 = 0; - group = &gMain.spriteGroups[SG_43]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_DOWN]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10; @@ -736,7 +736,7 @@ void RenderRayquazaSprites(void) } } - group = &gMain.spriteGroups[SG_42]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_UP]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10; @@ -760,13 +760,13 @@ void RenderRayquazaSprites(void) if (gCurrentPinballGame->introFrameCounter == 671) { group->active = FALSE; - gMain.spriteGroups[SG_41].active = TRUE; - gMain.spriteGroups[SG_45].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BOUNCING].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_SHADOW_FX].active = TRUE; } } else { - group = &gMain.spriteGroups[SG_41]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BOUNCING]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10 - (gCurrentPinballGame->cameraXOffset - 88); @@ -843,7 +843,7 @@ void RenderRayquazaSprites(void) DmaCopy16(3, gRayquazaBodyVariantTiles[varSL], (void *)0x06011620, 0x800); } - group = &gMain.spriteGroups[SG_21]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION]; if (group->active) { if (varSL >= 8) @@ -874,7 +874,7 @@ void RenderRayquazaSprites(void) } } - group = &gMain.spriteGroups[SG_45]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_SHADOW_FX]; if (group->active) { s16 var2 = (gCurrentPinballGame->bossHeadScreenY - 70) / 3 + 1; @@ -909,16 +909,16 @@ void RenderRayquazaSprites(void) if (gCurrentPinballGame->bossEntityState == RAYQUAZA_ENTITY_STATE_BOARD_CLEANUP) { - gMain.spriteGroups[SG_43].active = TRUE; - gMain.spriteGroups[SG_41].active = FALSE; - gMain.spriteGroups[SG_45].active = FALSE; - gMain.spriteGroups[SG_21].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_DOWN].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BOUNCING].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_SHADOW_FX].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION].active = FALSE; } if (gCurrentPinballGame->captureSequenceTimer == 21) { - gMain.spriteGroups[SG_45].active = FALSE; - gMain.spriteGroups[SG_21].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_SHADOW_FX].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION].active = FALSE; } } } @@ -1101,7 +1101,7 @@ void UpdateRayquazaMinionsAndEffects(void) && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->ballRespawnState == 0 && squaredMagnitude < 200) { - gMain.spriteGroups[SG_36].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX].active = TRUE; gCurrentPinballGame->ballGrabTimer = 600; m4aSongNumStart(SE_UNKNOWN_0x12A); PlayRumble(9); @@ -1122,7 +1122,7 @@ void UpdateRayquazaMinionsAndEffects(void) break; } - group = &gMain.spriteGroups[SG_17]; + group = &gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_CHARGE_RING]; if (group->active) { // ! odd behavior in the assembly with the addition and subtraction @@ -1132,7 +1132,7 @@ void UpdateRayquazaMinionsAndEffects(void) { oamSimple = &group->oam[j]; dst = (u16*)&gOamBuffer[oamSimple->oamId]; - src = gRayquazaHeadOamData[var0][j]; + src = gRayquazaLightningChargeRingOamData[var0][j]; *dst++ = *src++; *dst++ = *src++; *dst++ = *src++; @@ -1142,10 +1142,10 @@ void UpdateRayquazaMinionsAndEffects(void) } if (gCurrentPinballGame->lightningAttackState == RAYQUAZA_LIGHTNING_STATE_4) - gMain.spriteGroups[SG_17].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_CHARGE_RING].active = FALSE; } - group = &gMain.spriteGroups[SG_18]; + group = &gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE]; if (group->active) { group->baseX = gCurrentPinballGame->bossPositionX / 10 - (gCurrentPinballGame->cameraXOffset - 88); @@ -1154,7 +1154,7 @@ void UpdateRayquazaMinionsAndEffects(void) { oamSimple = &group->oam[j]; dst = (u16*)&gOamBuffer[oamSimple->oamId]; - src = gRayquazaNeckSegmentOamData[sp4][j]; + src = gRayquazaLightningWarningStrikeOamData[sp4][j]; *dst++ = *src++; *dst++ = *src++; *dst++ = *src++; @@ -1164,10 +1164,10 @@ void UpdateRayquazaMinionsAndEffects(void) } if (gCurrentPinballGame->lightningAttackState == RAYQUAZA_LIGHTNING_STATE_4) - gMain.spriteGroups[SG_18].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE].active = FALSE; } - group = &gMain.spriteGroups[SG_19]; + group = &gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_STRIKE]; if (group->active) { group->baseX = gCurrentPinballGame->lightningTargetPosition.x - gCurrentPinballGame->cameraXOffset; @@ -1176,7 +1176,7 @@ void UpdateRayquazaMinionsAndEffects(void) { oamSimple = &group->oam[j]; dst = (u16*)&gOamBuffer[oamSimple->oamId]; - src = gRayquazaSwoopAttackOamData[sp8][j]; + src = gRayquazaLightningStrikeOamData[sp8][j]; *dst++ = *src++; *dst++ = *src++; *dst++ = *src++; @@ -1194,10 +1194,10 @@ void UpdateRayquazaMinionsAndEffects(void) } if (gCurrentPinballGame->lightningAttackState == RAYQUAZA_LIGHTNING_STATE_4) - gMain.spriteGroups[SG_19].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_STRIKE].active = FALSE; } - group = &gMain.spriteGroups[SG_22]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_RIGHT]; if (group->active) { group->baseX = gCurrentPinballGame->windEntityPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 120); @@ -1210,7 +1210,7 @@ void UpdateRayquazaMinionsAndEffects(void) } } - group = &gMain.spriteGroups[SG_23]; + group = &gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_LEFT]; if (group->active) { group->baseX = gCurrentPinballGame->windEntityPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 360); @@ -1230,7 +1230,7 @@ void UpdateRayquazaMinionsAndEffects(void) for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[SG_15 + i]; + group = &gMain.spriteGroups[SG_RAYQUAZA_TORNADO_BASE + i]; switch (gCurrentPinballGame->vortexEntityState[i]) { case RAYQUAZA_WHIRLWIND_STATE_INIT: @@ -1410,7 +1410,7 @@ void UpdateRayquazaMinionsAndEffects(void) } RenderWindCloudSprites(); - group = &gMain.spriteGroups[SG_20]; + group = &gMain.spriteGroups[SG_RAYQUAZA_WHIRLWIND_BALL_FLY_UP]; if (group->active) { s16 a; @@ -1455,7 +1455,7 @@ void UpdateLightningGrabEntity(void) u16 *dst; const u16 *src; - group = &gMain.spriteGroups[SG_36]; + group = &gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX]; if (!group->active) return; @@ -1509,7 +1509,7 @@ void UpdateLightningGrabEntity(void) if (gCurrentPinballGame->ballGrabTimer == 0) { - gMain.spriteGroups[SG_36].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX].active = FALSE; gCurrentPinballGame->ballGrabFlashTimer = 0; gCurrentPinballGame->ballGrabbed = 0; } @@ -1545,7 +1545,7 @@ void RenderWindCloudSprites(void) u32 rand; u16 var0; - group = &gMain.spriteGroups[SG_24]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0A]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); @@ -1557,7 +1557,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_25]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0B]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 14; i++) @@ -1568,7 +1568,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[SG_26]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1A]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); @@ -1580,7 +1580,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_27]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 9; i++) @@ -1591,7 +1591,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[SG_28]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2A]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); @@ -1603,7 +1603,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_29]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2B]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset + 128); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 12; i++) @@ -1614,7 +1614,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[SG_30]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0A]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); @@ -1626,7 +1626,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_31]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0B]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 14; i++) @@ -1637,7 +1637,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[SG_32]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1A]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); @@ -1649,7 +1649,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_33]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 9; i++) @@ -1660,7 +1660,7 @@ void RenderWindCloudSprites(void) } } - group = &gMain.spriteGroups[SG_34]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2A]; if (group->active) { group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); @@ -1672,7 +1672,7 @@ void RenderWindCloudSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_35]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2B]; group->baseX = gCurrentPinballGame->windCloudPosition.x / 10 - (gCurrentPinballGame->cameraXOffset - 368); group->baseY = gCurrentPinballGame->windCloudPosition.y / 10 - (gCurrentPinballGame->cameraYOffset - 90); for (i = 0; i < 12; i++) @@ -1683,14 +1683,14 @@ void RenderWindCloudSprites(void) } } - if (gMain.spriteGroups[SG_22].active) + if (gMain.spriteGroups[SG_RAYQUAZA_ENTITY_FLYBY_RIGHT].active) { if (gCurrentPinballGame->windCloudSpawnTimer == 6) { - gMain.spriteGroups[SG_24].active = FALSE; - gMain.spriteGroups[SG_25].active = FALSE; - gMain.spriteGroups[SG_26].active = TRUE; - gMain.spriteGroups[SG_27].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0A].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0B].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1A].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B].active = TRUE; if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->ballRespawnState == 0) @@ -1702,26 +1702,26 @@ void RenderWindCloudSprites(void) if (gCurrentPinballGame->windCloudSpawnTimer == 11) { - gMain.spriteGroups[SG_26].active = FALSE; - gMain.spriteGroups[SG_27].active = FALSE; - gMain.spriteGroups[SG_28].active = TRUE; - gMain.spriteGroups[SG_29].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1A].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2A].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2B].active = TRUE; } if (gCurrentPinballGame->windCloudSpawnTimer == 14) { - gMain.spriteGroups[SG_28].active = FALSE; - gMain.spriteGroups[SG_29].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2A].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2B].active = FALSE; } } else { if (gCurrentPinballGame->windCloudSpawnTimer == 6) { - gMain.spriteGroups[SG_30].active = FALSE; - gMain.spriteGroups[SG_31].active = FALSE; - gMain.spriteGroups[SG_32].active = TRUE; - gMain.spriteGroups[SG_33].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0A].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0B].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1A].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B].active = TRUE; if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->ballRespawnState == 0) @@ -1733,16 +1733,16 @@ void RenderWindCloudSprites(void) if (gCurrentPinballGame->windCloudSpawnTimer == 11) { - gMain.spriteGroups[SG_32].active = FALSE; - gMain.spriteGroups[SG_33].active = FALSE; - gMain.spriteGroups[SG_34].active = TRUE; - gMain.spriteGroups[SG_35].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1A].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2A].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2B].active = TRUE; } if (gCurrentPinballGame->windCloudSpawnTimer == 14) { - gMain.spriteGroups[SG_34].active = FALSE; - gMain.spriteGroups[SG_35].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2A].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2B].active = FALSE; } } @@ -1752,7 +1752,7 @@ void RenderWindCloudSprites(void) { gCurrentPinballGame->vortexAnimTimer[0] = 0; gCurrentPinballGame->vortexEntityState[0] = RAYQUAZA_WHIRLWIND_STATE_SPAWN; - gMain.spriteGroups[SG_15].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_TORNADO_0].active = TRUE; rand = Random() % 8; var0 = ((gMain.systemFrameCount % 240) << 0x10) / 240; gCurrentPinballGame->vortexOrbitCenter[0].x = gRayquazaTornadoSpawnPos[rand].x; @@ -1769,7 +1769,7 @@ void RenderWindCloudSprites(void) { gCurrentPinballGame->vortexAnimTimer[1] = 0; gCurrentPinballGame->vortexEntityState[1] = RAYQUAZA_WHIRLWIND_STATE_SPAWN; - gMain.spriteGroups[SG_16].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_TORNADO_1].active = TRUE; rand = (Random() % 8 + 8) % 32; // Force 8 to be added to r1 var0 = (((gMain.systemFrameCount + 120) % 240) << 0x10) / 240; gCurrentPinballGame->vortexOrbitCenter[1].x = gRayquazaTornadoSpawnPos[rand].x; @@ -1900,7 +1900,7 @@ void UpdateRayquazaIntroSequence(void) gCurrentPinballGame->minionLogicPosition[2].y = 1800; } - group = &gMain.spriteGroups[SG_11]; + group = &gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_0]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[0].x / 10; @@ -1921,7 +1921,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[SG_12]; + group = &gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_1]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[1].x / 10; @@ -1942,7 +1942,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[SG_13]; + group = &gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_2]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[2].x / 10; @@ -1965,12 +1965,12 @@ void UpdateRayquazaIntroSequence(void) if (gCurrentPinballGame->introFrameCounter == 660) { - gMain.spriteGroups[SG_11].active = FALSE; - gMain.spriteGroups[SG_12].active = FALSE; - gMain.spriteGroups[SG_13].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_0].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_1].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_2].active = FALSE; } - group = &gMain.spriteGroups[SG_14]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYING_SPARKLE]; if (group->active) { if (gCurrentPinballGame->introFrameCounter >= 195 && gCurrentPinballGame->introFrameCounter < 205) @@ -1994,7 +1994,7 @@ void UpdateRayquazaIntroSequence(void) if (gCurrentPinballGame->introFrameCounter == 150) { - gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_RAYQUAZA_FLYING_SPARKLE].active = TRUE; gCurrentPinballGame->orbCollisionPosition.x = 1600; gCurrentPinballGame->orbCollisionPosition.y = -100; gCurrentPinballGame->orbLogicPosition.x = -21; @@ -2014,7 +2014,7 @@ void UpdateRayquazaIntroSequence(void) } if (gCurrentPinballGame->introFrameCounter == 350) - gMain.spriteGroups[SG_14].active = FALSE; + gMain.spriteGroups[SG_RAYQUAZA_FLYING_SPARKLE].active = FALSE; } } @@ -2026,7 +2026,7 @@ void UpdateRayquazaIntroSequence(void) gCurrentPinballGame->introFrameCounter++; } - group = &gMain.spriteGroups[SG_11]; + group = &gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_0]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[0].x / 10; @@ -2047,7 +2047,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[SG_12]; + group = &gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_1]; if (group->active) { group->baseX = gCurrentPinballGame->minionLogicPosition[1].x / 10; @@ -2068,7 +2068,7 @@ void UpdateRayquazaIntroSequence(void) } } - group = &gMain.spriteGroups[SG_14]; + group = &gMain.spriteGroups[SG_RAYQUAZA_FLYING_SPARKLE]; if (group->active) { if (gCurrentPinballGame->introFrameCounter >= 190 && gCurrentPinballGame->introFrameCounter < 200) From c59f13fb4effd0de2df9d625a82a3a019f583a79 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Tue, 12 May 2026 02:16:09 -0500 Subject: [PATCH 08/33] spheal sprite groups --- data/rom_1.s | 2 +- include/constants/spriteGroups.h | 16 ++++++++++ src/all_board_process0_sprite_init.c | 14 ++++----- src/spheal_process3.c | 46 ++++++++++++++-------------- 4 files changed, 47 insertions(+), 31 deletions(-) diff --git a/data/rom_1.s b/data/rom_1.s index f617b056..4bd12878 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -1376,7 +1376,7 @@ gRayquazaSpriteSheet:: @ 0x084AA18C gRayquazaBodyVariantTiles:: @ 0x084AA9EC .incbin "baserom.gba", 0x4AA9EC, 0x5000 -gSphealScoreCounterDigitSprites:: @ 0x084AF9EC +gSphealNetGfx:: @ 0x084AF9EC .incbin "baserom.gba", 0x4AF9EC, 0x600 gSphealExtendedScoreSprites:: @ 0x084AFFEC diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index b978ac6d..c0c4ecac 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -17,17 +17,21 @@ #define SG_DUSKULL_BASE 7 // Of 3 #define SG_DUSKULL_0 7 #define SG_KECLEON_TREE_LEAVES 7 +#define SG_SPHEAL_END_SCORE_PANEL 7 #define SG_8 8 #define SG_DUSKULL_1 8 +#define SG_SPHEAL_END_SCORE_SPHEALS_SUNK 8 #define SG_9 9 #define SG_DUSKULL_2 9 #define SG_LEGENDARY_CATCH_PORTRAIT 9 #define SG_KECLEON_DUST_FX 9 +#define SG_SPHEAL_END_SCORE_BALLS_SUNK 9 #define SG_10 10 #define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 #define SG_KECLEON_DRAW_ORDER_SPRITES_BASE 10 // Includes bushes, ball, kecleon entity -- 14 total reserved #define SG_MAIN_BOARD_FLIPPER_BASE 10 // Of 2. Left, Right #define SG_MAIN_BOARD_LEFT_FLIPPER 10 +#define SG_SPHEAL_END_SCORE_TOTAL 10 #define SG_11 11 #define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left #define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 @@ -35,6 +39,7 @@ #define SG_KYOGRE_CRYSTAL_TOP_RIGHT 11 #define SG_MAIN_BOARD_RIGHT_FLIPPER 11 #define SG_RAYQUAZA_INTRO_CLOUD_0 11 +#define SG_SPHEAL_SCORED_COUNTER 11 #define SG_12 12 #define SG_DUSCLOPS_PHASING_FX 12 #define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 @@ -50,30 +55,41 @@ #define SG_GROUDON_CRYSTAL_BOTTOM_LEFT 14 #define SG_KYOGRE_CRYSTAL_BOTTOM_LEFT 14 #define SG_RAYQUAZA_FLYING_SPARKLE 14 +#define SG_SPHEAL_ENTITY_BASE 14 // Of 2 +#define SG_SPHEAL_ENTITY_0 14 #define SG_15 15 #define SG_GROUDON_BOULDER_BASE 15 // Of 3 #define SG_KYOGRE_INTRO_CRYSTAL_GROUND 15 #define SG_RAYQUAZA_TORNADO_BASE 15 // Of 2 #define SG_RAYQUAZA_TORNADO_0 15 +#define SG_SPHEAL_ENTITY_1 15 #define SG_16 16 #define SG_KYOGRE_FREEZE_TRAP 16 #define SG_RAYQUAZA_TORNADO_1 16 +#define SG_SPHEAL_ENTITY_REFLECTION_BASE 16 // Of 2 +#define SG_SPHEAL_ENTITY_REFLECTION_0 16 #define SG_17 17 #define SG_RAYQUAZA_LIGHTNING_CHARGE_RING 17 +#define SG_SPHEAL_ENTITY_REFLECTION_1 17 #define SG_18 18 #define SG_GROUDON_FILE_PILLAR_BASE 18 // Of 4 #define SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE 18 +#define SG_SPHEAL_NET 18 #define SG_19 19 #define SG_RAYQUAZA_LIGHTNING_STRIKE 19 +#define SG_SPHEAL_WHISCASH_ENTITY 19 #define SG_20 20 #define SG_RAYQUAZA_WHIRLWIND_BALL_FLY_UP 20 +#define SG_SPHEAL_PELIPPER_ENTITY 20 #define SG_21 21 #define SG_KYOGRE_ENTITY 21 #define SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION 21 +#define SG_SPHEAL_LEFT_SEALEO_ENTITY 21 #define SG_22 22 #define SG_GROUDON_FIREBALL 22 #define SG_KYOGRE_WHIRLPOOL_0 22 #define SG_RAYQUAZA_ENTITY_FLYBY_RIGHT 22 // Left to right +#define SG_SPHEAL_RIGHT_SEALEO_ENTITY 22 #define SG_23 23 #define SG_GROUDON_FIREBALL_LAUNCH_FX 23 #define SG_KYOGRE_WHIRLPOOL_1 23 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 1efce001..7c02692c 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -370,13 +370,13 @@ void SphealBoardProcess_0A_51150(void) } gMain.fieldSpriteGroups[0]->active = TRUE; - gMain.spriteGroups[SG_18].active = TRUE; - gMain.spriteGroups[SG_21].active = TRUE; - gMain.spriteGroups[SG_22].active = TRUE; - gMain.spriteGroups[SG_14].active = TRUE; - gMain.spriteGroups[SG_15].active = TRUE; - gMain.spriteGroups[SG_16].active = TRUE; - gMain.spriteGroups[SG_17].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_NET].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_LEFT_SEALEO_ENTITY].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_RIGHT_SEALEO_ENTITY].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_ENTITY_0].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_ENTITY_1].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_ENTITY_REFLECTION_0].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_ENTITY_REFLECTION_1].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, diff --git a/src/spheal_process3.c b/src/spheal_process3.c index 834e859e..9ea8b921 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -21,7 +21,7 @@ extern struct SongHeader se_unk_13d; extern const s8 gSphealScoreDigitSpriteIndices[]; extern const u16 gSphealWaterBackgroundTilemap[]; -extern const u8 gSphealScoreCounterDigitSprites[][0x200]; +extern const u8 gSphealNetGfx[][0x200]; extern const u8 gSphealExtendedScoreSprites[][0x180]; extern const u8 gSphealFlyingEnemyVariantSprites[][0x120]; extern const u8 gSphealMinionBodySprites[][0x800]; @@ -206,10 +206,10 @@ void SphealBoardProcess_3B_43228(void) { gCurrentPinballGame->boardState = SPHEAL_BOARD_STATE_SCORE_DISPLAY; gCurrentPinballGame->stageTimer = 0; - gMain.spriteGroups[SG_7].active = TRUE; - gMain.spriteGroups[SG_8].active = TRUE; - gMain.spriteGroups[SG_9].active = TRUE; - gMain.spriteGroups[SG_10].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_END_SCORE_PANEL].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_END_SCORE_SPHEALS_SUNK].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_END_SCORE_BALLS_SUNK].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_END_SCORE_TOTAL].active = TRUE; DmaCopy16(3, gSphealResultsScreenGfx, (void *)0x06015800, 0x800); gCurrentPinballGame->bannerSlideYOffset = -126; gCurrentPinballGame->boardEntityActive = 1; @@ -374,7 +374,7 @@ void UpdateSealeoEntityLogic(void) } } - group = &gMain.spriteGroups[SG_22]; + group = &gMain.spriteGroups[SG_SPHEAL_RIGHT_SEALEO_ENTITY]; if (group->active) { group->baseX = 100 - gCurrentPinballGame->cameraXOffset; @@ -390,7 +390,7 @@ void UpdateSealeoEntityLogic(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_21]; + group = &gMain.spriteGroups[SG_SPHEAL_LEFT_SEALEO_ENTITY]; if (group->active) { group->baseX = 140 - gCurrentPinballGame->cameraXOffset; @@ -855,7 +855,7 @@ void UpdateSphealEntityLogic(void) // Draw Spheals; set collision position. for (i = 0; i < 2; i++) { - group = &gMain.spriteGroups[SG_14 + i]; + group = &gMain.spriteGroups[SG_SPHEAL_ENTITY_BASE + i]; if (group->active) { sphealFrameIx = gCurrentPinballGame->sphealNextFrameIx[i]; @@ -910,7 +910,7 @@ void UpdateSphealEntityLogic(void) gCurrentPinballGame->sphealHitYPosition[i] = gCurrentPinballGame->sphealPositionQ8[i].y / 256 + gCurrentPinballGame->sphealOamYOffset[i]; - group = &gMain.spriteGroups[SG_16 + i]; + group = &gMain.spriteGroups[SG_SPHEAL_ENTITY_REFLECTION_BASE + i]; //Note: left/right are separated by 30 if (sphealFrameIx == 12 || sphealFrameIx == 42) @@ -947,7 +947,7 @@ void UpdateSphealScoreAndDelivery(void) struct OamDataSimple *oamSimple; var0 = 0; - group = &gMain.spriteGroups[SG_18]; + group = &gMain.spriteGroups[SG_SPHEAL_NET]; if (group->active) { group->baseX = 104 - gCurrentPinballGame->cameraXOffset; @@ -955,13 +955,13 @@ void UpdateSphealScoreAndDelivery(void) if (gCurrentPinballGame->scoreCountdownTimer < 22) var0 = gSphealScoreDigitSpriteIndices[gCurrentPinballGame->scoreCountdownTimer]; - DmaCopy16(3, gSphealScoreCounterDigitSprites[var0], (void *)0x06010920, 0x200); + DmaCopy16(3, gSphealNetGfx[var0], (void *)0x06010920, 0x200); oamSimple = &group->oam[0]; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_11]; + group = &gMain.spriteGroups[SG_SPHEAL_SCORED_COUNTER]; if (group->active) { group->baseX = 104 - gCurrentPinballGame->cameraXOffset; @@ -976,7 +976,7 @@ void UpdateSphealScoreAndDelivery(void) } if (gCurrentPinballGame->boardState == SPHEAL_BOARD_STATE_ACTIVE_PHASE) - gMain.spriteGroups[SG_11].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_SCORED_COUNTER].active = TRUE; if (gCurrentPinballGame->boardState < SPHEAL_BOARD_STATE_ENDING && gMain.modeChangeFlags == MODE_CHANGE_NONE && gCurrentPinballGame->scoreCountdownTimer) { @@ -1005,7 +1005,7 @@ void SphealBoard_WhiscashDeliversBall(void) const u16 *offsets; s16 var0; - group = &gMain.spriteGroups[SG_19]; + group = &gMain.spriteGroups[SG_SPHEAL_WHISCASH_ENTITY]; if (group->active) { offsets = gSphealWhiscashAnimFrameset[gCurrentPinballGame->deliveryAnimFrameIndex]; @@ -1030,12 +1030,12 @@ void SphealBoard_WhiscashDeliversBall(void) gCurrentPinballGame->deliveryAnimTimer = 0; gCurrentPinballGame->deliveryAnimFrameIndex++; if (gCurrentPinballGame->deliveryAnimFrameIndex == 1) - gMain.spriteGroups[SG_19].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_WHISCASH_ENTITY].active = TRUE; if (gCurrentPinballGame->deliveryAnimFrameIndex == 19) { gCurrentPinballGame->deliveryAnimFrameIndex = 18; - gMain.spriteGroups[SG_19].active = FALSE; + gMain.spriteGroups[SG_SPHEAL_WHISCASH_ENTITY].active = FALSE; gCurrentPinballGame->ballDeliveryActive = 0; } @@ -1079,7 +1079,7 @@ void SphealBoard_PelipperDeliversBall(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_20]; + group = &gMain.spriteGroups[SG_SPHEAL_PELIPPER_ENTITY]; if (group->active) { group->baseX = (gCurrentPinballGame->pelipperPosX / 10) - (gCurrentPinballGame->cameraXOffset - 146); @@ -1105,7 +1105,7 @@ void SphealBoard_PelipperDeliversBall(void) gCurrentPinballGame->pelipperFrameTimer = 0; gCurrentPinballGame->pelipperState = 8; gCurrentPinballGame->deliveryAnimFrameIndex = 13; - gMain.spriteGroups[SG_20].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_PELIPPER_ENTITY].active = TRUE; gCurrentPinballGame->boardEntityActive = 1; } } @@ -1123,7 +1123,7 @@ void SphealBoard_PelipperDeliversBall(void) } else { - gMain.spriteGroups[SG_20].active = FALSE; + gMain.spriteGroups[SG_SPHEAL_PELIPPER_ENTITY].active = FALSE; } if (gCurrentPinballGame->pelipperFrameTimer == 13) @@ -1551,7 +1551,7 @@ void UpdateSphealResultsScreen(void) gCurrentPinballGame->resultsAnimTimer++; - group = &gMain.spriteGroups[SG_7]; + group = &gMain.spriteGroups[SG_SPHEAL_END_SCORE_PANEL]; if (!group->active) return; @@ -1602,7 +1602,7 @@ void UpdateSphealResultsScreen(void) sp18[10] = sp0[0] * 2 + 0x2D0; sp18[11] = sp0[1] * 2 + 0x2D0; - group = &gMain.spriteGroups[SG_8]; + group = &gMain.spriteGroups[SG_SPHEAL_END_SCORE_SPHEALS_SUNK]; group->baseX = 120; group->baseY = 60 + gCurrentPinballGame->bannerSlideYOffset; for (i = 0; i < 12; i++) @@ -1651,7 +1651,7 @@ void UpdateSphealResultsScreen(void) sp18[10] = sp0[0] * 2 + 0x2D0; sp18[11] = sp0[1] * 2 + 0x2D0; - group = &gMain.spriteGroups[SG_9]; + group = &gMain.spriteGroups[SG_SPHEAL_END_SCORE_BALLS_SUNK]; group->baseX = 120; group->baseY = 60 + gCurrentPinballGame->bannerSlideYOffset; for (i = 0; i < 12; i++) @@ -1699,7 +1699,7 @@ void UpdateSphealResultsScreen(void) sp0[0] = value; sp18[11] = sp0[0] * 2 + 0x2D0; - group = &gMain.spriteGroups[SG_10]; + group = &gMain.spriteGroups[SG_SPHEAL_END_SCORE_TOTAL]; group->baseX = 120; group->baseY = 60 + gCurrentPinballGame->bannerSlideYOffset; for (i = 0; i < 12; i++) From 8020b803d52baf9c6f6dcd24cd9025a9299496d8 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Tue, 12 May 2026 04:16:08 -0500 Subject: [PATCH 09/33] Pause Sprite Group + Dusclops SpriteSets --- data/rom_2.s | 441 ++++++++++++++------------- include/constants/spriteGroups.h | 11 +- src/all_board_pause_game.c | 12 +- src/all_board_process0_sprite_init.c | 12 +- src/dusclops_process3.c | 14 +- src/kecleon_process3.c | 4 +- 6 files changed, 249 insertions(+), 245 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 64205f7e..0e4cb907 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -4422,7 +4422,7 @@ gKecleonSpriteYSortData:: @ 0x086AEA70 .byte 30,11 .space 0x2 - .4byte gUnknown_086BA180 + .4byte gBonusBoardBallSpriteSet .byte 0,12 .space 0x2 @@ -5355,22 +5355,22 @@ gSapphireGetArrowTilePtrs:: @ 0x086B14A8 .4byte 0x06008AC0, 0x06008EA0, 0x060092A0 gFieldSpriteSets:: @ 0x086B155C - .4byte gUnknown_086B2390 - .2byte 0x54, 0 - .4byte gUnknown_086B24E0 - .2byte 0x57, 0 - .4byte gUnknown_086BB3E4 - .2byte 0xF, 0 - .4byte gKecleonDefaultSpriteSets - .2byte 0x21, 0 - .4byte gUnknown_086BB4A4 - .2byte 0x1B, 0 - .4byte gUnknown_086BB510 - .2byte 0x20, 0 - .4byte gUnknown_086BB590 - .2byte 0x2E, 0 - .4byte gUnknown_086BB648 - .2byte 0x17, 0 + .4byte gRubyBoardSpriteSets + .2byte 84, 0 + .4byte gSapphireBoardSpriteSets + .2byte 87, 0 + .4byte gDusclopsBoardSpriteSets + .2byte 15, 0 + .4byte gKecleonBoardSpriteSets + .2byte 33, 0 + .4byte gKyogreBoardSpriteSets + .2byte 27, 0 + .4byte gGroudonBoardSpriteSets + .2byte 32, 0 + .4byte gRayquazaBoardSpriteSets + .2byte 46, 0 + .4byte gSphealBoardSpriteSets + .2byte 23, 0 gMonHatchSpriteGroupPals:: @ 0x086B159C .4byte gMonHatchSpriteGroup0_Pals @@ -6530,7 +6530,7 @@ gUnknown_086B235E:: @ 0x086B235E .2byte 0 -gUnknown_086B2390:: @ 0x086B2390 +gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B17AE .4byte gUnknown_086B1808 .4byte gUnknown_086B181A @@ -6615,7 +6615,7 @@ gUnknown_086B2390:: @ 0x086B2390 .4byte gUnknown_086B19E8 .4byte gUnknown_086B235E .4byte gUnknown_086B1A98 -gUnknown_086B24E0:: @ 0x086B24E0 +gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B17AE .4byte gUnknown_086B1808 .4byte gUnknown_086B181A @@ -12087,22 +12087,22 @@ gDuskullSpritesheetOam:: @ 0x086BA0A0 packed_sprite_oam x=-0x8, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x49, priority=0x1, paletteNum=0x2 packed_sprite_oam x=0x18, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x59, priority=0x1, paletteNum=0x2 -gUnknown_086BA16C:: @ 0x086BA16C +gBonusBoardLeftFlipperSpriteSet:: @ 0x086BA16C .2byte 1 packed_sprite_oam x=-0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x0, priority=0x1, paletteNum=0x0 .2byte 0 -gUnknown_086BA176:: @ 0x086BA176 +gBonusBoardRightFlipperSpriteSet:: @ 0x086BA176 .2byte 1 packed_sprite_oam x=0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x10, priority=0x1, paletteNum=0x0 .2byte 0 -gUnknown_086BA180:: @ 0x086BA180 +gBonusBoardBallSpriteSet:: @ 0x086BA180 .2byte 1 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x20, priority=0x1, paletteNum=0x1 .2byte 0 -gUnknown_086BA18A:: @ 0x086BA18A +gBonusBoardPausePanelSpriteSet:: @ 0x086BA18A .2byte 11 packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x24, priority=0x0, paletteNum=0x9 .2byte 0 @@ -12127,14 +12127,14 @@ gUnknown_086BA18A:: @ 0x086BA18A packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086BA1E4:: @ 0x086BA1E4 +gBonusBoardPauseTopBorderSpriteSet:: @ 0x086BA1E4 .2byte 2 packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f, priority=0x0, paletteNum=0x9 .2byte 0 packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086BA1F6:: @ 0x086BA1F6 +gBonusBoardPauseBottomBorderSpriteSet:: @ 0x086BA1F6 .2byte 3 packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x33, priority=0x0, paletteNum=0x9 .2byte 0 @@ -12143,43 +12143,43 @@ gUnknown_086BA1F6:: @ 0x086BA1F6 packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x33, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086BA210:: @ 0x086BA210 +gBonusBoardBallRespawnFxSpriteSet:: @ 0x086BA210 .2byte 1 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x39, priority=0x1, paletteNum=0x1 .2byte 0 -gUnknown_086BA21A:: @ 0x086BA21A +gDusclopsBoardDuskullEntity0SpriteSet:: @ 0x086BA21A .2byte 2 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x49, priority=0x1, paletteNum=0x2 .2byte 0 packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x59, priority=0x1, paletteNum=0x2 .2byte 0 -gUnknown_086BA22C:: @ 0x086BA22C +gDusclopsBoardDuskullEntity1SpriteSet:: @ 0x086BA22C .2byte 2 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x5d, priority=0x1, paletteNum=0x2 .2byte 0 packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x6d, priority=0x1, paletteNum=0x2 .2byte 0 -gUnknown_086BA23E:: @ 0x086BA23E +gDusclopsBoardDuskullEntity2SpriteSet:: @ 0x086BA23E .2byte 2 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x71, priority=0x1, paletteNum=0x2 .2byte 0 packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x81, priority=0x1, paletteNum=0x2 .2byte 0 -gUnknown_086BA250:: @ 0x086BA250 +gDusclopsBoardDusclopsEntitySpriteSet:: @ 0x086BA250 .2byte 1 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x85, priority=0x3, paletteNum=0x3 .2byte 0 -gUnknown_086BA25A:: @ 0x086BA25A +gDusclopsBoardBallCaptureVortexFxSpriteSet:: @ 0x086BA25A .2byte 1 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xc5, priority=0x3, paletteNum=0x3 .2byte 0 -gUnknown_086BA264:: @ 0x086BA264 +gDusclopsBoardPhasingFxSpriteSet:: @ 0x086BA264 .2byte 2 packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xd5, priority=0x3, paletteNum=0x0 .2byte 0 @@ -12813,7 +12813,7 @@ gUnknown_086BAA1E:: @ 0x086BAA1E packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x14d, priority=0x1, paletteNum=0x8 .2byte 0 -gUnknown_086BAA40:: @ 0x086BAA40 +gBonusBoardScoreBannerGraphicSpriteSet:: @ 0x086BAA40 .2byte 3 packed_sprite_oam x=-0x50, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0x8 .2byte 0 @@ -12822,7 +12822,7 @@ gUnknown_086BAA40:: @ 0x086BAA40 packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x340, priority=0x0, paletteNum=0x8 .2byte 0 -gUnknown_086BAA5A:: @ 0x086BAA5A +gBonusBoardEndScoreSpriteSet:: @ 0x086BAA5A .2byte 18 packed_sprite_oam x=-0x25, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x38c, priority=0x0, paletteNum=0x8 .2byte 0 @@ -13497,192 +13497,193 @@ gUnknown_086BB382:: @ 0x086BB382 packed_sprite_oam x=0x56, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d2, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086BB3E4:: @ 0x086BB3E4 - .4byte gUnknown_086BA18A - .4byte gUnknown_086BA1E4 - .4byte gUnknown_086BA1F6 - .4byte gUnknown_086BA16C - .4byte gUnknown_086BA176 - .4byte gUnknown_086BAA5A - .4byte gUnknown_086BAA40 - .4byte gUnknown_086BA21A - .4byte gUnknown_086BA22C - .4byte gUnknown_086BA23E - .4byte gUnknown_086BA210 - .4byte gUnknown_086BA180 - .4byte gUnknown_086BA264 - .4byte gUnknown_086BA25A - .4byte gUnknown_086BA250 - -gKecleonDefaultSpriteSets:: @ 0x086BB420 -.4byte gUnknown_086BA18A -.4byte gUnknown_086BA1E4 -.4byte gUnknown_086BA1F6 -.4byte gUnknown_086BA16C -.4byte gUnknown_086BA176 -.4byte gUnknown_086BAA5A -.4byte gUnknown_086BAA40 -.4byte gUnknown_086BA2C8 -.4byte gUnknown_086BA210 -.4byte gUnknown_086BA288 -.4byte gUnknown_086BA394 -.4byte gUnknown_086BA382 -.4byte gUnknown_086BA35E -.4byte gUnknown_086BA370 -.4byte gUnknown_086BA34C -.4byte gUnknown_086BA33A -.4byte gUnknown_086BA29C -.4byte gUnknown_086BA2BE -.4byte gUnknown_086BA328 -.4byte gUnknown_086BA304 -.4byte gUnknown_086BA316 -.4byte gUnknown_086BA2F2 -.4byte gUnknown_086BA180 -.4byte gUnknown_086BA276 -.4byte gUnknown_086BA292 -.4byte gUnknown_086BA3A6 -.4byte gUnknown_086BA3C0 -.4byte gUnknown_086BA3D2 -.4byte gUnknown_086BA3E4 -.4byte gUnknown_086BA412 -.4byte gUnknown_086BA434 -.4byte gUnknown_086BA3F6 -.4byte gUnknown_086BA408 -gUnknown_086BB4A4:: @ 0x086BB4A4 -.4byte gUnknown_086BA18A -.4byte gUnknown_086BA1E4 -.4byte gUnknown_086BA1F6 -.4byte gUnknown_086BA16C -.4byte gUnknown_086BA176 -.4byte gUnknown_086BAA5A -.4byte gUnknown_086BAA40 -.4byte gUnknown_086B1F26 -.4byte gUnknown_086B1F78 -.4byte gUnknown_086B1676 -.4byte gUnknown_086B16A8 -.4byte gUnknown_086BA4D6 -.4byte gUnknown_086BA4F0 -.4byte gUnknown_086BA50A -.4byte gUnknown_086BA524 -.4byte gUnknown_086BA572 -.4byte gUnknown_086BA550 -.4byte gUnknown_086BA210 -.4byte gUnknown_086BA180 -.4byte gUnknown_086B1E46 -.4byte gUnknown_086B1E46 -.4byte gUnknown_086BA44E -.4byte gUnknown_086BA4A0 -.4byte gUnknown_086BA4AA -.4byte gUnknown_086BA4B4 -.4byte gUnknown_086B1DC4 -.4byte gUnknown_086BA53E -gUnknown_086BB510:: @ 0x086BB510 -.4byte gUnknown_086BA18A -.4byte gUnknown_086BA1E4 -.4byte gUnknown_086BA1F6 -.4byte gUnknown_086BA16C -.4byte gUnknown_086BA176 -.4byte gUnknown_086BAA5A -.4byte gUnknown_086BAA40 -.4byte gUnknown_086B1F26 -.4byte gUnknown_086B1F78 -.4byte gUnknown_086B1676 -.4byte gUnknown_086B16A8 -.4byte gUnknown_086BA624 -.4byte gUnknown_086BA63E -.4byte gUnknown_086BA658 -.4byte gUnknown_086BA672 -.4byte gUnknown_086BA5B4 -.4byte gUnknown_086BA5CE -.4byte gUnknown_086BA5E8 -.4byte gUnknown_086BA68C -.4byte gUnknown_086BA68C -.4byte gUnknown_086BA68C -.4byte gUnknown_086BA68C -.4byte gUnknown_086BAB1E -.4byte gUnknown_086BAAEC -.4byte gUnknown_086BAB40 -.4byte gUnknown_086BA210 -.4byte gUnknown_086BA180 -.4byte gUnknown_086B1E46 -.4byte gUnknown_086B1E46 -.4byte gUnknown_086BA6CA -.4byte gUnknown_086BA602 -.4byte gUnknown_086B1DC4 -gUnknown_086BB590:: @ 0x086BB590 -.4byte gUnknown_086BA18A -.4byte gUnknown_086BA1E4 -.4byte gUnknown_086BA1F6 -.4byte gUnknown_086BA16C -.4byte gUnknown_086BA176 -.4byte gUnknown_086BAA5A -.4byte gUnknown_086BAA40 -.4byte gUnknown_086B1F26 -.4byte gUnknown_086B1F78 -.4byte gUnknown_086B1676 -.4byte gUnknown_086B16A8 -.4byte gUnknown_086BAB52 -.4byte gUnknown_086BAB74 -.4byte gUnknown_086BABA6 -.4byte gUnknown_086BA75C -.4byte gUnknown_086BA85E -.4byte gUnknown_086BA85E -.4byte gUnknown_086BA8BE -.4byte gUnknown_086BA8D8 -.4byte gUnknown_086BA90A -.4byte gUnknown_086BA882 -.4byte gUnknown_086BA870 -.4byte gUnknown_086BABD0 -.4byte gUnknown_086BAC62 -.4byte gUnknown_086BACF4 -.4byte gUnknown_086BAD6E -.4byte gUnknown_086BADE0 -.4byte gUnknown_086BAE5A -.4byte gUnknown_086BAEA4 -.4byte gUnknown_086BAF1E -.4byte gUnknown_086BAF80 -.4byte gUnknown_086BAFFA -.4byte gUnknown_086BB06C -.4byte gUnknown_086BB0E6 -.4byte gUnknown_086BB130 -.4byte gUnknown_086BB1AA -.4byte gUnknown_086BA8AC -.4byte gUnknown_086BA210 -.4byte gUnknown_086BA180 -.4byte gUnknown_086B1E46 -.4byte gUnknown_086B1E46 -.4byte gUnknown_086BA854 -.4byte gUnknown_086BA766 -.4byte gUnknown_086BA7D8 -.4byte gUnknown_086B1DC4 -.4byte gUnknown_086BA84A - - - -gUnknown_086BB648:: @ 0x086BB648 -.4byte gUnknown_086BA18A -.4byte gUnknown_086BA1E4 -.4byte gUnknown_086BA1F6 -.4byte gUnknown_086BA16C -.4byte gUnknown_086BA176 -.4byte gUnknown_086BAA5A -.4byte gUnknown_086BAA40 -.4byte gUnknown_086BB20C -.4byte gUnknown_086BB2BE -.4byte gUnknown_086BB320 -.4byte gUnknown_086BB382 -.4byte gUnknown_086BA94E -.4byte gUnknown_086BA210 -.4byte gUnknown_086BA180 -.4byte gUnknown_086BA974 -.4byte gUnknown_086BA996 -.4byte gUnknown_086BA9B8 -.4byte gUnknown_086BA9DA -.4byte gUnknown_086BA944 -.4byte gUnknown_086BA9FC -.4byte gUnknown_086BAA1E -.4byte gUnknown_086BA960 -.4byte gUnknown_086BA96A +gDusclopsBoardSpriteSets:: @ 0x086BB3E4 + .4byte gBonusBoardPausePanelSpriteSet + .4byte gBonusBoardPauseTopBorderSpriteSet + .4byte gBonusBoardPauseBottomBorderSpriteSet + .4byte gBonusBoardLeftFlipperSpriteSet + .4byte gBonusBoardRightFlipperSpriteSet + .4byte gBonusBoardEndScoreSpriteSet + .4byte gBonusBoardScoreBannerGraphicSpriteSet + .4byte gDusclopsBoardDuskullEntity0SpriteSet + .4byte gDusclopsBoardDuskullEntity1SpriteSet + .4byte gDusclopsBoardDuskullEntity2SpriteSet + .4byte gBonusBoardBallRespawnFxSpriteSet + .4byte gBonusBoardBallSpriteSet + .4byte gDusclopsBoardPhasingFxSpriteSet + .4byte gDusclopsBoardBallCaptureVortexFxSpriteSet + .4byte gDusclopsBoardDusclopsEntitySpriteSet + +gKecleonBoardSpriteSets:: @ 0x086BB420 + .4byte gBonusBoardPausePanelSpriteSet + .4byte gBonusBoardPauseTopBorderSpriteSet + .4byte gBonusBoardPauseBottomBorderSpriteSet + .4byte gBonusBoardLeftFlipperSpriteSet + .4byte gBonusBoardRightFlipperSpriteSet + .4byte gBonusBoardEndScoreSpriteSet + .4byte gBonusBoardScoreBannerGraphicSpriteSet + .4byte gUnknown_086BA2C8 + .4byte gBonusBoardBallRespawnFxSpriteSet + .4byte gUnknown_086BA288 + .4byte gUnknown_086BA394 + .4byte gUnknown_086BA382 + .4byte gUnknown_086BA35E + .4byte gUnknown_086BA370 + .4byte gUnknown_086BA34C + .4byte gUnknown_086BA33A + .4byte gUnknown_086BA29C + .4byte gUnknown_086BA2BE + .4byte gUnknown_086BA328 + .4byte gUnknown_086BA304 + .4byte gUnknown_086BA316 + .4byte gUnknown_086BA2F2 + .4byte gBonusBoardBallSpriteSet + .4byte gUnknown_086BA276 + .4byte gUnknown_086BA292 + .4byte gUnknown_086BA3A6 + .4byte gUnknown_086BA3C0 + .4byte gUnknown_086BA3D2 + .4byte gUnknown_086BA3E4 + .4byte gUnknown_086BA412 + .4byte gUnknown_086BA434 + .4byte gUnknown_086BA3F6 + .4byte gUnknown_086BA408 + +gKyogreBoardSpriteSets:: @ 0x086BB4A4 + .4byte gBonusBoardPausePanelSpriteSet + .4byte gBonusBoardPauseTopBorderSpriteSet + .4byte gBonusBoardPauseBottomBorderSpriteSet + .4byte gBonusBoardLeftFlipperSpriteSet + .4byte gBonusBoardRightFlipperSpriteSet + .4byte gBonusBoardEndScoreSpriteSet + .4byte gBonusBoardScoreBannerGraphicSpriteSet + .4byte gUnknown_086B1F26 + .4byte gUnknown_086B1F78 + .4byte gUnknown_086B1676 + .4byte gUnknown_086B16A8 + .4byte gUnknown_086BA4D6 + .4byte gUnknown_086BA4F0 + .4byte gUnknown_086BA50A + .4byte gUnknown_086BA524 + .4byte gUnknown_086BA572 + .4byte gUnknown_086BA550 + .4byte gBonusBoardBallRespawnFxSpriteSet + .4byte gBonusBoardBallSpriteSet + .4byte gUnknown_086B1E46 + .4byte gUnknown_086B1E46 + .4byte gUnknown_086BA44E + .4byte gUnknown_086BA4A0 + .4byte gUnknown_086BA4AA + .4byte gUnknown_086BA4B4 + .4byte gUnknown_086B1DC4 + .4byte gUnknown_086BA53E + +gGroudonBoardSpriteSets:: @ 0x086BB510 + .4byte gBonusBoardPausePanelSpriteSet + .4byte gBonusBoardPauseTopBorderSpriteSet + .4byte gBonusBoardPauseBottomBorderSpriteSet + .4byte gBonusBoardLeftFlipperSpriteSet + .4byte gBonusBoardRightFlipperSpriteSet + .4byte gBonusBoardEndScoreSpriteSet + .4byte gBonusBoardScoreBannerGraphicSpriteSet + .4byte gUnknown_086B1F26 + .4byte gUnknown_086B1F78 + .4byte gUnknown_086B1676 + .4byte gUnknown_086B16A8 + .4byte gUnknown_086BA624 + .4byte gUnknown_086BA63E + .4byte gUnknown_086BA658 + .4byte gUnknown_086BA672 + .4byte gUnknown_086BA5B4 + .4byte gUnknown_086BA5CE + .4byte gUnknown_086BA5E8 + .4byte gUnknown_086BA68C + .4byte gUnknown_086BA68C + .4byte gUnknown_086BA68C + .4byte gUnknown_086BA68C + .4byte gUnknown_086BAB1E + .4byte gUnknown_086BAAEC + .4byte gUnknown_086BAB40 + .4byte gBonusBoardBallRespawnFxSpriteSet + .4byte gBonusBoardBallSpriteSet + .4byte gUnknown_086B1E46 + .4byte gUnknown_086B1E46 + .4byte gUnknown_086BA6CA + .4byte gUnknown_086BA602 + .4byte gUnknown_086B1DC4 + +gRayquazaBoardSpriteSets:: @ 0x086BB590 + .4byte gBonusBoardPausePanelSpriteSet + .4byte gBonusBoardPauseTopBorderSpriteSet + .4byte gBonusBoardPauseBottomBorderSpriteSet + .4byte gBonusBoardLeftFlipperSpriteSet + .4byte gBonusBoardRightFlipperSpriteSet + .4byte gBonusBoardEndScoreSpriteSet + .4byte gBonusBoardScoreBannerGraphicSpriteSet + .4byte gUnknown_086B1F26 + .4byte gUnknown_086B1F78 + .4byte gUnknown_086B1676 + .4byte gUnknown_086B16A8 + .4byte gUnknown_086BAB52 + .4byte gUnknown_086BAB74 + .4byte gUnknown_086BABA6 + .4byte gUnknown_086BA75C + .4byte gUnknown_086BA85E + .4byte gUnknown_086BA85E + .4byte gUnknown_086BA8BE + .4byte gUnknown_086BA8D8 + .4byte gUnknown_086BA90A + .4byte gUnknown_086BA882 + .4byte gUnknown_086BA870 + .4byte gUnknown_086BABD0 + .4byte gUnknown_086BAC62 + .4byte gUnknown_086BACF4 + .4byte gUnknown_086BAD6E + .4byte gUnknown_086BADE0 + .4byte gUnknown_086BAE5A + .4byte gUnknown_086BAEA4 + .4byte gUnknown_086BAF1E + .4byte gUnknown_086BAF80 + .4byte gUnknown_086BAFFA + .4byte gUnknown_086BB06C + .4byte gUnknown_086BB0E6 + .4byte gUnknown_086BB130 + .4byte gUnknown_086BB1AA + .4byte gUnknown_086BA8AC + .4byte gBonusBoardBallRespawnFxSpriteSet + .4byte gBonusBoardBallSpriteSet + .4byte gUnknown_086B1E46 + .4byte gUnknown_086B1E46 + .4byte gUnknown_086BA854 + .4byte gUnknown_086BA766 + .4byte gUnknown_086BA7D8 + .4byte gUnknown_086B1DC4 + .4byte gUnknown_086BA84A + +gSphealBoardSpriteSets:: @ 0x086BB648 + .4byte gBonusBoardPausePanelSpriteSet + .4byte gBonusBoardPauseTopBorderSpriteSet + .4byte gBonusBoardPauseBottomBorderSpriteSet + .4byte gBonusBoardLeftFlipperSpriteSet + .4byte gBonusBoardRightFlipperSpriteSet + .4byte gBonusBoardEndScoreSpriteSet + .4byte gBonusBoardScoreBannerGraphicSpriteSet + .4byte gUnknown_086BB20C + .4byte gUnknown_086BB2BE + .4byte gUnknown_086BB320 + .4byte gUnknown_086BB382 + .4byte gUnknown_086BA94E + .4byte gBonusBoardBallRespawnFxSpriteSet + .4byte gBonusBoardBallSpriteSet + .4byte gUnknown_086BA974 + .4byte gUnknown_086BA996 + .4byte gUnknown_086BA9B8 + .4byte gUnknown_086BA9DA + .4byte gUnknown_086BA944 + .4byte gUnknown_086BA9FC + .4byte gUnknown_086BAA1E + .4byte gUnknown_086BA960 + .4byte gUnknown_086BA96A diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index c0c4ecac..a95bf51c 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -2,8 +2,11 @@ #define GUARD_CONSTANTS_SPRITE_GROUPS_H #define SG_0 0 +#define SG_PAUSE_PANEL 0 #define SG_1 1 +#define SG_PAUSE_TOP_BORDER 1 #define SG_2 2 +#define SG_PAUSE_BOTTOM_BORDER 2 #define SG_3 3 #define SG_BONUS_BOARD_FLIPPER_BASE 3 // Of 2. Left, Right #define SG_BONUS_BOARD_LEFT_FLIPPER 3 @@ -14,15 +17,15 @@ #define SG_6 6 #define SG_BONUS_COMPLETE_BANNER 6 #define SG_7 7 -#define SG_DUSKULL_BASE 7 // Of 3 -#define SG_DUSKULL_0 7 +#define SG_DUSKULL_ENTITY_BASE 7 // Of 3 +#define SG_DUSKULL_ENTITY_0 7 #define SG_KECLEON_TREE_LEAVES 7 #define SG_SPHEAL_END_SCORE_PANEL 7 #define SG_8 8 -#define SG_DUSKULL_1 8 +#define SG_DUSKULL_ENTITY_1 8 #define SG_SPHEAL_END_SCORE_SPHEALS_SUNK 8 #define SG_9 9 -#define SG_DUSKULL_2 9 +#define SG_DUSKULL_ENTITY_2 9 #define SG_LEGENDARY_CATCH_PORTRAIT 9 #define SG_KECLEON_DUST_FX 9 #define SG_SPHEAL_END_SCORE_BALLS_SUNK 9 diff --git a/src/all_board_pause_game.c b/src/all_board_pause_game.c index d92c8201..d834b1c2 100644 --- a/src/all_board_pause_game.c +++ b/src/all_board_pause_game.c @@ -100,7 +100,7 @@ void PositionPauseMenuSprites(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = &gMain.spriteGroups[SG_0]; + group = &gMain.spriteGroups[SG_PAUSE_PANEL]; oamSimple = &group->oam[0]; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset; @@ -125,7 +125,7 @@ void PositionPauseMenuSprites(void) gOamBuffer[oamSimple->oamId].matrixNum = 0; } - group = &gMain.spriteGroups[SG_1]; + group = &gMain.spriteGroups[SG_PAUSE_TOP_BORDER]; for (i = 0; i < 2; i++) { oamSimple = &group->oam[i]; @@ -133,7 +133,7 @@ void PositionPauseMenuSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset; } - group = &gMain.spriteGroups[SG_2]; + group = &gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER]; for (i = 0; i < 3; i++) { oamSimple = &group->oam[i]; @@ -226,7 +226,7 @@ void AnimatePauseMenuOverlay(void) yScale = 256; } - group = &gMain.spriteGroups[SG_0]; + group = &gMain.spriteGroups[SG_PAUSE_PANEL]; if (var0 >= 0) { s16 index; @@ -275,7 +275,7 @@ void AnimatePauseMenuOverlay(void) SetMatrixScale(0x100, yScale, 5); - group = &gMain.spriteGroups[SG_1]; + group = &gMain.spriteGroups[SG_PAUSE_TOP_BORDER]; group->baseX = 100 - xOffset; group->baseY = 80 + yOffset; for (i = 0; i < 2; i++) @@ -285,7 +285,7 @@ void AnimatePauseMenuOverlay(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_2]; + group = &gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER]; group->baseX = 68 + xOffset; group->baseY = 108 - yOffset; for (i = 0; i < 3; i++) diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 7c02692c..121c1cb3 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -13,9 +13,9 @@ void RubyBoardProcess_0A_50848(void) gMain.spriteGroups[SG_64].active = TRUE; group = &gMain.spriteGroups[SG_48]; // fake match? gMain.spriteGroups[SG_70].active = TRUE; - gMain.spriteGroups[SG_0].active = TRUE; - gMain.spriteGroups[SG_1].active = TRUE; - gMain.spriteGroups[SG_2].active = TRUE; + gMain.spriteGroups[SG_PAUSE_PANEL].active = TRUE; + gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; + gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER].active = TRUE; gMain.spriteGroups[SG_28].active = TRUE; gMain.spriteGroups[SG_81].active = TRUE; gMain.spriteGroups[SG_65].active = TRUE; @@ -111,9 +111,9 @@ void SapphireBoardProcess_0A_50AD4(void) gMain.spriteGroups[SG_69].active = TRUE; gMain.spriteGroups[SG_52].active = TRUE; gMain.spriteGroups[SG_74].active = TRUE; - gMain.spriteGroups[SG_0].active = TRUE; - gMain.spriteGroups[SG_1].active = TRUE; - gMain.spriteGroups[SG_2].active = TRUE; + gMain.spriteGroups[SG_PAUSE_PANEL].active = TRUE; + gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; + gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER].active = TRUE; gMain.spriteGroups[SG_25].active = TRUE; gMain.spriteGroups[SG_85].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, diff --git a/src/dusclops_process3.c b/src/dusclops_process3.c index b34fbdc6..941fcf26 100644 --- a/src/dusclops_process3.c +++ b/src/dusclops_process3.c @@ -97,9 +97,9 @@ void DusclopsBoardProcess_3B_33130(void) else { gCurrentPinballGame->cameraYAdjust = 0; - gMain.spriteGroups[SG_DUSKULL_0].active = TRUE; - gMain.spriteGroups[SG_DUSKULL_1].active = TRUE; - gMain.spriteGroups[SG_DUSKULL_2].active = TRUE; + gMain.spriteGroups[SG_DUSKULL_ENTITY_0].active = TRUE; + gMain.spriteGroups[SG_DUSKULL_ENTITY_1].active = TRUE; + gMain.spriteGroups[SG_DUSKULL_ENTITY_2].active = TRUE; gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_1_DUSKULL_PHASE; gCurrentPinballGame->stageTimer = 0; } @@ -273,9 +273,9 @@ void DuskullPhase_ProcessEntityLogic(void) { if (should_draw_duskull) { gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_2_INIT_DUSCLOPS_PHASE; - gMain.spriteGroups[SG_DUSKULL_0].active = FALSE; - gMain.spriteGroups[SG_DUSKULL_1].active = FALSE; - gMain.spriteGroups[SG_DUSKULL_2].active = FALSE; + gMain.spriteGroups[SG_DUSKULL_ENTITY_0].active = FALSE; + gMain.spriteGroups[SG_DUSKULL_ENTITY_1].active = FALSE; + gMain.spriteGroups[SG_DUSKULL_ENTITY_2].active = FALSE; } } @@ -568,7 +568,7 @@ void DuskullPhase_ProcessGraphics() { s16 spriteVariant = gCurrentPinballGame->minionSpriteVariant[i]; DmaCopy16(3, gDusclopsBoardDuskull_Gfx + spriteVariant * 0x280, OBJ_VRAM0 + 0x920 + i * 0x280, 0x280); oamIx = gCurrentPinballGame->minionOamIx[i]; - spriteGroup = &gMain.spriteGroups[SG_DUSKULL_BASE + i]; + spriteGroup = &gMain.spriteGroups[SG_DUSKULL_ENTITY_BASE + i]; if (gCurrentPinballGame->minionDrawInFrame[i]) { s32 x = 0; // Scrub C to get the compiler to add before subtracting diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index 3c1c858a..9a0fc8c8 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -50,7 +50,7 @@ extern const s16 gKecleonPlantAnimIndices[]; extern const struct KecleonSpriteSortEntry gKecleonSpriteYSortData[]; extern const u16 gKecleonLowerBodyOamData[126][2][3]; extern const u16 gKecleonUpperBodyOamData[126][2][3]; -extern const struct SpriteSet *gKecleonDefaultSpriteSets[]; +extern const struct SpriteSet *gKecleonBoardSpriteSets[]; void KecleonBoardProcess_3A_35860(void) { @@ -1324,7 +1324,7 @@ void SortKecleonSpritesByY(void) struct KecleonSpriteSortEntry sp0[14]; for (i = 0; i < 33; i++) - gKecleonSpriteSets[i] = gKecleonDefaultSpriteSets[i]; + gKecleonSpriteSets[i] = gKecleonBoardSpriteSets[i]; sp0[12] = gKecleonSpriteYSortData[12]; sp0[12].ySortKey = gCurrentPinballGame->ball->positionQ0.y; From 5853653746ea1222822f2d36678d66719a9b29b2 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Tue, 12 May 2026 05:00:42 -0500 Subject: [PATCH 10/33] packed oam readability --- data/rom_2.s | 3252 +++++++++++++++++++++++++------------------------- 1 file changed, 1626 insertions(+), 1626 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 0e4cb907..40642907 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -211,45 +211,45 @@ gUnknown_086A5706:: @ 0x086A5706 gUnknown_086A5710:: @ 0x086A5710 .2byte 5 - packed_sprite_oam x=-0x34, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x60, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x34, y=-0x1E, spriteSize=SPRITE_SIZE_64x32, tileNum=0x60, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x34, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x80, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x34, y=0x2, spriteSize=SPRITE_SIZE_64x32, tileNum=0x80, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xC, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xa0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xC, y=-0x1E, spriteSize=SPRITE_SIZE_32x64, tileNum=0xa0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=-0x1E, spriteSize=SPRITE_SIZE_8x32, tileNum=0xc0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=0x2, spriteSize=SPRITE_SIZE_8x32, tileNum=0xc4, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A573A:: @ 0x086A573A .2byte 2 - packed_sprite_oam x=-0x28, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x28, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0xc8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x18, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xe8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x18, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0xe8, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A574C:: @ 0x086A574C .2byte 2 - packed_sprite_oam x=-0x30, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xf0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x30, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0xf0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x110, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=-0xB, spriteSize=SPRITE_SIZE_32x32, tileNum=0x110, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A575E:: @ 0x086A575E .2byte 3 - packed_sprite_oam x=-0x38, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x120, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x38, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x120, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x8, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x140, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x8, y=-0xB, spriteSize=SPRITE_SIZE_32x32, tileNum=0x140, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x150, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0x150, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A5778:: @ 0x086A5778 .2byte 2 - packed_sprite_oam x=-0x2C, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x158, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x2C, y=-0x10, spriteSize=SPRITE_SIZE_64x32, tileNum=0x158, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x14, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x178, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x14, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x178, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A578A:: @ 0x086A578A @@ -257,258 +257,258 @@ gUnknown_086A578A:: @ 0x086A578A gUnknown_086A5988:: @ 0x086A5988 .2byte 8 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 gUnknown_086A59CA:: @ 0x086A59CA .2byte 9 - packed_sprite_oam x=-0x61, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x61, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x61, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x61, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x41, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x41, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x41, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x41, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x38, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x38, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 gUnknown_086A5A14:: @ 0x086A5A14 .2byte 11 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x314, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x314, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x18, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x18, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x20, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x20, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 gUnknown_086A5A6E:: @ 0x086A5A6E .2byte 15 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x30, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x8, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x314, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x8, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x314, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x18, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x18, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x28, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x28, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x28, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x336, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x28, y=0xC, spriteSize=SPRITE_SIZE_8x16, tileNum=0x336, priority=0x0, paletteNum=0x5 .2byte 0 gUnknown_086A5AE8:: @ 0x086A5AE8 .2byte 15 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x30, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x7, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x314, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x7, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x314, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x11, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x11, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x31, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x31, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x31, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x31, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x41, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x41, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x41, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x41, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x17, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x17, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x9, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x9, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x27, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x27, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x29, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x338, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x29, y=0xC, spriteSize=SPRITE_SIZE_8x16, tileNum=0x338, priority=0x0, paletteNum=0x5 .2byte 0 gUnknown_086A5B62:: @ 0x086A5B62 .2byte 15 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x30, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x8, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x314, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x8, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x314, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x18, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x18, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x28, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x28, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x28, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x33a, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x28, y=0xC, spriteSize=SPRITE_SIZE_8x16, tileNum=0x33a, priority=0x0, paletteNum=0x5 .2byte 0 gUnknown_086A5BDC:: @ 0x086A5BDC .2byte 14 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x30, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x8, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x314, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x8, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x314, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x18, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x18, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x28, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x28, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 gUnknown_086A5C4E:: @ 0x086A5C4E .2byte 14 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x30, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x30, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x8, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x314, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x8, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x314, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x10, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x10, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x18, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x18, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x8, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x8, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x28, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x28, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x5 .2byte 0 gUnknown_086A5CC0:: @ 0x086A5CC0 .2byte 14 - packed_sprite_oam x=-0x60, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x60, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x60, y=0x1C, spriteSize=SPRITE_SIZE_32x8, tileNum=0x308, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x30c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x40, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x310, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x40, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x310, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x30, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x318, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x14, spriteSize=SPRITE_SIZE_32x8, tileNum=0x318, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x31c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0xC, spriteSize=SPRITE_SIZE_16x16, tileNum=0x31c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x30, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x30, y=0x1C, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x322, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x32, tileNum=0x322, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x40, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x40, y=0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x18, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x18, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x28, y=0x14, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x312, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x28, y=0x14, spriteSize=SPRITE_SIZE_16x8, tileNum=0x312, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x8, y=0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x33c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x8, y=0xE, spriteSize=SPRITE_SIZE_16x16, tileNum=0x33c, priority=0x0, paletteNum=0x4 .2byte 0 gUnknown_086A5D32:: @ 0x086A5D32 @@ -656,217 +656,217 @@ gUnknown_086A64FA:: @ 0x086A64FA gUnknown_086A6830:: @ 0x086A6830 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x9, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x9, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A683A:: @ 0x086A683A .2byte 9 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x30, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x30, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A6884:: @ 0x086A6884 .2byte 13 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x30, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x30, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x30, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x9c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x30, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x9c, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x30, y=0x30, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xce, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x30, y=0x30, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x32, tileNum=0xce, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x30, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4e, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x30, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x32, tileNum=0x4e, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A68EE:: @ 0x086A68EE .2byte 11 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x30, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x30, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4f, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x4f, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x40, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0x40, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x4c, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x60, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x48, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x60, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x60, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x60, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x4c, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A6948:: @ 0x086A6948 .2byte 6 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x94, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x32, tileNum=0x94, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x14, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x32, tileNum=0x14, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1c, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x50, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1d, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1d, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x114, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x114, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A697A:: @ 0x086A697A .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x140, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x140, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x144, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x144, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A698C:: @ 0x086A698C .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x148, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x148, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x14c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x14c, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A699E:: @ 0x086A699E .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x49, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x49, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4d, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x32, tileNum=0x4d, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc9, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x8, tileNum=0xc9, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xcd, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x8, tileNum=0xcd, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A69C0:: @ 0x086A69C0 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x180, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x180, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x184, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x184, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A69D2:: @ 0x086A69D2 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x188, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x188, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x18c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x18c, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A69E4:: @ 0x086A69E4 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x190, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x190, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x194, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x194, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A69F6:: @ 0x086A69F6 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x198, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x198, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x19c, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x19c, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A6A08:: @ 0x086A6A08 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1c0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1c0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1c4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1c4, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A6A1A:: @ 0x086A6A1A .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1c8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1c8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1cc, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1cc, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A6A2C:: @ 0x086A6A2C .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x150, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x154, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x154, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x158, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x158, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x8, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x30, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x30, y=0x10, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A6A56:: @ 0x086A6A56 .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x150, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x154, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x154, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x158, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x158, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x7, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x7, y=0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x31, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x31, y=0x10, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A6A80:: @ 0x086A6A80 .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x150, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x154, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x154, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x8, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x30, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x30, y=0x10, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x15c, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x15c, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A6AAA:: @ 0x086A6AAA .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x150, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x154, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x154, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x7, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x7, y=0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x31, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x31, y=0x10, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x15c, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x15c, priority=0x0, paletteNum=0x1 .2byte 0 gFieldSelectSpriteSets:: @ 0x086A6AD4 @@ -897,850 +897,850 @@ gFieldSelectBallSpeedPositions:: @ 0x086A6B28 gUnknown_086A6B30:: @ 0x086A6B30 .2byte 1 - packed_sprite_oam x=-0x40, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x40, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x40, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6B3A:: @ 0x086A6B3A .2byte 1 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6B44:: @ 0x086A6B44 .2byte 1 - packed_sprite_oam x=-0x40, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6B4E:: @ 0x086A6B4E .2byte 2 - packed_sprite_oam x=-0x40, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x41, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x41, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6B60:: @ 0x086A6B60 .2byte 2 - packed_sprite_oam x=-0x40, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6B72:: @ 0x086A6B72 .2byte 3 - packed_sprite_oam x=-0x40, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x40, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x40, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6B8C:: @ 0x086A6B8C .2byte 3 - packed_sprite_oam x=-0x40, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6BA6:: @ 0x086A6BA6 .2byte 3 - packed_sprite_oam x=-0x40, y=-0xF, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0xF, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6BC0:: @ 0x086A6BC0 .2byte 3 - packed_sprite_oam x=-0x40, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x40, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x40, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6BDA:: @ 0x086A6BDA .2byte 4 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x41, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x41, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x43, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x43, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6BFC:: @ 0x086A6BFC .2byte 6 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x46, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x46, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x42, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x42, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6C2E:: @ 0x086A6C2E .2byte 6 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0xb, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xe, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6C60:: @ 0x086A6C60 .2byte 6 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0xF, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0xF, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0xe, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0xd, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6C92:: @ 0x086A6C92 .2byte 6 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x40, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x40, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xe, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xd, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6CC4:: @ 0x086A6CC4 .2byte 6 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0xe, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0xd, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6CF6:: @ 0x086A6CF6 .2byte 7 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x43, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x43, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xd, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x47, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x47, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6D30:: @ 0x086A6D30 .2byte 7 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0xd, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6D6A:: @ 0x086A6D6A .2byte 8 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x46, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x46, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x42, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x42, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x12, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x12, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x41, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x41, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6DAC:: @ 0x086A6DAC .2byte 9 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x12, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x12, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x48, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x48, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6DF6:: @ 0x086A6DF6 .2byte 9 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x12, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x12, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6E40:: @ 0x086A6E40 .2byte 10 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x12, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x12, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x44, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x8, spriteSize=SPRITE_SIZE_16x8, tileNum=0x44, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x13, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x13, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6E92:: @ 0x086A6E92 .2byte 10 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x12, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x12, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x24, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x8, spriteSize=SPRITE_SIZE_16x8, tileNum=0x24, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x13, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x13, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6EE4:: @ 0x086A6EE4 .2byte 11 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x47, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x47, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x18, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x13, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x13, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x4a, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x4a, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6F3E:: @ 0x086A6F3E .2byte 12 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x1A, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x13, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x13, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x49, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x49, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A6FA0:: @ 0x086A6FA0 .2byte 12 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x1B, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x13, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x13, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x41, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x41, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x9, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A7002:: @ 0x086A7002 .2byte 13 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x1A, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x48, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x48, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x14, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x4a, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x4a, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A706C:: @ 0x086A706C .2byte 13 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x12, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x14, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A70D6:: @ 0x086A70D6 .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x44, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x7, spriteSize=SPRITE_SIZE_16x8, tileNum=0x44, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x14, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x46, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x46, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A7148:: @ 0x086A7148 .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x14, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A71BA:: @ 0x086A71BA .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x14, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x4a, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x4a, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A722C:: @ 0x086A722C .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x49, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x49, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A729E:: @ 0x086A729E .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x9, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x15, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x15, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x1B, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A7310:: @ 0x086A7310 .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x9, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x4a, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x4a, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x1A, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A7382:: @ 0x086A7382 .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x9, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x12, spriteSize=SPRITE_SIZE_8x16, tileNum=0x11, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A73F4:: @ 0x086A73F4 .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x9, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x46, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x7, spriteSize=SPRITE_SIZE_8x8, tileNum=0x46, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A7466:: @ 0x086A7466 .2byte 14 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x38, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x26, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x26, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x2E, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x7, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x7, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x12, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x12, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x29, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x29, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x9, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x30, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x8, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x35, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xa, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x35, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0xa, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A74D8:: @ 0x086A74D8 .2byte 4 - packed_sprite_oam x=-0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x60, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x40, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x60, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x64, priority=0x0, paletteNum=0xb + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x64, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xa0, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0xa0, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xa4, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0xa4, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086A74FA:: @ 0x086A74FA .2byte 1 - packed_sprite_oam x=-0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xca, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x8, y=-0x8, spriteSize=SPRITE_SIZE_16x16, tileNum=0xca, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A7504:: @ 0x086A7504 .2byte 1 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x98, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x98, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A750E:: @ 0x086A750E .2byte 1 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1c, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A7518:: @ 0x086A7518 .2byte 1 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x18, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x18, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A7522:: @ 0x086A7522 .2byte 1 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x9c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x9c, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A752C:: @ 0x086A752C .2byte 4 - packed_sprite_oam x=-0x18, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x18, y=-0x18, spriteSize=SPRITE_SIZE_32x32, tileNum=0x4c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x50, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x50, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x18, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xcc, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x18, y=0x8, spriteSize=SPRITE_SIZE_32x16, tileNum=0xcc, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xd0, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_16x16, tileNum=0xd0, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A754E:: @ 0x086A754E .2byte 4 - packed_sprite_oam x=-0x18, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x52, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x18, y=-0x18, spriteSize=SPRITE_SIZE_32x32, tileNum=0x52, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x56, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x56, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x18, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x18, y=0x8, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xd6, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_16x16, tileNum=0xd6, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086A7570:: @ 0x086A7570 .2byte 10 - packed_sprite_oam x=-0x78, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x100, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x78, y=-0x50, spriteSize=SPRITE_SIZE_64x64, tileNum=0x100, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x21e, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x38, y=-0x50, spriteSize=SPRITE_SIZE_16x32, tileNum=0x21e, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x78, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x110, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x78, y=0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x110, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x26, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x20c, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x26, y=0x30, spriteSize=SPRITE_SIZE_32x32, tileNum=0x20c, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x38, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x118, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x38, y=0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x118, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x28, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x21c, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x28, y=0x30, spriteSize=SPRITE_SIZE_16x32, tileNum=0x21c, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x214, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x38, y=-0x10, spriteSize=SPRITE_SIZE_64x32, tileNum=0x214, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x38, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x108, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x38, y=-0x50, spriteSize=SPRITE_SIZE_64x64, tileNum=0x108, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x14, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x210, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x14, y=-0x50, spriteSize=SPRITE_SIZE_32x32, tileNum=0x210, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x200, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x78, y=-0x10, spriteSize=SPRITE_SIZE_64x32, tileNum=0x200, priority=0x0, paletteNum=0x7 .2byte 0 gUnknown_086A75C2:: @ 0x086A75C2 .2byte 10 - packed_sprite_oam x=0x38, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x100, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x38, y=-0x50, spriteSize=SPRITE_SIZE_64x64, hFlip=0x1, tileNum=0x100, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x28, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x21e, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x28, y=-0x50, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x21e, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x38, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x110, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x38, y=0x10, spriteSize=SPRITE_SIZE_64x64, hFlip=0x1, tileNum=0x110, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x6, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x20c, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x6, y=0x30, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x20c, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x78, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x118, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x78, y=0x10, spriteSize=SPRITE_SIZE_64x64, hFlip=0x1, tileNum=0x118, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x38, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x21c, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x38, y=0x30, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x21c, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x214, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x78, y=-0x10, spriteSize=SPRITE_SIZE_64x32, hFlip=0x1, tileNum=0x214, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x108, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x78, y=-0x50, spriteSize=SPRITE_SIZE_64x64, hFlip=0x1, tileNum=0x108, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0xC, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x210, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0xC, y=-0x50, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x210, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x38, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x200, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x38, y=-0x10, spriteSize=SPRITE_SIZE_64x32, hFlip=0x1, tileNum=0x200, priority=0x0, paletteNum=0x7 .2byte 0 gUnknown_086A7614:: @ 0x086A7614 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x280, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x280, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x0, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x288, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0x288, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x40, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x290, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x40, y=0x18, spriteSize=SPRITE_SIZE_32x64, tileNum=0x290, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x40, y=0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x294, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x40, y=0x58, spriteSize=SPRITE_SIZE_32x16, tileNum=0x294, priority=0x0, paletteNum=0x8 .2byte 0 gUnknown_086A7636:: @ 0x086A7636 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x280, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x280, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x288, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0x288, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x40, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x290, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x40, y=0x18, spriteSize=SPRITE_SIZE_32x64, tileNum=0x290, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x40, y=0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x294, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x40, y=0x58, spriteSize=SPRITE_SIZE_32x16, tileNum=0x294, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A7658:: @ 0x086A7658 .2byte 8 - packed_sprite_oam x=-0x58, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x298, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x58, y=-0x68, spriteSize=SPRITE_SIZE_64x64, tileNum=0x298, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x380, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x18, y=-0x68, spriteSize=SPRITE_SIZE_64x32, tileNum=0x380, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x388, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x18, y=-0x48, spriteSize=SPRITE_SIZE_64x32, tileNum=0x388, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x390, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=-0x50, spriteSize=SPRITE_SIZE_16x32, tileNum=0x390, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x392, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x392, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3d2, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x3d2, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=-0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3d6, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=-0x30, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3d6, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x30, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x396, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x30, y=-0x28, spriteSize=SPRITE_SIZE_16x16, tileNum=0x396, priority=0x0, paletteNum=0x0 .2byte 0,0 gIntroScene1_SpriteSets:: @ 0x086A769C @@ -1922,13 +1922,13 @@ gTitleRevealJingle:: @ 0x086A77A8 gUnknown_086A7938:: @ 0x086A7938 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x0, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x0, priority=0x0, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x8, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x64, tileNum=0x8, priority=0x0, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x0, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc, priority=0x0, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x40, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x14, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=0x40, y=0x40, spriteSize=SPRITE_SIZE_32x64, tileNum=0x14, priority=0x0, paletteNum=0x6 .2byte 0,0 gIntroScene3_SpriteSets:: @ 0x086A795C @@ -1937,43 +1937,43 @@ gIntroScene3_SpriteSets:: @ 0x086A795C gUnknown_086A7964:: @ 0x086A7964 .2byte 4 - packed_sprite_oam x=0x0, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x0, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x18, spriteSize=SPRITE_SIZE_32x64, tileNum=0x0, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x4, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x4, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x20, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x20, y=0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x0, y=0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x14, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x58, spriteSize=SPRITE_SIZE_32x8, tileNum=0x14, priority=0x0, paletteNum=0x8 .2byte 0 gUnknown_086A7986:: @ 0x086A7986 .2byte 4 - packed_sprite_oam x=0x0, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x18, spriteSize=SPRITE_SIZE_32x64, tileNum=0x0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x4, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x4, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x14, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x58, spriteSize=SPRITE_SIZE_32x8, tileNum=0x14, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A79A8:: @ 0x086A79A8 .2byte 8 - packed_sprite_oam x=-0x58, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x18, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x58, y=-0x68, spriteSize=SPRITE_SIZE_64x64, tileNum=0x18, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x100, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x18, y=-0x68, spriteSize=SPRITE_SIZE_64x32, tileNum=0x100, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x108, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x18, y=-0x48, spriteSize=SPRITE_SIZE_64x32, tileNum=0x108, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x110, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=-0x50, spriteSize=SPRITE_SIZE_16x32, tileNum=0x110, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x112, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x112, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x152, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x152, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=-0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x156, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=-0x30, spriteSize=SPRITE_SIZE_16x8, tileNum=0x156, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x30, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x116, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x30, y=-0x28, spriteSize=SPRITE_SIZE_16x16, tileNum=0x116, priority=0x0, paletteNum=0x0 .2byte 0,0 @@ -1998,36 +1998,36 @@ gIntroScene5_TileOffsets:: @ 0x086A7A1C gUnknown_086A7A2C:: @ 0x086A7A2C .2byte 2 - packed_sprite_oam x=-0x20, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x20, y=-0x20, spriteSize=SPRITE_SIZE_64x32, tileNum=0x0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x8, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x20, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x8, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A7A3E:: @ 0x086A7A3E .2byte 1 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x10, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x10, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A7A48:: @ 0x086A7A48 .2byte 1 - packed_sprite_oam x=-0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x14, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x8, y=-0x8, spriteSize=SPRITE_SIZE_16x16, tileNum=0x14, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A7A52:: @ 0x086A7A52 .2byte 2 - packed_sprite_oam x=-0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x3, tileNum=0x0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x20, y=0x0, spriteSize=SPRITE_SIZE_64x32, vFlip=0x1, tileNum=0x0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x20, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x3, tileNum=0x8, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x20, y=-0x20, spriteSize=SPRITE_SIZE_64x32, vFlip=0x1, tileNum=0x8, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A7A64:: @ 0x086A7A64 .2byte 1 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0x10, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, vFlip=0x1, tileNum=0x10, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086A7A6E:: @ 0x086A7A6E .2byte 1 - packed_sprite_oam x=-0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x14, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x8, y=-0x8, spriteSize=SPRITE_SIZE_16x16, vFlip=0x1, tileNum=0x14, priority=0x0, paletteNum=0x1 .2byte 0 gIntroScene6_SpriteSets:: @ 0x086A7A78 @@ -2061,13 +2061,13 @@ gIntroScene6_EntityMovement:: @ 0x086A7B34 gUnknown_086A7B50:: @ 0x086A7B50 .2byte 4 - packed_sprite_oam x=-0x40, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x40, y=-0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0x0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x8, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=-0x40, spriteSize=SPRITE_SIZE_64x64, tileNum=0x8, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x10, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x10, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x18, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x18, priority=0x0, paletteNum=0x1 .2byte 0,0 gIntroScene7_SpriteSets:: @ 0x086A7B74 @@ -2211,151 +2211,151 @@ gCompletionBannerSpriteSets:: @ 0x086A7DD4 gUnknown_086A7DE8:: @ 0x086A7DE8 .2byte 2 - packed_sprite_oam x=0x0, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x7, spriteSize=SPRITE_SIZE_8x8, vFlip=0x1, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7DFA:: @ 0x086A7DFA .2byte 2 - packed_sprite_oam x=0x0, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=-0x9, spriteSize=SPRITE_SIZE_8x8, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0x1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x8, vFlip=0x1, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7E0C:: @ 0x086A7E0C .2byte 1 - packed_sprite_oam x=-0x1, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x1, y=0x4, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2, priority=0x0, paletteNum=0x0 .2byte 0 .incbin "baserom.gba", 0x6A7E16, 0xA gUnknown_086A7E20:: @ 0x086A7E20 .2byte 1 - packed_sprite_oam x=0x1, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x2, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x1, y=0x4, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x2, priority=0x0, paletteNum=0x0 .2byte 0 .incbin "baserom.gba", 0x6A7E2A, 0xA gUnknown_086A7E34:: @ 0x086A7E34 .2byte 5 - packed_sprite_oam x=0xC, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x120, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xC, y=-0x1E, spriteSize=SPRITE_SIZE_32x64, tileNum=0x120, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x124, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=-0x1E, spriteSize=SPRITE_SIZE_16x32, tileNum=0x124, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1a4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=0x2, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1a4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x34, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xb0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x34, y=-0x1E, spriteSize=SPRITE_SIZE_64x32, tileNum=0xb0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x34, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xb8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x34, y=0x2, spriteSize=SPRITE_SIZE_64x32, tileNum=0xb8, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7E5E:: @ 0x086A7E5E .2byte 2 - packed_sprite_oam x=-0x28, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x20, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x28, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x20, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x18, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x28, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x18, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0x28, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7E70:: @ 0x086A7E70 .2byte 2 - packed_sprite_oam x=-0x30, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2a, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x30, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2a, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x32, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=-0xB, spriteSize=SPRITE_SIZE_32x32, tileNum=0x32, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7E82:: @ 0x086A7E82 .2byte 3 - packed_sprite_oam x=-0x38, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x36, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x38, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x36, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x8, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xa0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x8, y=-0xB, spriteSize=SPRITE_SIZE_32x32, tileNum=0xa0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=-0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3e, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0x3e, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7E9C:: @ 0x086A7E9C .2byte 2 - packed_sprite_oam x=-0x2C, y=-0x13, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xa4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x2C, y=-0x13, spriteSize=SPRITE_SIZE_64x32, tileNum=0xa4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x14, y=-0x13, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xac, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x14, y=-0x13, spriteSize=SPRITE_SIZE_32x32, tileNum=0xac, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7EAE:: @ 0x086A7EAE .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x6, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x6, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xa, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0xa, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0xe, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7EC8:: @ 0x086A7EC8 .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x8, tileNum=0x6, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x8, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x8, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x30, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x30, y=0x0, spriteSize=SPRITE_SIZE_16x8, tileNum=0xc, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0xe, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xf, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x18, y=0x0, spriteSize=SPRITE_SIZE_16x8, tileNum=0xf, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x28, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x28, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x11, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7EFA:: @ 0x086A7EFA .2byte 4 - packed_sprite_oam x=-0x4A, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x136, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x2B, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1b6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x2B, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1b6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x126, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x38, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x126, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x12e, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A7F1C:: @ 0x086A7F1C .2byte 4 - packed_sprite_oam x=-0x4A, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x136, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x2B, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1b6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x2B, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1b6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x126, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x38, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x126, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x12e, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x4 .2byte 0 gUnknown_086A7F3E:: @ 0x086A7F3E .2byte 4 - packed_sprite_oam x=-0x4A, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x136, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x2B, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1b6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x2B, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1b6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x126, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=-0x38, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x126, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x12e, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x5 .2byte 0 gUnknown_086A7F60:: @ 0x086A7F60 .2byte 4 - packed_sprite_oam x=-0x4A, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x136, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x2B, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1b6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x2B, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1b6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x126, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=-0x38, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x126, priority=0x0, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x12e, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x6 .2byte 0 gUnknown_086A7F82:: @ 0x086A7F82 .2byte 4 - packed_sprite_oam x=-0x4A, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x136, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x2B, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1b6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x2B, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1b6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x126, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=-0x38, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x126, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x12e, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x7 .2byte 0 gScorePaletteAnimOffsets:: @ 0x086A7FA4 @@ -2371,54 +2371,54 @@ gHighScoreCharToTileMap:: @ 0x086A7FAC gUnknown_086A8000:: @ 0x086A8000 .2byte 0x5 - packed_sprite_oam x=-0x3A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14e, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x14e, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x2A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x14e, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x2A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x14e, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x160, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x30, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x160, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x164, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x164, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x168, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x168, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A802A:: @ 0x086A802A .2byte 0x5 - packed_sprite_oam x=-0x3A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x14c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x2A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x14c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x2A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x14c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x160, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x30, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x160, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x164, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x164, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x168, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x168, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A8054:: @ 0x086A8054 .2byte 0x5 - packed_sprite_oam x=-0x3A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x16c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x16c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x2A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x16c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x2A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x16c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x180, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x30, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x180, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x184, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x184, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x188, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x188, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086A807E:: @ 0x086A807E .2byte 0x5 - packed_sprite_oam x=-0x3A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x14c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x14c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x2A, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x14c, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=0x2A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x14c, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x30, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x180, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x30, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x180, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x184, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x184, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x188, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x188, priority=0x0, paletteNum=0x0 .2byte 0 @@ -2478,9 +2478,9 @@ gUnknown_086A8AF2:: @ 0x086A8AF2 gUnknown_086A8AFC:: @ 0x086A8AFC .2byte 0x2 - packed_sprite_oam x=-0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x298, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=-0x30, y=-0x10, spriteSize=SPRITE_SIZE_64x32, tileNum=0x298, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x300, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x300, priority=0x0, paletteNum=0x2 .2byte 0 .incbin "baserom.gba", 0x6A8B0E, 0xA8 @@ -5401,1132 +5401,1132 @@ gMonIconPalettes:: @ 0x086B15B4 gUnknown_086B15F8:: @ 0x086B15F8 .2byte 1 - packed_sprite_oam x=-0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x0, priority=0x2, paletteNum=0x0 + packed_sprite_oam x=-0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x0, priority=0x2, paletteNum=0x0 .2byte 0 gUnknown_086B1602:: @ 0x086B1602 .2byte 1 - packed_sprite_oam x=0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x10, priority=0x2, paletteNum=0x0 + packed_sprite_oam x=0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x10, priority=0x2, paletteNum=0x0 .2byte 0 gUnknown_086B160C:: @ 0x086B160C .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x20, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086B1616:: @ 0x086B1616 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x24, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x24, priority=0x2, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2c, priority=0x2, paletteNum=0x3 .2byte 0 gUnknown_086B1628:: @ 0x086B1628 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x30, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x30, priority=0x2, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x38, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38, priority=0x2, paletteNum=0x3 .2byte 0 gUnknown_086B163A:: @ 0x086B163A .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3c, priority=0x3, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x16, tileNum=0x3c, priority=0x3, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x40, priority=0x3, paletteNum=0x3 + packed_sprite_oam x=0x10, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_8x16, tileNum=0x40, priority=0x3, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x42, priority=0x3, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x10, mosaic=0x1, spriteSize=SPRITE_SIZE_16x8, tileNum=0x42, priority=0x3, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x44, priority=0x3, paletteNum=0x3 + packed_sprite_oam x=0x10, y=0x10, mosaic=0x1, spriteSize=SPRITE_SIZE_8x8, tileNum=0x44, priority=0x3, paletteNum=0x3 .2byte 0 gUnknown_086B165C:: @ 0x086B165C .2byte 3 - packed_sprite_oam x=0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x45, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x45, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x4d, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=-0x18, y=-0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x4d, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=-0x8, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x55, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=-0x8, y=-0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x55, priority=0x0, paletteNum=0x9 .2byte 0 gUnknown_086B1676:: @ 0x086B1676 .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x5d, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x28, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x20, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x20, y=0x28, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, vFlip=0x1, tileNum=0x5d, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x38, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x61, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x38, y=0x8, spriteSize=SPRITE_SIZE_8x32, tileNum=0x61, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x61, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x61, priority=0x3, paletteNum=0x1 .2byte 0 gUnknown_086B16A8:: @ 0x086B16A8 .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x65, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x65, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x69, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x69, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x6d, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x6d, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x71, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x71, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x75, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x75, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x79, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x79, priority=0x3, paletteNum=0x0 .2byte 0 gUnknown_086B16DA:: @ 0x086B16DA .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x7d, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x7d, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x81, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x81, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x85, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x85, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x89, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x89, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x8d, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x8d, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x91, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x91, priority=0x3, paletteNum=0x0 .2byte 0 gUnknown_086B170C:: @ 0x086B170C .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x7d, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x7d, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x81, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x81, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x85, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x85, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x89, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x89, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x8d, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x8d, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x91, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x91, priority=0x3, paletteNum=0x0 .2byte 0 gUnknown_086B173E:: @ 0x086B173E .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x65, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x65, priority=0x1, paletteNum=0xd .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x75, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x75, priority=0x1, paletteNum=0xd .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x7d, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x7d, priority=0x1, paletteNum=0xd .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x85, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x85, priority=0x1, paletteNum=0xd .2byte 0 gUnknown_086B1760:: @ 0x086B1760 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x95, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x95, priority=0x1, paletteNum=0xd .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x99, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x99, priority=0x1, paletteNum=0xd .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9b, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x9b, priority=0x1, paletteNum=0xd .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x9d, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x9d, priority=0x1, paletteNum=0xd .2byte 0 gUnknown_086B1782:: @ 0x086B1782 .2byte 4 - packed_sprite_oam x=-0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0x9e, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=-0x8, y=0x0, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, vFlip=0x1, tileNum=0x9e, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0xae, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=-0x18, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, vFlip=0x1, tileNum=0xae, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x9e, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=-0x18, y=-0x20, spriteSize=SPRITE_SIZE_32x32, tileNum=0x9e, priority=0x3, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x8, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xae, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x8, y=-0x20, spriteSize=SPRITE_SIZE_16x32, tileNum=0xae, priority=0x3, paletteNum=0x1 .2byte 0 gUnknown_086B17A4:: @ 0x086B17A4 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xb6, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb6, priority=0x1, paletteNum=0xf .2byte 0 gUnknown_086B17AE:: @ 0x086B17AE .2byte 11 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc6, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xc6, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc7, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xc7, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc8, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xc8, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc9, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xc9, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xca, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xca, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xcb, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xcb, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xcc, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xcc, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xcd, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xcd, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xce, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xce, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xcf, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xcf, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd0, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xd0, priority=0x0, paletteNum=0x9 .2byte 0 gUnknown_086B1808:: @ 0x086B1808 .2byte 2 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xd1, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0xd1, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xd1, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0xd1, priority=0x0, paletteNum=0x9 .2byte 0 gUnknown_086B181A:: @ 0x086B181A .2byte 3 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0xd5, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0xd5, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xd9, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x40, y=-0x10, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0xd9, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0xd5, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0xd5, priority=0x0, paletteNum=0x9 .2byte 0 gUnknown_086B1834:: @ 0x086B1834 .2byte 2 - packed_sprite_oam x=-0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xdb, priority=0x0, paletteNum=0x3 + packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xdb, priority=0x0, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xdb, priority=0x0, paletteNum=0x3 + packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xdb, priority=0x0, paletteNum=0x3 .2byte 0 gUnknown_086B1846:: @ 0x086B1846 .2byte 2 - packed_sprite_oam x=-0x10, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xe7, priority=0x1, paletteNum=0xb + packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x32, tileNum=0xe7, priority=0x1, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x10, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xe7, priority=0x1, paletteNum=0xb + packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x32, tileNum=0xe7, priority=0x1, paletteNum=0xb .2byte 0 gUnknown_086B1858:: @ 0x086B1858 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xf7, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xf7, priority=0x3, paletteNum=0x1 .2byte 0 gUnknown_086B1862:: @ 0x086B1862 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x107, priority=0x1, paletteNum=0xb + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x107, priority=0x1, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x10f, priority=0x1, paletteNum=0xb + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x10f, priority=0x1, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x4, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x113, priority=0x1, paletteNum=0xb + packed_sprite_oam x=0x4, y=0x20, spriteSize=SPRITE_SIZE_16x8, tileNum=0x113, priority=0x1, paletteNum=0xb .2byte 0 gUnknown_086B187C:: @ 0x086B187C .2byte 4 - packed_sprite_oam x=-0x18, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x115, priority=0x1, paletteNum=0xb + packed_sprite_oam x=-0x18, y=-0x20, spriteSize=SPRITE_SIZE_32x32, tileNum=0x115, priority=0x1, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x125, priority=0x1, paletteNum=0xb + packed_sprite_oam x=0x8, y=-0x20, spriteSize=SPRITE_SIZE_16x32, tileNum=0x125, priority=0x1, paletteNum=0xb .2byte 0 - packed_sprite_oam x=-0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x12d, priority=0x1, paletteNum=0xb + packed_sprite_oam x=-0x18, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x12d, priority=0x1, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x135, priority=0x1, paletteNum=0xb + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x135, priority=0x1, paletteNum=0xb .2byte 0 gUnknown_086B189E:: @ 0x086B189E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x139, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x139, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x149, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x149, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086B18B0:: @ 0x086B18B0 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x151, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x151, priority=0x2, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x155, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x155, priority=0x2, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x157, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x157, priority=0x2, paletteNum=0x4 .2byte 0 gUnknown_086B18CA:: @ 0x086B18CA .2byte 3 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x159, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x159, priority=0x2, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x15d, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x15d, priority=0x2, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x15f, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x15f, priority=0x2, paletteNum=0x4 .2byte 0 gUnknown_086B18E4:: @ 0x086B18E4 .2byte 3 - packed_sprite_oam x=0xA, y=-0x1, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x161, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0xA, y=-0x1, spriteSize=SPRITE_SIZE_8x16, tileNum=0x161, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x0, y=0xF, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x163, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0xF, spriteSize=SPRITE_SIZE_32x32, tileNum=0x163, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x20, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x173, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0x20, y=0x17, spriteSize=SPRITE_SIZE_8x8, tileNum=0x173, priority=0x1, paletteNum=0x6 .2byte 0 gUnknown_086B18FE:: @ 0x086B18FE .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x174, priority=0x2, paletteNum=0x9 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x174, priority=0x2, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0xF, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x174, priority=0x2, paletteNum=0x9 + packed_sprite_oam x=0xF, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x174, priority=0x2, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x17c, priority=0x2, paletteNum=0x9 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x17c, priority=0x2, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0xF, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x17c, priority=0x2, paletteNum=0x9 + packed_sprite_oam x=0xF, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x17c, priority=0x2, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x184, priority=0x2, paletteNum=0x9 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x184, priority=0x2, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0xF, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x184, priority=0x2, paletteNum=0x9 + packed_sprite_oam x=0xF, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x184, priority=0x2, paletteNum=0x9 .2byte 0 gUnknown_086B1930:: @ 0x086B1930 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x18c, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x18c, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x194, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x194, priority=0x1, paletteNum=0x5 .2byte 0 gUnknown_086B1942:: @ 0x086B1942 .2byte 2 - packed_sprite_oam x=-0x11, y=-0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x198, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x11, y=-0xE, spriteSize=SPRITE_SIZE_32x32, tileNum=0x198, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x11, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1a8, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x11, y=0x12, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1a8, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086B1954:: @ 0x086B1954 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1ac, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1ac, priority=0x1, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1bc, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1bc, priority=0x1, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x8, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1c0, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x8, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1c0, priority=0x1, paletteNum=0x8 .2byte 0 gUnknown_086B196E:: @ 0x086B196E .2byte 6 - packed_sprite_oam x=-0x20, y=-0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1c4, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=-0x20, y=-0xE, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1c4, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x20, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1cc, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=-0x20, y=0x2, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1cc, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x17, y=-0x13, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1d0, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=-0x17, y=-0x13, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1d0, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x17, y=-0x3, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1d8, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=-0x17, y=-0x3, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1d8, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0xF, y=-0x13, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1dc, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=-0xF, y=-0x13, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1dc, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0xF, y=-0x3, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1e4, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=-0xF, y=-0x3, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1e4, priority=0x1, paletteNum=0x7 .2byte 0 gUnknown_086B19A0:: @ 0x086B19A0 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x1e8, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x1e8, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x208, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x208, priority=0x0, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x20c, priority=0x0, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x20c, priority=0x0, paletteNum=0x2 .2byte 0 gUnknown_086B19BA:: @ 0x086B19BA .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x210, priority=0x0, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x210, priority=0x0, paletteNum=0x3 .2byte 0 gUnknown_086B19C4:: @ 0x086B19C4 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x214, priority=0x0, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x214, priority=0x0, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0x214, priority=0x0, paletteNum=0x3 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, vFlip=0x1, tileNum=0x214, priority=0x0, paletteNum=0x3 .2byte 0 gUnknown_086B19D6:: @ 0x086B19D6 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x21c, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x21c, priority=0x2, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x22c, priority=0x2, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x22c, priority=0x2, paletteNum=0x4 .2byte 0 gUnknown_086B19E8:: @ 0x086B19E8 .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x230, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x230, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x230, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x230, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x230, priority=0x0, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 gUnknown_086B1A12:: @ 0x086B1A12 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x234, priority=0x1, paletteNum=0x9 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x234, priority=0x1, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x244, priority=0x1, paletteNum=0x9 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x244, priority=0x1, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x24c, priority=0x1, paletteNum=0x9 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x24c, priority=0x1, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x254, priority=0x1, paletteNum=0x9 + packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x254, priority=0x1, paletteNum=0x9 .2byte 0 gUnknown_086B1A34:: @ 0x086B1A34 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x258, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x258, priority=0x1, paletteNum=0xa .2byte 0 gUnknown_086B1A3E:: @ 0x086B1A3E .2byte 1 - packed_sprite_oam x=-0x11, y=-0xF, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x25c, priority=0x0, paletteNum=0x3 + packed_sprite_oam x=-0x11, y=-0xF, spriteSize=SPRITE_SIZE_32x32, tileNum=0x25c, priority=0x0, paletteNum=0x3 .2byte 0 gUnknown_086B1A48:: @ 0x086B1A48 .2byte 3 - packed_sprite_oam x=0x8, y=0x19, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x294, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x18, y=0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x293, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x291, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x8, y=0x19, spriteSize=SPRITE_SIZE_8x8, tileNum=0x294, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x18, y=0x1E, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x291, priority=0x1, paletteNum=0xd gUnknown_086B1A5C:: @ 0x086B1A5C .2byte 3 - packed_sprite_oam x=0x8, y=0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x293, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x18, y=0x21, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x294, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x20, y=0x13, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x292, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x8, y=0x1C, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x18, y=0x21, spriteSize=SPRITE_SIZE_8x8, tileNum=0x294, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x20, y=0x13, spriteSize=SPRITE_SIZE_8x8, tileNum=0x292, priority=0x1, paletteNum=0xd gUnknown_086B1A70:: @ 0x086B1A70 .2byte 3 - packed_sprite_oam x=0x8, y=0x1F, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x292, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x18, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x293, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x20, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x293, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x8, y=0x1F, spriteSize=SPRITE_SIZE_8x8, tileNum=0x292, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x18, y=0x24, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x20, y=0x16, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd gUnknown_086B1A84:: @ 0x086B1A84 .2byte 3 - packed_sprite_oam x=0x8, y=0x22, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x291, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x18, y=0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x292, priority=0x1, paletteNum=0xd - packed_sprite_oam x=0x20, y=0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x294, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x8, y=0x22, spriteSize=SPRITE_SIZE_8x8, tileNum=0x291, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x18, y=0x27, spriteSize=SPRITE_SIZE_8x8, tileNum=0x292, priority=0x1, paletteNum=0xd + packed_sprite_oam x=0x20, y=0x1A, spriteSize=SPRITE_SIZE_8x8, tileNum=0x294, priority=0x1, paletteNum=0xd gUnknown_086B1A98:: @ 0x086B1A98 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x295, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x295, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x2, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2a5, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x2, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2a5, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2a9, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2a9, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086B1AB2:: @ 0x086B1AB2 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x115, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x115, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x125, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x20, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x32, tileNum=0x125, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x12d, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x16, tileNum=0x12d, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x135, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x20, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_16x16, tileNum=0x135, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086B1AD4:: @ 0x086B1AD4 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x139, priority=0x3, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x139, priority=0x3, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x149, priority=0x3, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x32, tileNum=0x149, priority=0x3, paletteNum=0x2 .2byte 0 gUnknown_086B1AE6:: @ 0x086B1AE6 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x151, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x151, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x161, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0x20, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x32, tileNum=0x161, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x169, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x8, tileNum=0x169, priority=0x1, paletteNum=0x6 .2byte 0 gUnknown_086B1B00:: @ 0x086B1B00 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x16d, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x16d, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x17d, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x16, tileNum=0x17d, priority=0x1, paletteNum=0xa .2byte 0 gUnknown_086B1B12:: @ 0x086B1B12 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x185, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x185, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x195, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x16, tileNum=0x195, priority=0x1, paletteNum=0xa .2byte 0 gUnknown_086B1B24:: @ 0x086B1B24 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x19d, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x19d, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1ad, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1ad, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x0, y=-0x1, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1bd, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x0, y=-0x1, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1bd, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086B1B3E:: @ 0x086B1B3E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1cd, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1cd, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1d5, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1d5, priority=0x1, paletteNum=0x7 .2byte 0 gUnknown_086B1B50:: @ 0x086B1B50 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1d9, priority=0x2, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1d9, priority=0x2, paletteNum=0x7 .2byte 0 gUnknown_086B1B5A:: @ 0x086B1B5A .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1e1, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1e1, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1e9, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1e9, priority=0x1, paletteNum=0x7 .2byte 0 gUnknown_086B1B6C:: @ 0x086B1B6C .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1ed, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1ed, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1f5, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1f5, priority=0x1, paletteNum=0x7 .2byte 0 gUnknown_086B1B7E:: @ 0x086B1B7E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1f9, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1f9, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x201, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x201, priority=0x1, paletteNum=0x7 .2byte 0 gUnknown_086B1B90:: @ 0x086B1B90 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x205, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x205, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x209, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x209, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x20b, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x20b, priority=0x1, paletteNum=0x0 .2byte 0 gUnknown_086B1BAA:: @ 0x086B1BAA .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x20d, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20d, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x211, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x211, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x213, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x213, priority=0x1, paletteNum=0x0 .2byte 0 gUnknown_086B1BC4:: @ 0x086B1BC4 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x215, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x215, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x219, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x219, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x21b, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x21b, priority=0x1, paletteNum=0x0 .2byte 0 gUnknown_086B1BDE:: @ 0x086B1BDE .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x21d, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x21d, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x221, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x221, priority=0x1, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x223, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x223, priority=0x1, paletteNum=0x0 .2byte 0 gUnknown_086B1BF8:: @ 0x086B1BF8 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x225, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x225, priority=0x0, paletteNum=0xb .2byte 0 gUnknown_086B1C02:: @ 0x086B1C02 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x235, priority=0x3, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x235, priority=0x3, paletteNum=0xa .2byte 0 gUnknown_086B1C0C:: @ 0x086B1C0C .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x239, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x239, priority=0x1, paletteNum=0xa .2byte 0 gUnknown_086B1C16:: @ 0x086B1C16 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x249, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x249, priority=0x1, paletteNum=0xa .2byte 0 gUnknown_086B1C20:: @ 0x086B1C20 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x259, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_64x32, tileNum=0x259, priority=0x1, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x279, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x8, tileNum=0x279, priority=0x1, paletteNum=0x8 .2byte 0 gUnknown_086B1C32:: @ 0x086B1C32 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x27d, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x27d, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086B1C3C:: @ 0x086B1C3C .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x28d, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x28d, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x28d, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x28d, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x28d, priority=0x0, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 gUnknown_086B1C66:: @ 0x086B1C66 .2byte 5 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, vFlip=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, vFlip=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 gUnknown_086B1C90:: @ 0x086B1C90 .2byte 9 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1CDA:: @ 0x086B1CDA .2byte 6 - packed_sprite_oam x=-0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x371, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x8, y=-0x8, spriteSize=SPRITE_SIZE_32x16, tileNum=0x371, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0x371, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x8, y=0x8, spriteSize=SPRITE_SIZE_32x16, vFlip=0x1, tileNum=0x371, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x1A, y=-0x19, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x379, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x1A, y=-0x19, spriteSize=SPRITE_SIZE_32x32, tileNum=0x379, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x1B, y=0xB, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0x379, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x1B, y=0xB, spriteSize=SPRITE_SIZE_32x32, vFlip=0x1, tileNum=0x379, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0xC, y=-0x1C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x379, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0xC, y=-0x1C, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x379, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x7, y=0x5, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0x379, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x7, y=0x5, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, vFlip=0x1, tileNum=0x379, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1D0C:: @ 0x086B1D0C .2byte 6 - packed_sprite_oam x=-0x4, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x4, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x4, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x4, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x4, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x4, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1D3E:: @ 0x086B1D3E .2byte 6 - packed_sprite_oam x=0x0, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=-0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2c8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x10, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2d0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x10, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2d0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x18, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x18, y=0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x18, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2e8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x18, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2e8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x18, y=0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f4, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x18, y=0x48, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f4, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x20, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x20, y=0x30, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2f0, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1D70:: @ 0x086B1D70 .2byte 6 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086B1DA2:: @ 0x086B1DA2 .2byte 4 - packed_sprite_oam x=0x9, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x34, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x9, y=-0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x34, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x8, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x44, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x8, y=0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x44, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x30, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x0, y=-0x8, spriteSize=SPRITE_SIZE_8x32, tileNum=0x30, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x22, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x46, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x22, y=0x18, spriteSize=SPRITE_SIZE_16x16, tileNum=0x46, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086B1DC4:: @ 0x086B1DC4 .2byte 16 - packed_sprite_oam x=0xA, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x396, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0xA, y=0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x396, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0xA, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x39e, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0xA, y=0x38, spriteSize=SPRITE_SIZE_8x8, tileNum=0x39e, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x5, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x2, tileNum=0x396, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x5, y=0x20, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, vFlip=0x1, tileNum=0x396, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x3, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x1, size=0x0, tileNum=0x39e, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x3, y=0x18, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, vFlip=0x1, tileNum=0x39e, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x6, y=0x26, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x362, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x6, y=0x26, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x362, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x2, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x372, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x2, y=0x16, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x372, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x12, y=0x36, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x37f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x12, y=0x36, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x37f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0xA, y=0x26, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x380, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0xA, y=0x26, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x380, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0xA, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x388, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0xA, y=0x16, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x388, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x2, y=0x46, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x38a, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x2, y=0x46, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x38a, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0xA, y=0x46, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x38e, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0xA, y=0x46, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x38e, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x2, y=0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x38f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x2, y=0x6, spriteSize=SPRITE_SIZE_16x8, tileNum=0x38f, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0xA, y=0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x391, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0xA, y=0xE, spriteSize=SPRITE_SIZE_32x8, tileNum=0x391, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=-0x1, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x33b, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=-0x1, y=-0x4, spriteSize=SPRITE_SIZE_16x16, tileNum=0x33b, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x7, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x341, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x7, y=0xC, spriteSize=SPRITE_SIZE_16x8, tileNum=0x341, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0xF, y=-0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x33f, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0xF, y=-0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x33f, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086B1E46:: @ 0x086B1E46 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x20, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086B1E50:: @ 0x086B1E50 .2byte 15 - packed_sprite_oam x=-0x7F, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x7F, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x3F, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x3F, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x340, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x1, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x340, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x41, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x380, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x41, y=0x0, spriteSize=SPRITE_SIZE_32x64, tileNum=0x380, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x61, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3a0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x61, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x3a0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x61, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3a8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x61, y=0x20, spriteSize=SPRITE_SIZE_16x32, tileNum=0x3a8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x7F, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3b0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x7F, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x5F, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3b4, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x5F, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b4, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x3F, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3b8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x3F, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x1F, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3bc, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x1F, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3bc, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x1, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x1, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x21, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3c4, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x21, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3c4, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x41, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3c8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x41, y=0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3c8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x61, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3cc, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x61, y=0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3cc, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x61, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3cc, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x61, y=0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3cc, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1ECA:: @ 0x086B1ECA .2byte 7 - packed_sprite_oam x=0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3b5, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x18, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x3b5, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x18, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3c5, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x18, y=0x20, spriteSize=SPRITE_SIZE_32x32, tileNum=0x3c5, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3d5, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x3d5, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x10, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3dd, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=0x18, spriteSize=SPRITE_SIZE_8x32, tileNum=0x3dd, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x38, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3e1, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x38, y=0x20, spriteSize=SPRITE_SIZE_16x32, tileNum=0x3e1, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x48, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3e9, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x48, y=0x20, spriteSize=SPRITE_SIZE_8x32, tileNum=0x3e9, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3ed, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3ed, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1F04:: @ 0x086B1F04 .2byte 4 - packed_sprite_oam x=0x3, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x304, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x3, y=-0x8, spriteSize=SPRITE_SIZE_16x8, tileNum=0x304, priority=0x2, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x5, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x306, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=-0x5, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x306, priority=0x2, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2c0, priority=0x2, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x8, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c8, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2c8, priority=0x2, paletteNum=0x3 .2byte 0 gUnknown_086B1F26:: @ 0x086B1F26 .2byte 10 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c2, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c2, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c4, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c4, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c8, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c8, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ca, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ca, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2cc, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2cc, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ce, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ce, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d2, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d2, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086B1F78:: @ 0x086B1F78 .2byte 10 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d4, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d4, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d6, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d8, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d8, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2da, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2da, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2dc, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2dc, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2de, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2de, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e0, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e0, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e2, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e2, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e4, priority=0x0, paletteNum=0x1 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e6, priority=0x0, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e6, priority=0x0, paletteNum=0x1 .2byte 0 gUnknown_086B1FCA:: @ 0x086B1FCA .2byte 5 - packed_sprite_oam x=0x23, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2d2, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x23, y=0x2, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2d2, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x3, y=0xA, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x3, y=0xA, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x33, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2da, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x33, y=0x2, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2da, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x3, y=0x2A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x3, y=0x2A, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2d0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x3, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2de, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x3, y=0x2, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2de, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B1FF4:: @ 0x086B1FF4 .2byte 6 - packed_sprite_oam x=-0x9, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x9, y=0x8, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x9, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e2, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x9, y=0x18, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e2, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x31, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x31, y=0x8, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x31, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x2e2, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x31, y=0x18, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x2e2, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2e3, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2e3, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x10, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2e7, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2e7, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B2026:: @ 0x086B2026 .2byte 4 - packed_sprite_oam x=0x15, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ed, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x15, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ed, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2f1, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2f1, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x1E, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2f3, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x1E, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2f3, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B2048:: @ 0x086B2048 .2byte 5 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f5, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2f5, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2f9, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2f9, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x28, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2f9, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x28, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2f9, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x48, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2f9, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x48, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2f9, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x68, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x309, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x68, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x309, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B2072:: @ 0x086B2072 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x311, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x311, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x321, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x321, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B2084:: @ 0x086B2084 .2byte 2 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x300, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B2096:: @ 0x086B2096 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x340, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x340, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B20A0:: @ 0x086B20A0 .2byte 2 - packed_sprite_oam x=0x10, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x380, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x380, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x10, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x384, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x10, y=0x30, spriteSize=SPRITE_SIZE_16x8, tileNum=0x384, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B20B2:: @ 0x086B20B2 .2byte 14 - packed_sprite_oam x=-0x68, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x68, y=0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x68, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x300, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x68, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x300, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x58, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x304, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x58, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x304, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x38, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x30c, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x38, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x30c, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x314, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x18, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x314, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x31c, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x31c, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x28, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x28, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x324, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x48, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x32c, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x48, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x32c, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x58, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x300, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x58, y=0x0, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x300, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x28, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x330, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x28, y=0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x330, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x28, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x370, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x28, y=0x10, spriteSize=SPRITE_SIZE_32x64, tileNum=0x370, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x8, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x370, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_32x64, tileNum=0x370, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x8, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x390, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x8, y=0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x390, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x8, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x398, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x8, y=0x30, spriteSize=SPRITE_SIZE_16x32, tileNum=0x398, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B2124:: @ 0x086B2124 .2byte 5 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3a0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3a0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3a4, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3a4, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3a8, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3a8, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3ac, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3ac, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3b0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b0, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B214E:: @ 0x086B214E .2byte 5 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3b6, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b6, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3ba, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3ba, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3be, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3be, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3c2, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3c2, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3c6, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3c6, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B2178:: @ 0x086B2178 .2byte 5 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3cc, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3cc, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3d0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3d0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3d4, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3d4, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3d8, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3d8, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3dc, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3dc, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B21A2:: @ 0x086B21A2 .2byte 8 - packed_sprite_oam x=-0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c4, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c4, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c8, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x18, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c8, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x28, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2cc, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x28, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2cc, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2d0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2d0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x50, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2d4, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x50, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2d4, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x60, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2d8, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x60, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2d8, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x70, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2dc, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x70, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2dc, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B21E4:: @ 0x086B21E4 .2byte 4 - packed_sprite_oam x=0x18, y=0x21, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x18, y=0x21, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x58, y=0x21, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x58, y=0x21, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x80, y=0x21, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x80, y=0x21, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x40, y=0x21, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x40, y=0x21, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B2206:: @ 0x086B2206 .2byte 4 - packed_sprite_oam x=0x18, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x18, y=-0x28, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x58, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x58, y=-0x28, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x80, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x80, y=-0x28, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x40, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x40, y=-0x28, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B2228:: @ 0x086B2228 .2byte 4 - packed_sprite_oam x=-0x80, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x80, y=0x16, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x1C, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x1C, y=0x16, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x32, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x32, y=0x16, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x6A, y=0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x6A, y=0x16, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B224A:: @ 0x086B224A .2byte 4 - packed_sprite_oam x=-0x32, y=-0xD, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x32, y=-0xD, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x80, y=-0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x80, y=-0xE, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x6A, y=-0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x6A, y=-0xE, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x1C, y=-0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x1C, y=-0xE, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B226C:: @ 0x086B226C .2byte 8 - packed_sprite_oam x=-0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x320, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x40, y=0x4, spriteSize=SPRITE_SIZE_32x8, tileNum=0x320, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x20, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x20, y=0x4, spriteSize=SPRITE_SIZE_16x8, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x80, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x320, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x80, y=0x4, spriteSize=SPRITE_SIZE_32x8, tileNum=0x320, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x60, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x60, y=0x4, spriteSize=SPRITE_SIZE_16x8, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x40, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x320, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x40, y=0x4, spriteSize=SPRITE_SIZE_32x8, tileNum=0x320, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x60, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x60, y=0x4, spriteSize=SPRITE_SIZE_16x8, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x320, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x4, spriteSize=SPRITE_SIZE_32x8, tileNum=0x320, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x324, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x4, spriteSize=SPRITE_SIZE_16x8, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B22AE:: @ 0x086B22AE .2byte 4 - packed_sprite_oam x=-0x8, y=-0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x326, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x8, y=-0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x64, tileNum=0x326, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x346, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x10, y=-0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x346, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x18, y=-0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0x326, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x18, y=-0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x64, hFlip=0x1, tileNum=0x326, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x38, y=-0x10, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x346, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x38, y=-0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x346, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B22D0:: @ 0x086B22D0 .2byte 4 - packed_sprite_oam x=-0x38, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x38e, priority=0x0, paletteNum=0xe + packed_sprite_oam x=-0x38, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x38e, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x50, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x37e, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x50, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x37e, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x39e, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=-0x8, spriteSize=SPRITE_SIZE_16x32, tileNum=0x39e, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3a6, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x18, spriteSize=SPRITE_SIZE_16x16, tileNum=0x3a6, priority=0x0, paletteNum=0xe .2byte 0 gUnknown_086B22F2:: @ 0x086B22F2 .2byte 6 - packed_sprite_oam x=0x0, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=-0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2d0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=-0x8, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2d0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x0, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2d8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x0, y=0x18, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2d8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x20, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2e0, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0x20, y=0x18, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=-0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2e4, priority=0x1, paletteNum=0xe + packed_sprite_oam x=-0x8, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e4, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x18, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x304, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x18, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x304, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086B2324:: @ 0x086B2324 .2byte 7 - packed_sprite_oam x=-0x47, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2c0, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=-0x47, y=0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2c0, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x27, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=-0x27, y=0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x33, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2d2, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=-0x33, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2d2, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x13, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e2, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=-0x13, y=0x8, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e2, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x1E, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2e4, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=-0x1E, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2e4, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x2, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2f4, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=0x2, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2f4, priority=0x1, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x52, y=0x2C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f6, priority=0x1, paletteNum=0x6 + packed_sprite_oam x=-0x52, y=0x2C, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2f6, priority=0x1, paletteNum=0x6 .2byte 0 gUnknown_086B235E:: @ 0x086B235E .2byte 6 - packed_sprite_oam x=0xC, y=-0x33, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2f8, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0xC, y=-0x33, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2f8, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x4, y=-0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x308, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x4, y=-0x2B, spriteSize=SPRITE_SIZE_16x16, tileNum=0x308, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0x4, y=-0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x30c, priority=0x0, paletteNum=0xb + packed_sprite_oam x=0x4, y=-0x1B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x30c, priority=0x0, paletteNum=0xb .2byte 0 - packed_sprite_oam x=0xC, y=-0x22, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2dc, priority=0x0, paletteNum=0xe + packed_sprite_oam x=0xC, y=-0x22, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2dc, priority=0x0, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0xC, y=-0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e0, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0xC, y=-0x2, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e0, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0xC, y=0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e2, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0xC, y=0xE, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e2, priority=0x1, paletteNum=0xe .2byte 0 @@ -12089,1412 +12089,1412 @@ gDuskullSpritesheetOam:: @ 0x086BA0A0 gBonusBoardLeftFlipperSpriteSet:: @ 0x086BA16C .2byte 1 - packed_sprite_oam x=-0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x0, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=-0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x0, priority=0x1, paletteNum=0x0 .2byte 0 gBonusBoardRightFlipperSpriteSet:: @ 0x086BA176 .2byte 1 - packed_sprite_oam x=0x1, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x10, priority=0x1, paletteNum=0x0 + packed_sprite_oam x=0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x10, priority=0x1, paletteNum=0x0 .2byte 0 gBonusBoardBallSpriteSet:: @ 0x086BA180 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x20, priority=0x1, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x1, paletteNum=0x1 .2byte 0 gBonusBoardPausePanelSpriteSet:: @ 0x086BA18A .2byte 11 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x24, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x24, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x25, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x25, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x26, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x26, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x27, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x27, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x28, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x28, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x29, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x29, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2a, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2a, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2b, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2b, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2c, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2d, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e, priority=0x0, paletteNum=0x9 .2byte 0 gBonusBoardPauseTopBorderSpriteSet:: @ 0x086BA1E4 .2byte 2 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f, priority=0x0, paletteNum=0x9 .2byte 0 gBonusBoardPauseBottomBorderSpriteSet:: @ 0x086BA1F6 .2byte 3 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x33, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0x33, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0x37, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x40, y=-0x10, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0x37, priority=0x0, paletteNum=0x9 .2byte 0 - packed_sprite_oam x=0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x33, priority=0x0, paletteNum=0x9 + packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0x33, priority=0x0, paletteNum=0x9 .2byte 0 gBonusBoardBallRespawnFxSpriteSet:: @ 0x086BA210 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x39, priority=0x1, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x39, priority=0x1, paletteNum=0x1 .2byte 0 gDusclopsBoardDuskullEntity0SpriteSet:: @ 0x086BA21A .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x49, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x49, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x59, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x59, priority=0x1, paletteNum=0x2 .2byte 0 gDusclopsBoardDuskullEntity1SpriteSet:: @ 0x086BA22C .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x5d, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x5d, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x6d, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x6d, priority=0x1, paletteNum=0x2 .2byte 0 gDusclopsBoardDuskullEntity2SpriteSet:: @ 0x086BA23E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x71, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x71, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x81, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, tileNum=0x81, priority=0x1, paletteNum=0x2 .2byte 0 gDusclopsBoardDusclopsEntitySpriteSet:: @ 0x086BA250 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x85, priority=0x3, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x85, priority=0x3, paletteNum=0x3 .2byte 0 gDusclopsBoardBallCaptureVortexFxSpriteSet:: @ 0x086BA25A .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xc5, priority=0x3, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xc5, priority=0x3, paletteNum=0x3 .2byte 0 gDusclopsBoardPhasingFxSpriteSet:: @ 0x086BA264 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x1, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xd5, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, mosaic=0x1, spriteSize=SPRITE_SIZE_64x64, tileNum=0xd5, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x40, affineMode=0x0, objMode=0x1, mosaic=0x1, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x115, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x40, objMode=ST_OAM_OBJ_BLEND, mosaic=0x1, spriteSize=SPRITE_SIZE_64x32, tileNum=0x115, priority=0x3, paletteNum=0x0 .2byte 0 gUnknown_086BA276:: @ 0x086BA276 .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x49, priority=0x2, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x49, priority=0x2, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x59, priority=0x2, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x8, tileNum=0x59, priority=0x2, paletteNum=0x2 .2byte 0 gUnknown_086BA288:: @ 0x086BA288 .2byte 1 - packed_sprite_oam x=0x0, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x5d, priority=0x2, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x18, spriteSize=SPRITE_SIZE_32x16, tileNum=0x5d, priority=0x2, paletteNum=0x3 .2byte 0 gUnknown_086BA292:: @ 0x086BA292 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x65, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x65, priority=0x2, paletteNum=0xc .2byte 0 gUnknown_086BA29C:: @ 0x086BA29C .2byte 4 - packed_sprite_oam x=-0x48, y=-0x2E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x69, priority=0x2, paletteNum=0x7 + packed_sprite_oam x=-0x48, y=-0x2E, spriteSize=SPRITE_SIZE_16x16, tileNum=0x69, priority=0x2, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x2E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6d, priority=0x2, paletteNum=0x7 + packed_sprite_oam x=-0x38, y=-0x2E, spriteSize=SPRITE_SIZE_8x16, tileNum=0x6d, priority=0x2, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x48, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x6f, priority=0x2, paletteNum=0x7 + packed_sprite_oam x=-0x48, y=-0x1E, spriteSize=SPRITE_SIZE_16x8, tileNum=0x6f, priority=0x2, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=-0x38, y=-0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x71, priority=0x2, paletteNum=0x7 + packed_sprite_oam x=-0x38, y=-0x1E, spriteSize=SPRITE_SIZE_8x8, tileNum=0x71, priority=0x2, paletteNum=0x7 .2byte 0 gUnknown_086BA2BE:: @ 0x086BA2BE .2byte 1 - packed_sprite_oam x=0x30, y=-0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x72, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x30, y=-0x48, spriteSize=SPRITE_SIZE_32x32, tileNum=0x72, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA2C8:: @ 0x086BA2C8 .2byte 5 - packed_sprite_oam x=-0x48, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x82, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x48, y=-0x80, spriteSize=SPRITE_SIZE_64x32, tileNum=0x82, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x8, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xa2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x8, y=-0x80, spriteSize=SPRITE_SIZE_64x32, tileNum=0xa2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x38, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xc2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x38, y=-0x80, spriteSize=SPRITE_SIZE_16x32, tileNum=0xc2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x20, y=-0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xca, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x20, y=-0x60, spriteSize=SPRITE_SIZE_32x8, tileNum=0xca, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x0, y=-0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xce, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x0, y=-0x60, spriteSize=SPRITE_SIZE_32x8, tileNum=0xce, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA2F2:: @ 0x086BA2F2 .2byte 2 - packed_sprite_oam x=-0x58, y=-0x70, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x58, y=-0x70, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x58, y=-0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x58, y=-0x60, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA304:: @ 0x086BA304 .2byte 2 - packed_sprite_oam x=-0x68, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x68, y=-0x68, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x68, y=-0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x68, y=-0x58, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA316:: @ 0x086BA316 .2byte 2 - packed_sprite_oam x=0x38, y=-0x70, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x38, y=-0x70, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x38, y=-0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x38, y=-0x60, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA328:: @ 0x086BA328 .2byte 2 - packed_sprite_oam x=0x48, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x48, y=-0x68, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x48, y=-0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x48, y=-0x58, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA33A:: @ 0x086BA33A .2byte 2 - packed_sprite_oam x=-0x68, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x68, y=-0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x68, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x68, y=-0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA34C:: @ 0x086BA34C .2byte 2 - packed_sprite_oam x=-0x48, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x48, y=-0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x48, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x48, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA35E:: @ 0x086BA35E .2byte 2 - packed_sprite_oam x=-0x58, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x58, y=-0x18, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x58, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=-0x58, y=-0x8, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA370:: @ 0x086BA370 .2byte 2 - packed_sprite_oam x=0x40, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x40, y=-0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x40, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x40, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA382:: @ 0x086BA382 .2byte 2 - packed_sprite_oam x=0x38, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x38, y=-0x18, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x38, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x38, y=-0x8, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA394:: @ 0x086BA394 .2byte 2 - packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd2, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x30, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0xd2, priority=0x2, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=0x30, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xda, priority=0x2, paletteNum=0x6 + packed_sprite_oam x=0x30, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 gUnknown_086BA3A6:: @ 0x086BA3A6 .2byte 3 - packed_sprite_oam x=-0x30, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf6, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=-0x30, y=-0x68, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf6, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x30, y=-0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xfa, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=-0x30, y=-0x58, spriteSize=SPRITE_SIZE_16x8, tileNum=0xfa, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x20, y=-0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xfc, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=-0x20, y=-0x60, spriteSize=SPRITE_SIZE_8x16, tileNum=0xfc, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086BA3C0:: @ 0x086BA3C0 .2byte 2 - packed_sprite_oam x=-0x60, y=-0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x10e, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=-0x60, y=-0x48, spriteSize=SPRITE_SIZE_32x16, tileNum=0x10e, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x60, y=-0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x116, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=-0x60, y=-0x38, spriteSize=SPRITE_SIZE_32x8, tileNum=0x116, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086BA3D2:: @ 0x086BA3D2 .2byte 2 - packed_sprite_oam x=0x10, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x11a, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x10, y=0x8, spriteSize=SPRITE_SIZE_32x16, tileNum=0x11a, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x10, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x122, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x10, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x122, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086BA3E4:: @ 0x086BA3E4 .2byte 2 - packed_sprite_oam x=0x48, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x132, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x48, y=-0x50, spriteSize=SPRITE_SIZE_16x32, tileNum=0x132, priority=0x2, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x58, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x13a, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x58, y=-0x50, spriteSize=SPRITE_SIZE_8x32, tileNum=0x13a, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086BA3F6:: @ 0x086BA3F6 .2byte 2 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0x49, priority=0x3, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x8, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, vFlip=0x1, tileNum=0x49, priority=0x3, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x59, priority=0x3, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0x59, priority=0x3, paletteNum=0x4 .2byte 0 gUnknown_086BA408:: @ 0x086BA408 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0x20, priority=0x3, paletteNum=0x1 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, vFlip=0x1, tileNum=0x20, priority=0x3, paletteNum=0x1 .2byte 0 gUnknown_086BA412:: @ 0x086BA412 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x16e, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x16e, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x16f, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x16f, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x170, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x170, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x170, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x170, priority=0x3, paletteNum=0x0 .2byte 0 gUnknown_086BA434:: @ 0x086BA434 .2byte 3 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x16e, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x16e, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x16f, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x16f, priority=0x3, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x170, priority=0x3, paletteNum=0x0 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x170, priority=0x3, paletteNum=0x0 .2byte 0 gUnknown_086BA44E:: @ 0x086BA44E .2byte 10 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x7d, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x7d, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x85, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x85, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x95, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x95, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x0, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x9d, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x0, y=0x30, spriteSize=SPRITE_SIZE_32x16, tileNum=0x9d, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x20, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xa5, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x20, y=0x30, spriteSize=SPRITE_SIZE_16x16, tileNum=0xa5, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x30, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x7d, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x30, y=0x0, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x7d, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x40, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x85, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x40, y=0x10, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x85, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x30, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x95, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x30, y=0x10, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x95, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x40, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x9d, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x40, y=0x30, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x9d, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x30, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0xa5, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x30, y=0x30, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0xa5, priority=0x1, paletteNum=0xf .2byte 0 gUnknown_086BA4A0:: @ 0x086BA4A0 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xa9, priority=0x3, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xa9, priority=0x3, paletteNum=0x6 .2byte 0 gUnknown_086BA4AA:: @ 0x086BA4AA .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xb9, priority=0x3, paletteNum=0x6 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb9, priority=0x3, paletteNum=0x6 .2byte 0 gUnknown_086BA4B4:: @ 0x086BA4B4 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc9, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc9, priority=0x2, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc9, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc9, priority=0x2, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc9, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc9, priority=0x2, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc9, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc9, priority=0x2, paletteNum=0xc .2byte 0 gUnknown_086BA4D6:: @ 0x086BA4D6 .2byte 3 - packed_sprite_oam x=0x5E, y=-0x47, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x109, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x5E, y=-0x47, spriteSize=SPRITE_SIZE_8x16, tileNum=0x109, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x66, y=-0x47, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x10b, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x66, y=-0x47, spriteSize=SPRITE_SIZE_16x16, tileNum=0x10b, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x66, y=-0x37, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x10f, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x66, y=-0x37, spriteSize=SPRITE_SIZE_16x8, tileNum=0x10f, priority=0x1, paletteNum=0x5 .2byte 0 gUnknown_086BA4F0:: @ 0x086BA4F0 .2byte 3 - packed_sprite_oam x=-0x80, y=-0x37, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x111, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=-0x80, y=-0x37, spriteSize=SPRITE_SIZE_8x16, tileNum=0x111, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x37, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x113, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=-0x78, y=-0x37, spriteSize=SPRITE_SIZE_16x16, tileNum=0x113, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x117, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=-0x78, y=-0x27, spriteSize=SPRITE_SIZE_16x8, tileNum=0x117, priority=0x1, paletteNum=0x5 .2byte 0 gUnknown_086BA50A:: @ 0x086BA50A .2byte 3 - packed_sprite_oam x=0x66, y=0x31, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x119, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x66, y=0x31, spriteSize=SPRITE_SIZE_8x16, tileNum=0x119, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x6E, y=0x31, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x11b, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x6E, y=0x31, spriteSize=SPRITE_SIZE_16x16, tileNum=0x11b, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=0x6E, y=0x41, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x6E, y=0x41, spriteSize=SPRITE_SIZE_16x8, tileNum=0x11f, priority=0x1, paletteNum=0x5 .2byte 0 gUnknown_086BA524:: @ 0x086BA524 .2byte 3 - packed_sprite_oam x=-0x72, y=0x51, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x119, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=-0x72, y=0x51, spriteSize=SPRITE_SIZE_8x16, tileNum=0x119, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x6A, y=0x51, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x11b, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=-0x6A, y=0x51, spriteSize=SPRITE_SIZE_16x16, tileNum=0x11b, priority=0x1, paletteNum=0x5 .2byte 0 - packed_sprite_oam x=-0x6A, y=0x61, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x11f, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=-0x6A, y=0x61, spriteSize=SPRITE_SIZE_16x8, tileNum=0x11f, priority=0x1, paletteNum=0x5 .2byte 0 gUnknown_086BA53E:: @ 0x086BA53E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x121, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x121, priority=0x1, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x125, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x125, priority=0x1, paletteNum=0xf .2byte 0 gUnknown_086BA550:: @ 0x086BA550 .2byte 4 - packed_sprite_oam x=-0x10, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x127, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x10, y=-0x9, spriteSize=SPRITE_SIZE_32x32, tileNum=0x127, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x10, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x137, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x10, y=-0x9, spriteSize=SPRITE_SIZE_16x32, tileNum=0x137, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x10, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x13f, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x10, y=0x17, spriteSize=SPRITE_SIZE_32x8, tileNum=0x13f, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x10, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x143, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x10, y=0x17, spriteSize=SPRITE_SIZE_16x8, tileNum=0x143, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA572:: @ 0x086BA572 .2byte 8 - packed_sprite_oam x=-0x80, y=-0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x145, priority=0x1, paletteNum=0xa + packed_sprite_oam x=-0x80, y=-0x34, spriteSize=SPRITE_SIZE_32x16, tileNum=0x145, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=-0x80, y=-0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x14d, priority=0x1, paletteNum=0xa + packed_sprite_oam x=-0x80, y=-0x24, spriteSize=SPRITE_SIZE_32x8, tileNum=0x14d, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=0x5C, y=-0x44, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x151, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x5C, y=-0x44, spriteSize=SPRITE_SIZE_32x16, tileNum=0x151, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=0x5C, y=-0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x159, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x5C, y=-0x34, spriteSize=SPRITE_SIZE_32x8, tileNum=0x159, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=-0x72, y=0x54, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x15d, priority=0x1, paletteNum=0xa + packed_sprite_oam x=-0x72, y=0x54, spriteSize=SPRITE_SIZE_32x16, tileNum=0x15d, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=-0x72, y=0x64, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x165, priority=0x1, paletteNum=0xa + packed_sprite_oam x=-0x72, y=0x64, spriteSize=SPRITE_SIZE_32x8, tileNum=0x165, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=0x64, y=0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x169, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x64, y=0x34, spriteSize=SPRITE_SIZE_32x16, tileNum=0x169, priority=0x1, paletteNum=0xa .2byte 0 - packed_sprite_oam x=0x64, y=0x44, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x171, priority=0x1, paletteNum=0xa + packed_sprite_oam x=0x64, y=0x44, spriteSize=SPRITE_SIZE_32x8, tileNum=0x171, priority=0x1, paletteNum=0xa .2byte 0 gUnknown_086BA5B4:: @ 0x086BA5B4 .2byte 3 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x7d, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x7d, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x81, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x32, tileNum=0x81, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x85, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x85, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA5CE:: @ 0x086BA5CE .2byte 3 - packed_sprite_oam x=0x8, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x95, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x95, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x99, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x32, tileNum=0x99, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x9d, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x9d, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA5E8:: @ 0x086BA5E8 .2byte 3 - packed_sprite_oam x=0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xad, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x8, tileNum=0xad, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xb1, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x32, tileNum=0xb1, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xb5, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb5, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA602:: @ 0x086BA602 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc5, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc5, priority=0x2, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc5, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc5, priority=0x2, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc5, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc5, priority=0x2, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x3, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xc5, priority=0x2, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc5, priority=0x2, paletteNum=0xc .2byte 0 gUnknown_086BA624:: @ 0x086BA624 .2byte 3 - packed_sprite_oam x=0x5E, y=-0x47, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x105, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x5E, y=-0x47, spriteSize=SPRITE_SIZE_8x16, tileNum=0x105, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x66, y=-0x37, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x107, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x66, y=-0x37, spriteSize=SPRITE_SIZE_16x8, tileNum=0x107, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x66, y=-0x47, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x109, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x66, y=-0x47, spriteSize=SPRITE_SIZE_16x16, tileNum=0x109, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086BA63E:: @ 0x086BA63E .2byte 3 - packed_sprite_oam x=0x66, y=0x31, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc5, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x66, y=0x31, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc5, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x6E, y=0x41, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc7, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x6E, y=0x41, spriteSize=SPRITE_SIZE_16x8, tileNum=0xc7, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x6E, y=0x31, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc9, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x6E, y=0x31, spriteSize=SPRITE_SIZE_16x16, tileNum=0xc9, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086BA658:: @ 0x086BA658 .2byte 3 - packed_sprite_oam x=0x7E, y=-0x37, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc5, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x7E, y=-0x37, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc5, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc7, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x78, y=-0x27, spriteSize=SPRITE_SIZE_16x8, tileNum=0xc7, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x78, y=-0x37, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc9, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x78, y=-0x37, spriteSize=SPRITE_SIZE_16x16, tileNum=0xc9, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086BA672:: @ 0x086BA672 .2byte 3 - packed_sprite_oam x=-0x72, y=0x51, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc5, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x72, y=0x51, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc5, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x6A, y=0x61, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xc7, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x6A, y=0x61, spriteSize=SPRITE_SIZE_16x8, tileNum=0xc7, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=-0x6A, y=0x51, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc9, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=-0x6A, y=0x51, spriteSize=SPRITE_SIZE_16x16, tileNum=0xc9, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086BA68C:: @ 0x086BA68C .2byte 10 - packed_sprite_oam x=0x5, y=0x5, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x199, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=-0x11, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x199, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=-0xD, y=0x3D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x199, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=0x2A, y=0x3C, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x199, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=0x29, y=0x2A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x196, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=0x24, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x196, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=-0xE, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x199, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=0xE, y=0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x196, priority=0x1, paletteNum=0x4 - packed_sprite_oam x=0x0, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x17d, priority=0x1, paletteNum=0x5 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x11d, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x5, y=0x5, spriteSize=SPRITE_SIZE_8x8, tileNum=0x199, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=-0x11, y=0x30, spriteSize=SPRITE_SIZE_8x8, tileNum=0x199, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=-0xD, y=0x3D, spriteSize=SPRITE_SIZE_8x8, tileNum=0x199, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x2A, y=0x3C, spriteSize=SPRITE_SIZE_8x8, tileNum=0x199, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x29, y=0x2A, spriteSize=SPRITE_SIZE_8x8, tileNum=0x196, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x24, y=0x18, spriteSize=SPRITE_SIZE_8x8, tileNum=0x196, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=-0xE, y=0x18, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x199, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0xE, y=0x1A, spriteSize=SPRITE_SIZE_8x8, tileNum=0x196, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x17d, priority=0x1, paletteNum=0x5 + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x11d, priority=0x1, paletteNum=0x5 gUnknown_086BA6CA:: @ 0x086BA6CA .incbin "baserom.gba", 0x6BA6Ca, 0x92 gUnknown_086BA75C:: @ 0x086BA75C .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x7d, priority=0x3, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x7d, priority=0x3, paletteNum=0xc .2byte 0 gUnknown_086BA766:: @ 0x086BA766 .2byte 14 - packed_sprite_oam x=0x4, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xb1, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x4, y=-0x50, spriteSize=SPRITE_SIZE_16x8, tileNum=0xb1, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x8, y=-0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xb3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x8, y=-0x48, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb3, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x8, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xc3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x8, y=-0x28, spriteSize=SPRITE_SIZE_32x8, tileNum=0xc3, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xc7, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=-0x20, spriteSize=SPRITE_SIZE_16x32, tileNum=0xc7, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xC, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xd1, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0xC, y=-0x8, spriteSize=SPRITE_SIZE_8x16, tileNum=0xd1, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xcf, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=0x0, spriteSize=SPRITE_SIZE_16x8, tileNum=0xcf, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x4, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xd3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x4, y=0x8, spriteSize=SPRITE_SIZE_16x32, tileNum=0xd3, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xdb, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0xdb, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x4, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xdd, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x4, y=0x28, spriteSize=SPRITE_SIZE_16x8, tileNum=0xdd, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xdf, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=0x30, spriteSize=SPRITE_SIZE_16x32, tileNum=0xdf, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xC, y=0x43, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe7, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0xC, y=0x43, spriteSize=SPRITE_SIZE_8x16, tileNum=0xe7, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x2, y=0x58, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xe9, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x2, y=0x58, spriteSize=SPRITE_SIZE_16x32, tileNum=0xe9, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xf1, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=0x50, spriteSize=SPRITE_SIZE_16x8, tileNum=0xf1, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xC, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xf3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0xC, y=0x30, spriteSize=SPRITE_SIZE_8x8, tileNum=0xf3, priority=0x3, paletteNum=0xf .2byte 0 gUnknown_086BA7D8:: @ 0x086BA7D8 .2byte 14 - packed_sprite_oam x=0x4, y=0x70, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xb1, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x4, y=0x70, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0xb1, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x8, y=0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0xb3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x8, y=0x50, spriteSize=SPRITE_SIZE_32x32, vFlip=0x1, tileNum=0xb3, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x8, y=0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x1, tileNum=0xc3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x8, y=0x48, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0xc3, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0xc7, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=0x28, spriteSize=SPRITE_SIZE_16x32, vFlip=0x1, tileNum=0xc7, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xC, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xd1, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0xC, y=0x20, spriteSize=SPRITE_SIZE_8x16, vFlip=0x1, tileNum=0xd1, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xcf, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=0x20, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0xcf, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x4, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0xd3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x4, y=0x0, spriteSize=SPRITE_SIZE_16x32, vFlip=0x1, tileNum=0xd3, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xdb, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=-0x8, spriteSize=SPRITE_SIZE_8x16, vFlip=0x1, tileNum=0xdb, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x4, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xdd, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x4, y=-0x8, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0xdd, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0xdf, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=-0x28, spriteSize=SPRITE_SIZE_16x32, vFlip=0x1, tileNum=0xdf, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xC, y=-0x2B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xe7, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0xC, y=-0x2B, spriteSize=SPRITE_SIZE_8x16, vFlip=0x1, tileNum=0xe7, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x2, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x2, tileNum=0xe9, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0x2, y=-0x50, spriteSize=SPRITE_SIZE_16x32, vFlip=0x1, tileNum=0xe9, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x4, y=-0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xf1, priority=0x3, paletteNum=0xf + packed_sprite_oam x=-0x4, y=-0x30, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0xf1, priority=0x3, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xC, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x1, size=0x0, tileNum=0xf3, priority=0x3, paletteNum=0xf + packed_sprite_oam x=0xC, y=-0x10, spriteSize=SPRITE_SIZE_8x8, vFlip=0x1, tileNum=0xf3, priority=0x3, paletteNum=0xf .2byte 0 gUnknown_086BA84A:: @ 0x086BA84A .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x1, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x91, priority=0x2, paletteNum=0xf + packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x32, tileNum=0x91, priority=0x2, paletteNum=0xf .2byte 0 gUnknown_086BA854:: @ 0x086BA854 .2byte 1 - packed_sprite_oam x=0x0, y=-0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0xb1, priority=0x1, paletteNum=0xf + packed_sprite_oam x=0x0, y=-0x2, spriteSize=SPRITE_SIZE_64x64, tileNum=0xb1, priority=0x1, paletteNum=0xf .2byte 0 gUnknown_086BA85E:: @ 0x086BA85E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0xf5, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xf5, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x105, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x105, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA870:: @ 0x086BA870 .2byte 2 - packed_sprite_oam x=0x11, y=-0x21, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x109, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x11, y=-0x21, spriteSize=SPRITE_SIZE_32x16, tileNum=0x109, priority=0x1, paletteNum=0xe .2byte 0 - packed_sprite_oam x=0x11, y=-0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x111, priority=0x1, paletteNum=0xe + packed_sprite_oam x=0x11, y=-0x11, spriteSize=SPRITE_SIZE_32x8, tileNum=0x111, priority=0x1, paletteNum=0xe .2byte 0 gUnknown_086BA882:: @ 0x086BA882 .2byte 5 - packed_sprite_oam x=0x0, y=-0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x139, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=-0x30, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x139, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x149, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x149, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x151, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x151, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x159, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_32x8, tileNum=0x159, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x15d, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x15d, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA8AC:: @ 0x086BA8AC .2byte 2 - packed_sprite_oam x=-0x2, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x254, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x2, y=0x8, spriteSize=SPRITE_SIZE_16x8, tileNum=0x254, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0xE, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x256, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0xE, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x256, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA8BE:: @ 0x086BA8BE .2byte 3 - packed_sprite_oam x=0x0, y=0x2E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x19a, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x2E, spriteSize=SPRITE_SIZE_32x8, tileNum=0x19a, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x20, y=0x29, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x19e, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x20, y=0x29, spriteSize=SPRITE_SIZE_32x8, tileNum=0x19e, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x20, y=0x31, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1a2, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x20, y=0x31, spriteSize=SPRITE_SIZE_16x8, tileNum=0x1a2, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA8D8:: @ 0x086BA8D8 .2byte 6 - packed_sprite_oam x=-0x3, y=-0x3D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1da, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x3, y=-0x3D, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1da, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x2, y=-0x1D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1de, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x2, y=-0x1D, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1de, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5, y=-0xD, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1e0, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x5, y=-0xD, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1e0, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5, y=0x13, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1e4, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x5, y=0x13, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1e4, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5, y=0x33, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x1ea, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x5, y=0x33, spriteSize=SPRITE_SIZE_8x16, tileNum=0x1ea, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0xD, y=0x33, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x1ec, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0xD, y=0x33, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1ec, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA90A:: @ 0x086BA90A .2byte 7 - packed_sprite_oam x=-0x8, y=-0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1f6, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x8, y=-0x38, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1f6, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x8, y=-0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x1fe, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x8, y=-0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1fe, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x206, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x8, y=-0x8, spriteSize=SPRITE_SIZE_8x16, tileNum=0x206, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x8, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x208, priority=0x1, paletteNum=0xc + packed_sprite_oam x=-0x8, y=0x8, spriteSize=SPRITE_SIZE_16x32, tileNum=0x208, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x210, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x8, y=0x18, spriteSize=SPRITE_SIZE_8x16, tileNum=0x210, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x212, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x28, spriteSize=SPRITE_SIZE_16x32, tileNum=0x212, priority=0x1, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x48, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x21a, priority=0x1, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x48, spriteSize=SPRITE_SIZE_32x32, tileNum=0x21a, priority=0x1, paletteNum=0xc .2byte 0 gUnknown_086BA944:: @ 0x086BA944 .2byte 1 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x49, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x49, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086BA94E:: @ 0x086BA94E .2byte 2 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x59, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x59, priority=0x1, paletteNum=0x3 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x61, priority=0x1, paletteNum=0x3 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x61, priority=0x1, paletteNum=0x3 .2byte 0 gUnknown_086BA960:: @ 0x086BA960 .2byte 1 - packed_sprite_oam x=-0x5F, y=0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x3, tileNum=0xa5, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=-0x5F, y=0x9, spriteSize=SPRITE_SIZE_64x64, hFlip=0x1, tileNum=0xa5, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086BA96A:: @ 0x086BA96A .2byte 1 - packed_sprite_oam x=0x1F, y=0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x65, priority=0x2, paletteNum=0x5 + packed_sprite_oam x=0x1F, y=0x9, spriteSize=SPRITE_SIZE_64x64, tileNum=0x65, priority=0x2, paletteNum=0x5 .2byte 0 gUnknown_086BA974:: @ 0x086BA974 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xe5, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xe5, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xe9, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0xe9, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xeb, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0xeb, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xed, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xed, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA996:: @ 0x086BA996 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xee, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xee, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xf2, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0xf2, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xf4, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0xf4, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xf6, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xf6, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA9B8:: @ 0x086BA9B8 .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0xf7, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf7, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xfb, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0xfb, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xfd, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0xfd, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0xff, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xff, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA9DA:: @ 0x086BA9DA .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x100, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x100, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x104, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x104, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x0, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x106, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x106, priority=0x1, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=0x10, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x108, priority=0x1, paletteNum=0x4 + packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x108, priority=0x1, paletteNum=0x4 .2byte 0 gUnknown_086BA9FC:: @ 0x086BA9FC .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x109, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x109, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x119, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x119, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x121, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x121, priority=0x1, paletteNum=0x7 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x129, priority=0x1, paletteNum=0x7 + packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x129, priority=0x1, paletteNum=0x7 .2byte 0 gUnknown_086BAA1E:: @ 0x086BAA1E .2byte 4 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x12d, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x12d, priority=0x1, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x13d, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x13d, priority=0x1, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x145, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x145, priority=0x1, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x14d, priority=0x1, paletteNum=0x8 + packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x14d, priority=0x1, paletteNum=0x8 .2byte 0 gBonusBoardScoreBannerGraphicSpriteSet:: @ 0x086BAA40 .2byte 3 - packed_sprite_oam x=-0x50, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x50, y=-0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x300, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x30, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x340, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x30, y=-0x10, spriteSize=SPRITE_SIZE_32x64, tileNum=0x340, priority=0x0, paletteNum=0x8 .2byte 0 gBonusBoardEndScoreSpriteSet:: @ 0x086BAA5A .2byte 18 - packed_sprite_oam x=-0x25, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x38c, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x25, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x38c, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x1C, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x38e, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x1C, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x38e, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x13, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x390, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x13, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x390, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0xA, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x392, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0xA, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x392, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x1, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x394, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x1, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x394, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x8, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x396, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x8, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x396, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x11, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x398, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x11, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x398, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x1A, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x39a, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x1A, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x39a, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x2A, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x39c, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x2A, y=0x28, spriteSize=SPRITE_SIZE_8x16, tileNum=0x39c, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x3A, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x360, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x3A, y=0x24, spriteSize=SPRITE_SIZE_32x16, tileNum=0x360, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x1A, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x368, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x1A, y=0x24, spriteSize=SPRITE_SIZE_32x16, tileNum=0x368, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x6, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x370, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x6, y=0x24, spriteSize=SPRITE_SIZE_32x16, tileNum=0x370, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x26, y=0x24, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x378, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x26, y=0x24, spriteSize=SPRITE_SIZE_16x16, tileNum=0x378, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x3A, y=0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x37c, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x3A, y=0x34, spriteSize=SPRITE_SIZE_32x8, tileNum=0x37c, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=-0x1A, y=0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x380, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=-0x1A, y=0x34, spriteSize=SPRITE_SIZE_32x8, tileNum=0x380, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x6, y=0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x384, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x6, y=0x34, spriteSize=SPRITE_SIZE_32x8, tileNum=0x384, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x26, y=0x34, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x388, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x26, y=0x34, spriteSize=SPRITE_SIZE_16x8, tileNum=0x388, priority=0x0, paletteNum=0x8 .2byte 0 - packed_sprite_oam x=0x36, y=0x29, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x38a, priority=0x0, paletteNum=0x8 + packed_sprite_oam x=0x36, y=0x29, spriteSize=SPRITE_SIZE_8x16, tileNum=0x38a, priority=0x0, paletteNum=0x8 .2byte 0 gUnknown_086BAAEC:: @ 0x086BAAEC .2byte 6 - packed_sprite_oam x=-0xA, y=0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c6, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0xA, y=0x1B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2c6, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0xA, y=0x22, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ca, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0xA, y=0x22, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ca, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x2, y=0x2A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x2, y=0x2A, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2cc, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x12, y=0x1B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x2c6, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x12, y=0x1B, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x2c6, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x2A, y=0x22, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x2ca, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x2A, y=0x22, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x2ca, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x1A, y=0x2A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x1A, y=0x2A, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAB1E:: @ 0x086BAB1E .2byte 4 - packed_sprite_oam x=-0x10, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x10, y=-0x7, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x32c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x0, y=-0x7, spriteSize=SPRITE_SIZE_8x32, tileNum=0x32c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x10, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x324, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x10, y=-0x7, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x324, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x8, y=-0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x32c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x8, y=-0x7, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x32c, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAB40:: @ 0x086BAB40 .2byte 2 - packed_sprite_oam x=-0x7, y=-0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x364, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x7, y=-0x2, spriteSize=SPRITE_SIZE_32x16, tileNum=0x364, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x7, y=0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x36c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x7, y=0xE, spriteSize=SPRITE_SIZE_32x8, tileNum=0x36c, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAB52:: @ 0x086BAB52 .2byte 4 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x2c0, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x300, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x300, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x40, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x40, y=0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x340, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x50, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x348, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x50, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x348, priority=0x1, paletteNum=0x2 .2byte 0 gUnknown_086BAB74:: @ 0x086BAB74 .2byte 6 - packed_sprite_oam x=-0x20, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x34a, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=-0x20, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x34a, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x35a, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x35a, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x0, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x37a, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x37a, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x382, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x382, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x40, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x38a, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x40, y=0x28, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38a, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x40, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x38e, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x40, y=0x8, spriteSize=SPRITE_SIZE_64x32, tileNum=0x38e, priority=0x1, paletteNum=0x2 .2byte 0 gUnknown_086BABA6:: @ 0x086BABA6 .2byte 5 - packed_sprite_oam x=-0x40, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x3, tileNum=0x3ae, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x3ae, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x3ce, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x3ce, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x3de, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x3de, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x30, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3e2, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x30, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x3e2, priority=0x1, paletteNum=0x2 .2byte 0 - packed_sprite_oam x=0x20, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x3e4, priority=0x1, paletteNum=0x2 + packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3e4, priority=0x1, paletteNum=0x2 .2byte 0 gUnknown_086BABD0:: @ 0x086BABD0 .2byte 18 - packed_sprite_oam x=-0x79, y=0xA, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x79, y=0xA, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x69, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c4, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x69, y=0x2, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c4, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x59, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c8, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x59, y=0x2, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c8, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x51, y=-0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2ca, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x51, y=-0x6, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2ca, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x32, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2da, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x32, y=0x8, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2da, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x22, y=-0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2de, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x22, y=-0x6, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2de, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x16, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2e6, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x16, y=0x2, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2e6, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xA, y=-0x5, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2ee, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0xA, y=-0x5, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2ee, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x1A, y=-0x5, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f6, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x1A, y=-0x5, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2f6, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x21, y=0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2fa, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x21, y=0x7, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2fa, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x39, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x302, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x39, y=0x17, spriteSize=SPRITE_SIZE_32x8, tileNum=0x302, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x41, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x306, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x41, y=-0x9, spriteSize=SPRITE_SIZE_16x32, tileNum=0x306, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x39, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x30e, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x39, y=-0x9, spriteSize=SPRITE_SIZE_8x16, tileNum=0x30e, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x50, y=-0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x50, y=-0x11, spriteSize=SPRITE_SIZE_16x8, tileNum=0x320, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x51, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x310, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x51, y=-0x9, spriteSize=SPRITE_SIZE_32x32, tileNum=0x310, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x71, y=0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x322, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x71, y=0x6, spriteSize=SPRITE_SIZE_8x16, tileNum=0x322, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x71, y=0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x324, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x71, y=0x1A, spriteSize=SPRITE_SIZE_8x8, tileNum=0x324, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x16, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x325, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x16, y=0x12, spriteSize=SPRITE_SIZE_8x8, tileNum=0x325, priority=0x0, paletteNum=0xf .2byte 0 gUnknown_086BAC62:: @ 0x086BAC62 .2byte 18 - packed_sprite_oam x=0x69, y=0xA, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x69, y=0xA, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x59, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x2c4, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x59, y=0x2, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x2c4, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x51, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x2c8, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x51, y=0x2, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x2c8, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x31, y=-0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x2ca, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x31, y=-0x6, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x2ca, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x22, y=0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x2da, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x22, y=0x8, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x2da, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x12, y=-0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x2de, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x12, y=-0x6, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x2de, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0xA, y=0x2, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x2e6, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0xA, y=0x2, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x2e6, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x1A, y=-0x5, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x2ee, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x1A, y=-0x5, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x2ee, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x22, y=-0x5, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x2f6, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x22, y=-0x5, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x2f6, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x41, y=0x7, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x2fa, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x41, y=0x7, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x2fa, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x59, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x302, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x59, y=0x17, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x302, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x51, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x306, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x51, y=-0x9, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x306, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x41, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x30e, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x41, y=-0x9, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x30e, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x60, y=-0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x320, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x60, y=-0x11, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x320, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x71, y=-0x9, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x310, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x71, y=-0x9, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x310, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=-0x79, y=0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x322, priority=0x0, paletteNum=0xf + packed_sprite_oam x=-0x79, y=0x6, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x322, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0x69, y=0x1A, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x324, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0x69, y=0x1A, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x324, priority=0x0, paletteNum=0xf .2byte 0 - packed_sprite_oam x=0xE, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x325, priority=0x0, paletteNum=0xf + packed_sprite_oam x=0xE, y=0x12, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x325, priority=0x0, paletteNum=0xf .2byte 0 gUnknown_086BACF4:: @ 0x086BACF4 .2byte 15 - packed_sprite_oam x=-0x78, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x78, y=-0x68, spriteSize=SPRITE_SIZE_32x8, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x58, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x32a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x58, y=-0x68, spriteSize=SPRITE_SIZE_32x16, tileNum=0x32a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x38, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x38, y=-0x67, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x0, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x28, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x28, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x8, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x348, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x8, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x18, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x350, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x18, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x350, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x38, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x38, y=-0x80, spriteSize=SPRITE_SIZE_32x8, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x58, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x58, y=-0x80, spriteSize=SPRITE_SIZE_16x8, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x40, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x40, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x60, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x60, y=0x18, spriteSize=SPRITE_SIZE_16x8, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x20, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x20, y=0x60, spriteSize=SPRITE_SIZE_32x16, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x40, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x348, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x40, y=0x60, spriteSize=SPRITE_SIZE_32x16, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x60, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x350, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x60, y=0x60, spriteSize=SPRITE_SIZE_32x16, tileNum=0x350, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x18, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x18, y=-0x50, spriteSize=SPRITE_SIZE_32x16, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAD6E:: @ 0x086BAD6E .2byte 14 - packed_sprite_oam x=0x38, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x348, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x38, y=-0x50, spriteSize=SPRITE_SIZE_32x16, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x58, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x350, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x58, y=-0x50, spriteSize=SPRITE_SIZE_32x16, tileNum=0x350, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x70, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x70, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x50, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x32a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x50, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x32a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x30, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x30, y=0x11, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x38, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x38, y=-0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x18, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x18, y=-0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x18, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x18, y=-0x28, spriteSize=SPRITE_SIZE_32x8, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x38, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x32a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x38, y=-0x28, spriteSize=SPRITE_SIZE_32x16, tileNum=0x32a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x58, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x58, y=-0x27, spriteSize=SPRITE_SIZE_32x8, tileNum=0x332, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x68, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x68, y=0x60, spriteSize=SPRITE_SIZE_32x8, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x48, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x48, y=0x60, spriteSize=SPRITE_SIZE_16x8, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x78, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x78, y=0x30, spriteSize=SPRITE_SIZE_32x8, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x60, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x60, y=-0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BADE0:: @ 0x086BADE0 .2byte 15 - packed_sprite_oam x=-0x65, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x65, y=0x11, spriteSize=SPRITE_SIZE_32x8, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x45, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x45, y=0x11, spriteSize=SPRITE_SIZE_32x8, tileNum=0x35c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x25, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x360, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x25, y=0x11, spriteSize=SPRITE_SIZE_16x8, tileNum=0x360, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x24, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x24, y=-0x27, spriteSize=SPRITE_SIZE_32x8, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x44, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x44, y=-0x27, spriteSize=SPRITE_SIZE_32x8, tileNum=0x35c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x64, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x360, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x64, y=-0x27, spriteSize=SPRITE_SIZE_16x8, tileNum=0x360, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x6C, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x6C, y=-0x67, spriteSize=SPRITE_SIZE_32x8, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x4C, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x4C, y=-0x67, spriteSize=SPRITE_SIZE_32x8, tileNum=0x35c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x2C, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x360, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x2C, y=-0x67, spriteSize=SPRITE_SIZE_16x8, tileNum=0x360, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5F, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x362, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5F, y=-0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x362, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x76, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x362, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x76, y=0x30, spriteSize=SPRITE_SIZE_32x8, tileNum=0x362, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x4D, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4D, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5B, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5B, y=0x60, spriteSize=SPRITE_SIZE_32x8, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x2B, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x2B, y=-0x40, spriteSize=SPRITE_SIZE_32x8, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x19, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x36a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x19, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAE5A:: @ 0x086BAE5A .2byte 9 - packed_sprite_oam x=0x7, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x7, y=0x38, spriteSize=SPRITE_SIZE_16x16, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x17, y=0x3B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x17, y=0x3B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x376, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x2F, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x36a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x2F, y=0x60, spriteSize=SPRITE_SIZE_32x16, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x4F, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4F, y=0x60, spriteSize=SPRITE_SIZE_16x16, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5F, y=0x63, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x5F, y=0x63, spriteSize=SPRITE_SIZE_32x8, tileNum=0x376, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x26, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x36a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x26, y=-0x50, spriteSize=SPRITE_SIZE_32x16, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x46, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x46, y=-0x50, spriteSize=SPRITE_SIZE_16x16, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x56, y=-0x4D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x56, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, tileNum=0x376, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x45, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x45, y=-0x80, spriteSize=SPRITE_SIZE_32x8, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAEA4:: @ 0x086BAEA4 .2byte 15 - packed_sprite_oam x=-0x52, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x52, y=0x12, spriteSize=SPRITE_SIZE_32x8, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x32, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x37e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x32, y=0x12, spriteSize=SPRITE_SIZE_16x8, tileNum=0x37e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x22, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x380, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x22, y=0x12, spriteSize=SPRITE_SIZE_16x8, tileNum=0x380, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x31, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x31, y=-0x27, spriteSize=SPRITE_SIZE_32x8, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x51, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x37e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x51, y=-0x27, spriteSize=SPRITE_SIZE_16x8, tileNum=0x37e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x61, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x380, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x61, y=-0x27, spriteSize=SPRITE_SIZE_16x8, tileNum=0x380, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5E, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5E, y=-0x67, spriteSize=SPRITE_SIZE_32x8, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x3E, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x37e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x3E, y=-0x67, spriteSize=SPRITE_SIZE_16x8, tileNum=0x37e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x2E, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x380, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x2E, y=-0x67, spriteSize=SPRITE_SIZE_16x8, tileNum=0x380, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x58, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x382, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x58, y=-0x20, spriteSize=SPRITE_SIZE_16x8, tileNum=0x382, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x48, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x384, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x48, y=-0x20, spriteSize=SPRITE_SIZE_8x8, tileNum=0x384, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x6D, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x382, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x6D, y=0x30, spriteSize=SPRITE_SIZE_16x8, tileNum=0x382, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5D, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x384, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5D, y=0x30, spriteSize=SPRITE_SIZE_8x8, tileNum=0x384, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x33, y=-0x4D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x33, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x53, y=-0x4D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x53, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAF1E:: @ 0x086BAF1E .2byte 12 - packed_sprite_oam x=-0xD, y=0x3B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0xD, y=0x3B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x13, y=0x3B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x13, y=0x3B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x3C, y=0x63, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x3C, y=0x63, spriteSize=SPRITE_SIZE_32x8, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5C, y=0x63, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x5C, y=0x63, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x24, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x24, y=-0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x14, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x14, y=-0x40, spriteSize=SPRITE_SIZE_8x8, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x54, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x54, y=0x17, spriteSize=SPRITE_SIZE_16x8, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x64, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x64, y=0x17, spriteSize=SPRITE_SIZE_8x8, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x55, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x55, y=0x60, spriteSize=SPRITE_SIZE_16x8, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x45, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x45, y=0x60, spriteSize=SPRITE_SIZE_8x8, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x4B, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4B, y=-0x80, spriteSize=SPRITE_SIZE_16x8, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5B, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x5B, y=-0x80, spriteSize=SPRITE_SIZE_8x8, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAF80:: @ 0x086BAF80 .2byte 15 - packed_sprite_oam x=0x60, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x60, y=-0x68, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x40, y=-0x68, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x32a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x40, y=-0x68, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x32a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x20, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x20, y=-0x67, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x18, y=0x0, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x18, y=0x0, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x10, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x10, y=0x38, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x10, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x348, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x10, y=0x38, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x30, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x350, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x30, y=0x38, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x350, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x50, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x50, y=-0x80, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x60, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x60, y=-0x80, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x58, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x58, y=0x18, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x68, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x68, y=0x18, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x38, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x38, y=0x60, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x58, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x348, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x58, y=0x60, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x78, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x350, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x78, y=0x60, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x350, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x30, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x340, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x30, y=-0x50, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BAFFA:: @ 0x086BAFFA .2byte 14 - packed_sprite_oam x=-0x50, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x348, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x50, y=-0x50, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x70, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x350, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x70, y=-0x50, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x350, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x58, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x58, y=0x10, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x38, y=0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x32a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x38, y=0x10, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x32a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x18, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x18, y=0x11, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x20, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x20, y=-0x40, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x10, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x10, y=-0x40, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x30, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x30, y=-0x28, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x50, y=-0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x32a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x50, y=-0x28, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x32a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x70, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x70, y=-0x27, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x332, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x50, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x50, y=0x60, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x33a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x40, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x33e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x40, y=0x60, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x33e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x60, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x60, y=0x30, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x48, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x48, y=-0x20, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BB06C:: @ 0x086BB06C .2byte 15 - packed_sprite_oam x=0x4E, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4E, y=0x11, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x2E, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x2E, y=0x11, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x1E, y=0x11, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x360, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x1E, y=0x11, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x360, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x3B, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x3B, y=-0x27, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5B, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5B, y=-0x27, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x6B, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x360, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x6B, y=-0x27, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x360, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x55, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x55, y=-0x67, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x35, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x35, y=-0x67, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x35c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x25, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x360, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x25, y=-0x67, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x360, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x48, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x362, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x48, y=-0x20, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x362, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x5F, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x362, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x5F, y=0x30, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x362, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x64, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x64, y=0x18, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x44, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x44, y=0x60, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x14, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x14, y=-0x40, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x2, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x36a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x2, y=0x38, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BB0E6:: @ 0x086BB0E6 .2byte 9 - packed_sprite_oam x=-0xE, y=0x38, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0xE, y=0x38, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x2E, y=0x3B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x2E, y=0x3B, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x46, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x36a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x46, y=0x60, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x56, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x56, y=0x60, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x76, y=0x63, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x76, y=0x63, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x3D, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x2, tileNum=0x36a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x3D, y=-0x50, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x4D, y=-0x50, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x4D, y=-0x50, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x6D, y=-0x4D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x6D, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x376, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5B, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5B, y=-0x80, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BB130:: @ 0x086BB130 .2byte 15 - packed_sprite_oam x=0x41, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x41, y=0x12, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x31, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x37e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x31, y=0x12, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x37e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x21, y=0x12, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x380, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x21, y=0x12, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x380, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x42, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x42, y=-0x27, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x52, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x37e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x52, y=-0x27, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x37e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x62, y=-0x27, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x380, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x62, y=-0x27, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x380, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x4D, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4D, y=-0x67, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x3D, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x37e, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x3D, y=-0x67, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x37e, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x2D, y=-0x67, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x380, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x2D, y=-0x67, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x380, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x57, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x382, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x57, y=-0x20, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x382, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x4F, y=-0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x384, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4F, y=-0x20, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x384, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x6C, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x382, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x6C, y=0x30, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x382, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x64, y=0x30, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x384, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x64, y=0x30, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x384, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x44, y=-0x4D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x44, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x64, y=-0x4D, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x64, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BB1AA:: @ 0x086BB1AA .2byte 12 - packed_sprite_oam x=-0x4, y=0x3B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x4, y=0x3B, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x24, y=0x3B, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x24, y=0x3B, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x4D, y=0x63, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x4D, y=0x63, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x6D, y=0x63, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x6D, y=0x63, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x23, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x23, y=-0x40, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x1B, y=-0x40, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x1B, y=-0x40, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x55, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x55, y=0x17, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x5D, y=0x17, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x5D, y=0x17, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x54, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x54, y=0x60, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=0x4C, y=0x60, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=0x4C, y=0x60, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x4C, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x385, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x4C, y=-0x80, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x385, priority=0x0, paletteNum=0xc .2byte 0 - packed_sprite_oam x=-0x54, y=-0x80, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x1, vFlip=0x0, size=0x0, tileNum=0x387, priority=0x0, paletteNum=0xc + packed_sprite_oam x=-0x54, y=-0x80, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 gUnknown_086BB20C:: @ 0x086BB20C .2byte 22 - packed_sprite_oam x=-0x5E, y=-0x16, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x5E, y=-0x16, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c0, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x5E, y=-0x6, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c4, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x5E, y=-0x6, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2c4, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x4E, y=-0xE, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2c6, priority=0x0, paletteNum=0x4 + packed_sprite_oam x=-0x4E, y=-0xE, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c6, priority=0x0, paletteNum=0x4 .2byte 0 - packed_sprite_oam x=-0x5A, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2c8, priority=0x0, paletteNum=0x6 + packed_sprite_oam x=-0x5A, y=0x4, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c8, priority=0x0, paletteNum=0x6 .2byte 0 - packed_sprite_oam x=-0x68, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x68, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x48, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x48, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x28, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x28, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x8, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x8, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x18, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x18, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x38, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2f1, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x38, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2f1, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x58, y=0x18, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2f5, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x58, y=0x18, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2f5, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x4A, y=0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x1, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x2, tileNum=0x2e5, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x4A, y=0x1E, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2e5, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x2A, y=0x1E, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ed, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x2A, y=0x1E, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ed, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x46, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x46, y=-0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2cc, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x46, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x46, y=0x4, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2cc, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x18, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x18, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x20, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x20, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x10, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x10, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x18, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x18, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x20, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2ef, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x20, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ef, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x46, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x46, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2cc, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086BB2BE:: @ 0x086BB2BE .2byte 12 - packed_sprite_oam x=-0x6, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x6, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xA, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xA, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xF, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xF, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x17, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x17, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x1F, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x1F, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x27, y=-0x8, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x27, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x34, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x34, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x3C, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x3C, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x32, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x32, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x2A, y=-0x10, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x2A, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086BB320:: @ 0x086BB320 .2byte 12 - packed_sprite_oam x=-0x6, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x6, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xA, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xA, y=0xC, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xF, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xF, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x17, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x17, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x1F, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x1F, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x27, y=0xC, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x27, y=0xC, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x34, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x34, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x3C, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x3C, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x32, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x32, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x2A, y=0x4, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x2A, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 gUnknown_086BB382:: @ 0x086BB382 .2byte 12 - packed_sprite_oam x=-0xE, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0xE, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=-0x6, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=-0x6, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xA, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xA, y=0x28, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0xF, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0xF, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x17, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x17, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x1F, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x1F, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x27, y=0x28, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x0, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2e4, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x27, y=0x28, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2e4, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x2C, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x2C, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x34, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x34, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x3C, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d0, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x3C, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 - packed_sprite_oam x=0x56, y=0x20, affineMode=0x0, objMode=0x0, mosaic=0x0, bpp=0x0, shape=0x2, matrixNum=0x0, hFlip=0x0, vFlip=0x0, size=0x0, tileNum=0x2d2, priority=0x0, paletteNum=0x0 + packed_sprite_oam x=0x56, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d2, priority=0x0, paletteNum=0x0 .2byte 0 gDusclopsBoardSpriteSets:: @ 0x086BB3E4 From 0dd7e1e9b7c946e0386f0db0dbca9ebedd826b05 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Wed, 13 May 2026 01:39:28 -0500 Subject: [PATCH 11/33] field sprite group address refs --- asm/macros/sprite_oam.inc | 9 ++ data/rom_2.s | 167 +++++++++++++++++++++++++------------- 2 files changed, 118 insertions(+), 58 deletions(-) diff --git a/asm/macros/sprite_oam.inc b/asm/macros/sprite_oam.inc index 088545a1..c10ebd1d 100644 --- a/asm/macros/sprite_oam.inc +++ b/asm/macros/sprite_oam.inc @@ -11,3 +11,12 @@ .4byte ( ((\y) & 0xFF) | (((\affineMode) & 0x3) << 8) | (((\objMode) & 0x3) << 10) | (((\mosaic) & 0x1) << 12) | (((\bpp) & 0x1) << 13) | (((__shape) & 0x3) << 14) | (((\x) & 0x1FF) << 16) | (((\matrixNum) & 0x7) << 25) | (((\hFlip) & 0x1) << 28) | (((\vFlip) & 0x1) << 29) | (((__size) & 0x3) << 30) ) .2byte ( ((\tileNum) & 0x3FF) | (((\priority) & 0x3) << 10) | (((\paletteNum) & 0xF) << 12) ) .endm + + @ for generating sprite addresses in Rom based on indexes. + @ Takes in a comma separated list of indexes. + .macro spriteGroupAddrs indexes:vararg + .irp idx,\indexes + .set __addr, gMain_spriteGroups + ((\idx) * 0xB8) + .4byte (__addr) + .endr + .endm diff --git a/data/rom_2.s b/data/rom_2.s index 40642907..ade6f196 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -418,6 +418,7 @@ gUnknown_086A5B62:: @ 0x086A5B62 .2byte 0 packed_sprite_oam x=0x28, y=0xC, spriteSize=SPRITE_SIZE_8x16, tileNum=0x33a, priority=0x0, paletteNum=0x5 .2byte 0 + gUnknown_086A5BDC:: @ 0x086A5BDC .2byte 14 packed_sprite_oam x=-0x60, y=0xC, spriteSize=SPRITE_SIZE_32x16, tileNum=0x300, priority=0x0, paletteNum=0x4 @@ -4865,10 +4866,60 @@ gUnknown_086B0150:: @ 0x086B0150 .ascii "SUBTOTAL____________POK^MON_EVOLVED_____BONUS_______________SUBTOTAL____________TRAVELED_AREA_______BONUS_______________SUBTOTAL____________SLOT_PLAYED_________BONUS_______________SUBTOTAL____________PIKA_SAVER__________BONUS_______________SUBTOTAL____________SUBTOTAL____________SUBTOTAL____________SUBTOTAL____________SUBTOTAL____________MULTIPLIER__________TOTAL_______________" gMainFieldSpriteGroups:: @ 0x086B02CC - .incbin "baserom.gba", 0x6B02CC, 0x1E0 + @ ruby + spriteGroupAddrs 70, 41, 42, 50, 15, 16, 17, 18, 19, 20 + spriteGroupAddrs 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 + spriteGroupAddrs 31, 32, 33, 34, 35, 36, 37, 38, 39, 54 + spriteGroupAddrs 55, 64, 67, 43, 72, 73, 74, 75, 76, 77 + spriteGroupAddrs 79, 49, 80, 69, 56, 44, 45, 46, 47, 40 + spriteGroupAddrs 83 + .4byte 0,0,0,0,0,0,0,0,0 + + @ sapphire + spriteGroupAddrs 74, 40, 41, 54, 12, 13, 14, 15, 16, 17 + spriteGroupAddrs 18, 19, 20, 21, 22, 23, 24, 25, 28, 29 + spriteGroupAddrs 30, 31, 32, 33, 34, 35, 36, 37, 38, 55 + spriteGroupAddrs 56, 72, 71, 42, 77, 78, 79, 80, 81, 82 + spriteGroupAddrs 83, 53, 84, 73, 57, 43, 44, 45, 46, 39 + spriteGroupAddrs 86 + .4byte 0,0,0,0,0,0,0,0,0 gBonusFieldSpriteGroups:: @ 0x086B04AC - .incbin "baserom.gba", 0x6B04AC, 0x2D0 + @ dusclops + spriteGroupAddrs 11, 10 + .4byte 0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + + @ kecleon + spriteGroupAddrs 22, 8 + .4byte 0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + + @ kyogre + spriteGroupAddrs 18, 17, 0, 25, 7, 8, 19, 20 + .4byte 0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + + @ groudon + spriteGroupAddrs 26, 25, 0, 31, 7, 8, 27, 28 + .4byte 0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + + @ rayquaza + spriteGroupAddrs 38, 37, 0, 44, 7, 8, 39, 40 + .4byte 0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + + @ spheal + spriteGroupAddrs 13, 12 + .4byte 0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 + .4byte 0,0,0,0,0,0,0,0,0,0 BoardProcPairs_086B077C:: @ 0x086B077C .4byte AllBoardProcess_1A_47100, AllBoardProcess_1B_47160 @@ -5448,7 +5499,7 @@ gUnknown_086B165C:: @ 0x086B165C packed_sprite_oam x=-0x8, y=-0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x55, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086B1676:: @ 0x086B1676 +gLegendaryCatchPortraitSpriteSet:: @ 0x086B1676 .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x5d, priority=0x3, paletteNum=0x1 .2byte 0 @@ -5463,7 +5514,7 @@ gUnknown_086B1676:: @ 0x086B1676 packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x61, priority=0x3, paletteNum=0x1 .2byte 0 -gUnknown_086B16A8:: @ 0x086B16A8 +gLegendaryCatchPortraitBordersSpriteSet:: @ 0x086B16A8 .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x65, priority=0x3, paletteNum=0x0 .2byte 0 @@ -6561,10 +6612,10 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B22F2 .4byte gUnknown_086B165C .4byte gUnknown_086B1CDA -.4byte gUnknown_086B1676 +.4byte gLegendaryCatchPortraitSpriteSet .4byte gUnknown_086B170C .4byte gUnknown_086B170C -.4byte gUnknown_086B16A8 +.4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gUnknown_086B16DA .4byte gUnknown_086B21E4 .4byte gUnknown_086B2206 @@ -6645,10 +6696,10 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1AE6 .4byte gUnknown_086B2324 .4byte gUnknown_086B1CDA -.4byte gUnknown_086B1676 +.4byte gLegendaryCatchPortraitSpriteSet .4byte gUnknown_086B170C .4byte gUnknown_086B170C -.4byte gUnknown_086B16A8 +.4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gUnknown_086B16DA .4byte gUnknown_086B21E4 .4byte gUnknown_086B2206 @@ -12193,12 +12244,12 @@ gUnknown_086BA276:: @ 0x086BA276 packed_sprite_oam x=0x0, y=0x20, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x8, tileNum=0x59, priority=0x2, paletteNum=0x2 .2byte 0 -gUnknown_086BA288:: @ 0x086BA288 +gKecleonDustFxSpriteSet:: @ 0x086BA288 .2byte 1 packed_sprite_oam x=0x0, y=0x18, spriteSize=SPRITE_SIZE_32x16, tileNum=0x5d, priority=0x2, paletteNum=0x3 .2byte 0 -gUnknown_086BA292:: @ 0x086BA292 +gKecleonScopeItemSpriteSet:: @ 0x086BA292 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x65, priority=0x2, paletteNum=0xc .2byte 0 @@ -12219,7 +12270,7 @@ gUnknown_086BA2BE:: @ 0x086BA2BE packed_sprite_oam x=0x30, y=-0x48, spriteSize=SPRITE_SIZE_32x32, tileNum=0x72, priority=0x2, paletteNum=0x6 .2byte 0 -gUnknown_086BA2C8:: @ 0x086BA2C8 +gKecleonTreeLeavesSpriteSet:: @ 0x086BA2C8 .2byte 5 packed_sprite_oam x=-0x48, y=-0x80, spriteSize=SPRITE_SIZE_64x32, tileNum=0x82, priority=0x2, paletteNum=0x6 .2byte 0 @@ -12302,7 +12353,7 @@ gUnknown_086BA394:: @ 0x086BA394 packed_sprite_oam x=0x30, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0xda, priority=0x2, paletteNum=0x6 .2byte 0 -gUnknown_086BA3A6:: @ 0x086BA3A6 +gKecleonFlowerByTreeSpriteSet:: @ 0x086BA3A6 .2byte 3 packed_sprite_oam x=-0x30, y=-0x68, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf6, priority=0x2, paletteNum=0x5 .2byte 0 @@ -12311,40 +12362,40 @@ gUnknown_086BA3A6:: @ 0x086BA3A6 packed_sprite_oam x=-0x20, y=-0x60, spriteSize=SPRITE_SIZE_8x16, tileNum=0xfc, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086BA3C0:: @ 0x086BA3C0 +gKecleonFlowerPairLeftSpriteSet:: @ 0x086BA3C0 .2byte 2 packed_sprite_oam x=-0x60, y=-0x48, spriteSize=SPRITE_SIZE_32x16, tileNum=0x10e, priority=0x2, paletteNum=0x5 .2byte 0 packed_sprite_oam x=-0x60, y=-0x38, spriteSize=SPRITE_SIZE_32x8, tileNum=0x116, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086BA3D2:: @ 0x086BA3D2 +gKecleonFlowerPairBottomRightSpriteSet:: @ 0x086BA3D2 .2byte 2 packed_sprite_oam x=0x10, y=0x8, spriteSize=SPRITE_SIZE_32x16, tileNum=0x11a, priority=0x2, paletteNum=0x5 .2byte 0 packed_sprite_oam x=0x10, y=0x18, spriteSize=SPRITE_SIZE_32x8, tileNum=0x122, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086BA3E4:: @ 0x086BA3E4 +gKecleonFlowerTrippleRightSpriteSet:: @ 0x086BA3E4 .2byte 2 packed_sprite_oam x=0x48, y=-0x50, spriteSize=SPRITE_SIZE_16x32, tileNum=0x132, priority=0x2, paletteNum=0x5 .2byte 0 packed_sprite_oam x=0x58, y=-0x50, spriteSize=SPRITE_SIZE_8x32, tileNum=0x13a, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086BA3F6:: @ 0x086BA3F6 +gKecleonReflectionHeadSpriteSet:: @ 0x086BA3F6 .2byte 2 packed_sprite_oam x=0x0, y=0x8, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, vFlip=0x1, tileNum=0x49, priority=0x3, paletteNum=0x4 .2byte 0 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0x59, priority=0x3, paletteNum=0x4 .2byte 0 -gUnknown_086BA408:: @ 0x086BA408 +gKecleonReflectionBallSpriteSet:: @ 0x086BA408 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, vFlip=0x1, tileNum=0x20, priority=0x3, paletteNum=0x1 .2byte 0 -gUnknown_086BA412:: @ 0x086BA412 +gKecleonBallRippleFxSpriteSet:: @ 0x086BA412 .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x16e, priority=0x3, paletteNum=0x0 .2byte 0 @@ -12356,7 +12407,7 @@ gUnknown_086BA412:: @ 0x086BA412 .2byte 0 -gUnknown_086BA434:: @ 0x086BA434 +gKecleonStepRippleFxSpriteSet:: @ 0x086BA434 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x16e, priority=0x3, paletteNum=0x0 .2byte 0 @@ -12365,7 +12416,7 @@ gUnknown_086BA434:: @ 0x086BA434 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x170, priority=0x3, paletteNum=0x0 .2byte 0 -gUnknown_086BA44E:: @ 0x086BA44E +gKyogreEntitySpriteSet:: @ 0x086BA44E .2byte 10 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x7d, priority=0x1, paletteNum=0xf .2byte 0 @@ -12388,17 +12439,17 @@ gUnknown_086BA44E:: @ 0x086BA44E packed_sprite_oam x=0x30, y=0x30, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0xa5, priority=0x1, paletteNum=0xf .2byte 0 -gUnknown_086BA4A0:: @ 0x086BA4A0 +gKyogreWhirlpool0SpriteSet:: @ 0x086BA4A0 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xa9, priority=0x3, paletteNum=0x6 .2byte 0 -gUnknown_086BA4AA:: @ 0x086BA4AA +gKyogreWhirlpool1SpriteSet:: @ 0x086BA4AA .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb9, priority=0x3, paletteNum=0x6 .2byte 0 -gUnknown_086BA4B4:: @ 0x086BA4B4 +gKyogreShockwaveSpriteSet:: @ 0x086BA4B4 .2byte 4 packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc9, priority=0x2, paletteNum=0xc .2byte 0 @@ -12409,7 +12460,7 @@ gUnknown_086BA4B4:: @ 0x086BA4B4 packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc9, priority=0x2, paletteNum=0xc .2byte 0 -gUnknown_086BA4D6:: @ 0x086BA4D6 +gKyogreCrystalTopRightSpriteSet:: @ 0x086BA4D6 .2byte 3 packed_sprite_oam x=0x5E, y=-0x47, spriteSize=SPRITE_SIZE_8x16, tileNum=0x109, priority=0x1, paletteNum=0x5 .2byte 0 @@ -12418,7 +12469,7 @@ gUnknown_086BA4D6:: @ 0x086BA4D6 packed_sprite_oam x=0x66, y=-0x37, spriteSize=SPRITE_SIZE_16x8, tileNum=0x10f, priority=0x1, paletteNum=0x5 .2byte 0 -gUnknown_086BA4F0:: @ 0x086BA4F0 +gKyogreCrystalTopLeftSpriteSet:: @ 0x086BA4F0 .2byte 3 packed_sprite_oam x=-0x80, y=-0x37, spriteSize=SPRITE_SIZE_8x16, tileNum=0x111, priority=0x1, paletteNum=0x5 .2byte 0 @@ -12427,7 +12478,7 @@ gUnknown_086BA4F0:: @ 0x086BA4F0 packed_sprite_oam x=-0x78, y=-0x27, spriteSize=SPRITE_SIZE_16x8, tileNum=0x117, priority=0x1, paletteNum=0x5 .2byte 0 -gUnknown_086BA50A:: @ 0x086BA50A +gKyogreCrystalBottomRightSpriteSet:: @ 0x086BA50A .2byte 3 packed_sprite_oam x=0x66, y=0x31, spriteSize=SPRITE_SIZE_8x16, tileNum=0x119, priority=0x1, paletteNum=0x5 .2byte 0 @@ -12436,7 +12487,7 @@ gUnknown_086BA50A:: @ 0x086BA50A packed_sprite_oam x=0x6E, y=0x41, spriteSize=SPRITE_SIZE_16x8, tileNum=0x11f, priority=0x1, paletteNum=0x5 .2byte 0 -gUnknown_086BA524:: @ 0x086BA524 +gKyogreCrystalBottomLeftSpriteSet:: @ 0x086BA524 .2byte 3 packed_sprite_oam x=-0x72, y=0x51, spriteSize=SPRITE_SIZE_8x16, tileNum=0x119, priority=0x1, paletteNum=0x5 .2byte 0 @@ -12445,14 +12496,14 @@ gUnknown_086BA524:: @ 0x086BA524 packed_sprite_oam x=-0x6A, y=0x61, spriteSize=SPRITE_SIZE_16x8, tileNum=0x11f, priority=0x1, paletteNum=0x5 .2byte 0 -gUnknown_086BA53E:: @ 0x086BA53E +gKyogreSurfacingFxSpriteSet:: @ 0x086BA53E .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x121, priority=0x1, paletteNum=0xf .2byte 0 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x125, priority=0x1, paletteNum=0xf .2byte 0 -gUnknown_086BA550:: @ 0x086BA550 +gKyogreFreezeTrapSpriteSet:: @ 0x086BA550 .2byte 4 packed_sprite_oam x=-0x10, y=-0x9, spriteSize=SPRITE_SIZE_32x32, tileNum=0x127, priority=0x1, paletteNum=0xc .2byte 0 @@ -12463,7 +12514,7 @@ gUnknown_086BA550:: @ 0x086BA550 packed_sprite_oam x=0x10, y=0x17, spriteSize=SPRITE_SIZE_16x8, tileNum=0x143, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA572:: @ 0x086BA572 +gKyogreIntroCrystalGroundSpriteSet:: @ 0x086BA572 .2byte 8 packed_sprite_oam x=-0x80, y=-0x34, spriteSize=SPRITE_SIZE_32x16, tileNum=0x145, priority=0x1, paletteNum=0xa .2byte 0 @@ -13522,9 +13573,9 @@ gKecleonBoardSpriteSets:: @ 0x086BB420 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gUnknown_086BA2C8 + .4byte gKecleonTreeLeavesSpriteSet .4byte gBonusBoardBallRespawnFxSpriteSet - .4byte gUnknown_086BA288 + .4byte gKecleonDustFxSpriteSet .4byte gUnknown_086BA394 .4byte gUnknown_086BA382 .4byte gUnknown_086BA35E @@ -13539,15 +13590,15 @@ gKecleonBoardSpriteSets:: @ 0x086BB420 .4byte gUnknown_086BA2F2 .4byte gBonusBoardBallSpriteSet .4byte gUnknown_086BA276 - .4byte gUnknown_086BA292 - .4byte gUnknown_086BA3A6 - .4byte gUnknown_086BA3C0 - .4byte gUnknown_086BA3D2 - .4byte gUnknown_086BA3E4 - .4byte gUnknown_086BA412 - .4byte gUnknown_086BA434 - .4byte gUnknown_086BA3F6 - .4byte gUnknown_086BA408 + .4byte gKecleonScopeItemSpriteSet + .4byte gKecleonFlowerByTreeSpriteSet + .4byte gKecleonFlowerPairLeftSpriteSet + .4byte gKecleonFlowerPairBottomRightSpriteSet + .4byte gKecleonFlowerTrippleRightSpriteSet + .4byte gKecleonBallRippleFxSpriteSet + .4byte gKecleonStepRippleFxSpriteSet + .4byte gKecleonReflectionHeadSpriteSet + .4byte gKecleonReflectionBallSpriteSet gKyogreBoardSpriteSets:: @ 0x086BB4A4 .4byte gBonusBoardPausePanelSpriteSet @@ -13559,24 +13610,24 @@ gKyogreBoardSpriteSets:: @ 0x086BB4A4 .4byte gBonusBoardScoreBannerGraphicSpriteSet .4byte gUnknown_086B1F26 .4byte gUnknown_086B1F78 - .4byte gUnknown_086B1676 - .4byte gUnknown_086B16A8 - .4byte gUnknown_086BA4D6 - .4byte gUnknown_086BA4F0 - .4byte gUnknown_086BA50A - .4byte gUnknown_086BA524 - .4byte gUnknown_086BA572 - .4byte gUnknown_086BA550 + .4byte gLegendaryCatchPortraitSpriteSet + .4byte gLegendaryCatchPortraitBordersSpriteSet + .4byte gKyogreCrystalTopRightSpriteSet + .4byte gKyogreCrystalTopLeftSpriteSet + .4byte gKyogreCrystalBottomRightSpriteSet + .4byte gKyogreCrystalBottomLeftSpriteSet + .4byte gKyogreIntroCrystalGroundSpriteSet + .4byte gKyogreFreezeTrapSpriteSet .4byte gBonusBoardBallRespawnFxSpriteSet .4byte gBonusBoardBallSpriteSet .4byte gUnknown_086B1E46 .4byte gUnknown_086B1E46 - .4byte gUnknown_086BA44E - .4byte gUnknown_086BA4A0 - .4byte gUnknown_086BA4AA - .4byte gUnknown_086BA4B4 + .4byte gKyogreEntitySpriteSet + .4byte gKyogreWhirlpool0SpriteSet + .4byte gKyogreWhirlpool1SpriteSet + .4byte gKyogreShockwaveSpriteSet .4byte gUnknown_086B1DC4 - .4byte gUnknown_086BA53E + .4byte gKyogreSurfacingFxSpriteSet gGroudonBoardSpriteSets:: @ 0x086BB510 .4byte gBonusBoardPausePanelSpriteSet @@ -13588,8 +13639,8 @@ gGroudonBoardSpriteSets:: @ 0x086BB510 .4byte gBonusBoardScoreBannerGraphicSpriteSet .4byte gUnknown_086B1F26 .4byte gUnknown_086B1F78 - .4byte gUnknown_086B1676 - .4byte gUnknown_086B16A8 + .4byte gLegendaryCatchPortraitSpriteSet + .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gUnknown_086BA624 .4byte gUnknown_086BA63E .4byte gUnknown_086BA658 @@ -13622,8 +13673,8 @@ gRayquazaBoardSpriteSets:: @ 0x086BB590 .4byte gBonusBoardScoreBannerGraphicSpriteSet .4byte gUnknown_086B1F26 .4byte gUnknown_086B1F78 - .4byte gUnknown_086B1676 - .4byte gUnknown_086B16A8 + .4byte gLegendaryCatchPortraitSpriteSet + .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gUnknown_086BAB52 .4byte gUnknown_086BAB74 .4byte gUnknown_086BABA6 From 238c0733523338678f8dbc7969bbc5c928983fde Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Wed, 13 May 2026 02:50:30 -0500 Subject: [PATCH 12/33] field sprite group IXs used by bonus boards --- include/constants/spriteGroups.h | 13 ++++++++++ include/functions.h | 2 +- src/all_board_process0_sprite_init.c | 12 ++++----- src/all_board_process7.c | 38 ++++++++++++++-------------- src/main_board_center_capture_hole.c | 18 ++++++------- src/main_board_evolution_mode.c | 2 +- src/main_board_to_be_split.c | 32 +++++++++++------------ 7 files changed, 65 insertions(+), 52 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index a95bf51c..688cf6f6 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -205,4 +205,17 @@ #define SG_98 98 #define SG_99 99 +#define FIELD_SG_BALL 0 +#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_BASE 1 // Of 0 +#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_0 1 +#define FIELD_SG_BONUS_BOARD_BALL_RESPAWN_FX 1 +#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_1 2 + +#define FIELD_SG_CAPTURE_MON_BALL_FX 3 // Halo at start of capture cutscene & ball opening, with energy field +#define FIELD_SG_POKEMON_NAME_TEXT 4 +#define FIELD_SG_WAS_CAUGHT_TEXT 5 +#define FIELD_SG_BONUS_BOARD_BALL_TRAIL_BASE 6 // Of 0 +#define FIELD_SG_BONUS_BOARD_BALL_TRAIL_0 6 +#define FIELD_SG_BONUS_BOARD_BALL_TRAIL_1 7 + #endif //GUARD_CONSTANTS_SPRITE_GROUPS_H \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index 835c9edc..7fadc4f8 100644 --- a/include/functions.h +++ b/include/functions.h @@ -482,7 +482,7 @@ extern void LoadPokemonNameGraphics(); extern void UpdatePokemonNamePosition(); extern void HidePokemonNameDisplay(); extern void InitEvolutionSuccessDisplay(void); -extern void AnimateEvolutionSuccessScreen(void); +extern void AnimateWasCaughtBanner(void); extern void InitRubyEggHatchAnimation(void); //extern ? UpdateRubyEggHatchAnimation(); //extern ? UpdateHatchCave(); diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 121c1cb3..0218866a 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -198,7 +198,7 @@ void DusclopsBoardProcess_0A_50D48(void) gMain.spriteGroups[i].active = FALSE; } - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -224,7 +224,7 @@ void KecleonBoardProcess_0A_50DE0(void) gMain.spriteGroups[i].active = FALSE; } - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; gMain.spriteGroups[SG_KECLEON_DRAW_ORDER_SPRITES_BASE +13].active = TRUE; gMain.spriteGroups[SG_KECLEON_DUST_FX].active = TRUE; gMain.spriteGroups[SG_KECLEON_SCOPE_ITEM].active = TRUE; @@ -272,7 +272,7 @@ void KyogreBoardProcess_0A_50F04() gMain.spriteGroups[i].active = FALSE; } - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; gMain.spriteGroups[SG_KYOGRE_CRYSTAL_TOP_RIGHT].active = TRUE; gMain.spriteGroups[SG_KYOGRE_CRYSTAL_TOP_LEFT].active = TRUE; gMain.spriteGroups[SG_KYOGRE_CRYSTAL_BOTTOM_RIGHT].active = TRUE; @@ -307,7 +307,7 @@ void GroudonBoardProcess_0A_50FD4(void) } } - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; gMain.spriteGroups[SG_GROUDON_CRYSTAL_TOP_RIGHT].active = TRUE; gMain.spriteGroups[SG_GROUDON_CRYSTAL_BOTTOM_RIGHT].active = TRUE; gMain.spriteGroups[SG_GROUDON_CRYSTAL_TOP_LEFT].active = TRUE; @@ -338,7 +338,7 @@ void RayquazaBoardProcess_0A_51090(void) gMain.spriteGroups[i].active = FALSE; } - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; gMain.spriteGroups[SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_UP].active = TRUE; gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_0].active = TRUE; gMain.spriteGroups[SG_RAYQUAZA_INTRO_CLOUD_1].active = TRUE; @@ -369,7 +369,7 @@ void SphealBoardProcess_0A_51150(void) gMain.spriteGroups[i].active = FALSE; } - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; gMain.spriteGroups[SG_SPHEAL_NET].active = TRUE; gMain.spriteGroups[SG_SPHEAL_LEFT_SEALEO_ENTITY].active = TRUE; gMain.spriteGroups[SG_SPHEAL_RIGHT_SEALEO_ENTITY].active = TRUE; diff --git a/src/all_board_process7.c b/src/all_board_process7.c index ea904a25..c8686788 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -52,7 +52,7 @@ void MainBoardProcess_7B_12524(void) currentBallState->positionQ0.x = currentBallState->positionQ1.x / 2; currentBallState->positionQ0.y = currentBallState->positionQ1.y / 2; - spriteGroup = gMain.fieldSpriteGroups[0]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BALL]; if (spriteGroup->active) { @@ -148,7 +148,7 @@ void MainBoardProcess_7B_12524(void) { for (i = 0; i < 2; i++) { - spriteGroup = gMain.fieldSpriteGroups[i + 1]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_BASE + i]; if (spriteGroup->active) { @@ -170,10 +170,10 @@ void MainBoardProcess_7B_12524(void) } } - gMain.fieldSpriteGroups[1]->active = TRUE; - gMain.fieldSpriteGroups[2]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_1]->active = TRUE; gMain.fieldSpriteGroups[49]->active = TRUE; - gMain.fieldSpriteGroups[0]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = FALSE; } else { @@ -192,10 +192,10 @@ void MainBoardProcess_7B_12524(void) } } - gMain.fieldSpriteGroups[1]->active = FALSE; - gMain.fieldSpriteGroups[2]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_0]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_1]->active = FALSE; gMain.fieldSpriteGroups[49]->active = FALSE; - gMain.fieldSpriteGroups[0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; } spriteGroup = gMain.fieldSpriteGroups[43]; @@ -205,8 +205,8 @@ void MainBoardProcess_7B_12524(void) s8 newIx; if (gCurrentPinballGame->ballShadowTimer < 59) { - spriteGroup->baseX = gMain.fieldSpriteGroups[0]->baseX - 8; - spriteGroup->baseY = gMain.fieldSpriteGroups[0]->baseY - 8; + spriteGroup->baseX = gMain.fieldSpriteGroups[FIELD_SG_BALL]->baseX - 8; + spriteGroup->baseY = gMain.fieldSpriteGroups[FIELD_SG_BALL]->baseY - 8; } else { @@ -254,16 +254,16 @@ void BonusBoardProcess_7B_12BF8() case FIELD_GROUDON: case FIELD_SPHEAL: primaryBall->oamPriority = 1; - spriteGroup = gMain.fieldSpriteGroups[0]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BALL]; break; case FIELD_RAYQUAZA: if (primaryBall->oamPriority > 2) primaryBall->oamPriority = 2; - spriteGroup = gMain.fieldSpriteGroups[0]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BALL]; break; default: primaryBall->oamPriority = 3; - spriteGroup = gMain.fieldSpriteGroups[0]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BALL]; break; } @@ -305,7 +305,7 @@ void BonusBoardProcess_7B_12BF8() if (gCurrentPinballGame->ballRespawnState) { - spriteGroup = gMain.fieldSpriteGroups[1]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BONUS_BOARD_BALL_RESPAWN_FX]; if (spriteGroup->active) { spriteGroup->baseX = primaryBall->screenPosition.x - 8; @@ -434,7 +434,7 @@ void BonusBoardProcess_7B_12BF8() for (i = 0; i < 2; i++) { - spriteGroup = gMain.fieldSpriteGroups[i + 6]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BONUS_BOARD_BALL_TRAIL_BASE + i]; if (spriteGroup->active) { oam = &spriteGroup->oam[0]; @@ -467,8 +467,8 @@ void BonusBoardProcess_7B_12BF8() } } } - gMain.fieldSpriteGroups[6]->active = TRUE; - gMain.fieldSpriteGroups[7]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BONUS_BOARD_BALL_TRAIL_0]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BONUS_BOARD_BALL_TRAIL_1]->active = TRUE; } else { @@ -485,8 +485,8 @@ void BonusBoardProcess_7B_12BF8() oamData->y = 200; } } - gMain.fieldSpriteGroups[6]->active = FALSE; - gMain.fieldSpriteGroups[7]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_BONUS_BOARD_BALL_TRAIL_0]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_BONUS_BOARD_BALL_TRAIL_1]->active = FALSE; } } } diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index a65cd240..565e21fd 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -663,7 +663,7 @@ void RunMonCaptureSequence(void) gMain.blendBrightness = 7; } - spriteGroup = gMain.fieldSpriteGroups[3]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]; if (spriteGroup->active) { @@ -701,10 +701,10 @@ void RunMonCaptureSequence(void) } } - gMain.fieldSpriteGroups[3]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]->active = TRUE; if (gCurrentPinballGame->captureSequenceTimer == 10 && gCurrentPinballGame->captureSequenceFrame == 3) - gMain.fieldSpriteGroups[3]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]->active = FALSE; break; case 11: //TODO: fakematch; unused i. Here for the +4 to parse correctly; @@ -796,7 +796,7 @@ void RunMonCaptureSequence(void) case 25: case 27: case 28: - spriteGroup = gMain.fieldSpriteGroups[3]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]; if (spriteGroup->active) { @@ -835,7 +835,7 @@ void RunMonCaptureSequence(void) } } } - gMain.fieldSpriteGroups[3]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]->active = TRUE; if (gCurrentPinballGame->captureSequenceTimer == 18 || gCurrentPinballGame->captureSequenceTimer == 20 || gCurrentPinballGame->captureSequenceTimer == 21) { @@ -900,7 +900,7 @@ void RunMonCaptureSequence(void) break; case 26: - spriteGroup = gMain.fieldSpriteGroups[3]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]; if (spriteGroup->active) { @@ -946,7 +946,7 @@ void RunMonCaptureSequence(void) gMain.blendBrightness = 4; DmaCopy16(3, gBallPalettes[gCurrentPinballGame->ballUpgradeType], 0x05000220, 0x20); - spriteGroup = gMain.fieldSpriteGroups[3]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]; if (spriteGroup->active) { @@ -957,7 +957,7 @@ void RunMonCaptureSequence(void) } } - gMain.fieldSpriteGroups[3]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]->active = FALSE; gCurrentPinballGame->ball->ballHidden = 0; gCurrentPinballGame->ball->velocity.y = -256; gCurrentPinballGame->ball->velocity.x = 40; @@ -1167,7 +1167,7 @@ void RunMonCaptureSequence(void) case 33: gCurrentPinballGame->ball->oamPriority = 3; - AnimateEvolutionSuccessScreen(); + AnimateWasCaughtBanner(); if (gCurrentPinballGame->captureSequenceFrame <= 229 && gCurrentPinballGame->nameRevealAnimFrame == 150) gCurrentPinballGame->nameRevealAnimFrame--; diff --git a/src/main_board_evolution_mode.c b/src/main_board_evolution_mode.c index 8b16d326..27fc7d62 100644 --- a/src/main_board_evolution_mode.c +++ b/src/main_board_evolution_mode.c @@ -222,7 +222,7 @@ void UpdateEvolutionMode(void) } else { - AnimateEvolutionSuccessScreen(); + AnimateWasCaughtBanner(); if (gCurrentPinballGame->stageTimer < 230) { if (gCurrentPinballGame->nameRevealAnimFrame == 150) diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 775bd2be..f4ea3a55 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -1006,7 +1006,7 @@ void LoadPokemonNameGraphics(void) gCurrentPinballGame->nameSpacingOffset = 0; LoadPortraitGraphics(PORTRAIT_STATE_EVO_PREVIEW, PORTRAIT_MAIN_SLOT); gCurrentPinballGame->activePortraitType = 14; - gMain.fieldSpriteGroups[4]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]->active = TRUE; for (i = 0; i < 10; i++) { if (gSpeciesInfo[gCurrentPinballGame->currentSpecies].name[i] == 0x20) @@ -1028,7 +1028,7 @@ void UpdatePokemonNamePosition(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[4]; + group = gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]; for (i = 0; i < 10; i++) { group->baseX = i * 8 + (gCurrentPinballGame->nameSpacingOffset + 152) + gCurrentPinballGame->shopUISlideOffset; @@ -1041,7 +1041,7 @@ void UpdatePokemonNamePosition(void) void HidePokemonNameDisplay(void) { - gMain.fieldSpriteGroups[4]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } @@ -1057,7 +1057,7 @@ void InitEvolutionSuccessDisplay(void) gCurrentPinballGame->nameRevealAnimFrame = 0; LoadPortraitGraphics(PORTRAIT_STATE_POKEMON_DISPLAY, PORTRAIT_MAIN_SLOT); gCurrentPinballGame->activePortraitType = 13; - gMain.fieldSpriteGroups[4]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]->active = TRUE; for (i = 0; i < 10; i++) { if (gSpeciesInfo[gCurrentPinballGame->currentSpecies].name[i] == 0x20) @@ -1072,7 +1072,7 @@ void InitEvolutionSuccessDisplay(void) } } - gMain.fieldSpriteGroups[5]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_WAS_CAUGHT_TEXT]->active = TRUE; for (i = 0; i < 10; i++) { if (gCaughtTextChars[i] == 0x20) @@ -1099,7 +1099,7 @@ void InitEvolutionSuccessDisplay(void) } } -void AnimateEvolutionSuccessScreen(void) +void AnimateWasCaughtBanner(void) { s16 i, j, k; struct SpriteGroup *group; @@ -1110,7 +1110,7 @@ void AnimateEvolutionSuccessScreen(void) if (gCurrentPinballGame->nameRevealAnimFrame == 0) { gCurrentPinballGame->nameRevealAnimFrame++; - group = gMain.fieldSpriteGroups[4]; + group = gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]; group->baseX = 0; group->baseY = 180; for (i = 0; i < 10; i++) @@ -1120,7 +1120,7 @@ void AnimateEvolutionSuccessScreen(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[5]; + group = gMain.fieldSpriteGroups[FIELD_SG_WAS_CAUGHT_TEXT]; group->baseX = 0; group->baseY = 180; for (i = 0; i < 10; i++) @@ -1136,7 +1136,7 @@ void AnimateEvolutionSuccessScreen(void) if (gCurrentPinballGame->nameRevealAnimFrame < 156) { - group = gMain.fieldSpriteGroups[4]; + group = gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]; for (i = 0; i < 10; i++) { if (gCurrentPinballGame->nameRevealDelays[i]) @@ -1158,7 +1158,7 @@ void AnimateEvolutionSuccessScreen(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[5]; + group = gMain.fieldSpriteGroups[FIELD_SG_WAS_CAUGHT_TEXT]; for (i = 0; i < 10; i++) { if (gCurrentPinballGame->nameRevealDelaysRow2[i]) @@ -1197,7 +1197,7 @@ void AnimateEvolutionSuccessScreen(void) } else { - group = gMain.fieldSpriteGroups[4]; + group = gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]; for (i = 0; i < 10; i++) { if (gCurrentPinballGame->nameRevealDelays[i]) @@ -1213,7 +1213,7 @@ void AnimateEvolutionSuccessScreen(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[5]; + group = gMain.fieldSpriteGroups[FIELD_SG_WAS_CAUGHT_TEXT]; for (i = 0; i < 10; i++) { if (gCurrentPinballGame->nameRevealDelaysRow2[i]) @@ -1232,7 +1232,7 @@ void AnimateEvolutionSuccessScreen(void) } else { - group = gMain.fieldSpriteGroups[4]; + group = gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]; if (group->active) { group->baseX = 0; @@ -1245,7 +1245,7 @@ void AnimateEvolutionSuccessScreen(void) } } - group = gMain.fieldSpriteGroups[5]; + group = gMain.fieldSpriteGroups[FIELD_SG_WAS_CAUGHT_TEXT]; if (group->active) { group->baseX = 0; @@ -1258,8 +1258,8 @@ void AnimateEvolutionSuccessScreen(void) } } - gMain.fieldSpriteGroups[4]->active = FALSE; - gMain.fieldSpriteGroups[5]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_POKEMON_NAME_TEXT]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_WAS_CAUGHT_TEXT]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } } From fae6a5cea2dc7223c923fd192ff329ca10186f18 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Wed, 13 May 2026 03:10:10 -0500 Subject: [PATCH 13/33] documentation for fieldSpriteGroups field --- include/main.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/main.h b/include/main.h index 29667ecd..075d5611 100644 --- a/include/main.h +++ b/include/main.h @@ -82,6 +82,19 @@ struct Main /*0x3C*/ volatile u16 blendBrightness; // may be a sub-struct. possibly for saved game? /*0x40*/ int hasSavedGame; + + /*** + * Allows for a 'board' level indirect sprite group references, so that multiple boards + * use a shared 'logical' reference for a sprite group, separate from the actual group + * being used for the specific board. + * + * EG: all fieldSpriteGroup[board][0] are a reference to the ball sprite group, but the + * actual sprite groups used for the ball (by field) are groups 70/74/11/22/18/26/38/13. + * + * Non boss bonuses use 2 entries (ball/respawn graphics) + * Boss bonus boards use those 2, plus an additional 5 for the 'capture' cutscene. + * Main boards have several, for shared features on the 2 main boards. + ***/ /*0x44*/ struct SpriteGroup **fieldSpriteGroups; /*0x48*/ int rngValue; /*0x4C*/ u32 systemFrameCount; From e2f0444a67ec9f52266179c3f8167861b84e0269 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Fri, 15 May 2026 00:53:19 -0500 Subject: [PATCH 14/33] field select screen --- include/constants/spriteGroups.h | 274 +++++++++++++++++++------------ include/main.h | 2 +- src/all_board_process7.c | 2 +- src/field_select.c | 34 ++-- 4 files changed, 192 insertions(+), 120 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index 688cf6f6..76633a21 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -1,155 +1,215 @@ #ifndef GUARD_CONSTANTS_SPRITE_GROUPS_H #define GUARD_CONSTANTS_SPRITE_GROUPS_H -#define SG_0 0 +// Field Select +#define SG_FIELD_SELECT_RUBY_BOARD_NAME_HIGHLIGHT 0 +#define SG_FIELD_SELECT_SAPPHIRE_BOARD_NAME_HIGHLIGHT 1 +#define SG_FIELD_SELECT_RUBY_FULL_HIGHLIGHT 2 +#define SG_FIELD_SELECT_SAPPHIRE_FULL_SHADOW 3 +#define SG_FIELD_SELECT_RUBY_SHRINKING_HIGHLIGHT_BASE 4 // 4-6 +#define SG_FIELD_SELECT_RUBY_FULL_SHADOW 7 +#define SG_FIELD_SELECT_SAPPHIRE_GROWING_HIGHLIGHT_BASE 8 // 8-10 +#define SG_FIELD_SELECT_SAPPHIRE_FULL_HIGHLIGHT 11 +#define SG_FIELD_SELECT_BALL_SPEED_SELECT_BASE 12 // Of 4 +#define SG_FIELD_SELECT_BALL_SPEED_NORMAL_0 12 +#define SG_FIELD_SELECT_BALL_SPEED_NORMAL_1 13 +#define SG_FIELD_SELECT_BALL_SPEED_SLOW_0 14 +#define SG_FIELD_SELECT_BALL_SPEED_SLOW_1 15 + +// Shared by all boards #define SG_PAUSE_PANEL 0 -#define SG_1 1 #define SG_PAUSE_TOP_BORDER 1 -#define SG_2 2 #define SG_PAUSE_BOTTOM_BORDER 2 -#define SG_3 3 + +// Shared by main boards +#define SG_MAIN_BOARD_FLIPPER_BASE 10 // Of 2. Left, Right +#define SG_MAIN_BOARD_LEFT_FLIPPER 10 +#define SG_MAIN_BOARD_RIGHT_FLIPPER 11 + +// Shared by bonus / boss boards #define SG_BONUS_BOARD_FLIPPER_BASE 3 // Of 2. Left, Right #define SG_BONUS_BOARD_LEFT_FLIPPER 3 -#define SG_4 4 #define SG_BONUS_BOARD_RIGHT_FLIPPER 4 -#define SG_5 5 #define SG_BONUS_COMPLETE_BANNER_SCORE 5 -#define SG_6 6 #define SG_BONUS_COMPLETE_BANNER 6 -#define SG_7 7 + #define SG_LEGENDARY_POKEMON_CATCH_NAME_TEXT 7 + #define SG_LEGENDARY_POKEMON_WAS_CAUGHT_TEXT 8 +#define SG_LEGENDARY_CATCH_PORTRAIT 9 +#define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 + +// Dusclops board +//1-6 shared #define SG_DUSKULL_ENTITY_BASE 7 // Of 3 #define SG_DUSKULL_ENTITY_0 7 -#define SG_KECLEON_TREE_LEAVES 7 -#define SG_SPHEAL_END_SCORE_PANEL 7 -#define SG_8 8 #define SG_DUSKULL_ENTITY_1 8 -#define SG_SPHEAL_END_SCORE_SPHEALS_SUNK 8 -#define SG_9 9 #define SG_DUSKULL_ENTITY_2 9 -#define SG_LEGENDARY_CATCH_PORTRAIT 9 -#define SG_KECLEON_DUST_FX 9 -#define SG_SPHEAL_END_SCORE_BALLS_SUNK 9 -#define SG_10 10 -#define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 -#define SG_KECLEON_DRAW_ORDER_SPRITES_BASE 10 // Includes bushes, ball, kecleon entity -- 14 total reserved -#define SG_MAIN_BOARD_FLIPPER_BASE 10 // Of 2. Left, Right -#define SG_MAIN_BOARD_LEFT_FLIPPER 10 -#define SG_SPHEAL_END_SCORE_TOTAL 10 -#define SG_11 11 + #define SG_DUSCLOPS_BALL_RESPAWN_FX 10, + #define SG_DUSCLOPS_BALL 11, +#define SG_DUSCLOPS_PHASING_FX 12 +#define SG_DUSCLOPS_CAPTURE_VORTEX 13 +#define SG_DUSCLOPS_ENTITY 14 + +// Groudon board +//1-10 shared #define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left #define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 +#define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 +#define SG_GROUDON_CRYSTAL_TOP_LEFT 13 +#define SG_GROUDON_CRYSTAL_BOTTOM_LEFT 14 +#define SG_GROUDON_BOULDER_BASE 15 // Of 3 +#define SG_GROUDON_FILE_PILLAR_BASE 18 // Of 4 +#define SG_GROUDON_FIREBALL 22 +#define SG_GROUDON_FIREBALL_LAUNCH_FX 23 +#define SG_GROUDON_FIREBALL_CAUGHT_BALL 24 + #define SG_GROUDON_BALL_RESPAWN_FX 25, + #define SG_GROUDON_BALL 26, + #define SG_GROUDON_CATCH_BALL_TRAIL_0 27, + #define SG_GROUDON_CATCH_BALL_TRAIL_1 28, +#define SG_GROUDON_ENTITY 29 +#define SG_GROUDON_SHOCKWAVE 30 + +// Kecleon board +//1-6 shared +#define SG_KECLEON_TREE_LEAVES 7 + #define SG_KECLEON_BALL_RESPAWN 8 +#define SG_KECLEON_DUST_FX 9 +#define SG_KECLEON_DRAW_ORDER_SPRITES_BASE 10 // Includes bushes, ball, kecleon entity -- 14 total reserved + #define SG_KECLEON_BALL 22 +#define SG_KECLEON_SCOPE_ITEM 24 +#define SG_KECLEON_FLOWER_BY_TREE 25 +#define SG_KECLEON_FLOWER_PAIR_LEFT 26 +#define SG_KECLEON_FLOWER_PAIR_BOTTOM_RIGHT 27 +#define SG_KECLEON_FLOWER_TRIPLE_RIGHT 28 +#define SG_KECLEON_BALL_RIPPLE_FX 29 +#define SG_KECLEON_STEP_RIPPLE_FX 30 +#define SG_KECLEON_REFLECTION_HEAD 31 +#define SG_KECLEON_REFLECTION_BALL 32 + +// Kyogre board +//1-10 shared #define SG_KYOGRE_CRYSTAL_BASE 11 // Of 4. Top right; top left, bottom right, bottom left. #define SG_KYOGRE_CRYSTAL_TOP_RIGHT 11 -#define SG_MAIN_BOARD_RIGHT_FLIPPER 11 -#define SG_RAYQUAZA_INTRO_CLOUD_0 11 -#define SG_SPHEAL_SCORED_COUNTER 11 -#define SG_12 12 -#define SG_DUSCLOPS_PHASING_FX 12 -#define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 #define SG_KYOGRE_CRYSTAL_TOP_LEFT 12 -#define SG_RAYQUAZA_INTRO_CLOUD_1 12 -#define SG_13 13 -#define SG_DUSCLOPS_CAPTURE_VORTEX 13 -#define SG_GROUDON_CRYSTAL_TOP_LEFT 13 #define SG_KYOGRE_CRYSTAL_BOTTOM_RIGHT 13 -#define SG_RAYQUAZA_INTRO_CLOUD_2 13 -#define SG_14 14 -#define SG_DUSCLOPS_ENTITY 14 -#define SG_GROUDON_CRYSTAL_BOTTOM_LEFT 14 #define SG_KYOGRE_CRYSTAL_BOTTOM_LEFT 14 -#define SG_RAYQUAZA_FLYING_SPARKLE 14 -#define SG_SPHEAL_ENTITY_BASE 14 // Of 2 -#define SG_SPHEAL_ENTITY_0 14 -#define SG_15 15 -#define SG_GROUDON_BOULDER_BASE 15 // Of 3 #define SG_KYOGRE_INTRO_CRYSTAL_GROUND 15 +#define SG_KYOGRE_FREEZE_TRAP 16 + #define SG_KYOGRE_BALL_RESPAWN_FX 17 + #define SG_KYOGRE_BALL 18 + #define SG_KYOGRE_CATCH_BALL_TRAIL_0 19, + #define SG_KYOGRE_CATCH_BALL_TRAIL_1 20, +#define SG_KYOGRE_ENTITY 21 +#define SG_KYOGRE_WHIRLPOOL_0 22 +#define SG_KYOGRE_WHIRLPOOL_1 23 +#define SG_KYOGRE_SHOCKWAVE 24 +#define SG_KYOGRE_SURFACING_FX 26 + +// Rayquaza board +//1-10 shared +#define SG_RAYQUAZA_INTRO_CLOUD_0 11 +#define SG_RAYQUAZA_INTRO_CLOUD_1 12 +#define SG_RAYQUAZA_INTRO_CLOUD_2 13 +#define SG_RAYQUAZA_FLYING_SPARKLE 14 #define SG_RAYQUAZA_TORNADO_BASE 15 // Of 2 #define SG_RAYQUAZA_TORNADO_0 15 -#define SG_SPHEAL_ENTITY_1 15 -#define SG_16 16 -#define SG_KYOGRE_FREEZE_TRAP 16 #define SG_RAYQUAZA_TORNADO_1 16 +#define SG_RAYQUAZA_LIGHTNING_CHARGE_RING 17 +#define SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE 18 +#define SG_RAYQUAZA_LIGHTNING_STRIKE 19 +#define SG_RAYQUAZA_WHIRLWIND_BALL_FLY_UP 20 +#define SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION 21 +#define SG_RAYQUAZA_ENTITY_FLYBY_RIGHT 22 // Left to right +#define SG_RAYQUAZA_ENTITY_FLYBY_LEFT 23 // Right to left +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0A 24 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0B 25 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1A 26 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B 27 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2A 28 +#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2B 29 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0A 30 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0B 31 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1A 32 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B 33 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2A 34 +#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2B 35 +#define SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX 36 + #define SG_RAYQUAZA_BALL_RESPAWN_FX 37 + #define SG_RAYQUAZA_BALL 38 + #define SG_RAYQUAZA_CATCH_BALL_TRAIL_0 39 + #define SG_RAYQUAZA_CATCH_BALL_TRAIL_1 40 +#define SG_RAYQUAZA_ENTITY_BOUNCING 41 +#define SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_UP 42 +#define SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_DOWN 43 +#define SG_RAYQUAZA_ENTITY_SHADOW_FX 45 + +// Spheal board +//1-6 shared +#define SG_SPHEAL_END_SCORE_PANEL 7 +#define SG_SPHEAL_END_SCORE_SPHEALS_SUNK 8 +#define SG_SPHEAL_END_SCORE_BALLS_SUNK 9 +#define SG_SPHEAL_END_SCORE_TOTAL 10 +#define SG_SPHEAL_SCORED_COUNTER 11 + #define SG_SPHEAL_BALL_RESPAWN_FX 12 + #define SG_SPHEAL_BALL 13 +#define SG_SPHEAL_ENTITY_BASE 14 // Of 2 +#define SG_SPHEAL_ENTITY_0 14 +#define SG_SPHEAL_ENTITY_1 15 #define SG_SPHEAL_ENTITY_REFLECTION_BASE 16 // Of 2 #define SG_SPHEAL_ENTITY_REFLECTION_0 16 -#define SG_17 17 -#define SG_RAYQUAZA_LIGHTNING_CHARGE_RING 17 #define SG_SPHEAL_ENTITY_REFLECTION_1 17 -#define SG_18 18 -#define SG_GROUDON_FILE_PILLAR_BASE 18 // Of 4 -#define SG_RAYQUAZA_LIGHTNING_WARNING_STRIKE 18 #define SG_SPHEAL_NET 18 -#define SG_19 19 -#define SG_RAYQUAZA_LIGHTNING_STRIKE 19 #define SG_SPHEAL_WHISCASH_ENTITY 19 -#define SG_20 20 -#define SG_RAYQUAZA_WHIRLWIND_BALL_FLY_UP 20 #define SG_SPHEAL_PELIPPER_ENTITY 20 -#define SG_21 21 -#define SG_KYOGRE_ENTITY 21 -#define SG_RAYQUAZA_ENTITY_ROAR_HEAD_EXTENSION 21 #define SG_SPHEAL_LEFT_SEALEO_ENTITY 21 -#define SG_22 22 -#define SG_GROUDON_FIREBALL 22 -#define SG_KYOGRE_WHIRLPOOL_0 22 -#define SG_RAYQUAZA_ENTITY_FLYBY_RIGHT 22 // Left to right #define SG_SPHEAL_RIGHT_SEALEO_ENTITY 22 + +// Raw list. (can be removed later) +#define SG_0 0 +#define SG_1 1 +#define SG_2 2 +#define SG_3 3 +#define SG_4 4 +#define SG_5 5 +#define SG_6 6 +#define SG_7 7 +#define SG_8 8 +#define SG_9 9 +#define SG_10 10 +#define SG_11 11 +#define SG_12 12 +#define SG_13 13 +#define SG_14 14 +#define SG_15 15 +#define SG_16 16 +#define SG_17 17 +#define SG_18 18 +#define SG_19 19 +#define SG_20 20 +#define SG_21 21 +#define SG_22 22 #define SG_23 23 -#define SG_GROUDON_FIREBALL_LAUNCH_FX 23 -#define SG_KYOGRE_WHIRLPOOL_1 23 -#define SG_RAYQUAZA_ENTITY_FLYBY_LEFT 23 // Right to left #define SG_24 24 -#define SG_GROUDON_FIREBALL_CAUGHT_BALL 24 -#define SG_KECLEON_SCOPE_ITEM 24 -#define SG_KYOGRE_SHOCKWAVE 24 -#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0A 24 #define SG_25 25 -#define SG_KECLEON_FLOWER_BY_TREE 25 -#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_0B 25 #define SG_26 26 -#define SG_KECLEON_FLOWER_PAIR_LEFT 26 -#define SG_KYOGRE_SURFACING_FX 26 -#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1A 26 #define SG_27 27 -#define SG_KECLEON_FLOWER_PAIR_BOTTOM_RIGHT 27 -#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B 27 #define SG_28 28 -#define SG_KECLEON_FLOWER_TRIPLE_RIGHT 28 -#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2A 28 #define SG_29 29 -#define SG_GROUDON_ENTITY 29 -#define SG_KECLEON_BALL_RIPPLE_FX 29 -#define SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_2B 29 #define SG_30 30 -#define SG_GROUDON_SHOCKWAVE 30 -#define SG_KECLEON_STEP_RIPPLE_FX 30 -#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0A 30 #define SG_31 31 -#define SG_KECLEON_REFLECTION_HEAD 31 -#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_0B 31 #define SG_32 32 -#define SG_KECLEON_REFLECTION_BALL 32 -#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1A 32 #define SG_33 33 -#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B 33 #define SG_34 34 -#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2A 34 #define SG_35 35 -#define SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_2B 35 #define SG_36 36 -#define SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX 36 #define SG_37 37 #define SG_38 38 #define SG_39 39 #define SG_40 40 #define SG_41 41 -#define SG_RAYQUAZA_ENTITY_BOUNCING 41 #define SG_42 42 -#define SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_UP 42 #define SG_43 43 -#define SG_RAYQUAZA_ENTITY_BACKGROUND_FLY_DOWN 43 #define SG_44 44 #define SG_45 45 -#define SG_RAYQUAZA_ENTITY_SHADOW_FX 45 #define SG_46 46 #define SG_47 47 #define SG_48 48 @@ -205,16 +265,28 @@ #define SG_98 98 #define SG_99 99 -#define FIELD_SG_BALL 0 -#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_BASE 1 // Of 0 -#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_0 1 -#define FIELD_SG_BONUS_BOARD_BALL_RESPAWN_FX 1 -#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_1 2 +// **************************************************** +// Field Sprite Group uses data from gMainFieldSpriteGroups and gBonusFieldSpriteGroups +// These are board level indirect references to the sprite group used by the individual fields. +// The array index in the fieldSpriteGroup always points to the same sprite. The data in the +// array points to the sprite group used for that sprite on the specific board. +// All boards +#define FIELD_SG_BALL 0 #define FIELD_SG_CAPTURE_MON_BALL_FX 3 // Halo at start of capture cutscene & ball opening, with energy field #define FIELD_SG_POKEMON_NAME_TEXT 4 #define FIELD_SG_WAS_CAUGHT_TEXT 5 -#define FIELD_SG_BONUS_BOARD_BALL_TRAIL_BASE 6 // Of 0 + +// Main boards +//0,3-5 shared +#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_BASE 1 // Of 2 +#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_0 1 +#define FIELD_SG_MAIN_BOARD_BALL_TRAIL_1 2 + +// bonus/legendary boards +//0,3-5 shared +#define FIELD_SG_BONUS_BOARD_BALL_RESPAWN_FX 1 +#define FIELD_SG_BONUS_BOARD_BALL_TRAIL_BASE 6 // Of 2 #define FIELD_SG_BONUS_BOARD_BALL_TRAIL_0 6 #define FIELD_SG_BONUS_BOARD_BALL_TRAIL_1 7 diff --git a/include/main.h b/include/main.h index 075d5611..8308e122 100644 --- a/include/main.h +++ b/include/main.h @@ -84,7 +84,7 @@ struct Main /*0x40*/ int hasSavedGame; /*** - * Allows for a 'board' level indirect sprite group references, so that multiple boards + * Allows for 'board' level indirect sprite group references, so that multiple boards * use a shared 'logical' reference for a sprite group, separate from the actual group * being used for the specific board. * diff --git a/src/all_board_process7.c b/src/all_board_process7.c index c8686788..29008e68 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -179,7 +179,7 @@ void MainBoardProcess_7B_12524(void) { for (i = 0; i < 2; i++) { - spriteGroup = gMain.fieldSpriteGroups[i + 1]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_BASE + i]; if (spriteGroup->active) { diff --git a/src/field_select.c b/src/field_select.c index a37160f1..bb1f1da5 100644 --- a/src/field_select.c +++ b/src/field_select.c @@ -74,8 +74,8 @@ void LoadFieldSelectGraphics(void) static void InitFieldSelectData(void) { - gFieldSelectData.rubyFieldSpriteGroup = SG_2; - gFieldSelectData.sapphireFieldSpriteGroup = SG_3; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_HIGHLIGHT; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_SHADOW; gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; gFieldSelectData.selectedField = FIELD_RUBY; @@ -139,16 +139,16 @@ void FieldSelect_State1_8C7C(void) { gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; - gFieldSelectData.rubyFieldSpriteGroup = SG_2; - gFieldSelectData.sapphireFieldSpriteGroup = SG_3; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_HIGHLIGHT; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_SHADOW; gFieldSelectData.transitionFrame = 0; } else { gFieldSelectData.rubyHighlightVisible = 1; gFieldSelectData.sapphireHighlightVisible = 0; - gFieldSelectData.rubyFieldSpriteGroup = SG_7; - gFieldSelectData.sapphireFieldSpriteGroup = SG_11; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_SHADOW; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_HIGHLIGHT; gFieldSelectData.transitionFrame = 0; } } @@ -161,16 +161,16 @@ void FieldSelect_State1_8C7C(void) { gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; - gFieldSelectData.rubyFieldSpriteGroup = SG_2; - gFieldSelectData.sapphireFieldSpriteGroup = SG_3; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_HIGHLIGHT; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_SHADOW; gFieldSelectData.transitionFrame = 0; } else { gFieldSelectData.rubyHighlightVisible = 1; gFieldSelectData.sapphireHighlightVisible = 0; - gFieldSelectData.rubyFieldSpriteGroup = SG_7; - gFieldSelectData.sapphireFieldSpriteGroup = SG_11; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_SHADOW; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_HIGHLIGHT; gFieldSelectData.transitionFrame = 0; } } @@ -238,8 +238,8 @@ void FieldSelect_State1_8C7C(void) gFieldSelectData.selectedField = FIELD_RUBY; gFieldSelectData.rubyHighlightVisible = 0; gFieldSelectData.sapphireHighlightVisible = 1; - gFieldSelectData.rubyFieldSpriteGroup = SG_2; - gFieldSelectData.sapphireFieldSpriteGroup = SG_3; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_HIGHLIGHT; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_SHADOW; gFieldSelectData.transitionFrame = 0; gFieldSelectData.state = FIELD_SELECT_STATE_CHOOSE_FIELD; } @@ -252,8 +252,8 @@ void FieldSelect_State1_8C7C(void) gFieldSelectData.selectedField = FIELD_SAPPHIRE; gFieldSelectData.rubyHighlightVisible = 1; gFieldSelectData.sapphireHighlightVisible = 0; - gFieldSelectData.rubyFieldSpriteGroup = SG_7; - gFieldSelectData.sapphireFieldSpriteGroup = SG_11; + gFieldSelectData.rubyFieldSpriteGroup = SG_FIELD_SELECT_RUBY_FULL_SHADOW; + gFieldSelectData.sapphireFieldSpriteGroup = SG_FIELD_SELECT_SAPPHIRE_FULL_HIGHLIGHT; gFieldSelectData.transitionFrame = 0; gFieldSelectData.state = FIELD_SELECT_STATE_CHOOSE_FIELD; } @@ -306,11 +306,11 @@ static void RenderFieldSelectSprites(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - r6 = &gMain.spriteGroups[SG_0]; - r9 = &gMain.spriteGroups[SG_1]; + r6 = &gMain.spriteGroups[SG_FIELD_SELECT_RUBY_BOARD_NAME_HIGHLIGHT]; + r9 = &gMain.spriteGroups[SG_FIELD_SELECT_SAPPHIRE_BOARD_NAME_HIGHLIGHT]; sp0 = &gMain.spriteGroups[gFieldSelectData.rubyFieldSpriteGroup]; r10 = &gMain.spriteGroups[gFieldSelectData.sapphireFieldSpriteGroup]; - r8 = &gMain.spriteGroups[SG_12 + gFieldSelectData.ballSpeed * 2 + gFieldSelectData.speedBlinkToggle]; + r8 = &gMain.spriteGroups[SG_FIELD_SELECT_BALL_SPEED_SELECT_BASE + gFieldSelectData.ballSpeed * 2 + gFieldSelectData.speedBlinkToggle]; r6->active = gFieldSelectData.rubyHighlightVisible; r9->active = gFieldSelectData.sapphireHighlightVisible; From 6966706e3cacab769341406d30ae861274e12697 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Fri, 15 May 2026 02:00:44 -0500 Subject: [PATCH 15/33] title screen sprite groups --- include/constants/spriteGroups.h | 13 ++- include/titlescreen.h | 8 +- src/titlescreen.c | 162 +++++++++++++++---------------- 3 files changed, 97 insertions(+), 86 deletions(-) diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index 76633a21..95899942 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -1,7 +1,18 @@ #ifndef GUARD_CONSTANTS_SPRITE_GROUPS_H #define GUARD_CONSTANTS_SPRITE_GROUPS_H -// Field Select +// Title screen + // before pressing start +#define SG_TITLE_SCREEN_FLIPPER_AND_START_BASE 0 // Of 4 +#define SG_TITLE_SCREEN_FLIPPER_AND_START_ANIM_MAX 3 +#define SG_DELETE_SAVE_CONFIRMATION_PANE 4 + + // after pressing start +#define SG_TITLE_SCREEN_LEFT_FLIPPER_BASE 0 // Of 3 +#define SG_TITLE_SCREEN_RIGHT_FLIPPER_BASE 3 // Of 3 +#define SG_MENU_PANEL 6 + +// Field Select screen #define SG_FIELD_SELECT_RUBY_BOARD_NAME_HIGHLIGHT 0 #define SG_FIELD_SELECT_SAPPHIRE_BOARD_NAME_HIGHLIGHT 1 #define SG_FIELD_SELECT_RUBY_FULL_HIGHLIGHT 2 diff --git a/include/titlescreen.h b/include/titlescreen.h index f98847fe..461d0ec8 100644 --- a/include/titlescreen.h +++ b/include/titlescreen.h @@ -12,10 +12,10 @@ struct TitlescreenStruct /*0x09*/ s8 pressStartAndFlippersVisible; /*0x0A*/ s8 menuSpriteGroupId; /*0x0B*/ s8 menuVisible; - /*0x0C*/ s8 cursorSpriteGroupId; - /*0x0D*/ s8 cursorArrowVisible; - /*0x0E*/ s8 selectorSpriteGroupId; - /*0x0F*/ s8 selectorVisible; + /*0x0C*/ s8 titleScreenLeftFlipperSpriteGroup; + /*0x0D*/ s8 leftFlipperCursorVisible; + /*0x0E*/ s8 titleScreenRightFlipperSpriteGroup; + /*0x0F*/ s8 rightFlipperCursorVisible; /*0x10*/ s8 deleteSaveSpriteGroupId; /*0x11*/ s8 deleteSaveWindowVisible; /*0x12*/ s16 idleFadeoutCounter; diff --git a/src/titlescreen.c b/src/titlescreen.c index f355b8c8..c77c2442 100644 --- a/src/titlescreen.c +++ b/src/titlescreen.c @@ -103,16 +103,16 @@ void InitTitlescreenStates(void) gTitlescreen.animTimer = 0; gTitlescreen.animPhase = 0; gTitlescreen.menuAction = 0; - gTitlescreen.pressStartAnimSpriteGroupId = SG_0; - gTitlescreen.deleteSaveSpriteGroupId = SG_4; + gTitlescreen.pressStartAnimSpriteGroupId = SG_TITLE_SCREEN_FLIPPER_AND_START_BASE; + gTitlescreen.deleteSaveSpriteGroupId = SG_DELETE_SAVE_CONFIRMATION_PANE; gTitlescreen.pressStartAndFlippersVisible = TRUE; gTitlescreen.deleteSaveWindowVisible = FALSE; - gTitlescreen.menuSpriteGroupId = SG_6; - gTitlescreen.cursorSpriteGroupId = SG_0; - gTitlescreen.selectorSpriteGroupId = SG_3; + gTitlescreen.menuSpriteGroupId = SG_MENU_PANEL; + gTitlescreen.titleScreenLeftFlipperSpriteGroup = SG_TITLE_SCREEN_LEFT_FLIPPER_BASE; + gTitlescreen.titleScreenRightFlipperSpriteGroup = SG_TITLE_SCREEN_RIGHT_FLIPPER_BASE; gTitlescreen.menuVisible = FALSE; - gTitlescreen.cursorArrowVisible = 0; - gTitlescreen.selectorVisible = 0; + gTitlescreen.leftFlipperCursorVisible = 0; + gTitlescreen.rightFlipperCursorVisible = 0; gHighScoreEntrySource = 1; gEraseSaveDataAccessStep = 0; gEraseSaveDataAccessCounter = 0; @@ -170,8 +170,8 @@ void TitleScreen1_WaitForStartButton(void) if (gTitlescreen.animTimer >= gTitlePressStartAnimDurations[gTitlescreen.pressStartAnimSpriteGroupId]) { gTitlescreen.animTimer = 0; - if (++gTitlescreen.pressStartAnimSpriteGroupId > SG_3) - gTitlescreen.pressStartAnimSpriteGroupId = SG_0; + if (++gTitlescreen.pressStartAnimSpriteGroupId > SG_TITLE_SCREEN_FLIPPER_AND_START_ANIM_MAX) + gTitlescreen.pressStartAnimSpriteGroupId = SG_TITLE_SCREEN_FLIPPER_AND_START_BASE; } if (JOY_HELD(KEYS_MASK)) @@ -292,8 +292,8 @@ void TitleScreen3_8010E00(void) if (++gTitlescreen.animPhase > 11) { gTitlescreen.animPhase = 0; - gTitlescreen.cursorArrowVisible = 1; - gTitlescreen.selectorVisible = 1; + gTitlescreen.leftFlipperCursorVisible = 1; + gTitlescreen.rightFlipperCursorVisible = 1; gMain.subState = SUBSTATE_MENU_INPUT_NO_SAVED_GAME; } } @@ -310,8 +310,8 @@ void TitleScreen3_8010E00(void) if (++gTitlescreen.animPhase > 11) { gTitlescreen.animPhase = 0; - gTitlescreen.cursorArrowVisible = 1; - gTitlescreen.selectorVisible = 1; + gTitlescreen.leftFlipperCursorVisible = 1; + gTitlescreen.rightFlipperCursorVisible = 1; gMain.subState = SUBSTATE_MENU_INPUT_SAVED_GAME; } } @@ -338,8 +338,8 @@ void TitleScreen4_MenuInputNoSavedGame(void) if (++gTitlescreen.animPhase > 6) gTitlescreen.animPhase = 0; - gTitlescreen.cursorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0]; - gTitlescreen.selectorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0] + 3; + gTitlescreen.titleScreenLeftFlipperSpriteGroup = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0]; + gTitlescreen.titleScreenRightFlipperSpriteGroup = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0] + 3; } if (JOY_NEW(DPAD_UP)) @@ -367,8 +367,8 @@ void TitleScreen4_MenuInputNoSavedGame(void) m4aSongNumStart(SE_MENU_CANCEL); gTitlescreen.animTimer = 0; gTitlescreen.animPhase = 12; - gTitlescreen.cursorArrowVisible = 0; - gTitlescreen.selectorVisible = 0; + gTitlescreen.leftFlipperCursorVisible = 0; + gTitlescreen.rightFlipperCursorVisible = 0; gMain.subState = SUBSTATE_ANIM_CLOSE_MENU; } @@ -437,8 +437,8 @@ void TitleScreen5_MenuInputSavedGame(void) if (++gTitlescreen.animPhase > 6) gTitlescreen.animPhase = 0; - gTitlescreen.cursorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0]; - gTitlescreen.selectorSpriteGroupId = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0] + 3; + gTitlescreen.titleScreenLeftFlipperSpriteGroup = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0]; + gTitlescreen.titleScreenRightFlipperSpriteGroup = gTitleMenuSlideOutAnimSpriteGroupData[gTitlescreen.animPhase][0] + 3; } if (JOY_NEW(DPAD_UP)) @@ -466,8 +466,8 @@ void TitleScreen5_MenuInputSavedGame(void) m4aSongNumStart(SE_MENU_CANCEL); gTitlescreen.animTimer = 0; gTitlescreen.animPhase = 12; - gTitlescreen.cursorArrowVisible = 0; - gTitlescreen.selectorVisible = 0; + gTitlescreen.leftFlipperCursorVisible = 0; + gTitlescreen.rightFlipperCursorVisible = 0; gMain.subState = SUBSTATE_ANIM_CLOSE_MENU; } @@ -723,9 +723,9 @@ struct UnknownStruct1 void RenderTitleMenuNoSavedGame(void) { - struct SpriteGroup *menuSpriteGroup; - struct SpriteGroup *r9; - struct SpriteGroup *r8; + struct SpriteGroup *menuPanel_SG; + struct SpriteGroup *leftFlipper_SG; + struct SpriteGroup *rightFlipper_SG; const struct UnknownStruct1 *r12; int sp0; @@ -734,69 +734,69 @@ void RenderTitleMenuNoSavedGame(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - menuSpriteGroup = &gMain.spriteGroups[gTitlescreen.menuSpriteGroupId]; - r9 = &gMain.spriteGroups[gTitlescreen.cursorSpriteGroupId]; - r8 = &gMain.spriteGroups[gTitlescreen.selectorSpriteGroupId]; + menuPanel_SG = &gMain.spriteGroups[gTitlescreen.menuSpriteGroupId]; + leftFlipper_SG = &gMain.spriteGroups[gTitlescreen.titleScreenLeftFlipperSpriteGroup]; + rightFlipper_SG = &gMain.spriteGroups[gTitlescreen.titleScreenRightFlipperSpriteGroup]; - menuSpriteGroup->active = gTitlescreen.menuVisible; - r9->active = gTitlescreen.cursorArrowVisible; - r8->active = gTitlescreen.selectorVisible; + menuPanel_SG->active = gTitlescreen.menuVisible; + leftFlipper_SG->active = gTitlescreen.leftFlipperCursorVisible; + rightFlipper_SG->active = gTitlescreen.rightFlipperCursorVisible; LoadSpriteSets((const struct SpriteSet *const *)gTitleNoSaveMenuSpriteSets, 7, gMain.spriteGroups); - if (menuSpriteGroup->active == TRUE) + if (menuPanel_SG->active == TRUE) { - menuSpriteGroup->baseX = 0x78; - menuSpriteGroup->baseY = 0x66; + menuPanel_SG->baseX = 0x78; + menuPanel_SG->baseY = 0x66; r12 = (const struct UnknownStruct1 *)gTitleNoSaveMenuSpriteSets[6]; for (sp0 = 0; sp0 < r12->count; sp0++) { - struct OamDataSimple *r4 = &menuSpriteGroup->oam[sp0]; + struct OamDataSimple *r4 = &menuPanel_SG->oam[sp0]; if (r12[sp0 + 1].count == 1) // dunno. wtf? gOamBuffer[r4->oamId].objMode = 1; else gOamBuffer[r4->oamId].objMode = 0; - gOamBuffer[r4->oamId].x = r4->xOffset + menuSpriteGroup->baseX; - gOamBuffer[r4->oamId].y = r4->yOffset + menuSpriteGroup->baseY; + gOamBuffer[r4->oamId].x = r4->xOffset + menuPanel_SG->baseX; + gOamBuffer[r4->oamId].y = r4->yOffset + menuPanel_SG->baseY; } } - if (r9->active == TRUE) + if (leftFlipper_SG->active == TRUE) { struct OamDataSimple *r5; - r9->baseX = gTitleNoSaveArrowPositions[gTitlescreen.menuCursorIndex].x; - r9->baseY = gTitleNoSaveArrowPositions[gTitlescreen.menuCursorIndex].y; + leftFlipper_SG->baseX = gTitleNoSaveArrowPositions[gTitlescreen.menuCursorIndex].x; + leftFlipper_SG->baseY = gTitleNoSaveArrowPositions[gTitlescreen.menuCursorIndex].y; - r5 = &r9->oam[0]; + r5 = &leftFlipper_SG->oam[0]; - gOamBuffer[r5->oamId].x = r5->xOffset + r9->baseX; - gOamBuffer[r5->oamId].y = r5->yOffset + r9->baseY; + gOamBuffer[r5->oamId].x = r5->xOffset + leftFlipper_SG->baseX; + gOamBuffer[r5->oamId].y = r5->yOffset + leftFlipper_SG->baseY; } - if (r8->active == TRUE) + if (rightFlipper_SG->active == TRUE) { struct OamDataSimple *r5; - r8->baseX = gTitleNoSaveSelectorPositions[gTitlescreen.menuCursorIndex].x; - r8->baseY = gTitleNoSaveSelectorPositions[gTitlescreen.menuCursorIndex].y; + rightFlipper_SG->baseX = gTitleNoSaveSelectorPositions[gTitlescreen.menuCursorIndex].x; + rightFlipper_SG->baseY = gTitleNoSaveSelectorPositions[gTitlescreen.menuCursorIndex].y; - r5 = &r8->oam[0]; + r5 = &rightFlipper_SG->oam[0]; - gOamBuffer[r5->oamId].x = r5->xOffset + r8->baseX; - gOamBuffer[r5->oamId].y = r5->yOffset + r8->baseY; + gOamBuffer[r5->oamId].x = r5->xOffset + rightFlipper_SG->baseX; + gOamBuffer[r5->oamId].y = r5->yOffset + rightFlipper_SG->baseY; } - menuSpriteGroup->active = FALSE; - r9->active = FALSE; - r8->active = FALSE; + menuPanel_SG->active = FALSE; + leftFlipper_SG->active = FALSE; + rightFlipper_SG->active = FALSE; } void RenderTitleMenuSavedGame(void) { - struct SpriteGroup *r10; - struct SpriteGroup *r9; - struct SpriteGroup *r8; + struct SpriteGroup *menuPanel_SG; + struct SpriteGroup *leftFlipper_SG; + struct SpriteGroup *rightFlipper_SG; const struct UnknownStruct1 *r12; int sp0; @@ -805,62 +805,62 @@ void RenderTitleMenuSavedGame(void) REG_BLDCNT = gMain.blendControl; REG_BLDALPHA = gMain.blendAlpha; - r10 = &gMain.spriteGroups[gTitlescreen.menuSpriteGroupId]; - r9 = &gMain.spriteGroups[gTitlescreen.cursorSpriteGroupId]; - r8 = &gMain.spriteGroups[gTitlescreen.selectorSpriteGroupId]; + menuPanel_SG = &gMain.spriteGroups[gTitlescreen.menuSpriteGroupId]; + leftFlipper_SG = &gMain.spriteGroups[gTitlescreen.titleScreenLeftFlipperSpriteGroup]; + rightFlipper_SG = &gMain.spriteGroups[gTitlescreen.titleScreenRightFlipperSpriteGroup]; - r10->active = gTitlescreen.menuVisible; - r9->active = gTitlescreen.cursorArrowVisible; - r8->active = gTitlescreen.selectorVisible; + menuPanel_SG->active = gTitlescreen.menuVisible; + leftFlipper_SG->active = gTitlescreen.leftFlipperCursorVisible; + rightFlipper_SG->active = gTitlescreen.rightFlipperCursorVisible; LoadSpriteSets((const struct SpriteSet *const *)gTitleSavedMenuSpriteSets, 7, gMain.spriteGroups); - if (r10->active == TRUE) + if (menuPanel_SG->active == TRUE) { - r10->baseX = 0x78; - r10->baseY = 0x66; + menuPanel_SG->baseX = 0x78; + menuPanel_SG->baseY = 0x66; r12 = (const struct UnknownStruct1 *)gTitleSavedMenuSpriteSets[6]; for (sp0 = 0; sp0 < r12->count; sp0++) { - struct OamDataSimple *r4 = &r10->oam[sp0]; + struct OamDataSimple *r4 = &menuPanel_SG->oam[sp0]; if (r12[sp0 + 1].count == 1) // dunno. wtf? gOamBuffer[r4->oamId].objMode = 1; else gOamBuffer[r4->oamId].objMode = 0; - gOamBuffer[r4->oamId].x = r4->xOffset + r10->baseX; - gOamBuffer[r4->oamId].y = r4->yOffset + r10->baseY; + gOamBuffer[r4->oamId].x = r4->xOffset + menuPanel_SG->baseX; + gOamBuffer[r4->oamId].y = r4->yOffset + menuPanel_SG->baseY; } } - if (r9->active == TRUE) + if (leftFlipper_SG->active == TRUE) { struct OamDataSimple *r5; - r9->baseX = gTitleSavedArrowPositions[gTitlescreen.menuCursorIndex].x; - r9->baseY = gTitleSavedArrowPositions[gTitlescreen.menuCursorIndex].y; + leftFlipper_SG->baseX = gTitleSavedArrowPositions[gTitlescreen.menuCursorIndex].x; + leftFlipper_SG->baseY = gTitleSavedArrowPositions[gTitlescreen.menuCursorIndex].y; - r5 = &r9->oam[0]; + r5 = &leftFlipper_SG->oam[0]; - gOamBuffer[r5->oamId].x = r5->xOffset + r9->baseX; - gOamBuffer[r5->oamId].y = r5->yOffset + r9->baseY; + gOamBuffer[r5->oamId].x = r5->xOffset + leftFlipper_SG->baseX; + gOamBuffer[r5->oamId].y = r5->yOffset + leftFlipper_SG->baseY; } - if (r8->active == TRUE) + if (rightFlipper_SG->active == TRUE) { struct OamDataSimple *r5; - r8->baseX = gTitleSavedSelectorPositions[gTitlescreen.menuCursorIndex].x; - r8->baseY = gTitleSavedSelectorPositions[gTitlescreen.menuCursorIndex].y; + rightFlipper_SG->baseX = gTitleSavedSelectorPositions[gTitlescreen.menuCursorIndex].x; + rightFlipper_SG->baseY = gTitleSavedSelectorPositions[gTitlescreen.menuCursorIndex].y; - r5 = &r8->oam[0]; + r5 = &rightFlipper_SG->oam[0]; - gOamBuffer[r5->oamId].x = r5->xOffset + r8->baseX; - gOamBuffer[r5->oamId].y = r5->yOffset + r8->baseY; + gOamBuffer[r5->oamId].x = r5->xOffset + rightFlipper_SG->baseX; + gOamBuffer[r5->oamId].y = r5->yOffset + rightFlipper_SG->baseY; } - r10->active = FALSE; - r9->active = FALSE; - r8->active = FALSE; + menuPanel_SG->active = FALSE; + leftFlipper_SG->active = FALSE; + rightFlipper_SG->active = FALSE; } void DeleteSaveFile(void) From 6e7ea3cf2618de7079a9c1c9f151c142382797fd Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 23 May 2026 01:12:52 -0500 Subject: [PATCH 16/33] bonus spriteset naming, high score spritegroup consts --- data/rom_1.s | 2 +- data/rom_2.s | 291 ++++++++++++++++--------------- include/constants/spriteGroups.h | 8 +- src/high_scores.c | 130 +++++++------- src/spheal_process3.c | 8 +- 5 files changed, 227 insertions(+), 212 deletions(-) diff --git a/data/rom_1.s b/data/rom_1.s index 4bd12878..6b6f43a2 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -1379,7 +1379,7 @@ gRayquazaBodyVariantTiles:: @ 0x084AA9EC gSphealNetGfx:: @ 0x084AF9EC .incbin "baserom.gba", 0x4AF9EC, 0x600 -gSphealExtendedScoreSprites:: @ 0x084AFFEC +gSphealNetFrontGfx:: @ 0x084AFFEC .incbin "baserom.gba", 0x4AFFEC, 0x480 gSphealFlyingEnemyVariantSprites:: @ 0x084B046C diff --git a/data/rom_2.s b/data/rom_2.s index ade6f196..a84fe477 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -6131,7 +6131,7 @@ gUnknown_086B1DA2:: @ 0x086B1DA2 packed_sprite_oam x=0x22, y=0x18, spriteSize=SPRITE_SIZE_16x16, tileNum=0x46, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086B1DC4:: @ 0x086B1DC4 +gMonCatchBallAbsorbPokemonFxSpriteSet:: @ 0x086B1DC4 .2byte 16 packed_sprite_oam x=0xA, y=0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x396, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6166,7 +6166,7 @@ gUnknown_086B1DC4:: @ 0x086B1DC4 packed_sprite_oam x=0xF, y=-0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x33f, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086B1E46:: @ 0x086B1E46 +gMonCatchBallTrailSpriteSet:: @ 0x086B1E46 .2byte 1 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6232,7 +6232,7 @@ gUnknown_086B1F04:: @ 0x086B1F04 packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2c8, priority=0x2, paletteNum=0x3 .2byte 0 -gUnknown_086B1F26:: @ 0x086B1F26 +gLegendaryCatchNameBannerSpriteSheet:: @ 0x086B1F26 .2byte 10 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c0, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6255,7 +6255,7 @@ gUnknown_086B1F26:: @ 0x086B1F26 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d2, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086B1F78:: @ 0x086B1F78 +gLegendaryCatchWasCaughtTextSpriteSheet:: @ 0x086B1F78 .2byte 10 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d4, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6597,8 +6597,8 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B1FCA .4byte gUnknown_086B19BA .4byte gUnknown_086B19C4 -.4byte gUnknown_086B1F26 -.4byte gUnknown_086B1F78 +.4byte gLegendaryCatchNameBannerSpriteSheet +.4byte gLegendaryCatchWasCaughtTextSpriteSheet .4byte gUnknown_086B1FF4 .4byte gUnknown_086B2026 .4byte gUnknown_086B2048 @@ -6623,8 +6623,8 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B224A .4byte gUnknown_086B226C .4byte gUnknown_086B160C -.4byte gUnknown_086B1E46 -.4byte gUnknown_086B1E46 +.4byte gMonCatchBallTrailSpriteSet +.4byte gMonCatchBallTrailSpriteSet .4byte gUnknown_086B173E .4byte gUnknown_086B1A48 .4byte gUnknown_086B1A5C @@ -6632,7 +6632,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B1A84 .4byte gUnknown_086B1846 .4byte gUnknown_086B1760 -.4byte gUnknown_086B1DC4 +.4byte gMonCatchBallAbsorbPokemonFxSpriteSet .4byte gUnknown_086B1942 .4byte gUnknown_086B187C .4byte gUnknown_086B189E @@ -6666,6 +6666,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B19E8 .4byte gUnknown_086B235E .4byte gUnknown_086B1A98 + gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B17AE .4byte gUnknown_086B1808 @@ -6679,8 +6680,8 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B20B2 .4byte gUnknown_086B15F8 .4byte gUnknown_086B1602 -.4byte gUnknown_086B1F26 -.4byte gUnknown_086B1F78 +.4byte gLegendaryCatchNameBannerSpriteSheet +.4byte gLegendaryCatchWasCaughtTextSpriteSheet .4byte gUnknown_086B1FF4 .4byte gUnknown_086B2026 .4byte gUnknown_086B2048 @@ -6706,8 +6707,8 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B2228 .4byte gUnknown_086B224A .4byte gUnknown_086B226C -.4byte gUnknown_086B1E46 -.4byte gUnknown_086B1E46 +.4byte gMonCatchBallTrailSpriteSet +.4byte gMonCatchBallTrailSpriteSet .4byte gUnknown_086B160C .4byte gUnknown_086B173E .4byte gUnknown_086B1A48 @@ -6721,7 +6722,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1BF8 .4byte gUnknown_086B1846 .4byte gUnknown_086B1760 -.4byte gUnknown_086B1DC4 +.4byte gMonCatchBallAbsorbPokemonFxSpriteSet .4byte gUnknown_086B1616 .4byte gUnknown_086B1628 .4byte gUnknown_086B1862 @@ -12533,7 +12534,7 @@ gKyogreIntroCrystalGroundSpriteSet:: @ 0x086BA572 packed_sprite_oam x=0x64, y=0x44, spriteSize=SPRITE_SIZE_32x8, tileNum=0x171, priority=0x1, paletteNum=0xa .2byte 0 -gUnknown_086BA5B4:: @ 0x086BA5B4 +gGroudonBoulder0SpriteSet:: @ 0x086BA5B4 .2byte 3 packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x7d, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12542,7 +12543,7 @@ gUnknown_086BA5B4:: @ 0x086BA5B4 packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x85, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA5CE:: @ 0x086BA5CE +gGroudonBoulder1SpriteSet:: @ 0x086BA5CE .2byte 3 packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x95, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12551,7 +12552,7 @@ gUnknown_086BA5CE:: @ 0x086BA5CE packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x9d, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA5E8:: @ 0x086BA5E8 +gGroudonBoulder2SpriteSet:: @ 0x086BA5E8 .2byte 3 packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x8, tileNum=0xad, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12560,7 +12561,7 @@ gUnknown_086BA5E8:: @ 0x086BA5E8 packed_sprite_oam x=0x8, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb5, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA602:: @ 0x086BA602 +gGroudonShockwaveSpriteSet:: @ 0x086BA602 .2byte 4 packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc5, priority=0x2, paletteNum=0xc .2byte 0 @@ -12571,7 +12572,7 @@ gUnknown_086BA602:: @ 0x086BA602 packed_sprite_oam x=0x0, y=0x0, affineMode=ST_OAM_AFFINE_DOUBLE, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x64, tileNum=0xc5, priority=0x2, paletteNum=0xc .2byte 0 -gUnknown_086BA624:: @ 0x086BA624 +gGroudonCrystalTopRightSpriteSet:: @ 0x086BA624 .2byte 3 packed_sprite_oam x=0x5E, y=-0x47, spriteSize=SPRITE_SIZE_8x16, tileNum=0x105, priority=0x1, paletteNum=0x3 .2byte 0 @@ -12580,7 +12581,7 @@ gUnknown_086BA624:: @ 0x086BA624 packed_sprite_oam x=0x66, y=-0x47, spriteSize=SPRITE_SIZE_16x16, tileNum=0x109, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086BA63E:: @ 0x086BA63E +gGroudonCrystalBottomRightSpriteSet:: @ 0x086BA63E .2byte 3 packed_sprite_oam x=0x66, y=0x31, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc5, priority=0x1, paletteNum=0x3 .2byte 0 @@ -12589,7 +12590,7 @@ gUnknown_086BA63E:: @ 0x086BA63E packed_sprite_oam x=0x6E, y=0x31, spriteSize=SPRITE_SIZE_16x16, tileNum=0xc9, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086BA658:: @ 0x086BA658 +gGroudonCrystalTopLeftSpriteSet:: @ 0x086BA658 .2byte 3 packed_sprite_oam x=0x7E, y=-0x37, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc5, priority=0x1, paletteNum=0x3 .2byte 0 @@ -12598,7 +12599,7 @@ gUnknown_086BA658:: @ 0x086BA658 packed_sprite_oam x=-0x78, y=-0x37, spriteSize=SPRITE_SIZE_16x16, tileNum=0xc9, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086BA672:: @ 0x086BA672 +gGroudonCrystalBottomLeftSpriteSet:: @ 0x086BA672 .2byte 3 packed_sprite_oam x=-0x72, y=0x51, spriteSize=SPRITE_SIZE_8x16, tileNum=0xc5, priority=0x1, paletteNum=0x3 .2byte 0 @@ -12607,7 +12608,7 @@ gUnknown_086BA672:: @ 0x086BA672 packed_sprite_oam x=-0x6A, y=0x51, spriteSize=SPRITE_SIZE_16x16, tileNum=0xc9, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086BA68C:: @ 0x086BA68C +gGroudonFirePillarSpriteSet:: @ 0x086BA68C .2byte 10 packed_sprite_oam x=0x5, y=0x5, spriteSize=SPRITE_SIZE_8x8, tileNum=0x199, priority=0x1, paletteNum=0x4 packed_sprite_oam x=-0x11, y=0x30, spriteSize=SPRITE_SIZE_8x8, tileNum=0x199, priority=0x1, paletteNum=0x4 @@ -12620,15 +12621,15 @@ gUnknown_086BA68C:: @ 0x086BA68C packed_sprite_oam x=0x0, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x17d, priority=0x1, paletteNum=0x5 packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x11d, priority=0x1, paletteNum=0x5 -gUnknown_086BA6CA:: @ 0x086BA6CA +gGroudonEntitySpriteSet:: @ 0x086BA6CA .incbin "baserom.gba", 0x6BA6Ca, 0x92 -gUnknown_086BA75C:: @ 0x086BA75C +gRaquazaFlyingSparkleSpriteSet:: @ 0x086BA75C .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x7d, priority=0x3, paletteNum=0xc .2byte 0 -gUnknown_086BA766:: @ 0x086BA766 +gRaquazaEntityFlyingUpSpriteSet:: @ 0x086BA766 .2byte 14 packed_sprite_oam x=0x4, y=-0x50, spriteSize=SPRITE_SIZE_16x8, tileNum=0xb1, priority=0x3, paletteNum=0xf .2byte 0 @@ -12659,7 +12660,7 @@ gUnknown_086BA766:: @ 0x086BA766 packed_sprite_oam x=0xC, y=0x30, spriteSize=SPRITE_SIZE_8x8, tileNum=0xf3, priority=0x3, paletteNum=0xf .2byte 0 -gUnknown_086BA7D8:: @ 0x086BA7D8 +gRaquazaEntityFlyingDownSpriteSet:: @ 0x086BA7D8 .2byte 14 packed_sprite_oam x=0x4, y=0x70, spriteSize=SPRITE_SIZE_16x8, vFlip=0x1, tileNum=0xb1, priority=0x3, paletteNum=0xf .2byte 0 @@ -12690,31 +12691,31 @@ gUnknown_086BA7D8:: @ 0x086BA7D8 packed_sprite_oam x=0xC, y=-0x10, spriteSize=SPRITE_SIZE_8x8, vFlip=0x1, tileNum=0xf3, priority=0x3, paletteNum=0xf .2byte 0 -gUnknown_086BA84A:: @ 0x086BA84A +gRaquazaEntityShadowFxSpriteSet:: @ 0x086BA84A .2byte 1 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_64x32, tileNum=0x91, priority=0x2, paletteNum=0xf .2byte 0 -gUnknown_086BA854:: @ 0x086BA854 +gRaquazaEntityBouncingSpriteSet:: @ 0x086BA854 .2byte 1 packed_sprite_oam x=0x0, y=-0x2, spriteSize=SPRITE_SIZE_64x64, tileNum=0xb1, priority=0x1, paletteNum=0xf .2byte 0 -gUnknown_086BA85E:: @ 0x086BA85E +gRaquazaTornadoSpriteSet:: @ 0x086BA85E .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xf5, priority=0x1, paletteNum=0xc .2byte 0 packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x105, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA870:: @ 0x086BA870 +gRaquazaEntityRoarHeadExtensionSpriteSet:: @ 0x086BA870 .2byte 2 packed_sprite_oam x=0x11, y=-0x21, spriteSize=SPRITE_SIZE_32x16, tileNum=0x109, priority=0x1, paletteNum=0xe .2byte 0 packed_sprite_oam x=0x11, y=-0x11, spriteSize=SPRITE_SIZE_32x8, tileNum=0x111, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086BA882:: @ 0x086BA882 +gRaquazaWhirlwindBallLaunchSpriteSet:: @ 0x086BA882 .2byte 5 packed_sprite_oam x=0x0, y=-0x30, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x139, priority=0x1, paletteNum=0xc .2byte 0 @@ -12727,14 +12728,14 @@ gUnknown_086BA882:: @ 0x086BA882 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x15d, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA8AC:: @ 0x086BA8AC +gRaquazaLightningBallGrabSpriteSet:: @ 0x086BA8AC .2byte 2 packed_sprite_oam x=-0x2, y=0x8, spriteSize=SPRITE_SIZE_16x8, tileNum=0x254, priority=0x1, paletteNum=0xc .2byte 0 packed_sprite_oam x=0xE, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x256, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA8BE:: @ 0x086BA8BE +gRaquazaLightningChargeRingSpriteSet:: @ 0x086BA8BE .2byte 3 packed_sprite_oam x=0x0, y=0x2E, spriteSize=SPRITE_SIZE_32x8, tileNum=0x19a, priority=0x1, paletteNum=0xc .2byte 0 @@ -12743,7 +12744,7 @@ gUnknown_086BA8BE:: @ 0x086BA8BE packed_sprite_oam x=0x20, y=0x31, spriteSize=SPRITE_SIZE_16x8, tileNum=0x1a2, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA8D8:: @ 0x086BA8D8 +gRaquazaLightningWarningStrikeSpriteSet:: @ 0x086BA8D8 .2byte 6 packed_sprite_oam x=-0x3, y=-0x3D, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1da, priority=0x1, paletteNum=0xc .2byte 0 @@ -12758,7 +12759,7 @@ gUnknown_086BA8D8:: @ 0x086BA8D8 packed_sprite_oam x=0xD, y=0x33, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1ec, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA90A:: @ 0x086BA90A +gRaquazaLightningStrikeSpriteSet:: @ 0x086BA90A .2byte 7 packed_sprite_oam x=-0x8, y=-0x38, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1f6, priority=0x1, paletteNum=0xc .2byte 0 @@ -12775,29 +12776,29 @@ gUnknown_086BA90A:: @ 0x086BA90A packed_sprite_oam x=0x0, y=0x48, spriteSize=SPRITE_SIZE_32x32, tileNum=0x21a, priority=0x1, paletteNum=0xc .2byte 0 -gUnknown_086BA944:: @ 0x086BA944 +gSphealNetBackSpriteSet:: @ 0x086BA944 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x49, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086BA94E:: @ 0x086BA94E +gSphealNetFrontSpriteSet:: @ 0x086BA94E .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x59, priority=0x1, paletteNum=0x3 .2byte 0 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x61, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086BA960:: @ 0x086BA960 +gSphealLeftSealeoEntitySpriteSet:: @ 0x086BA960 .2byte 1 packed_sprite_oam x=-0x5F, y=0x9, spriteSize=SPRITE_SIZE_64x64, hFlip=0x1, tileNum=0xa5, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086BA96A:: @ 0x086BA96A +gSphealRightSealeoEntitySpriteSet:: @ 0x086BA96A .2byte 1 packed_sprite_oam x=0x1F, y=0x9, spriteSize=SPRITE_SIZE_64x64, tileNum=0x65, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086BA974:: @ 0x086BA974 +gSphealEntity0SpriteSet:: @ 0x086BA974 .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xe5, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12808,7 +12809,7 @@ gUnknown_086BA974:: @ 0x086BA974 packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xed, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA996:: @ 0x086BA996 +gSphealEntity1SpriteSet:: @ 0x086BA996 .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xee, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12819,7 +12820,7 @@ gUnknown_086BA996:: @ 0x086BA996 packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xf6, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA9B8:: @ 0x086BA9B8 +gSphealEntity0ReflectionSpriteSet:: @ 0x086BA9B8 .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xf7, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12830,7 +12831,7 @@ gUnknown_086BA9B8:: @ 0x086BA9B8 packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xff, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA9DA:: @ 0x086BA9DA +gSphealEntity1ReflectionSpriteSet:: @ 0x086BA9DA .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x100, priority=0x1, paletteNum=0x4 .2byte 0 @@ -12841,7 +12842,7 @@ gUnknown_086BA9DA:: @ 0x086BA9DA packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x108, priority=0x1, paletteNum=0x4 .2byte 0 -gUnknown_086BA9FC:: @ 0x086BA9FC +gSphealWhiscashEntitySpriteSet:: @ 0x086BA9FC .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x109, priority=0x1, paletteNum=0x7 .2byte 0 @@ -12853,7 +12854,7 @@ gUnknown_086BA9FC:: @ 0x086BA9FC .2byte 0 -gUnknown_086BAA1E:: @ 0x086BAA1E +gSphealPelipperEntitySpriteSet:: @ 0x086BAA1E .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x12d, priority=0x1, paletteNum=0x8 .2byte 0 @@ -12912,7 +12913,7 @@ gBonusBoardEndScoreSpriteSet:: @ 0x086BAA5A packed_sprite_oam x=0x36, y=0x29, spriteSize=SPRITE_SIZE_8x16, tileNum=0x38a, priority=0x0, paletteNum=0x8 .2byte 0 -gUnknown_086BAAEC:: @ 0x086BAAEC +gGroudonFireballLaunchFxSpriteSet:: @ 0x086BAAEC .2byte 6 packed_sprite_oam x=-0xA, y=0x1B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2c6, priority=0x0, paletteNum=0xc .2byte 0 @@ -12927,7 +12928,7 @@ gUnknown_086BAAEC:: @ 0x086BAAEC packed_sprite_oam x=0x1A, y=0x2A, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x2cc, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAB1E:: @ 0x086BAB1E +gGroudonFireballSpriteSet:: @ 0x086BAB1E .2byte 4 packed_sprite_oam x=-0x10, y=-0x7, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xc .2byte 0 @@ -12938,14 +12939,14 @@ gUnknown_086BAB1E:: @ 0x086BAB1E packed_sprite_oam x=0x8, y=-0x7, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x32c, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAB40:: @ 0x086BAB40 +gGroudonFireballCaughtBallSpriteSet:: @ 0x086BAB40 .2byte 2 packed_sprite_oam x=-0x7, y=-0x2, spriteSize=SPRITE_SIZE_32x16, tileNum=0x364, priority=0x0, paletteNum=0xc .2byte 0 packed_sprite_oam x=-0x7, y=0xE, spriteSize=SPRITE_SIZE_32x8, tileNum=0x36c, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAB52:: @ 0x086BAB52 +gRaquazaIntroCloud0SpriteSet:: @ 0x086BAB52 .2byte 4 packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x1, paletteNum=0x2 .2byte 0 @@ -12956,7 +12957,7 @@ gUnknown_086BAB52:: @ 0x086BAB52 packed_sprite_oam x=0x50, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x348, priority=0x1, paletteNum=0x2 .2byte 0 -gUnknown_086BAB74:: @ 0x086BAB74 +gRaquazaIntroCloud1SpriteSet:: @ 0x086BAB74 .2byte 6 packed_sprite_oam x=-0x20, y=0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x34a, priority=0x1, paletteNum=0x2 .2byte 0 @@ -12971,7 +12972,7 @@ gUnknown_086BAB74:: @ 0x086BAB74 packed_sprite_oam x=0x40, y=0x8, spriteSize=SPRITE_SIZE_64x32, tileNum=0x38e, priority=0x1, paletteNum=0x2 .2byte 0 -gUnknown_086BABA6:: @ 0x086BABA6 +gRaquazaIntroCloud2SpriteSet:: @ 0x086BABA6 .2byte 5 packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x3ae, priority=0x1, paletteNum=0x2 .2byte 0 @@ -12984,7 +12985,7 @@ gUnknown_086BABA6:: @ 0x086BABA6 packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3e4, priority=0x1, paletteNum=0x2 .2byte 0 -gUnknown_086BABD0:: @ 0x086BABD0 +gRaquazaEntityFlybyRightSpriteSet:: @ 0x086BABD0 .2byte 18 packed_sprite_oam x=-0x79, y=0xA, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 @@ -13023,7 +13024,7 @@ gUnknown_086BABD0:: @ 0x086BABD0 packed_sprite_oam x=-0x16, y=0x12, spriteSize=SPRITE_SIZE_8x8, tileNum=0x325, priority=0x0, paletteNum=0xf .2byte 0 -gUnknown_086BAC62:: @ 0x086BAC62 +gRaquazaEntityFlybyLeftSpriteSet:: @ 0x086BAC62 .2byte 18 packed_sprite_oam x=0x69, y=0xA, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 @@ -13062,7 +13063,7 @@ gUnknown_086BAC62:: @ 0x086BAC62 packed_sprite_oam x=0xE, y=0x12, spriteSize=SPRITE_SIZE_8x8, hFlip=0x1, tileNum=0x325, priority=0x0, paletteNum=0xf .2byte 0 -gUnknown_086BACF4:: @ 0x086BACF4 +gRaquazaFlybyRightWindSpeedlines0ASpriteSet:: @ 0x086BACF4 .2byte 15 packed_sprite_oam x=-0x78, y=-0x68, spriteSize=SPRITE_SIZE_32x8, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 @@ -13095,7 +13096,7 @@ gUnknown_086BACF4:: @ 0x086BACF4 packed_sprite_oam x=0x18, y=-0x50, spriteSize=SPRITE_SIZE_32x16, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAD6E:: @ 0x086BAD6E +gRaquazaFlybyRightWindSpeedlines0BSpriteSet:: @ 0x086BAD6E .2byte 14 packed_sprite_oam x=0x38, y=-0x50, spriteSize=SPRITE_SIZE_32x16, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 @@ -13126,7 +13127,7 @@ gUnknown_086BAD6E:: @ 0x086BAD6E packed_sprite_oam x=-0x60, y=-0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BADE0:: @ 0x086BADE0 +gRaquazaFlybyRightWindSpeedlines1ASpriteSet:: @ 0x086BADE0 .2byte 15 packed_sprite_oam x=-0x65, y=0x11, spriteSize=SPRITE_SIZE_32x8, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 @@ -13159,7 +13160,7 @@ gUnknown_086BADE0:: @ 0x086BADE0 packed_sprite_oam x=-0x19, y=0x38, spriteSize=SPRITE_SIZE_32x16, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAE5A:: @ 0x086BAE5A +gRaquazaFlybyRightWindSpeedlines1BSpriteSet:: @ 0x086BAE5A .2byte 9 packed_sprite_oam x=0x7, y=0x38, spriteSize=SPRITE_SIZE_16x16, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 @@ -13180,7 +13181,7 @@ gUnknown_086BAE5A:: @ 0x086BAE5A packed_sprite_oam x=0x45, y=-0x80, spriteSize=SPRITE_SIZE_32x8, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAEA4:: @ 0x086BAEA4 +gRaquazaFlybyRightWindSpeedlines2ASpriteSet:: @ 0x086BAEA4 .2byte 15 packed_sprite_oam x=-0x52, y=0x12, spriteSize=SPRITE_SIZE_32x8, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 @@ -13213,7 +13214,7 @@ gUnknown_086BAEA4:: @ 0x086BAEA4 packed_sprite_oam x=0x53, y=-0x4D, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38c, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAF1E:: @ 0x086BAF1E +gRaquazaFlybyRightWindSpeedlines2BSpriteSet:: @ 0x086BAF1E .2byte 12 packed_sprite_oam x=-0xD, y=0x3B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 @@ -13240,7 +13241,7 @@ gUnknown_086BAF1E:: @ 0x086BAF1E packed_sprite_oam x=0x5B, y=-0x80, spriteSize=SPRITE_SIZE_8x8, tileNum=0x387, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAF80:: @ 0x086BAF80 +gRaquazaFlybyLeftWindSpeedlines0ASpriteSet:: @ 0x086BAF80 .2byte 15 packed_sprite_oam x=0x60, y=-0x68, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x326, priority=0x0, paletteNum=0xc .2byte 0 @@ -13273,7 +13274,7 @@ gUnknown_086BAF80:: @ 0x086BAF80 packed_sprite_oam x=-0x30, y=-0x50, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x340, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BAFFA:: @ 0x086BAFFA +gRaquazaFlybyLeftWindSpeedlines0BSpriteSet:: @ 0x086BAFFA .2byte 14 packed_sprite_oam x=-0x50, y=-0x50, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x348, priority=0x0, paletteNum=0xc .2byte 0 @@ -13304,7 +13305,7 @@ gUnknown_086BAFFA:: @ 0x086BAFFA packed_sprite_oam x=0x48, y=-0x20, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x336, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BB06C:: @ 0x086BB06C +gRaquazaFlybyLeftWindSpeedlines1ASpriteSet:: @ 0x086BB06C .2byte 15 packed_sprite_oam x=0x4E, y=0x11, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x358, priority=0x0, paletteNum=0xc .2byte 0 @@ -13337,7 +13338,7 @@ gUnknown_086BB06C:: @ 0x086BB06C packed_sprite_oam x=0x2, y=0x38, spriteSize=SPRITE_SIZE_32x16, hFlip=0x1, tileNum=0x36a, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BB0E6:: @ 0x086BB0E6 +gRaquazaFlybyLeftWindSpeedlines1BSpriteSet:: @ 0x086BB0E6 .2byte 9 packed_sprite_oam x=-0xE, y=0x38, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x372, priority=0x0, paletteNum=0xc .2byte 0 @@ -13358,7 +13359,7 @@ gUnknown_086BB0E6:: @ 0x086BB0E6 packed_sprite_oam x=-0x5B, y=-0x80, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x366, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086BB130:: @ 0x086BB130 +gRaquazaFlybyLeftWindSpeedlines2ASpriteSet:: @ 0x086BB130 .2byte 15 packed_sprite_oam x=0x41, y=0x12, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x37a, priority=0x0, paletteNum=0xc .2byte 0 @@ -13392,7 +13393,7 @@ gUnknown_086BB130:: @ 0x086BB130 .2byte 0 -gUnknown_086BB1AA:: @ 0x086BB1AA +gRaquazaFlybyLeftWindSpeedlines2BSpriteSet:: @ 0x086BB1AA .2byte 12 packed_sprite_oam x=-0x4, y=0x3B, spriteSize=SPRITE_SIZE_32x8, hFlip=0x1, tileNum=0x388, priority=0x0, paletteNum=0xc .2byte 0 @@ -13420,7 +13421,7 @@ gUnknown_086BB1AA:: @ 0x086BB1AA .2byte 0 -gUnknown_086BB20C:: @ 0x086BB20C +gSphealEndScorePanelSpriteSet:: @ 0x086BB20C .2byte 22 packed_sprite_oam x=-0x5E, y=-0x16, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c0, priority=0x0, paletteNum=0x4 .2byte 0 @@ -13467,7 +13468,7 @@ gUnknown_086BB20C:: @ 0x086BB20C packed_sprite_oam x=0x46, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2cc, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086BB2BE:: @ 0x086BB2BE +gSphealEndScoreSphealsSunkSpriteSet:: @ 0x086BB2BE .2byte 12 packed_sprite_oam x=-0x6, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 @@ -13494,7 +13495,7 @@ gUnknown_086BB2BE:: @ 0x086BB2BE packed_sprite_oam x=-0x2A, y=-0x10, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086BB320:: @ 0x086BB320 +gSphealEndScoreBallsSunkSpriteSet:: @ 0x086BB320 .2byte 12 packed_sprite_oam x=-0x6, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 @@ -13521,7 +13522,7 @@ gUnknown_086BB320:: @ 0x086BB320 packed_sprite_oam x=-0x2A, y=0x4, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086BB382:: @ 0x086BB382 +gSphealEndScoreTotalSpriteSet:: @ 0x086BB382 .2byte 12 packed_sprite_oam x=-0xE, y=0x20, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d0, priority=0x0, paletteNum=0x0 .2byte 0 @@ -13608,8 +13609,8 @@ gKyogreBoardSpriteSets:: @ 0x086BB4A4 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gUnknown_086B1F26 - .4byte gUnknown_086B1F78 + .4byte gLegendaryCatchNameBannerSpriteSheet + .4byte gLegendaryCatchWasCaughtTextSpriteSheet .4byte gLegendaryCatchPortraitSpriteSet .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gKyogreCrystalTopRightSpriteSet @@ -13620,13 +13621,13 @@ gKyogreBoardSpriteSets:: @ 0x086BB4A4 .4byte gKyogreFreezeTrapSpriteSet .4byte gBonusBoardBallRespawnFxSpriteSet .4byte gBonusBoardBallSpriteSet - .4byte gUnknown_086B1E46 - .4byte gUnknown_086B1E46 + .4byte gMonCatchBallTrailSpriteSet + .4byte gMonCatchBallTrailSpriteSet .4byte gKyogreEntitySpriteSet .4byte gKyogreWhirlpool0SpriteSet .4byte gKyogreWhirlpool1SpriteSet .4byte gKyogreShockwaveSpriteSet - .4byte gUnknown_086B1DC4 + .4byte gMonCatchBallAbsorbPokemonFxSpriteSet .4byte gKyogreSurfacingFxSpriteSet gGroudonBoardSpriteSets:: @ 0x086BB510 @@ -13637,31 +13638,31 @@ gGroudonBoardSpriteSets:: @ 0x086BB510 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gUnknown_086B1F26 - .4byte gUnknown_086B1F78 + .4byte gLegendaryCatchNameBannerSpriteSheet + .4byte gLegendaryCatchWasCaughtTextSpriteSheet .4byte gLegendaryCatchPortraitSpriteSet .4byte gLegendaryCatchPortraitBordersSpriteSet - .4byte gUnknown_086BA624 - .4byte gUnknown_086BA63E - .4byte gUnknown_086BA658 - .4byte gUnknown_086BA672 - .4byte gUnknown_086BA5B4 - .4byte gUnknown_086BA5CE - .4byte gUnknown_086BA5E8 - .4byte gUnknown_086BA68C - .4byte gUnknown_086BA68C - .4byte gUnknown_086BA68C - .4byte gUnknown_086BA68C - .4byte gUnknown_086BAB1E - .4byte gUnknown_086BAAEC - .4byte gUnknown_086BAB40 + .4byte gGroudonCrystalTopRightSpriteSet + .4byte gGroudonCrystalBottomRightSpriteSet + .4byte gGroudonCrystalTopLeftSpriteSet + .4byte gGroudonCrystalBottomLeftSpriteSet + .4byte gGroudonBoulder0SpriteSet + .4byte gGroudonBoulder1SpriteSet + .4byte gGroudonBoulder2SpriteSet + .4byte gGroudonFirePillarSpriteSet + .4byte gGroudonFirePillarSpriteSet + .4byte gGroudonFirePillarSpriteSet + .4byte gGroudonFirePillarSpriteSet + .4byte gGroudonFireballSpriteSet + .4byte gGroudonFireballLaunchFxSpriteSet + .4byte gGroudonFireballCaughtBallSpriteSet .4byte gBonusBoardBallRespawnFxSpriteSet .4byte gBonusBoardBallSpriteSet - .4byte gUnknown_086B1E46 - .4byte gUnknown_086B1E46 - .4byte gUnknown_086BA6CA - .4byte gUnknown_086BA602 - .4byte gUnknown_086B1DC4 + .4byte gMonCatchBallTrailSpriteSet + .4byte gMonCatchBallTrailSpriteSet + .4byte gGroudonEntitySpriteSet + .4byte gGroudonShockwaveSpriteSet + .4byte gMonCatchBallAbsorbPokemonFxSpriteSet gRayquazaBoardSpriteSets:: @ 0x086BB590 .4byte gBonusBoardPausePanelSpriteSet @@ -13671,45 +13672,45 @@ gRayquazaBoardSpriteSets:: @ 0x086BB590 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gUnknown_086B1F26 - .4byte gUnknown_086B1F78 + .4byte gLegendaryCatchNameBannerSpriteSheet + .4byte gLegendaryCatchWasCaughtTextSpriteSheet .4byte gLegendaryCatchPortraitSpriteSet .4byte gLegendaryCatchPortraitBordersSpriteSet - .4byte gUnknown_086BAB52 - .4byte gUnknown_086BAB74 - .4byte gUnknown_086BABA6 - .4byte gUnknown_086BA75C - .4byte gUnknown_086BA85E - .4byte gUnknown_086BA85E - .4byte gUnknown_086BA8BE - .4byte gUnknown_086BA8D8 - .4byte gUnknown_086BA90A - .4byte gUnknown_086BA882 - .4byte gUnknown_086BA870 - .4byte gUnknown_086BABD0 - .4byte gUnknown_086BAC62 - .4byte gUnknown_086BACF4 - .4byte gUnknown_086BAD6E - .4byte gUnknown_086BADE0 - .4byte gUnknown_086BAE5A - .4byte gUnknown_086BAEA4 - .4byte gUnknown_086BAF1E - .4byte gUnknown_086BAF80 - .4byte gUnknown_086BAFFA - .4byte gUnknown_086BB06C - .4byte gUnknown_086BB0E6 - .4byte gUnknown_086BB130 - .4byte gUnknown_086BB1AA - .4byte gUnknown_086BA8AC + .4byte gRaquazaIntroCloud0SpriteSet + .4byte gRaquazaIntroCloud1SpriteSet + .4byte gRaquazaIntroCloud2SpriteSet + .4byte gRaquazaFlyingSparkleSpriteSet + .4byte gRaquazaTornadoSpriteSet + .4byte gRaquazaTornadoSpriteSet + .4byte gRaquazaLightningChargeRingSpriteSet + .4byte gRaquazaLightningWarningStrikeSpriteSet + .4byte gRaquazaLightningStrikeSpriteSet + .4byte gRaquazaWhirlwindBallLaunchSpriteSet + .4byte gRaquazaEntityRoarHeadExtensionSpriteSet + .4byte gRaquazaEntityFlybyRightSpriteSet + .4byte gRaquazaEntityFlybyLeftSpriteSet + .4byte gRaquazaFlybyRightWindSpeedlines0ASpriteSet + .4byte gRaquazaFlybyRightWindSpeedlines0BSpriteSet + .4byte gRaquazaFlybyRightWindSpeedlines1ASpriteSet + .4byte gRaquazaFlybyRightWindSpeedlines1BSpriteSet + .4byte gRaquazaFlybyRightWindSpeedlines2ASpriteSet + .4byte gRaquazaFlybyRightWindSpeedlines2BSpriteSet + .4byte gRaquazaFlybyLeftWindSpeedlines0ASpriteSet + .4byte gRaquazaFlybyLeftWindSpeedlines0BSpriteSet + .4byte gRaquazaFlybyLeftWindSpeedlines1ASpriteSet + .4byte gRaquazaFlybyLeftWindSpeedlines1BSpriteSet + .4byte gRaquazaFlybyLeftWindSpeedlines2ASpriteSet + .4byte gRaquazaFlybyLeftWindSpeedlines2BSpriteSet + .4byte gRaquazaLightningBallGrabSpriteSet .4byte gBonusBoardBallRespawnFxSpriteSet .4byte gBonusBoardBallSpriteSet - .4byte gUnknown_086B1E46 - .4byte gUnknown_086B1E46 - .4byte gUnknown_086BA854 - .4byte gUnknown_086BA766 - .4byte gUnknown_086BA7D8 - .4byte gUnknown_086B1DC4 - .4byte gUnknown_086BA84A + .4byte gMonCatchBallTrailSpriteSet + .4byte gMonCatchBallTrailSpriteSet + .4byte gRaquazaEntityBouncingSpriteSet + .4byte gRaquazaEntityFlyingUpSpriteSet + .4byte gRaquazaEntityFlyingDownSpriteSet + .4byte gMonCatchBallAbsorbPokemonFxSpriteSet + .4byte gRaquazaEntityShadowFxSpriteSet gSphealBoardSpriteSets:: @ 0x086BB648 .4byte gBonusBoardPausePanelSpriteSet @@ -13719,22 +13720,22 @@ gSphealBoardSpriteSets:: @ 0x086BB648 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gUnknown_086BB20C - .4byte gUnknown_086BB2BE - .4byte gUnknown_086BB320 - .4byte gUnknown_086BB382 - .4byte gUnknown_086BA94E + .4byte gSphealEndScorePanelSpriteSet + .4byte gSphealEndScoreSphealsSunkSpriteSet + .4byte gSphealEndScoreBallsSunkSpriteSet + .4byte gSphealEndScoreTotalSpriteSet + .4byte gSphealNetFrontSpriteSet .4byte gBonusBoardBallRespawnFxSpriteSet .4byte gBonusBoardBallSpriteSet - .4byte gUnknown_086BA974 - .4byte gUnknown_086BA996 - .4byte gUnknown_086BA9B8 - .4byte gUnknown_086BA9DA - .4byte gUnknown_086BA944 - .4byte gUnknown_086BA9FC - .4byte gUnknown_086BAA1E - .4byte gUnknown_086BA960 - .4byte gUnknown_086BA96A + .4byte gSphealEntity0SpriteSet + .4byte gSphealEntity1SpriteSet + .4byte gSphealEntity0ReflectionSpriteSet + .4byte gSphealEntity1ReflectionSpriteSet + .4byte gSphealNetBackSpriteSet + .4byte gSphealWhiscashEntitySpriteSet + .4byte gSphealPelipperEntitySpriteSet + .4byte gSphealLeftSealeoEntitySpriteSet + .4byte gSphealRightSealeoEntitySpriteSet diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index 95899942..e875c03b 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -159,7 +159,7 @@ #define SG_SPHEAL_END_SCORE_SPHEALS_SUNK 8 #define SG_SPHEAL_END_SCORE_BALLS_SUNK 9 #define SG_SPHEAL_END_SCORE_TOTAL 10 -#define SG_SPHEAL_SCORED_COUNTER 11 +#define SG_SPHEAL_NET_FRONT 11 // part of the net that is drawn over the ball/spheal #define SG_SPHEAL_BALL_RESPAWN_FX 12 #define SG_SPHEAL_BALL 13 #define SG_SPHEAL_ENTITY_BASE 14 // Of 2 @@ -174,6 +174,12 @@ #define SG_SPHEAL_LEFT_SEALEO_ENTITY 21 #define SG_SPHEAL_RIGHT_SEALEO_ENTITY 22 +// High score screen +#define SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_0 0 +#define SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1 1 +#define SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START 0 +#define SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_END 4 + // Raw list. (can be removed later) #define SG_0 0 #define SG_1 1 diff --git a/src/high_scores.c b/src/high_scores.c index 0e20e1ea..6f35cf4a 100644 --- a/src/high_scores.c +++ b/src/high_scores.c @@ -8,7 +8,7 @@ #include "constants/fields.h" extern StateFunc gHighScoresStateFuncs[15]; -extern StateFunc gIdleHighScoresStateFuncs[15]; +extern StateFunc gIdleHighScoresStateFuncs[3]; extern u8 gHighScoreBG_Pals[]; extern u8 gHighScoreBallWatermark_Tilemap[]; extern u8 gHighScoreText_Gfx[]; @@ -40,9 +40,9 @@ struct HighScoreScreenState u8 mainField; s32 highScoreIndex; s16 currentNameCharIndex; - s16 nameFlashSpriteGroup; + s16 nameFlashToggle; s16 flashFrameCounter; - s16 currentNameChar; + s16 currentNameChar; //0-25="A"-"Z", 26-35="0"-"9" 41=" " s16 flashDuration; s16 flashElapsedFrames; s16 paletteAnimPhase; @@ -55,21 +55,27 @@ struct HighScoreScreenState }; enum HighScoreStates{ - HIGH_SCORE_STATE_0 = 0, - HIGH_SCORE_STATE_1 = 1, - HIGH_SCORE_STATE_2 = 2, - HIGH_SCORE_STATE_3 = 3, - HIGH_SCORE_STATE_4 = 4, - HIGH_SCORE_STATE_5 = 5, - HIGH_SCORE_STATE_6 = 6, - HIGH_SCORE_STATE_7 = 7, - HIGH_SCORE_STATE_8 = 8, - HIGH_SCORE_STATE_9 = 9, - HIGH_SCORE_STATE_10 = 10, - HIGH_SCORE_STATE_11 = 11, - HIGH_SCORE_STATE_12 = 12, - HIGH_SCORE_STATE_13 = 13, - HIGH_SCORE_STATE_14 = 14 + HIGH_SCORE_STATE_INIT = 0, + HIGH_SCORE_STATE_SHOW_COMPLETION_BANNER = 1, + HIGH_SCORE_STATE_FLASH_NEW_SCORE_POSITION = 2, + HIGH_SCORE_STATE_BROWSE_SCORES = 3, + HIGH_SCORE_STATE_NAME_ENTRY = 4, + HIGH_SCORE_STATE_INIT_LINK_EXCHANGE = 5, + HIGH_SCORE_STATE_LINK_EXCHANGE_LOOP = 6, + HIGH_SCORE_STATE_LINK_ERROR = 7, + HIGH_SCORE_STATE_LINK_SUCCESS = 8, + HIGH_SCORE_STATE_LINK_RETRY_WAIT = 9, + HIGH_SCORE_STATE_RESET_CONFIRMATION = 10, + HIGH_SCORE_STATE_EXIT_TO_TITLE = 11, + HIGH_SCORE_STATE_RELOAD_AFTER_LINK = 12, + HIGH_SCORE_STATE_SHOW_MERGED_SCORES = 13, + HIGH_SCORE_STATE_RETURN_TO_MAIN = 14 +}; + +enum IdleHighScoreStates{ + IDLE_HIGH_SCORE_STATE_INIT = 0, + IDLE_HIGH_SCORE_STATE_AUTOSCROLL = 1, + IDLE_HIGH_SCORE_STATE_EXIT = 2 }; struct HighScoreScreenState gHighScoreScreenState; @@ -141,7 +147,7 @@ void InitHighScoreData(void) } } gHighScoreScreenState.currentNameCharIndex = 0; - gHighScoreScreenState.nameFlashSpriteGroup = SG_0; + gHighScoreScreenState.nameFlashToggle = 0; gHighScoreScreenState.flashFrameCounter = 0; gHighScoreScreenState.flashDuration = 0; gHighScoreScreenState.flashElapsedFrames = 0; @@ -188,20 +194,20 @@ void InitHighScoreData(void) { gCompletionBannerVisible = 1; gCompletionBannerY = 0xB8; - gCompletionBannerSpriteGroup = SG_0; + gCompletionBannerSpriteGroup = SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START; gCompletionBannerPhase = 0; - gHighScoreScreenState.nextSubState = 1; + gHighScoreScreenState.nextSubState = HIGH_SCORE_STATE_SHOW_COMPLETION_BANNER; } else { gCompletionBannerVisible = 0; - gHighScoreScreenState.nextSubState = 2; + gHighScoreScreenState.nextSubState = HIGH_SCORE_STATE_FLASH_NEW_SCORE_POSITION; } } else { gCompletionBannerDone = 0; - gHighScoreScreenState.nextSubState = 2; + gHighScoreScreenState.nextSubState = HIGH_SCORE_STATE_FLASH_NEW_SCORE_POSITION; } } else @@ -210,7 +216,7 @@ void InitHighScoreData(void) gScrollXOffset = 0; gScrollDirection = -1; RenderHighScoreSprites(); - gHighScoreScreenState.nextSubState = 3; + gHighScoreScreenState.nextSubState = HIGH_SCORE_STATE_BROWSE_SCORES; } gMain.bgOffsets[3].xOffset = gScrollXOffset; gMain.bgOffsets[2].xOffset = gScrollXOffset; @@ -236,21 +242,21 @@ void HighScore_ShowCompletionBanner(void) if((gHighScoreScreenState.flashDuration & 3) == 0) { gCompletionBannerSpriteGroup++; - if(gCompletionBannerSpriteGroup > SG_4) + if(gCompletionBannerSpriteGroup > SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_END) { - gCompletionBannerSpriteGroup = SG_0; + gCompletionBannerSpriteGroup = SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START; } } if(gCompletionBannerY == 0x50) { - gCompletionBannerSpriteGroup = SG_0; + gCompletionBannerSpriteGroup = SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START; gCompletionBannerPhase++; } break; case 2: if(JOY_NEW(A_BUTTON | B_BUTTON)) { - gCompletionBannerSpriteGroup = SG_0; + gCompletionBannerSpriteGroup = SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START; gCompletionBannerPhase++; } break; @@ -261,7 +267,7 @@ void HighScore_ShowCompletionBanner(void) gHighScoreScreenState.flashDuration = 0; gCompletionBannerDone = 1; gCompletionBannerVisible = 0; - gMain.subState = HIGH_SCORE_STATE_2; + gMain.subState = HIGH_SCORE_STATE_FLASH_NEW_SCORE_POSITION; } break; } @@ -284,7 +290,7 @@ void HighScore_FlashNewEntry(void) gHighScoreScreenState.flashDuration = 999; gHighScoreScreenState.flashElapsedFrames = 0; m4aSongNumStart(MUS_HIGH_SCORE); - gMain.subState = HIGH_SCORE_STATE_3; + gMain.subState = HIGH_SCORE_STATE_BROWSE_SCORES; } else { @@ -296,15 +302,16 @@ void HighScore_FlashNewEntry(void) if(gHighScoreScreenState.flashFrameCounter > 8) { gHighScoreScreenState.flashFrameCounter = 0; - if(!gHighScoreScreenState.nameFlashSpriteGroup) + + if(!gHighScoreScreenState.nameFlashToggle) { - gHighScoreScreenState.nameFlashSpriteGroup = SG_1; + gHighScoreScreenState.nameFlashToggle = 1; CopyString(6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] + (gHighScoreScreenState.mainField << 5), 0, 0x15, 4, 2); CopyString(0, 0x17, 6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] + (gHighScoreScreenState.mainField << 5), 4, 2); } else { - gHighScoreScreenState.nameFlashSpriteGroup = SG_0; + gHighScoreScreenState.nameFlashToggle = 0; CopyString(0, 0x15, 6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] + (gHighScoreScreenState.mainField << 5), 4, 2); } } @@ -324,14 +331,14 @@ void HighScore_FlashNewEntry(void) if(gHighScoreScreenState.flashElapsedFrames > gHighScoreScreenState.flashDuration) { gHighScoreScreenState.flashElapsedFrames = 0; - if(gHighScoreScreenState.nameFlashSpriteGroup == SG_1) + if(gHighScoreScreenState.nameFlashToggle == 1) { - gHighScoreScreenState.nameFlashSpriteGroup = SG_0; + gHighScoreScreenState.nameFlashToggle = 0; gHighScoreScreenState.flashFrameCounter = 0; CopyString(0, 0x15, 6 - (gHighScoreScreenState.mainField << 1), gHighScoreNameRowTilemapOffsets[gHighScoreScreenState.highScoreIndex] +(gHighScoreScreenState.mainField << 5), 4, 2); } m4aSongNumStart(MUS_HIGH_SCORE); - gMain.subState = HIGH_SCORE_STATE_4; + gMain.subState = HIGH_SCORE_STATE_NAME_ENTRY; } DmaCopy16(3, gBG0TilemapBuffer, 0x6000000, 0x1000); @@ -372,7 +379,7 @@ void HighScore_BrowseScores(void) if(JOY_NEW(A_BUTTON | B_BUTTON)) { m4aSongNumStart(SE_MENU_CANCEL); - gMain.subState = HIGH_SCORE_STATE_11; + gMain.subState = HIGH_SCORE_STATE_EXIT_TO_TITLE; } if(JOY_NEW(START_BUTTON)) { @@ -381,7 +388,7 @@ void HighScore_BrowseScores(void) m4aSongNumStart(SE_MENU_POPUP_OPEN); gShowDialogFlag = 1; gDialogType = 0; - gMain.subState = HIGH_SCORE_STATE_5; + gMain.subState = HIGH_SCORE_STATE_INIT_LINK_EXCHANGE; } } @@ -400,7 +407,7 @@ void HighScore_BrowseScores(void) m4aSongNumStart(SE_MENU_POPUP_OPEN); gShowDialogFlag = 1; gDialogType = 4; - gMain.subState = HIGH_SCORE_STATE_10; + gMain.subState = HIGH_SCORE_STATE_RESET_CONFIRMATION; } } if(gResetComboTimer > 0) @@ -436,7 +443,7 @@ void HighScore_NameEntry(void) if (++gHighScoreScreenState.flashFrameCounter > 12) { gHighScoreScreenState.flashFrameCounter = 0; - gHighScoreScreenState.nameFlashSpriteGroup = SG_1 - gHighScoreScreenState.nameFlashSpriteGroup; + gHighScoreScreenState.nameFlashToggle = SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1 - gHighScoreScreenState.nameFlashToggle; } if (++gHighScoreScreenState.paletteAnimTimer > 8) @@ -481,7 +488,7 @@ void HighScore_NameEntry(void) else { m4aSongNumStart(SE_MENU_MOVE); - gHighScoreScreenState.nameFlashSpriteGroup = SG_1; + gHighScoreScreenState.nameFlashToggle = SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; gHighScoreScreenState.currentNameCharIndex++; @@ -497,7 +504,7 @@ void HighScore_NameEntry(void) else { m4aSongNumStart(SE_MENU_MOVE); - gHighScoreScreenState.nameFlashSpriteGroup = SG_1; + gHighScoreScreenState.nameFlashToggle = SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; gHighScoreScreenState.currentNameCharIndex--; @@ -507,7 +514,7 @@ void HighScore_NameEntry(void) if (JOY_NEW(A_BUTTON)) { - gHighScoreScreenState.nameFlashSpriteGroup = SG_1; + gHighScoreScreenState.nameFlashToggle = SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; if (gHighScoreScreenState.currentNameCharIndex == HIGH_SCORE_NAME_LENGTH - 1) @@ -527,7 +534,7 @@ void HighScore_NameEntry(void) } SaveFile_WriteToSram(); - gMain.subState = HIGH_SCORE_STATE_3; + gMain.subState = HIGH_SCORE_STATE_BROWSE_SCORES; } else { @@ -545,7 +552,7 @@ void HighScore_NameEntry(void) else { m4aSongNumStart(SE_SCORE_ENTRY_A_B_MOVE); - gHighScoreScreenState.nameFlashSpriteGroup = SG_1; + gHighScoreScreenState.nameFlashToggle = SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1; PrintHighScoreNameChar(gHighScoreScreenState.currentNameChar, gHighScoreScreenState.highScoreIndex, gHighScoreScreenState.currentNameCharIndex, gHighScoreScreenState.mainField); gWorkingHighScores[gHighScoreScreenState.mainField][gHighScoreScreenState.highScoreIndex].data.parts.name[gHighScoreScreenState.currentNameCharIndex] = gHighScoreScreenState.currentNameChar; gHighScoreScreenState.currentNameCharIndex--; @@ -564,7 +571,7 @@ void HighScore_InitLinkExchange(void) InitLinkExchangeBuffers(); gLinkExchangeStep = 0; RenderHighScoreSprites(); - gMain.subState = HIGH_SCORE_STATE_6; + gMain.subState = HIGH_SCORE_STATE_LINK_EXCHANGE_LOOP; } void HighScore_LinkExchangeLoop(void) @@ -576,7 +583,7 @@ void HighScore_LinkExchangeLoop(void) gShowDialogFlag = 0; gDialogType = 0; ResetSerialAndInterrupts(); - gMain.subState = HIGH_SCORE_STATE_3; + gMain.subState = HIGH_SCORE_STATE_BROWSE_SCORES; } else { @@ -592,12 +599,12 @@ void HighScore_LinkExchangeLoop(void) s16 var0 = HighScore_ProcessLinkExchange(); if (var0 == -1) { - gMain.subState = HIGH_SCORE_STATE_8; + gMain.subState = HIGH_SCORE_STATE_LINK_SUCCESS; } else if (var0 == 1) { gDialogType = 2; - gMain.subState = HIGH_SCORE_STATE_7; + gMain.subState = HIGH_SCORE_STATE_LINK_ERROR; m4aSongNumStart(SE_FAILURE); } } @@ -606,7 +613,7 @@ void HighScore_LinkExchangeLoop(void) if ((gLinkStatusResult & 0x7f0000) != 0 && gLinkExchangeResult == -1 && ++gLinkTimeoutCounter > 180) { gDialogType = 2; - gMain.subState = HIGH_SCORE_STATE_7; + gMain.subState = HIGH_SCORE_STATE_LINK_ERROR; m4aSongNumStart(SE_FAILURE); } } @@ -618,7 +625,7 @@ void HighScore_LinkRetryWait(void) if (++gLinkTimeoutCounter > 2) { gLinkTimeoutCounter = 0; - gMain.subState = HIGH_SCORE_STATE_5; + gMain.subState = HIGH_SCORE_STATE_INIT_LINK_EXCHANGE; } } @@ -644,7 +651,7 @@ void HighScore_LinkError(void) FadeOutScreen(); m4aMPlayAllStop(); DisableVBlankInterrupts(); - gMain.subState = HIGH_SCORE_STATE_0; + gMain.subState = HIGH_SCORE_STATE_INIT; } } @@ -683,7 +690,7 @@ void HighScore_LinkSuccess(void) FadeOutScreen(); m4aMPlayAllStop(); DisableVBlankInterrupts(); - gMain.subState = HIGH_SCORE_STATE_12; + gMain.subState = HIGH_SCORE_STATE_RELOAD_AFTER_LINK; break; } @@ -701,14 +708,14 @@ void HighScore_ResetConfirmation(void) FadeOutScreen(); m4aMPlayAllStop(); DisableVBlankInterrupts(); - gMain.subState = HIGH_SCORE_STATE_0; + gMain.subState = HIGH_SCORE_STATE_INIT; } else if (JOY_NEW(B_BUTTON)) { m4aSongNumStart(SE_MENU_CANCEL); gShowDialogFlag = 0; gDialogType = 0; - gMain.subState = HIGH_SCORE_STATE_3; + gMain.subState = HIGH_SCORE_STATE_BROWSE_SCORES; } } @@ -777,7 +784,7 @@ void IdleHighScore_AutoScroll(void) { switch (gHighScoreScreenState.nextSubState) { - case 0: + case IDLE_HIGH_SCORE_STATE_INIT: if (++gHighScoreScreenState.paletteAnimTimer > 8) { gHighScoreScreenState.paletteAnimTimer = 0; @@ -790,20 +797,20 @@ void IdleHighScore_AutoScroll(void) gHighScoreScreenState.displayTimer = 0; gHighScoreScreenState.paletteAnimTimer = 0; gHighScoreScreenState.paletteAnimPhase = 0; - gHighScoreScreenState.nextSubState = 1; + gHighScoreScreenState.nextSubState = IDLE_HIGH_SCORE_STATE_AUTOSCROLL; } break; - case 1: + case IDLE_HIGH_SCORE_STATE_AUTOSCROLL: gScrollXOffset += 8; if (gScrollXOffset >= 240) { gHighScoreScreenState.displayTimer = 0; - gHighScoreScreenState.nextSubState = 2; + gHighScoreScreenState.nextSubState = IDLE_HIGH_SCORE_STATE_EXIT; } gMain.bgOffsets[3].xOffset = gScrollXOffset; gMain.bgOffsets[2].xOffset = gScrollXOffset; break; - case 2: + case IDLE_HIGH_SCORE_STATE_EXIT: if (++gHighScoreScreenState.paletteAnimTimer > 8) { gHighScoreScreenState.paletteAnimTimer = 0; @@ -939,7 +946,8 @@ void UpdateNameEntryCursor(void) int i; struct SpriteGroup *spriteGroup; - spriteGroup = &gMain.spriteGroups[gHighScoreScreenState.nameFlashSpriteGroup]; + //Arrow swaps between 2 variants, and then clones/positions both from the same base position + spriteGroup = &gMain.spriteGroups[gHighScoreScreenState.nameFlashToggle]; spriteGroup->active = TRUE; LoadSpriteSets(gNameEntryCursorSpriteSets, 2, gMain.spriteGroups); diff --git a/src/spheal_process3.c b/src/spheal_process3.c index 9ea8b921..b64bda0b 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -22,7 +22,7 @@ extern struct SongHeader se_unk_13d; extern const s8 gSphealScoreDigitSpriteIndices[]; extern const u16 gSphealWaterBackgroundTilemap[]; extern const u8 gSphealNetGfx[][0x200]; -extern const u8 gSphealExtendedScoreSprites[][0x180]; +extern const u8 gSphealNetFrontGfx[][0x180]; extern const u8 gSphealFlyingEnemyVariantSprites[][0x120]; extern const u8 gSphealMinionBodySprites[][0x800]; extern const u8 gSphealResultsScreenGfx[]; @@ -961,12 +961,12 @@ void UpdateSphealScoreAndDelivery(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_SPHEAL_SCORED_COUNTER]; + group = &gMain.spriteGroups[SG_SPHEAL_NET_FRONT]; if (group->active) { group->baseX = 104 - gCurrentPinballGame->cameraXOffset; group->baseY = 94 - gCurrentPinballGame->cameraYOffset; - DmaCopy16(3, gSphealExtendedScoreSprites[var0], (void *)0x06010B20, 0x180); + DmaCopy16(3, gSphealNetFrontGfx[var0], (void *)0x06010B20, 0x180); for (i = 0; i < 2; i++) { oamSimple = &group->oam[i]; @@ -976,7 +976,7 @@ void UpdateSphealScoreAndDelivery(void) } if (gCurrentPinballGame->boardState == SPHEAL_BOARD_STATE_ACTIVE_PHASE) - gMain.spriteGroups[SG_SPHEAL_SCORED_COUNTER].active = TRUE; + gMain.spriteGroups[SG_SPHEAL_NET_FRONT].active = TRUE; if (gCurrentPinballGame->boardState < SPHEAL_BOARD_STATE_ENDING && gMain.modeChangeFlags == MODE_CHANGE_NONE && gCurrentPinballGame->scoreCountdownTimer) { From 5f1dbc13b0dc6a7e1764166d75ba5260653cc440 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 25 May 2026 00:50:59 -0500 Subject: [PATCH 17/33] pokedex SG --- data/rom_1.s | 4 +- include/constants/spriteGroups.h | 22 ++++++ include/global.h | 4 +- include/variables.h | 2 +- src/all_board_portrait_display.c | 11 ++- src/main_board_intro_mode.c | 8 +- src/main_board_launcher_and_cutscenes.c | 2 +- src/pokedex.c | 99 +++++++++++++------------ src/save_and_restore_game.c | 2 +- sym_ewram.txt | 2 +- 10 files changed, 90 insertions(+), 66 deletions(-) diff --git a/data/rom_1.s b/data/rom_1.s index 6b6f43a2..6a4c9307 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -985,7 +985,7 @@ gRubyBoardPalette:: @ 0x081BFEE4 gDefaultBallPalette:: @ 0x081C0064 .incbin "baserom.gba", 0x1C0064, 0x80 -gPortraitGenericPalettes:: @ 0x081C00E4 +gLocationPalettes:: @ 0x081C00E4 .incbin "baserom.gba", 0x1C00E4, 0x200 gPortraitAnimPalettes:: @ 0x081C02E4 @@ -1340,7 +1340,7 @@ gRubyTravelVolbeat_Gfx:: @ 0x08483D8C gSapphireTravelIllumise_Gfx:: @ 0x08488A0C .incbin "baserom.gba", 0x488A0C, 0x4C80 -gPortraitGenericGraphics:: @ 0x0848D68C +gLocationPortraitGfx:: @ 0x0848D68C .incbin "baserom.gba", 0x48D68C, 0x2700 gCaptureModeTilesGfx:: @ 0x0848FD8C diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index e875c03b..cf4320a5 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -180,6 +180,28 @@ #define SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START 0 #define SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_END 4 +// Pokedex screen +#define SG_POKEDEX_CURSOR_HAND 0 +#define SG_POKEDEX_SCROLL_INDICATOR 1 +#define SG_POKEDEX_MON_PORTRAIT 2 +#define SG_POKEDEX_CATCH_SPRITE_ANIMATION 3 +#define SG_POKEDEX_HATCH_SPRITE_ANIMATION 4 +#define SG_POKEDEX_PRESS_SELECT_TEXT_BASE 5 // of 12 +#define SG_POKEDEX_POPUP_LIST_BASE 17 // of 5 +#define SG_POKEDEX_POPUP_START_TRANSMISSION 17 +#define SG_POKEDEX_POPUP_TRANSMITTING 18 +#define SG_POKEDEX_POPUP_TRANSMISSION_ERROR 19 +#define SG_POKEDEX_POPUP_TRANSFER_COMPLETE 20 +#define SG_POKEDEX_POPUP_DELETE_CONFIRMATION 21 +#define SG_POKEDEX_PRESS_START_0 22 +#define SG_POKEDEX_PRESS_START_1 23 +#define SG_POKEDEX_COMPLETION_BADGE 24 +#define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_BASE 25 +#define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_DOWN_0 25 +#define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_DOWN_1 26 +#define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_UP_0 27 +#define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_UP_1 28 + // Raw list. (can be removed later) #define SG_0 0 #define SG_1 1 diff --git a/include/global.h b/include/global.h index e0652d20..4186f30a 100644 --- a/include/global.h +++ b/include/global.h @@ -766,7 +766,7 @@ struct PinballGame /*0x6CC*/ s8 catchRevealFrameId; /*0x6CD*/ u8 catchTileShufflePool[6]; /*0x6D3*/ u8 catchTilePalette[6]; - /*0x6D9*/ s8 roulettePortraitIndexes[2]; + /*0x6D9*/ s8 areaRoulettePortraitIndex[2]; /*0x6DB*/ u8 creatureOamPriority; /*0x6DC*/ u8 prizeId; //Used both for roulette and shop purchases /*0x6DD*/ s8 prizeSelected; @@ -1004,7 +1004,7 @@ extern const u8 gPortraitAnimFrameGraphics[][0x300]; extern const u8 gBallRotationTileGraphics[][0x80]; extern const u8 gBallShadowTileGraphics[][0x200]; extern const u8 gMainStageBonusTrap_Gfx[][0x300]; -extern const u8 gPortraitGenericGraphics[][0x300]; +extern const u8 gLocationPortraitGfx[][0x300]; extern const u8 gChargeFillIndicator_Gfx[][0x80]; extern const u8 gPikaSaverTilesGfx[]; extern const u8 gMainBoardPikaSpinner_Gfx[][0x120]; diff --git a/include/variables.h b/include/variables.h index b675782b..7885e43e 100644 --- a/include/variables.h +++ b/include/variables.h @@ -283,7 +283,7 @@ extern s16 gPokedexInfoWindowSlideStep; extern s8 gPokedexButtonPromptFrame; extern s8 gPokedexShowButtonPrompt; extern s16 gPokedexSpriteCategory; -extern s8 gPokedexShowLinkCableIcon; +extern s8 gPokedexShowCompletionBadge; extern s16 gPokedexLinkStateTimer; extern s8 gPokedexShowPopupWindow; diff --git a/src/all_board_portrait_display.c b/src/all_board_portrait_display.c index 8e2528e7..4470f972 100644 --- a/src/all_board_portrait_display.c +++ b/src/all_board_portrait_display.c @@ -3,7 +3,7 @@ #include "constants/board/center_screen_states.h" #include "constants/board/main_board.h" -extern const u16 gPortraitGenericPalettes[]; +extern const u16 gLocationPalettes[]; extern const u16 gPortraitPaletteSlots[2]; extern const u16 gPortraitIdleCycleData[]; extern const u16 gPortraitAnimPalettes[]; @@ -31,13 +31,12 @@ void LoadPortraitGraphics(s16 displayMode, s16 picIx) switch (displayMode) { - // Show the case PORTRAIT_STATE_CURRENT_LOCATION: gCurrentPinballGame->creatureOamPriority = 3; - gCurrentPinballGame->portraitGfxIndex[picIx] = gCurrentPinballGame->roulettePortraitIndexes[picIx]; - DmaCopy16(3, gPortraitGenericGraphics[gCurrentPinballGame->portraitGfxIndex[picIx]], (void *)0x06010CA0 + picIx * 0x300, 0x300); - index = gCurrentPinballGame->roulettePortraitIndexes[picIx] * 0x10; - DmaCopy16(3, &gPortraitGenericPalettes[index], (void *)0x05000200 + gPortraitPaletteSlots[picIx] * 0x20, 0x20); + gCurrentPinballGame->portraitGfxIndex[picIx] = gCurrentPinballGame->areaRoulettePortraitIndex[picIx]; + DmaCopy16(3, gLocationPortraitGfx[gCurrentPinballGame->portraitGfxIndex[picIx]], (void *)0x06010CA0 + picIx * 0x300, 0x300); + index = gCurrentPinballGame->areaRoulettePortraitIndex[picIx] * 0x10; + DmaCopy16(3, &gLocationPalettes[index], (void *)0x05000200 + gPortraitPaletteSlots[picIx] * 0x20, 0x20); break; case PORTRAIT_STATE_SLOT_START_CARD: ptr = gPortraitIdleCycleData; diff --git a/src/main_board_intro_mode.c b/src/main_board_intro_mode.c index 7b305963..2b1b4c4e 100644 --- a/src/main_board_intro_mode.c +++ b/src/main_board_intro_mode.c @@ -24,9 +24,9 @@ void InitBoardIntroMode(void) gCurrentPinballGame->areaVisitCount = 0; gCurrentPinballGame->areaRouletteSlotIndex = (Random() + gMain.systemFrameCount) % 6; gCurrentPinballGame->area = gAreaRouletteTable[gMain.selectedField][gCurrentPinballGame->areaRouletteSlotIndex]; - gCurrentPinballGame->roulettePortraitIndexes[1] = gAreaPortraitIndexes[gCurrentPinballGame->area]; + gCurrentPinballGame->areaRoulettePortraitIndex[1] = gAreaPortraitIndexes[gCurrentPinballGame->area]; gCurrentPinballGame->area = gAreaRouletteTable[gMain.selectedField][(gCurrentPinballGame->areaRouletteSlotIndex + 1) % 6]; - gCurrentPinballGame->roulettePortraitIndexes[0] = gAreaPortraitIndexes[gCurrentPinballGame->area]; + gCurrentPinballGame->areaRoulettePortraitIndex[0] = gAreaPortraitIndexes[gCurrentPinballGame->area]; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_MAIN_SLOT); LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_ALT_SLOT); for (i = 0; i < 6; i++) @@ -192,7 +192,7 @@ void UpdateBoardIntroMode(void) gCurrentPinballGame->rouletteSubOffset = (gCurrentPinballGame->rouletteFrameIndex * 32) / gCurrentPinballGame->rouletteRotationPeriod; if (gCurrentPinballGame->rouletteFrameIndex == 0) { - gCurrentPinballGame->roulettePortraitIndexes[0] = gCurrentPinballGame->roulettePortraitIndexes[1]; + gCurrentPinballGame->areaRoulettePortraitIndex[0] = gCurrentPinballGame->areaRoulettePortraitIndex[1]; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_MAIN_SLOT); } @@ -212,7 +212,7 @@ void UpdateBoardIntroMode(void) } gCurrentPinballGame->area = gAreaRouletteTable[gMain.selectedField][gCurrentPinballGame->areaRouletteSlotIndex]; - gCurrentPinballGame->roulettePortraitIndexes[1] = gAreaPortraitIndexes[gCurrentPinballGame->area]; + gCurrentPinballGame->areaRoulettePortraitIndex[1] = gAreaPortraitIndexes[gCurrentPinballGame->area]; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_ALT_SLOT); m4aSongNumStart(SE_ROULETTE_TICK); } diff --git a/src/main_board_launcher_and_cutscenes.c b/src/main_board_launcher_and_cutscenes.c index e0e8e559..6067d6de 100644 --- a/src/main_board_launcher_and_cutscenes.c +++ b/src/main_board_launcher_and_cutscenes.c @@ -774,7 +774,7 @@ void RunTravelEventCutscene(void) if (gCurrentPinballGame->travelAnimKeyframeIndex == 7) { gCurrentPinballGame->area = gAreaRouletteTable[gMain.selectedField][gCurrentPinballGame->areaRouletteSlotIndex]; - gCurrentPinballGame->roulettePortraitIndexes[0] = gAreaPortraitIndexes[gCurrentPinballGame->area]; + gCurrentPinballGame->areaRoulettePortraitIndex[0] = gAreaPortraitIndexes[gCurrentPinballGame->area]; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_MAIN_SLOT); } diff --git a/src/pokedex.c b/src/pokedex.c index 0ab5751c..f888a3de 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -29,6 +29,9 @@ enum PokedexStates POKEDEX_STATE_RETURN_TO_TITLE, }; +#define SHOW_IX_CATCH_SPRITE 0 +#define SHOW_IX_HATCH_SPRITE 1 + void RefreshPokedexListDisplay(void); static void PokedexListScrollUp(void); static void PokedexListScrollDown(void); @@ -173,8 +176,8 @@ void InitPokedexState(void) gPokedexShowAnimSprite = 1; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; gPokedexSpriteCategory = 0; gPokedexInfoWindowSlideStep = 0; @@ -184,11 +187,11 @@ void InitPokedexState(void) LoadPokedexFlagsFromSave(); if (CheckAllPokemonCaught() == 1) { - gPokedexShowLinkCableIcon = 1; + gPokedexShowCompletionBadge = 1; } else { - gPokedexShowLinkCableIcon = 0; + gPokedexShowCompletionBadge = 0; } gPokedexShowPopupWindow = 0; @@ -311,8 +314,8 @@ void Pokedex_HandleListInput(void) gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; gPokedexSpriteAnimTimer = 0; gPokedexSpriteAnimFrame = 0; @@ -488,8 +491,8 @@ void Pokedex_DetailViewInput(void) { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; gPokedexSpriteAnimTimer = 0; gPokedexSpriteAnimFrame = 0; } @@ -499,15 +502,15 @@ void Pokedex_DetailViewInput(void) { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 0; - gPokedexShowCatchHatch[0] = 1; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 1; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; } else { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 0; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 1; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 1; } } } @@ -515,8 +518,8 @@ void Pokedex_DetailViewInput(void) { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; } } else @@ -527,8 +530,8 @@ void Pokedex_DetailViewInput(void) gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; gPokedexSpriteAnimTimer = 0; gPokedexSpriteAnimFrame = 0; } @@ -925,8 +928,8 @@ void UpdateMonSpriteVisibility(void) { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; gPokedexSpriteAnimTimer = 0; gPokedexSpriteAnimFrame = 0; } @@ -934,23 +937,23 @@ void UpdateMonSpriteVisibility(void) { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 0; - gPokedexShowCatchHatch[0] = 1; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 1; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; } else { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 0; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 1; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 1; } } else { gPokedexShowAnimSprite = 0; gPokedexShowPortrait = 1; - gPokedexShowCatchHatch[0] = 0; - gPokedexShowCatchHatch[1] = 0; + gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE] = 0; + gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE] = 0; } } @@ -1004,26 +1007,26 @@ void RenderPokedexSprites(void) const struct SpriteSet *spriteSet; int var0, var1; - group0 = &gMain.spriteGroups[SG_0]; - group1 = &gMain.spriteGroups[SG_1]; - group2 = &gMain.spriteGroups[SG_2]; - group3 = &gMain.spriteGroups[SG_3]; - group4 = &gMain.spriteGroups[SG_4]; - group5 = &gMain.spriteGroups[SG_5 + gPokedexAnimatedIconFrame]; - group6 = &gMain.spriteGroups[SG_17 + gPokedexPopupTypeIndex]; - group7 = &gMain.spriteGroups[SG_22 + gPokedexButtonPromptFrame]; - group8 = &gMain.spriteGroups[SG_24]; - group9 = &gMain.spriteGroups[SG_25 + gPokedexSpriteIndexBase * 2 + gPokedexPageIndicatorBlink]; + group0 = &gMain.spriteGroups[SG_POKEDEX_CURSOR_HAND]; + group1 = &gMain.spriteGroups[SG_POKEDEX_SCROLL_INDICATOR]; + group2 = &gMain.spriteGroups[SG_POKEDEX_MON_PORTRAIT]; + group3 = &gMain.spriteGroups[SG_POKEDEX_CATCH_SPRITE_ANIMATION]; + group4 = &gMain.spriteGroups[SG_POKEDEX_HATCH_SPRITE_ANIMATION]; + group5 = &gMain.spriteGroups[SG_POKEDEX_PRESS_SELECT_TEXT_BASE + gPokedexAnimatedIconFrame]; + group6 = &gMain.spriteGroups[SG_POKEDEX_POPUP_LIST_BASE + gPokedexPopupTypeIndex]; + group7 = &gMain.spriteGroups[SG_POKEDEX_PRESS_START_0 + gPokedexButtonPromptFrame]; + group8 = &gMain.spriteGroups[SG_POKEDEX_COMPLETION_BADGE]; + group9 = &gMain.spriteGroups[SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_BASE + gPokedexSpriteIndexBase * 2 + gPokedexPageIndicatorBlink]; group0->active = TRUE; group1->active = TRUE; group2->active = gPokedexShowPortrait; - group3->active = gPokedexShowCatchHatch[0]; - group4->active = gPokedexShowCatchHatch[1]; + group3->active = gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE]; + group4->active = gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE]; group5->active = gPokedexShowAnimSprite; group6->active = gPokedexShowPopupWindow; group7->active = gPokedexShowButtonPrompt; - group8->active = gPokedexShowLinkCableIcon; + group8->active = gPokedexShowCompletionBadge; group9->active = gPokedexShowPageIndicator; LoadSpriteSets(gPokedexSpriteSets, 29, group0); @@ -1220,23 +1223,23 @@ static void RenderLinkGraphics(void) struct OamDataSimple *groupOam; const struct SpriteSet *spriteSet; - group0 = &gMain.spriteGroups[SG_0]; - group1 = &gMain.spriteGroups[SG_1]; - group2 = &gMain.spriteGroups[SG_2]; - group3 = &gMain.spriteGroups[SG_3]; - group4 = &gMain.spriteGroups[SG_4]; - group6 = &gMain.spriteGroups[SG_5 + gPokedexAnimatedIconFrame]; - group7 = &gMain.spriteGroups[SG_17 + gPokedexPopupTypeIndex]; - group5 = &gMain.spriteGroups[SG_24]; + group0 = &gMain.spriteGroups[SG_POKEDEX_CURSOR_HAND]; + group1 = &gMain.spriteGroups[SG_POKEDEX_SCROLL_INDICATOR]; + group2 = &gMain.spriteGroups[SG_POKEDEX_MON_PORTRAIT]; + group3 = &gMain.spriteGroups[SG_POKEDEX_CATCH_SPRITE_ANIMATION]; + group4 = &gMain.spriteGroups[SG_POKEDEX_HATCH_SPRITE_ANIMATION]; + group6 = &gMain.spriteGroups[SG_POKEDEX_PRESS_SELECT_TEXT_BASE + gPokedexAnimatedIconFrame]; + group7 = &gMain.spriteGroups[SG_POKEDEX_POPUP_LIST_BASE + gPokedexPopupTypeIndex]; + group5 = &gMain.spriteGroups[SG_POKEDEX_COMPLETION_BADGE]; group0->active = TRUE; group1->active = TRUE; group2->active = gPokedexShowPortrait; - group3->active = gPokedexShowCatchHatch[0]; - group4->active = gPokedexShowCatchHatch[1]; + group3->active = gPokedexShowCatchHatch[SHOW_IX_CATCH_SPRITE]; + group4->active = gPokedexShowCatchHatch[SHOW_IX_HATCH_SPRITE]; group6->active = FALSE; group7->active = gPokedexShowPopupWindow; - group5->active = gPokedexShowLinkCableIcon; + group5->active = gPokedexShowCompletionBadge; LoadSpriteSetsWithCpuCopy(gPokedexSpriteSets, 29, group0); group0->baseX = 20 + gPokedexCursorBlinkOffset; diff --git a/src/save_and_restore_game.c b/src/save_and_restore_game.c index f2fe87d6..fab38dab 100644 --- a/src/save_and_restore_game.c +++ b/src/save_and_restore_game.c @@ -502,7 +502,7 @@ void RestoreMainFieldDynamicGraphics(void) switch (gCurrentPinballGame->portraitRenderMode[i]) { case 0: - DmaCopy16(3, gPortraitGenericGraphics[gCurrentPinballGame->portraitGfxIndex[i]], 0x06010CA0 + (i * 0x300), 0x300); + DmaCopy16(3, gLocationPortraitGfx[gCurrentPinballGame->portraitGfxIndex[i]], 0x06010CA0 + (i * 0x300), 0x300); gCurrentPinballGame->ball += 0; //TODO: Dumb match is still a match... break; case 9: diff --git a/sym_ewram.txt b/sym_ewram.txt index af5063d1..c656eb10 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -499,7 +499,7 @@ gHighScoreEntrySource: @ 0x202C588 .space 0x4 gPokedexScrollWaitFrames: @ 0x0202C58C .space 0x4 -gPokedexShowLinkCableIcon: @ 0x0202C590 +gPokedexShowCompletionBadge: @ 0x0202C590 .space 0x4 gIntroOverlayFadeStep: @ 0x0202C594 .space 0x4 From bbb9ba26fd604eea9173825e8b1ad67151253bd7 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 25 May 2026 19:33:37 -0500 Subject: [PATCH 18/33] checkpoint 1 --- data/rom_1.s | 2 +- data/rom_2.s | 38 +++++++++---------- include/constants/board/prize_definitions.h | 8 ++-- include/constants/spriteGroups.h | 40 +++++++++++++++++--- include/global.h | 2 +- src/all_board_mode_change_and_debug_menu.c | 42 ++++++++++----------- src/all_board_portrait_display.c | 7 +++- src/all_board_process7.c | 6 +-- src/main_board_catch_holes.c | 30 ++++++++------- src/main_board_evolution_mode.c | 2 +- src/main_board_to_be_split.c | 22 ++++++----- src/rayquaza_process3.c | 2 +- src/ruby_trigger_targets.c | 10 ++--- 13 files changed, 123 insertions(+), 88 deletions(-) diff --git a/data/rom_1.s b/data/rom_1.s index 6a4c9307..28460c02 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -1325,7 +1325,7 @@ gRubyRampGateTileGfx:: @ 0x0847DF0C gSideBumperGfx:: @ 0x0847FD0C .incbin "baserom.gba", 0x47FD0C, 0x200 -gShopDigitTilesGfx:: @ 0x0847FF0C +gShopPortraitOverlayGfx:: @ 0x0847FF0C .incbin "baserom.gba", 0x47FF0C, 0xF00 gDecimalDigitTilesGfx:: @ 0x08480E0C diff --git a/data/rom_2.s b/data/rom_2.s index a84fe477..52156570 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -5460,7 +5460,7 @@ gUnknown_086B1602:: @ 0x086B1602 packed_sprite_oam x=0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x10, priority=0x2, paletteNum=0x0 .2byte 0 -gUnknown_086B160C:: @ 0x086B160C +gMainBoardBallSpriteSet:: @ 0x086B160C .2byte 1 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6592,7 +6592,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B214E .4byte gUnknown_086B2178 .4byte gUnknown_086B20B2 -.4byte gUnknown_086B15F8 +.4byte gUnknown_086B15F8 @ 10 .4byte gUnknown_086B1602 .4byte gUnknown_086B1FCA .4byte gUnknown_086B19BA @@ -6602,7 +6602,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B1FF4 .4byte gUnknown_086B2026 .4byte gUnknown_086B2048 -.4byte gUnknown_086B2072 +.4byte gUnknown_086B2072 @ 20 .4byte gUnknown_086B1ECA .4byte gUnknown_086B1E50 .4byte gUnknown_086B1D0C @@ -6612,7 +6612,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B22F2 .4byte gUnknown_086B165C .4byte gUnknown_086B1CDA -.4byte gLegendaryCatchPortraitSpriteSet +.4byte gLegendaryCatchPortraitSpriteSet @ 30 .4byte gUnknown_086B170C .4byte gUnknown_086B170C .4byte gLegendaryCatchPortraitBordersSpriteSet @@ -6622,7 +6622,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B2228 .4byte gUnknown_086B224A .4byte gUnknown_086B226C -.4byte gUnknown_086B160C +.4byte gMainBoardBallSpriteSet @ 40 .4byte gMonCatchBallTrailSpriteSet .4byte gMonCatchBallTrailSpriteSet .4byte gUnknown_086B173E @@ -6632,7 +6632,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B1A84 .4byte gUnknown_086B1846 .4byte gUnknown_086B1760 -.4byte gMonCatchBallAbsorbPokemonFxSpriteSet +.4byte gMonCatchBallAbsorbPokemonFxSpriteSet @ 50 .4byte gUnknown_086B1942 .4byte gUnknown_086B187C .4byte gUnknown_086B189E @@ -6642,7 +6642,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B196E .4byte gUnknown_086B1954 .4byte gUnknown_086B18B0 -.4byte gUnknown_086B18CA +.4byte gUnknown_086B18CA @ 60 .4byte gUnknown_086B18E4 .4byte gUnknown_086B18FE .4byte gUnknown_086B1A12 @@ -6652,7 +6652,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B17A4 .4byte gUnknown_086B1A3E .4byte gUnknown_086B1858 -.4byte gUnknown_086B160C +.4byte gMainBoardBallSpriteSet @ 70 .4byte gUnknown_086B19D6 .4byte gUnknown_086B1C90 .4byte gUnknown_086B1D3E @@ -6662,7 +6662,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B1834 .4byte gUnknown_086B19A0 .4byte gUnknown_086B1C66 -.4byte gUnknown_086B21A2 +.4byte gUnknown_086B21A2 @ 80 .4byte gUnknown_086B19E8 .4byte gUnknown_086B235E .4byte gUnknown_086B1A98 @@ -6678,7 +6678,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B214E .4byte gUnknown_086B2178 .4byte gUnknown_086B20B2 -.4byte gUnknown_086B15F8 +.4byte gUnknown_086B15F8 @ 10 .4byte gUnknown_086B1602 .4byte gLegendaryCatchNameBannerSpriteSheet .4byte gLegendaryCatchWasCaughtTextSpriteSheet @@ -6688,7 +6688,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B2072 .4byte gUnknown_086B1ECA .4byte gUnknown_086B1E50 -.4byte gUnknown_086B1D0C +.4byte gUnknown_086B1D0C @ 20 .4byte gUnknown_086B1782 .4byte gUnknown_086B22AE .4byte gUnknown_086B22D0 @@ -6698,7 +6698,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B2324 .4byte gUnknown_086B1CDA .4byte gLegendaryCatchPortraitSpriteSet -.4byte gUnknown_086B170C +.4byte gUnknown_086B170C @ 30 .4byte gUnknown_086B170C .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gUnknown_086B16DA @@ -6708,8 +6708,8 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B224A .4byte gUnknown_086B226C .4byte gMonCatchBallTrailSpriteSet -.4byte gMonCatchBallTrailSpriteSet -.4byte gUnknown_086B160C +.4byte gMonCatchBallTrailSpriteSet @40 +.4byte gMainBoardBallSpriteSet .4byte gUnknown_086B173E .4byte gUnknown_086B1A48 .4byte gUnknown_086B1A5C @@ -6718,7 +6718,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1B90 .4byte gUnknown_086B1BAA .4byte gUnknown_086B1BC4 -.4byte gUnknown_086B1BDE +.4byte gUnknown_086B1BDE @ 50 .4byte gUnknown_086B1BF8 .4byte gUnknown_086B1846 .4byte gUnknown_086B1760 @@ -6728,7 +6728,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1862 .4byte gUnknown_086B1C0C .4byte gUnknown_086B1C16 -.4byte gUnknown_086B1AB2 +.4byte gUnknown_086B1AB2 @ 60 .4byte gUnknown_086B1B00 .4byte gUnknown_086B1B12 .4byte gUnknown_086B1B24 @@ -6738,17 +6738,17 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1B7E .4byte gUnknown_086B1B50 .4byte gUnknown_086B1C20 -.4byte gUnknown_086B1C32 +.4byte gUnknown_086B1C32 @ 70 .4byte gUnknown_086B17A4 .4byte gUnknown_086B163A .4byte gUnknown_086B1858 -.4byte gUnknown_086B160C +.4byte gMainBoardBallSpriteSet .4byte gUnknown_086B1AD4 .4byte gUnknown_086B1C02 .4byte gUnknown_086B1C90 .4byte gUnknown_086B1D3E .4byte gUnknown_086B1D70 -.4byte gUnknown_086B1DA2 +.4byte gUnknown_086B1DA2 @ 80 .4byte gUnknown_086B1F04 .4byte gUnknown_086B1834 .4byte gUnknown_086B1C66 diff --git a/include/constants/board/prize_definitions.h b/include/constants/board/prize_definitions.h index 16f43d14..16a1f39b 100644 --- a/include/constants/board/prize_definitions.h +++ b/include/constants/board/prize_definitions.h @@ -21,10 +21,10 @@ #define PRIZE_BALL_UPGRADE_C 12 #define PRIZE_BALL_UPGRADE_TO_MASTER 13 -//Note Prize 14-16 unused -#define PRIZE_14 14 -#define PRIZE_15 15 -#define PRIZE_16 16 +//Note Prize 14-16 unused in shop/roulette +#define PRIZE_14 14 // 'Start Slot' graphic +#define PRIZE_15 15 // Goto next graphic (up arrow) +#define PRIZE_16 16 // Travel ramp indicator graphic #define PRIZE_10_COINS 17 #define PRIZE_30_COINS 18 diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index cf4320a5..a1cebee6 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -32,11 +32,32 @@ #define SG_PAUSE_TOP_BORDER 1 #define SG_PAUSE_BOTTOM_BORDER 2 + // Shared by main boards +// 0-2 shared +#define SG_BALL_SAVE_LATI_ARM 3 // Drawn above ball +#define SG_BALL_SAVE_LATI 4 // Drawn below ball +#define SG_BALL_SAVE_BANNER 5 +#define SG_END_OF_BALL_BONUS_TEXT_BASE 6 // Of 3. Lines 0, 1, 2 +#define SG_END_OF_BALL_BONUS_TEXT_LINE_0 6 +#define SG_END_OF_BALL_BONUS_TEXT_LINE_1 7 +#define SG_END_OF_BALL_BONUS_TEXT_LINE_2 8 +#define SG_END_OF_BALL_BONUS_BANNER 9 #define SG_MAIN_BOARD_FLIPPER_BASE 10 // Of 2. Left, Right #define SG_MAIN_BOARD_LEFT_FLIPPER 10 #define SG_MAIN_BOARD_RIGHT_FLIPPER 11 +// Ruby board +// 0-11 shared +#define SG_RUBY_AERODACTLY_EGG_DELIVERY 12 +#define SG_RUBY_CHIKORITA_PROJECTILE 13 +#define SG_RUBY_CHIKORITA_PROJECTILE_COLLISION_FX 14 + #define SG_RUBY_POKEMON_NAME_TEXT 15 + #define SG_RUBY_WAS_CAUGHT_TEXT 16 + #define SG_RUBY_SHOP_ARROWS 17 // Left/Right, and evo Up/down arrow + #define SG_RUBY_SHOP_COINS 18 + #define SG_RUBY_SHOP_CONFIRMATION_PANEL 19 + // Shared by bonus / boss boards #define SG_BONUS_BOARD_FLIPPER_BASE 3 // Of 2. Left, Right #define SG_BONUS_BOARD_LEFT_FLIPPER 3 @@ -49,7 +70,7 @@ #define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 // Dusclops board -//1-6 shared +//0-6 shared #define SG_DUSKULL_ENTITY_BASE 7 // Of 3 #define SG_DUSKULL_ENTITY_0 7 #define SG_DUSKULL_ENTITY_1 8 @@ -61,7 +82,7 @@ #define SG_DUSCLOPS_ENTITY 14 // Groudon board -//1-10 shared +//0-10 shared #define SG_GROUDON_CRYSTAL_BASE 11 // Of 4. Top right; bottom right; top left; bottom left #define SG_GROUDON_CRYSTAL_TOP_RIGHT 11 #define SG_GROUDON_CRYSTAL_BOTTOM_RIGHT 12 @@ -80,7 +101,7 @@ #define SG_GROUDON_SHOCKWAVE 30 // Kecleon board -//1-6 shared +//0-6 shared #define SG_KECLEON_TREE_LEAVES 7 #define SG_KECLEON_BALL_RESPAWN 8 #define SG_KECLEON_DUST_FX 9 @@ -97,7 +118,7 @@ #define SG_KECLEON_REFLECTION_BALL 32 // Kyogre board -//1-10 shared +//0-10 shared #define SG_KYOGRE_CRYSTAL_BASE 11 // Of 4. Top right; top left, bottom right, bottom left. #define SG_KYOGRE_CRYSTAL_TOP_RIGHT 11 #define SG_KYOGRE_CRYSTAL_TOP_LEFT 12 @@ -116,7 +137,7 @@ #define SG_KYOGRE_SURFACING_FX 26 // Rayquaza board -//1-10 shared +//0-10 shared #define SG_RAYQUAZA_INTRO_CLOUD_0 11 #define SG_RAYQUAZA_INTRO_CLOUD_1 12 #define SG_RAYQUAZA_INTRO_CLOUD_2 13 @@ -154,7 +175,7 @@ #define SG_RAYQUAZA_ENTITY_SHADOW_FX 45 // Spheal board -//1-6 shared +//0-6 shared #define SG_SPHEAL_END_SCORE_PANEL 7 #define SG_SPHEAL_END_SCORE_SPHEALS_SUNK 8 #define SG_SPHEAL_END_SCORE_BALLS_SUNK 9 @@ -321,6 +342,13 @@ #define FIELD_SG_MAIN_BOARD_BALL_TRAIL_BASE 1 // Of 2 #define FIELD_SG_MAIN_BOARD_BALL_TRAIL_0 1 #define FIELD_SG_MAIN_BOARD_BALL_TRAIL_1 2 +#define FIELD_SG_MAIN_SHOP_ARROWS 6 // Left/Right, and evo Up/down arrow +#define FIELD_SG_MAIN_SHOP_COINS 7 +#define FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL 8 // Yellow bar displaying cost/mon name +#define FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY 9 // Change sheen, Sold Out indicator +#define FIELD_SG_MAIN_BOARD_LEGENDARY_CATCH_PORTRAIT 19 +#define FIELD_SG_MAIN_BOARD_LEGENDARY_CATCH_PORTRAIT_BORDERS 22 +#define FIELD_SG_MAIN_BOARD_BALL_OVERRIDE 49 // bonus/legendary boards //0,3-5 shared diff --git a/include/global.h b/include/global.h index 4186f30a..653bfb6e 100644 --- a/include/global.h +++ b/include/global.h @@ -284,7 +284,7 @@ struct PinballGame /*0x1AC*/ s8 shopSignFrame; /*0x1AD*/ s8 shopSignPaletteIndex; /*0x1AE*/ u8 shopOutcomeRepeatCount; - /*0x1AF*/ u8 shopBonusStageAlreadyBought; + /*0x1AF*/ u8 shopExtraBallPreviouslyPurchased; /*0x1B0*/ s8 evoNameSlideOnly; /*0x1B1*/ u8 filler1B1[0x1]; /*0x1B2*/ u16 evoFormAlternateTimer; diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index a1208a70..a49ec3af 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -201,10 +201,10 @@ void EndOfBallSequence(void) if (gMain.animationTimer == 199) { gCurrentPinballGame->bonusSummarySlideY = 128; - gMain.spriteGroups[SG_9].active = TRUE; - gMain.spriteGroups[SG_6].active = TRUE; - gMain.spriteGroups[SG_7].active = TRUE; - gMain.spriteGroups[SG_8].active = TRUE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_BANNER].active = TRUE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_LINE_0].active = TRUE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_LINE_1].active = TRUE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_LINE_2].active = TRUE; DmaCopy16(3, gMainBoardEndOfBall_Gfx, (void *)0x6015800, 0x2800); if (gMain.selectedField == FIELD_RUBY) { @@ -222,10 +222,10 @@ void EndOfBallSequence(void) } else if (gMain.animationTimer == 1) { - gMain.spriteGroups[SG_9].active = FALSE; - gMain.spriteGroups[SG_6].active = FALSE; - gMain.spriteGroups[SG_7].active = FALSE; - gMain.spriteGroups[SG_8].active = FALSE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_BANNER].active = FALSE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_LINE_0].active = FALSE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_LINE_1].active = FALSE; + gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_LINE_2].active = FALSE; } } else @@ -289,7 +289,7 @@ void BallSaverAnimation(void) if (gMain.animationTimer) { - group = &gMain.spriteGroups[SG_5]; + group = &gMain.spriteGroups[SG_BALL_SAVE_BANNER]; if (group->active) { group->baseX = 88; @@ -304,7 +304,7 @@ void BallSaverAnimation(void) } } - group = &gMain.spriteGroups[SG_4]; + group = &gMain.spriteGroups[SG_BALL_SAVE_LATI]; if (group->active) { group->baseX = 24 + gCurrentPinballGame->ballSaverPosX / 100; @@ -317,7 +317,7 @@ void BallSaverAnimation(void) gOamBuffer[oamSimple->oamId].matrixNum = 4; } - group = &gMain.spriteGroups[SG_3]; + group = &gMain.spriteGroups[SG_BALL_SAVE_LATI_ARM]; if (group->active) { group->baseX = 56 + gCurrentPinballGame->ballSaverPosX / 100; @@ -354,7 +354,7 @@ void BallSaverAnimation(void) { mat4Scale = 0x100; if (gMain.animationTimer < 30) - gMain.spriteGroups[SG_4].active = FALSE; + gMain.spriteGroups[SG_BALL_SAVE_LATI].active = FALSE; } if (gMain.animationTimer < 31) @@ -366,7 +366,7 @@ void BallSaverAnimation(void) else { mat3Scale = 8; - gMain.spriteGroups[SG_5].active = FALSE; + gMain.spriteGroups[SG_BALL_SAVE_BANNER].active = FALSE; } } else @@ -400,7 +400,7 @@ void BallSaverAnimation(void) gCurrentPinballGame->ballSaverBallVelY += 6; gCurrentPinballGame->ballSaverBallPosX += gCurrentPinballGame->ballSaverBallVelX; gCurrentPinballGame->ballSaverBallPosY += gCurrentPinballGame->ballSaverBallVelY; - gMain.spriteGroups[SG_3].active = FALSE; + gMain.spriteGroups[SG_BALL_SAVE_LATI_ARM].active = FALSE; if (gMain.animationTimer == 32) { gCurrentPinballGame->boardEntityActive = 0; @@ -450,9 +450,9 @@ void BallSaverAnimation(void) gCurrentPinballGame->ballSaverVelX = 0; gCurrentPinballGame->ballSaverVelY = 0; gCurrentPinballGame->ballSaverSlideY = 100; - gMain.spriteGroups[SG_5].active = TRUE; - gMain.spriteGroups[SG_4].active = TRUE; - gMain.spriteGroups[SG_3].active = TRUE; + gMain.spriteGroups[SG_BALL_SAVE_BANNER].active = TRUE; + gMain.spriteGroups[SG_BALL_SAVE_LATI].active = TRUE; + gMain.spriteGroups[SG_BALL_SAVE_LATI_ARM].active = TRUE; if (gMain.selectedField == FIELD_RUBY) { DmaCopy16(3, gMainBoardBallSave_Gfx, (void *)0x06015800, 0x2400); @@ -474,8 +474,8 @@ void BallSaverAnimation(void) } else if (gMain.animationTimer == 0) { - gMain.spriteGroups[SG_5].active = FALSE; - gMain.spriteGroups[SG_4].active = FALSE; + gMain.spriteGroups[SG_BALL_SAVE_BANNER].active = FALSE; + gMain.spriteGroups[SG_BALL_SAVE_LATI].active = FALSE; } } else @@ -1024,7 +1024,7 @@ void EndOfBallBonusSummary(void) if (gCurrentPinballGame->bonusSummaryTimer) gCurrentPinballGame->bonusSummaryTimer--; - group = &gMain.spriteGroups[SG_9]; + group = &gMain.spriteGroups[SG_END_OF_BALL_BONUS_BANNER]; if (group->active) { group->baseX = 120; @@ -1038,7 +1038,7 @@ void EndOfBallBonusSummary(void) for (i = 0; i < 3; i++) { - group = &gMain.spriteGroups[SG_6 + i]; + group = &gMain.spriteGroups[SG_END_OF_BALL_BONUS_TEXT_BASE + i]; group->baseX = 104; group->baseY = 64 + i * 16 + gCurrentPinballGame->bonusSummarySlideY + sp10; for (j = 0; j < 5; j++) diff --git a/src/all_board_portrait_display.c b/src/all_board_portrait_display.c index 4470f972..c9b751b0 100644 --- a/src/all_board_portrait_display.c +++ b/src/all_board_portrait_display.c @@ -112,6 +112,7 @@ void LoadPortraitGraphics(s16 displayMode, s16 picIx) case PORTRAIT_STATE_TRAVEL_RAMP_INDICATOR: if (gCurrentPinballGame->boardSubState == TRAVEL_SUBSTATE_STOP_LANE_INDICATORS) { + // This code state likely doesn't matter - Board is in this board substate for exactly 1 frame. gCurrentPinballGame->portraitGfxIndex[picIx] = gShopItemData[15][(gCurrentPinballGame->portraitCycleFrame % 48) / 24]; DmaCopy16(3, gPortraitAnimFrameGraphics[gCurrentPinballGame->portraitGfxIndex[picIx]], (void *)0x06010CA0 + picIx * 0x300, 0x300); @@ -133,9 +134,11 @@ void LoadPortraitGraphics(s16 displayMode, s16 picIx) DmaCopy16(3, gPortraitAnimFrameGraphics[gCurrentPinballGame->portraitGfxIndex[picIx]], (void *)0x06010CA0 + picIx * 0x300, 0x300); if (gCurrentPinballGame->coins < ptr[3] || ( - (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 3 && gCurrentPinballGame->outLanePikaPosition == 2) + (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_PICHU_SAVER + && gCurrentPinballGame->outLanePikaPosition == 2) || - (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 4 && gCurrentPinballGame->shopBonusStageAlreadyBought) + (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_EXTRA_BALL + && gCurrentPinballGame->shopExtraBallPreviouslyPurchased) )) { DmaCopy16(3, &gPortraitAnimPalettes[index], sp0, 0x20); diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 29008e68..80c5a9f8 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -94,7 +94,7 @@ void MainBoardProcess_7B_12524(void) oamData->y = oam->yOffset + spriteGroup->baseY; } - spriteGroup = gMain.fieldSpriteGroups[49]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_OVERRIDE]; if (spriteGroup->active) { @@ -172,7 +172,7 @@ void MainBoardProcess_7B_12524(void) gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_0]->active = TRUE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_1]->active = TRUE; - gMain.fieldSpriteGroups[49]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_OVERRIDE]->active = TRUE; gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = FALSE; } else @@ -194,7 +194,7 @@ void MainBoardProcess_7B_12524(void) gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_0]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_TRAIL_1]->active = FALSE; - gMain.fieldSpriteGroups[49]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_BALL_OVERRIDE]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; } diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 9a1139a0..3b9aaedf 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -85,9 +85,9 @@ void UpdateShopEntryAnimation(s16 arg0) LoadPortraitGraphics(PORTRAIT_STATE_SHOP_SELECTOR, PORTRAIT_MAIN_SLOT); RenderEvolutionUI(1); - gMain.fieldSpriteGroups[7]->active = TRUE; - gMain.fieldSpriteGroups[8]->active = TRUE; - gMain.fieldSpriteGroups[6]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_COINS]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = TRUE; gMain.fieldSpriteGroups[9]->active = TRUE; DmaCopy16(3, gShopEvoUI_Pals, OBJ_PLTT + 0x1C0, 0x20); @@ -213,9 +213,11 @@ void UpdateShopEntryAnimation(s16 arg0) s16 var_r3; const u16 *arr = gShopItemData[gCurrentPinballGame->shopSelectedItemId]; - if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 3 && gCurrentPinballGame->outLanePikaPosition == 2) + if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_PICHU_SAVER + && gCurrentPinballGame->outLanePikaPosition == 2) var_r3 = 999; - else if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 4 && gCurrentPinballGame->shopBonusStageAlreadyBought) + else if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_EXTRA_BALL + && gCurrentPinballGame->shopExtraBallPreviouslyPurchased) var_r3 = 999; else var_r3 = arr[3]; @@ -252,8 +254,8 @@ void UpdateShopEntryAnimation(s16 arg0) gCurrentPinballGame->catchModeEventTimer = 30; gCurrentPinballGame->shopAnimSlideTimer = 30; - if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 4) - gCurrentPinballGame->shopBonusStageAlreadyBought = 1; + if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_EXTRA_BALL) + gCurrentPinballGame->shopExtraBallPreviouslyPurchased = 1; } } @@ -341,9 +343,9 @@ void UpdateShopEntryAnimation(s16 arg0) gCurrentPinballGame->creatureOamPriority = 3; gCurrentPinballGame->prizeSelected = 0; - gMain.fieldSpriteGroups[7]->active = FALSE; - gMain.fieldSpriteGroups[8]->active = FALSE; - gMain.fieldSpriteGroups[6]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_COINS]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = FALSE; gMain.fieldSpriteGroups[9]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; @@ -421,9 +423,9 @@ void UpdateShopEntryAnimation(s16 arg0) RenderEvolutionUI(var_r7); - gMain.fieldSpriteGroups[8]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = TRUE; gMain.fieldSpriteGroups[9]->active = TRUE; - gMain.fieldSpriteGroups[6]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = TRUE; DmaCopy16(3, &gShopEvoUI_Pals, PLTT + 0x3C0, 0x20); @@ -753,8 +755,8 @@ void UpdateShopEntryAnimation(s16 arg0) gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BOARD_CENTER; gCurrentPinballGame->creatureOamPriority = 3; - gMain.fieldSpriteGroups[8]->active = FALSE; - gMain.fieldSpriteGroups[6]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = FALSE; gMain.fieldSpriteGroups[9]->active = FALSE; gCurrentPinballGame->evoBlinkTimer = 0; diff --git a/src/main_board_evolution_mode.c b/src/main_board_evolution_mode.c index 27fc7d62..5b6d39b7 100644 --- a/src/main_board_evolution_mode.c +++ b/src/main_board_evolution_mode.c @@ -192,7 +192,7 @@ void UpdateEvolutionMode(void) if (gCurrentPinballGame->modeAnimTimer == 148) { gCurrentPinballGame->modeAnimTimer++; - if (gMain.spriteGroups[SG_13].active) + if (gMain.spriteGroups[SG_RUBY_CHIKORITA_PROJECTILE].active) { if (gCurrentPinballGame->chikoritaProjectileTimer >= 80) { diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index f4ea3a55..64afd8c5 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -33,7 +33,7 @@ extern const u16 gShopOamAttributes[18][3]; extern const u16 gShopNumberOamFramesets[4][15]; extern const s16 gArrowBounceOffsets[]; extern const s16 gTimerIndicatorFrames[]; -extern const u8 gShopDigitTilesGfx[][0x300]; +extern const u8 gShopPortraitOverlayGfx[][0x300]; extern const u8 gDecimalDigitTilesGfx[][0x40]; extern const s16 gEvoShopAnimFrames[][7]; extern const u8 gRubyBoardShop_Gfx[][0x500]; @@ -571,7 +571,7 @@ void RenderEvolutionUI(s16 arg0) s16 sp0[2]; s16 sp4[2]; - group = gMain.fieldSpriteGroups[7]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_COINS]; var1 = gShopItemData[gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor]]; if (arg0) { @@ -593,7 +593,7 @@ void RenderEvolutionUI(s16 arg0) } } - group = gMain.fieldSpriteGroups[8]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]; index = gCurrentPinballGame->evolutionShopActive != 0 ? 1 : 0; if (group->active) { @@ -612,7 +612,7 @@ void RenderEvolutionUI(s16 arg0) } } - group = gMain.fieldSpriteGroups[6]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]; if (group->active) { if (gMain.shopPanelSlideOffset < 20) @@ -699,14 +699,15 @@ void RenderEvolutionUI(s16 arg0) else group->baseY = 88; - if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 4) + if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_EXTRA_BALL) { - if (gCurrentPinballGame->shopBonusStageAlreadyBought && gCurrentPinballGame->shopAnimSlideTimer / 5 == 0) + if (gCurrentPinballGame->shopExtraBallPreviouslyPurchased + && gCurrentPinballGame->shopAnimSlideTimer / 5 == 0) index = 4; else index = gTimerIndicatorFrames[gCurrentPinballGame->shopAnimSlideTimer / 5]; } - else if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == 3) + else if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_PICHU_SAVER) { if (gCurrentPinballGame->shopPikaSaverMaxed && gCurrentPinballGame->shopAnimSlideTimer / 5 == 0) index = 4; @@ -718,7 +719,8 @@ void RenderEvolutionUI(s16 arg0) index = gTimerIndicatorFrames[gCurrentPinballGame->shopAnimSlideTimer / 5]; } - DmaCopy16(3, gShopDigitTilesGfx[index], (void *)0x06016220, 0x300); + // Used for change selection sheen, sold out banner/greying + DmaCopy16(3, gShopPortraitOverlayGfx[index], (void *)0x06016220, 0x300); for (i = 0; i < 2; i++) { oamSimple = &group->oam[i]; @@ -929,7 +931,7 @@ void InitAerodactylEggDelivery(void) gCurrentPinballGame->eggDeliveryY = -40; gCurrentPinballGame->eggDeliveryVelX = -36; gCurrentPinballGame->eggDeliveryVelY = 60; - gMain.spriteGroups[SG_12].active = TRUE; + gMain.spriteGroups[SG_RUBY_AERODACTLY_EGG_DELIVERY].active = TRUE; gCurrentPinballGame->eggAnimationPhase = 1; gCurrentPinballGame->portraitOffsetX = gCurrentPinballGame->eggDeliveryX / 20 - gFlyingCreatureCameraOffsets[0].x; gCurrentPinballGame->portraitOffsetY = gCurrentPinballGame->eggDeliveryY / 20 - gFlyingCreatureCameraOffsets[0].y; @@ -947,7 +949,7 @@ void AnimateAerodactylEggDelivery(void) s16 var0; var0 = (gCurrentPinballGame->eggDropTimer % 56) / 8; - group = &gMain.spriteGroups[SG_12]; + group = &gMain.spriteGroups[SG_RUBY_AERODACTLY_EGG_DELIVERY]; if (gCurrentPinballGame->eggDropTimer < 130) { if (gCurrentPinballGame->eggDropTimer % 36U == 0) diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index ac1d41e4..147822bf 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -219,7 +219,7 @@ void RayquazaBoardProcess_3B_3EB2C(void) gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_SCORE_COUNTING_FINISHED; gCurrentPinballGame->numCompletedBonusStages++; - gCurrentPinballGame->shopBonusStageAlreadyBought = 0; + gCurrentPinballGame->shopExtraBallPreviouslyPurchased = 0; } break; case LEGENDARY_BOARD_STATE_SCORE_COUNTING_FINISHED: diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index a81b4b9a..7c01c88a 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -27,7 +27,7 @@ void UpdateChikoritaAttackAnimation(void) s16 var0; index = 0; - group = &gMain.spriteGroups[SG_14]; + group = &gMain.spriteGroups[SG_RUBY_CHIKORITA_PROJECTILE_COLLISION_FX]; if (gCurrentPinballGame->chikoritaProjectileTimer < 60) { if (gCurrentPinballGame->chikoritaProjectileTimer >= 27 && gCurrentPinballGame->chikoritaProjectileTimer < 47) @@ -72,7 +72,7 @@ void UpdateChikoritaAttackAnimation(void) } } - group = &gMain.spriteGroups[SG_13]; + group = &gMain.spriteGroups[SG_RUBY_CHIKORITA_PROJECTILE]; if (group->active) { if (gCurrentPinballGame->chikoritaProjectileTimer < 120) @@ -93,7 +93,7 @@ void UpdateChikoritaAttackAnimation(void) gCurrentPinballGame->chikoritaProjectileTimer++; if (gCurrentPinballGame->chikoritaProjectileTimer == 27) { - gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_RUBY_CHIKORITA_PROJECTILE_COLLISION_FX].active = TRUE; m4aSongNumStart(SE_UNKNOWN_0xC7); if (gCurrentPinballGame->sideBumperBounceCount[1] > 0) { @@ -108,7 +108,7 @@ void UpdateChikoritaAttackAnimation(void) if (gCurrentPinballGame->chikoritaProjectileTimer == 100) { - gMain.spriteGroups[SG_14].active = TRUE; + gMain.spriteGroups[SG_RUBY_CHIKORITA_PROJECTILE_COLLISION_FX].active = TRUE; m4aSongNumStart(SE_UNKNOWN_0xC7); if (gCurrentPinballGame->sideBumperBounceCount[0] > 0) { @@ -160,7 +160,7 @@ void AnimateChikoritaSprite(void) gCurrentPinballGame->chikoritaProjectileY = 0; gCurrentPinballGame->chikoritaProjectileVelX = 100; gCurrentPinballGame->chikoritaProjectileUnused = 0; - gMain.spriteGroups[SG_13].active = TRUE; + gMain.spriteGroups[SG_RUBY_CHIKORITA_PROJECTILE].active = TRUE; } if (gCurrentPinballGame->chikoritaFlashTimer < 54) From 92f06b1562ff828fb4493015da20ba6f9fb48067 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Mon, 25 May 2026 22:01:35 -0500 Subject: [PATCH 19/33] checkpoint 2 --- asmdiff.sh | 2 +- data/rom_2.s | 303 +++++++++++++++---------------- include/constants/spriteGroups.h | 10 + include/variables.h | 2 +- src/ereader.c | 22 +-- src/high_scores.c | 91 +++++----- sym_ewram.txt | 4 +- 7 files changed, 226 insertions(+), 208 deletions(-) diff --git a/asmdiff.sh b/asmdiff.sh index 9441660b..35418ea0 100755 --- a/asmdiff.sh +++ b/asmdiff.sh @@ -1,6 +1,6 @@ #!/bin/bash -OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" +OBJDUMP="arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" $OBJDUMP $OPTIONS baserom.gba > baserom.dump $OBJDUMP $OPTIONS pokepinballrs.gba > pokepinballrs.dump diff --git a/data/rom_2.s b/data/rom_2.s index 52156570..02e9b806 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -115,10 +115,10 @@ gBonusFieldSelectSpriteSets:: @ 0x086A4C80 .4byte gUnknown_086A69F6 .4byte gUnknown_086A6A08 .4byte gUnknown_086A6A1A - .4byte gUnknown_086A6A2C - .4byte gUnknown_086A6A56 - .4byte gUnknown_086A6A80 - .4byte gUnknown_086A6AAA + .4byte gFieldSelectBallSpeedNormal0SpriteSet + .4byte gFieldSelectBallSpeedNormal1SpriteSet + .4byte gFieldSelectBallSpeedSlow0SpriteSet + .4byte gFieldSelectBallSpeedSlow1SpriteSet gBonusFieldStageIconPositions:: @ 0x086A4CC0 .2byte 0x20, 0x20 @@ -148,11 +148,11 @@ gBonusFieldMenuSelectionToField:: @ 0x086A4CF0 gEReaderTextGlyphTable:: @ 0x086A4CF8 .incbin "baserom.gba", 0x6A4CF8, 0x7E0 -gCatchHatchSpriteSets:: @ 0x086A54D8 - .4byte gUnknown_086A5710 - .4byte gUnknown_086A573A - .4byte gUnknown_086A574C - .4byte gUnknown_086A575E +gEReaderSpriteSets:: @ 0x086A54D8 + .4byte gPokedexStartTransmissionPopupSpriteSet + .4byte gPokedexTransmittingPopupSpriteSet + .4byte gPokedexTransmissionErrorPopupSpriteSet + .4byte gPokedexTransferCompletePopupSpriteSet .4byte gUnknown_086A5988 .4byte gUnknown_086A59CA .4byte gUnknown_086A5A14 @@ -178,38 +178,38 @@ gEReaderTextHasNextPage:: @ 0x086A5528 gEReaderCardStartPages:: @ 0x086A5536 .byte 0x02, 0x04, 0x06, 0x09, 0x0B, 0x00 -gUnknown_086A553C:: @ 0x086A553C +gPokedexCursorHandSpriteSet:: @ 0x086A553C .incbin "baserom.gba", 0x6A553C, 0x14 -gUnknown_086A5550:: @ 0x086A5550 +gPokedexPressSelectText0SpriteSet:: @ 0x086A5550 .incbin "baserom.gba", 0x6A5550, 0x1A -gUnknown_086A556A:: @ 0x086A556A +gPokedexPressSelectText1SpriteSet:: @ 0x086A556A .incbin "baserom.gba", 0x6A556A, 0x1A -gUnknown_086A5584:: @ 0x086A5584 +gPokedexPressSelectText2SpriteSet:: @ 0x086A5584 .incbin "baserom.gba", 0x6A5584, 0x1A -gUnknown_086A559E:: @ 0x086A559E +gPokedexPressSelectText3SpriteSet:: @ 0x086A559E .incbin "baserom.gba", 0x6A559E, 0x1A -gUnknown_086A55B8:: @ 0x086A55B8 +gPokedexPressSelectText4SpriteSet:: @ 0x086A55B8 .incbin "baserom.gba", 0x6A55B8, 0x1A -gUnknown_086A55D2:: @ 0x086A55D2 +gPokedexPressSelectText5SpriteSet:: @ 0x086A55D2 .incbin "baserom.gba", 0x6A55D2, 0x1A -gUnknown_086A55EC:: @ 0x086A55EC +gPokedexPressSelectText6SpriteSet:: @ 0x086A55EC .incbin "baserom.gba", 0x6A55EC, 0x1A -gUnknown_086A5606:: @ 0x086A5606 +gPokedexPressSelectText7SpriteSet:: @ 0x086A5606 .incbin "baserom.gba", 0x6A5606, 0x1A -gUnknown_086A5620:: @ 0x086A5620 +gPokedexPressSelectText8SpriteSet:: @ 0x086A5620 .incbin "baserom.gba", 0x6A5620, 0x1A -gUnknown_086A563A:: @ 0x086A563A +gPokedexPressSelectText9SpriteSet:: @ 0x086A563A .incbin "baserom.gba", 0x6A563A, 0x1A -gUnknown_086A5654:: @ 0x086A5654 +gPokedexPressSelectText10SpriteSet:: @ 0x086A5654 .incbin "baserom.gba", 0x6A5654, 0x1A -gUnknown_086A566E:: @ 0x086A566E +gPokedexMonPortraitSpriteSet:: @ 0x086A566E .incbin "baserom.gba", 0x6A566E, 0x32 -gUnknown_086A56A0:: @ 0x086A56A0 +gPokedexCatchSpriteSpriteSet:: @ 0x086A56A0 .incbin "baserom.gba", 0x6A56A0, 0x66 -gUnknown_086A5706:: @ 0x086A5706 +gPokedexScrollIndicatorSpriteSet:: @ 0x086A5706 .incbin "baserom.gba", 0x6A5706, 0xA -gUnknown_086A5710:: @ 0x086A5710 +gPokedexStartTransmissionPopupSpriteSet:: @ 0x086A5710 .2byte 5 packed_sprite_oam x=-0x34, y=-0x1E, spriteSize=SPRITE_SIZE_64x32, tileNum=0x60, priority=0x0, paletteNum=0x0 .2byte 0 @@ -222,21 +222,21 @@ gUnknown_086A5710:: @ 0x086A5710 packed_sprite_oam x=0x2C, y=0x2, spriteSize=SPRITE_SIZE_8x32, tileNum=0xc4, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A573A:: @ 0x086A573A +gPokedexTransmittingPopupSpriteSet:: @ 0x086A573A .2byte 2 packed_sprite_oam x=-0x28, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0xc8, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x18, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0xe8, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A574C:: @ 0x086A574C +gPokedexTransmissionErrorPopupSpriteSet:: @ 0x086A574C .2byte 2 packed_sprite_oam x=-0x30, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0xf0, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x10, y=-0xB, spriteSize=SPRITE_SIZE_32x32, tileNum=0x110, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A575E:: @ 0x086A575E +gPokedexTransferCompletePopupSpriteSet:: @ 0x086A575E .2byte 3 packed_sprite_oam x=-0x38, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x120, priority=0x0, paletteNum=0x0 .2byte 0 @@ -245,14 +245,14 @@ gUnknown_086A575E:: @ 0x086A575E packed_sprite_oam x=0x28, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0x150, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A5778:: @ 0x086A5778 +gPokedexDeleteConfirmationPopupSpriteSet:: @ 0x086A5778 .2byte 2 packed_sprite_oam x=-0x2C, y=-0x10, spriteSize=SPRITE_SIZE_64x32, tileNum=0x158, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x14, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x178, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A578A:: @ 0x086A578A +gPokedexHatchSpriteSpriteSet:: @ 0x086A578A .incbin "baserom.gba", 0x6A578A, 0x1FE gUnknown_086A5988:: @ 0x086A5988 @@ -512,21 +512,21 @@ gUnknown_086A5CC0:: @ 0x086A5CC0 packed_sprite_oam x=-0x8, y=0xE, spriteSize=SPRITE_SIZE_16x16, tileNum=0x33c, priority=0x0, paletteNum=0x4 .2byte 0 -gUnknown_086A5D32:: @ 0x086A5D32 +gPokedexPressStart0SpriteSet:: @ 0x086A5D32 .incbin "baserom.gba", 0x6A5D32, 0x32 -gUnknown_086A5D64:: @ 0x086A5D64 +gPokedexPressStart1SpriteSet:: @ 0x086A5D64 .incbin "baserom.gba", 0x6A5D64, 0x1A -gUnknown_086A5D7E:: @ 0x086A5D7E +gPokedexCompletionBadgeSpriteSet:: @ 0x086A5D7E .incbin "baserom.gba", 0x6A5D7E, 0x1A -gUnknown_086A5D98:: @ 0x086A5D98 +gPokedexPressSelectText11SpriteSet:: @ 0x086A5D98 .incbin "baserom.gba", 0x6A5D98, 0x1A -gUnknown_086A5DB2:: @ 0x086A5DB2 +gPokedexTextPageChangeArrowDown0SpriteSet:: @ 0x086A5DB2 .incbin "baserom.gba", 0x6A5DB2, 0xA -gUnknown_086A5DBC:: @ 0x086A5DBC +gPokedexTextPageChangeArrowDown1SpriteSet:: @ 0x086A5DBC .incbin "baserom.gba", 0x6A5DBC, 0xA -gUnknown_086A5DC6:: @ 0x086A5DC6 +gPokedexTextPageChangeArrowUp0SpriteSet:: @ 0x086A5DC6 .incbin "baserom.gba", 0x6A5DC6, 0xA -gUnknown_086A5DD0:: @ 0x086A5DD0 +gPokedexTextPageChangeArrowUp1SpriteSet:: @ 0x086A5DD0 .incbin "baserom.gba", 0x6A5DD0, 0xA gPokedexAnimBaseTileNums:: @ 0x086A5DDA @@ -545,35 +545,35 @@ gPokedexAnimFrameDurations:: @ 0x086A6014 .incbin "baserom.gba", 0x6A6014, 0x134 gPokedexSpriteSets:: @ 0x086A6148 - .4byte gUnknown_086A553C - .4byte gUnknown_086A5706 - .4byte gUnknown_086A566E - .4byte gUnknown_086A56A0 - .4byte gUnknown_086A578A - .4byte gUnknown_086A5550 - .4byte gUnknown_086A556A - .4byte gUnknown_086A5584 - .4byte gUnknown_086A559E - .4byte gUnknown_086A55B8 - .4byte gUnknown_086A55D2 - .4byte gUnknown_086A55EC - .4byte gUnknown_086A5606 - .4byte gUnknown_086A5620 - .4byte gUnknown_086A563A - .4byte gUnknown_086A5654 - .4byte gUnknown_086A5D98 - .4byte gUnknown_086A5710 - .4byte gUnknown_086A573A - .4byte gUnknown_086A574C - .4byte gUnknown_086A575E - .4byte gUnknown_086A5778 - .4byte gUnknown_086A5D32 - .4byte gUnknown_086A5D64 - .4byte gUnknown_086A5D7E - .4byte gUnknown_086A5DB2 - .4byte gUnknown_086A5DBC - .4byte gUnknown_086A5DC6 - .4byte gUnknown_086A5DD0 + .4byte gPokedexCursorHandSpriteSet + .4byte gPokedexScrollIndicatorSpriteSet + .4byte gPokedexMonPortraitSpriteSet + .4byte gPokedexCatchSpriteSpriteSet + .4byte gPokedexHatchSpriteSpriteSet + .4byte gPokedexPressSelectText0SpriteSet + .4byte gPokedexPressSelectText1SpriteSet + .4byte gPokedexPressSelectText2SpriteSet + .4byte gPokedexPressSelectText3SpriteSet + .4byte gPokedexPressSelectText4SpriteSet + .4byte gPokedexPressSelectText5SpriteSet + .4byte gPokedexPressSelectText6SpriteSet + .4byte gPokedexPressSelectText7SpriteSet + .4byte gPokedexPressSelectText8SpriteSet + .4byte gPokedexPressSelectText9SpriteSet + .4byte gPokedexPressSelectText10SpriteSet + .4byte gPokedexPressSelectText11SpriteSet + .4byte gPokedexStartTransmissionPopupSpriteSet + .4byte gPokedexTransmittingPopupSpriteSet + .4byte gPokedexTransmissionErrorPopupSpriteSet + .4byte gPokedexTransferCompletePopupSpriteSet + .4byte gPokedexDeleteConfirmationPopupSpriteSet + .4byte gPokedexPressStart0SpriteSet + .4byte gPokedexPressStart1SpriteSet + .4byte gPokedexCompletionBadgeSpriteSet + .4byte gPokedexTextPageChangeArrowDown0SpriteSet + .4byte gPokedexTextPageChangeArrowDown1SpriteSet + .4byte gPokedexTextPageChangeArrowUp0SpriteSet + .4byte gPokedexTextPageChangeArrowUp1SpriteSet gDexAnimationIx:: @ 0x086A61BC @ marks which anim to show with the 'select' button in pokedex @@ -655,12 +655,12 @@ gPokedexListNameVramOffsets:: @ 0x086A64F0 gUnknown_086A64FA:: @ 0x086A64FA .incbin "baserom.gba", 0x6A64FA, 0x336 -gUnknown_086A6830:: @ 0x086A6830 +gFieldSelectFullHighlightSpriteSet:: @ 0x086A6830 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x9, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A683A:: @ 0x086A683A +gFieldSelectFullShadowSpriteSet:: @ 0x086A683A .2byte 9 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 @@ -681,7 +681,7 @@ gUnknown_086A683A:: @ 0x086A683A packed_sprite_oam x=0x20, y=0x50, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A6884:: @ 0x086A6884 +gFieldSelectDim3SpriteSet:: @ 0x086A6884 .2byte 13 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 @@ -710,7 +710,7 @@ gUnknown_086A6884:: @ 0x086A6884 packed_sprite_oam x=0x20, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x32, tileNum=0x48, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A68EE:: @ 0x086A68EE +gFieldSelectDim2SpriteSet:: @ 0x086A68EE .2byte 11 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 @@ -735,7 +735,7 @@ gUnknown_086A68EE:: @ 0x086A68EE packed_sprite_oam x=0x20, y=0x60, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_32x16, tileNum=0x4c, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A6948:: @ 0x086A6948 +gFieldSelectDim1SpriteSet:: @ 0x086A6948 .2byte 6 packed_sprite_oam x=0x40, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x16, tileNum=0x8, priority=0x0, paletteNum=0x0 .2byte 0 @@ -751,14 +751,14 @@ gUnknown_086A6948:: @ 0x086A6948 .2byte 0 -gUnknown_086A697A:: @ 0x086A697A +gFieldSelectRubyBoardNameHighlightSpriteSet:: @ 0x086A697A .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x140, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x144, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A698C:: @ 0x086A698C +gFieldSelectSapphireBoardNameHighlightSpriteSet:: @ 0x086A698C .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x148, priority=0x0, paletteNum=0x0 .2byte 0 @@ -818,7 +818,7 @@ gUnknown_086A6A1A:: @ 0x086A6A1A packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1cc, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A6A2C:: @ 0x086A6A2C +gFieldSelectBallSpeedNormal0SpriteSet:: @ 0x086A6A2C .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 @@ -831,7 +831,7 @@ gUnknown_086A6A2C:: @ 0x086A6A2C packed_sprite_oam x=0x30, y=0x10, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086A6A56:: @ 0x086A6A56 +gFieldSelectBallSpeedNormal1SpriteSet:: @ 0x086A6A56 .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 @@ -844,7 +844,7 @@ gUnknown_086A6A56:: @ 0x086A6A56 packed_sprite_oam x=0x31, y=0x10, spriteSize=SPRITE_SIZE_8x16, hFlip=0x1, tileNum=0x11f, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086A6A80:: @ 0x086A6A80 +gFieldSelectBallSpeedSlow0SpriteSet:: @ 0x086A6A80 .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 @@ -857,7 +857,7 @@ gUnknown_086A6A80:: @ 0x086A6A80 packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x15c, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086A6AAA:: @ 0x086A6AAA +gFieldSelectBallSpeedSlow1SpriteSet:: @ 0x086A6AAA .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x150, priority=0x0, paletteNum=0x1 .2byte 0 @@ -871,22 +871,22 @@ gUnknown_086A6AAA:: @ 0x086A6AAA .2byte 0 gFieldSelectSpriteSets:: @ 0x086A6AD4 - .4byte gUnknown_086A697A - .4byte gUnknown_086A698C - .4byte gUnknown_086A6830 - .4byte gUnknown_086A683A - .4byte gUnknown_086A6948 - .4byte gUnknown_086A68EE - .4byte gUnknown_086A6884 - .4byte gUnknown_086A683A - .4byte gUnknown_086A6884 - .4byte gUnknown_086A68EE - .4byte gUnknown_086A6948 - .4byte gUnknown_086A6830 - .4byte gUnknown_086A6A2C - .4byte gUnknown_086A6A56 - .4byte gUnknown_086A6A80 - .4byte gUnknown_086A6AAA + .4byte gFieldSelectRubyBoardNameHighlightSpriteSet + .4byte gFieldSelectSapphireBoardNameHighlightSpriteSet + .4byte gFieldSelectFullHighlightSpriteSet + .4byte gFieldSelectFullShadowSpriteSet + .4byte gFieldSelectDim1SpriteSet + .4byte gFieldSelectDim2SpriteSet + .4byte gFieldSelectDim3SpriteSet + .4byte gFieldSelectFullShadowSpriteSet + .4byte gFieldSelectDim3SpriteSet + .4byte gFieldSelectDim2SpriteSet + .4byte gFieldSelectDim1SpriteSet + .4byte gFieldSelectFullHighlightSpriteSet + .4byte gFieldSelectBallSpeedNormal0SpriteSet + .4byte gFieldSelectBallSpeedNormal1SpriteSet + .4byte gFieldSelectBallSpeedSlow0SpriteSet + .4byte gFieldSelectBallSpeedSlow1SpriteSet gFieldTransitionAnimData:: @ 0x086A6B14 .2byte 2, 4, 5, 6, 7 @@ -2188,56 +2188,55 @@ gIntroScene8b_BallDecelTable:: @ 0x086A7D4C .incbin "baserom.gba", 0x6A7D4C, 0x5C gNameEntryCursorSpriteSets:: @ 0x086A7DA8 - .4byte gUnknown_086A7DE8 - .4byte gUnknown_086A7DFA + .4byte gHighScoreNameEntryCursor0SpriteSet + .4byte gHighScoreNameEntryCursor1SpriteSet gHighScoreScreenSpriteSets:: @ 0x086A7DB0 - .4byte gUnknown_086A7E0C - .4byte gUnknown_086A7E20 - .4byte gUnknown_086A7E34 - .4byte gUnknown_086A7E5E - .4byte gUnknown_086A7E70 - .4byte gUnknown_086A7E82 - .4byte gUnknown_086A7E9C - .4byte gUnknown_086A7EAE - .4byte gUnknown_086A7EC8 - + .4byte gHighScorePageRightArrowSpriteSet + .4byte gHighScorePageLeftArrowSpriteSet + .4byte gHighScoreStartTransmissionPopupSpriteSet + .4byte gHighScoreTransmittingPopupSpriteSet + .4byte gHighScoreTransmissionErrorPopupSpriteSet + .4byte gHighScoreTransmissionCompletePopupSpriteSet + .4byte gHighScoreDeleteConfirmationPopupSpriteSet + .4byte gHighScorePressStart0SpriteSet + .4byte gHighScorePressStart1SpriteSet gCompletionBannerSpriteSets:: @ 0x086A7DD4 - .4byte gUnknown_086A7EFA - .4byte gUnknown_086A7F1C - .4byte gUnknown_086A7F3E - .4byte gUnknown_086A7F60 - .4byte gUnknown_086A7F82 + .4byte gHighScoreDexCompletionBanner0SpriteSet + .4byte gHighScoreDexCompletionBanner1SpriteSet + .4byte gHighScoreDexCompletionBanner2SpriteSet + .4byte gHighScoreDexCompletionBanner3SpriteSet + .4byte gHighScoreDexCompletionBanner4SpriteSet -gUnknown_086A7DE8:: @ 0x086A7DE8 +gHighScoreNameEntryCursor0SpriteSet:: @ 0x086A7DE8 .2byte 2 packed_sprite_oam x=0x0, y=-0x8, spriteSize=SPRITE_SIZE_8x8, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x0, y=0x7, spriteSize=SPRITE_SIZE_8x8, vFlip=0x1, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7DFA:: @ 0x086A7DFA +gHighScoreNameEntryCursor1SpriteSet:: @ 0x086A7DFA .2byte 2 packed_sprite_oam x=0x0, y=-0x9, spriteSize=SPRITE_SIZE_8x8, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x8, vFlip=0x1, tileNum=0x1, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7E0C:: @ 0x086A7E0C +gHighScorePageRightArrowSpriteSet:: @ 0x086A7E0C .2byte 1 packed_sprite_oam x=-0x1, y=0x4, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2, priority=0x0, paletteNum=0x0 .2byte 0 .incbin "baserom.gba", 0x6A7E16, 0xA -gUnknown_086A7E20:: @ 0x086A7E20 +gHighScorePageLeftArrowSpriteSet:: @ 0x086A7E20 .2byte 1 packed_sprite_oam x=0x1, y=0x4, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x2, priority=0x0, paletteNum=0x0 .2byte 0 .incbin "baserom.gba", 0x6A7E2A, 0xA -gUnknown_086A7E34:: @ 0x086A7E34 +gHighScoreStartTransmissionPopupSpriteSet:: @ 0x086A7E34 .2byte 5 packed_sprite_oam x=0xC, y=-0x1E, spriteSize=SPRITE_SIZE_32x64, tileNum=0x120, priority=0x0, paletteNum=0x0 .2byte 0 @@ -2250,21 +2249,21 @@ gUnknown_086A7E34:: @ 0x086A7E34 packed_sprite_oam x=-0x34, y=0x2, spriteSize=SPRITE_SIZE_64x32, tileNum=0xb8, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7E5E:: @ 0x086A7E5E +gHighScoreTransmittingPopupSpriteSet:: @ 0x086A7E5E .2byte 2 packed_sprite_oam x=-0x28, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x20, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x18, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0x28, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7E70:: @ 0x086A7E70 +gHighScoreTransmissionErrorPopupSpriteSet:: @ 0x086A7E70 .2byte 2 packed_sprite_oam x=-0x30, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2a, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x10, y=-0xB, spriteSize=SPRITE_SIZE_32x32, tileNum=0x32, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7E82:: @ 0x086A7E82 +gHighScoreTransmissionCompletePopupSpriteSet:: @ 0x086A7E82 .2byte 3 packed_sprite_oam x=-0x38, y=-0xB, spriteSize=SPRITE_SIZE_64x32, tileNum=0x36, priority=0x0, paletteNum=0x0 .2byte 0 @@ -2273,14 +2272,14 @@ gUnknown_086A7E82:: @ 0x086A7E82 packed_sprite_oam x=0x28, y=-0xB, spriteSize=SPRITE_SIZE_16x32, tileNum=0x3e, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7E9C:: @ 0x086A7E9C +gHighScoreDeleteConfirmationPopupSpriteSet:: @ 0x086A7E9C .2byte 2 packed_sprite_oam x=-0x2C, y=-0x13, spriteSize=SPRITE_SIZE_64x32, tileNum=0xa4, priority=0x0, paletteNum=0x0 .2byte 0 packed_sprite_oam x=0x14, y=-0x13, spriteSize=SPRITE_SIZE_32x32, tileNum=0xac, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7EAE:: @ 0x086A7EAE +gHighScorePressStart0SpriteSet:: @ 0x086A7EAE .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x6, priority=0x0, paletteNum=0x0 .2byte 0 @@ -2289,7 +2288,7 @@ gUnknown_086A7EAE:: @ 0x086A7EAE packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0xe, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7EC8:: @ 0x086A7EC8 +gHighScorePressStart1SpriteSet:: @ 0x086A7EC8 .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x8, tileNum=0x6, priority=0x0, paletteNum=0x0 .2byte 0 @@ -2304,7 +2303,7 @@ gUnknown_086A7EC8:: @ 0x086A7EC8 packed_sprite_oam x=0x28, y=0x0, spriteSize=SPRITE_SIZE_8x8, tileNum=0x11, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7EFA:: @ 0x086A7EFA +gHighScoreDexCompletionBanner0SpriteSet:: @ 0x086A7EFA .2byte 4 packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 @@ -2315,7 +2314,7 @@ gUnknown_086A7EFA:: @ 0x086A7EFA packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A7F1C:: @ 0x086A7F1C +gHighScoreDexCompletionBanner1SpriteSet:: @ 0x086A7F1C .2byte 4 packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 @@ -2326,7 +2325,7 @@ gUnknown_086A7F1C:: @ 0x086A7F1C packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x4 .2byte 0 -gUnknown_086A7F3E:: @ 0x086A7F3E +gHighScoreDexCompletionBanner2SpriteSet:: @ 0x086A7F3E .2byte 4 packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 @@ -2337,7 +2336,7 @@ gUnknown_086A7F3E:: @ 0x086A7F3E packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x5 .2byte 0 -gUnknown_086A7F60:: @ 0x086A7F60 +gHighScoreDexCompletionBanner3SpriteSet:: @ 0x086A7F60 .2byte 4 packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 @@ -2348,7 +2347,7 @@ gUnknown_086A7F60:: @ 0x086A7F60 packed_sprite_oam x=0x8, y=-0x18, spriteSize=SPRITE_SIZE_64x64, tileNum=0x12e, priority=0x0, paletteNum=0x6 .2byte 0 -gUnknown_086A7F82:: @ 0x086A7F82 +gHighScoreDexCompletionBanner4SpriteSet:: @ 0x086A7F82 .2byte 4 packed_sprite_oam x=-0x4A, y=-0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x136, priority=0x0, paletteNum=0x2 .2byte 0 @@ -2370,7 +2369,7 @@ gScorePaletteResetOffsets:: @ 0x086A7FA8 gHighScoreCharToTileMap:: @ 0x086A7FAC .incbin "baserom.gba", 0x6A7FAC, 0x54 -gUnknown_086A8000:: @ 0x086A8000 +gTitleFlippersAndStartAnim0SpriteSet:: @ 0x086A8000 .2byte 0x5 packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x14e, priority=0x0, paletteNum=0x4 .2byte 0 @@ -2383,7 +2382,7 @@ gUnknown_086A8000:: @ 0x086A8000 packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x168, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A802A:: @ 0x086A802A +gTitleFlippersAndStartAnim1SpriteSet:: @ 0x086A802A .2byte 0x5 packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x14c, priority=0x0, paletteNum=0x4 .2byte 0 @@ -2396,7 +2395,7 @@ gUnknown_086A802A:: @ 0x086A802A packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x168, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A8054:: @ 0x086A8054 +gTitleFlippersAndStartAnim2SpriteSet:: @ 0x086A8054 .2byte 0x5 packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x16c, priority=0x0, paletteNum=0x4 .2byte 0 @@ -2409,7 +2408,7 @@ gUnknown_086A8054:: @ 0x086A8054 packed_sprite_oam x=0x10, y=0x2B, spriteSize=SPRITE_SIZE_32x8, tileNum=0x188, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086A807E:: @ 0x086A807E +gTitleFlippersAndStartAnim3SpriteSet:: @ 0x086A807E .2byte 0x5 packed_sprite_oam x=-0x3A, y=0x2B, spriteSize=SPRITE_SIZE_16x8, tileNum=0x14c, priority=0x0, paletteNum=0x4 .2byte 0 @@ -2423,7 +2422,7 @@ gUnknown_086A807E:: @ 0x086A807E .2byte 0 -gUnknown_086A80A8:: @ 0x086A80A8 +gTitleMenuPanelSpriteSet:: @ 0x086A80A8 .incbin "baserom.gba", 0x6A80A8, 0x7A gUnknown_086A8122:: @ 0x086A8122 @@ -2459,25 +2458,25 @@ gUnknown_086A88B4:: @ 0x086A88B4 gUnknown_086A89AE:: @ 0x086A89AE .incbin "baserom.gba", 0x6A89AE, 0x112 -gUnknown_086A8AC0:: @ 0x086A8AC0 +gTitleLeftCursorFlipperAnim0SpriteSet:: @ 0x086A8AC0 .incbin "baserom.gba", 0x6A8AC0, 0xA -gUnknown_086A8ACA:: @ 0x086A8ACA +gTitleLeftCursorFlipperAnim1SpriteSet:: @ 0x086A8ACA .incbin "baserom.gba", 0x6A8ACA, 0xA -gUnknown_086A8AD4:: @ 0x086A8AD4 +gTitleLeftCursorFlipperAnim2SpriteSet:: @ 0x086A8AD4 .incbin "baserom.gba", 0x6A8AD4, 0xA -gUnknown_086A8ADE:: @ 0x086A8ADE +gTitleRightCursorFlipperAnim0SpriteSet:: @ 0x086A8ADE .incbin "baserom.gba", 0x6A8ADE, 0xA -gUnknown_086A8AE8:: @ 0x086A8AE8 +gTitleRightCursorFlipperAnim1SpriteSet:: @ 0x086A8AE8 .incbin "baserom.gba", 0x6A8AE8, 0xA -gUnknown_086A8AF2:: @ 0x086A8AF2 +gTitleRightCursorFlipperAnim2SpriteSet:: @ 0x086A8AF2 .incbin "baserom.gba", 0x6A8AF2, 0xA -gUnknown_086A8AFC:: @ 0x086A8AFC +gTitleDeleteSaveConfirmationPopupSpriteSet:: @ 0x086A8AFC .2byte 0x2 packed_sprite_oam x=-0x30, y=-0x10, spriteSize=SPRITE_SIZE_64x32, tileNum=0x298, priority=0x0, paletteNum=0x2 .2byte 0 @@ -2624,23 +2623,23 @@ gTitleSavedMenuActions:: @ 0x086A96D4 .2byte 0x0500, 0x0302, 0x0000 gTitlePressStartSpriteSets:: @ 0x086A96E4 - .4byte gUnknown_086A8000 - .4byte gUnknown_086A802A - .4byte gUnknown_086A8054 - .4byte gUnknown_086A807E - .4byte gUnknown_086A8AFC + .4byte gTitleFlippersAndStartAnim0SpriteSet + .4byte gTitleFlippersAndStartAnim1SpriteSet + .4byte gTitleFlippersAndStartAnim2SpriteSet + .4byte gTitleFlippersAndStartAnim3SpriteSet + .4byte gTitleDeleteSaveConfirmationPopupSpriteSet gTitleNoSaveDefaultSprites:: @ 0x086A96F8 - .4byte gUnknown_086A8AC0 - .4byte gUnknown_086A8ACA - .4byte gUnknown_086A8AD4 - .4byte gUnknown_086A8ADE - .4byte gUnknown_086A8AE8 - .4byte gUnknown_086A8AF2 - .4byte gUnknown_086A80A8 + .4byte gTitleLeftCursorFlipperAnim0SpriteSet + .4byte gTitleLeftCursorFlipperAnim1SpriteSet + .4byte gTitleLeftCursorFlipperAnim2SpriteSet + .4byte gTitleRightCursorFlipperAnim0SpriteSet + .4byte gTitleRightCursorFlipperAnim1SpriteSet + .4byte gTitleRightCursorFlipperAnim2SpriteSet + .4byte gTitleMenuPanelSpriteSet gTitleNoSaveAnimSprites:: @ 0x086A9714 - .4byte gUnknown_086A80A8 + .4byte gTitleMenuPanelSpriteSet .4byte gUnknown_086A8122 .4byte gUnknown_086A81B4 .4byte gUnknown_086A823E diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index a1cebee6..a3870ff9 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -198,6 +198,16 @@ // High score screen #define SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_0 0 #define SG_HIGH_SCORE_ENTRY_CURSOR_ARROW_1 1 + +#define SG_HIGH_SCORE_PAGE_RIGHT_ARROW 0 +#define SG_HIGH_SCORE_PAGE_LEFT_ARROW 1 +#define SG_HIGH_SCORE_POPUP_LIST_BASE 2 // of 5 +#define SG_HIGH_SCORE_POPUP_START_TRANSMISSION 2 +#define SG_HIGH_SCORE_POPUP_TRANSMITTING 3 +#define SG_HIGH_SCORE_POPUP_TRANSMISSION_ERROR 4 +#define SG_HIGH_SCORE_POPUP_TRANSFER_COMPLETE 5 +#define SG_HIGH_SCORE_POPUP_DELETE_CONFIRMATION 6 + #define SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_START 0 #define SG_HIGH_SCORE_COMPLETION_BANNER_LOOP_END 4 diff --git a/include/variables.h b/include/variables.h index 7885e43e..7d92abbc 100644 --- a/include/variables.h +++ b/include/variables.h @@ -321,7 +321,7 @@ extern s16 gTitleRevealJingle[][10][2]; extern u8 gLinkExchangeStep; extern const struct PokemonSpecies gSpeciesInfo[]; -extern const struct SpriteSet * const gCatchHatchSpriteSets[13]; +extern const struct SpriteSet * const gEReaderSpriteSets[13]; extern u8 (*gMonHatchSpriteGroupGfx[])[0x10E0]; extern u8 (*gMonHatchSpriteGroupPals[])[0x20]; diff --git a/src/ereader.c b/src/ereader.c index a481c0c7..e322dfb7 100644 --- a/src/ereader.c +++ b/src/ereader.c @@ -474,23 +474,23 @@ s16 GetEReaderCardIndex(void) if (gEReaderReceivedCardId == 0x1f52) { - return 0; + return EREADER_SPECIAL_GUESTS_CARD; } else if (gEReaderReceivedCardId == 0x3e1a) { - return 1; + return EREADER_ENCOUNTER_RATE_UP_CARD; } else if (gEReaderReceivedCardId == 0x25af) { - return 2; + return EREADER_DX_MODE_CARD; } else if (gEReaderReceivedCardId == 0x4a09) { - return 3; + return EREADER_RUIN_AREA_CARD; } else if (gEReaderReceivedCardId == 0x6b12) { - return 4; + return EREADER_BONUS_STAGE_CARD; } else { @@ -510,7 +510,7 @@ void UpdateEReaderSprites(void) puVar5 = &gMain.spriteGroups[gEReaderHeaderAnimSpriteGroup]; puVar9->active = gEReaderStatusSpriteVisible; puVar5->active = TRUE; - LoadSpriteSets(gCatchHatchSpriteSets, 13, gMain.spriteGroups); + LoadSpriteSets(gEReaderSpriteSets, 13, gMain.spriteGroups); if (puVar9->active == TRUE) { @@ -525,7 +525,7 @@ void UpdateEReaderSprites(void) puVar9->baseY = 0x50; } - puVar8 = gCatchHatchSpriteSets[gEReaderStatusAnimSpriteGroup]; + puVar8 = gEReaderSpriteSets[gEReaderStatusAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -537,7 +537,7 @@ void UpdateEReaderSprites(void) puVar5->baseX = 0x78; puVar5->baseY = 0x18; - puVar8 = gCatchHatchSpriteSets[gEReaderHeaderAnimSpriteGroup]; + puVar8 = gEReaderSpriteSets[gEReaderHeaderAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -561,7 +561,7 @@ void UpdateEReaderSpritesViaOam(void) { puVar5 = &gMain.spriteGroups[gEReaderHeaderAnimSpriteGroup]; puVar9->active = gEReaderStatusSpriteVisible; puVar5->active = TRUE; - LoadSpriteSetsWithCpuCopy(gCatchHatchSpriteSets, 13, gMain.spriteGroups); + LoadSpriteSetsWithCpuCopy(gEReaderSpriteSets, 13, gMain.spriteGroups); if (puVar9->active == TRUE) { @@ -576,7 +576,7 @@ void UpdateEReaderSpritesViaOam(void) { puVar9->baseY = 0x50; } - puVar8 = gCatchHatchSpriteSets[gEReaderStatusAnimSpriteGroup]; + puVar8 = gEReaderSpriteSets[gEReaderStatusAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { @@ -588,7 +588,7 @@ void UpdateEReaderSpritesViaOam(void) { puVar5->baseX = 0x78; puVar5->baseY = 0x18; - puVar8 = gCatchHatchSpriteSets[gEReaderHeaderAnimSpriteGroup]; + puVar8 = gEReaderSpriteSets[gEReaderHeaderAnimSpriteGroup]; for (iVar7 = 0; iVar7 < puVar8->count; iVar7++) { diff --git a/src/high_scores.c b/src/high_scores.c index 6f35cf4a..1d4ccdba 100644 --- a/src/high_scores.c +++ b/src/high_scores.c @@ -18,8 +18,8 @@ extern s8 gCompletionBannerVisible; extern s16 gCompletionBannerY; extern s8 gCompletionBannerPhase; extern s8 gCompletionBannerSpriteGroup; -extern s8 gShowDialogFlag; -extern u8 gDialogType; +extern s8 gHighScoreShowPopupFlag; +extern u8 gHighScorePopupType; extern u16 gLinkExchangeCommand; extern u16 gLinkPacketCounter; extern s8 gLinkExchangeSendPhase; @@ -44,13 +44,13 @@ struct HighScoreScreenState s16 flashFrameCounter; s16 currentNameChar; //0-25="A"-"Z", 26-35="0"-"9" 41=" " s16 flashDuration; - s16 flashElapsedFrames; + s16 flashElapsedFrames; // also used for page arrow blink toggle s16 paletteAnimPhase; s16 paletteAnimTimer; s16 inputRepeatDelay; s16 linkWaitTimer; s8 nextIdleState; - s8 arrowBlinkToggle; + s8 pressStartBlinkToggle; // press start blink toggle s8 displayModeVisible; }; @@ -89,6 +89,15 @@ extern u8 gHighScoreDialogs_Gfx[]; extern u32 gHighScoreNameRowTilemapOffsets[8]; extern const struct HighScoreEntry gDefaultHighScores[2][8]; +enum HighScorePopupType { + HIGH_SCORE_POPUP_DEFAULT = 0, + HIGH_SCORE_POPUP_TRANSMISSION_CONNECT_PROMPT = 0, + HIGH_SCORE_POPUP_TRANSMITTING_ACTIVE = 1, + HIGH_SCORE_POPUP_TRANSMISSION_ERROR = 2, + HIGH_SCORE_POPUP_TRANSMISSION_COMPLETE = 3, + HIGH_SCORE_POPUP_DELETE_CONFIRMATION_PROMPT = 4 +}; + void HighScoresMain(void) { gHighScoresStateFuncs[gMain.subState](); @@ -155,10 +164,10 @@ void InitHighScoreData(void) gHighScoreScreenState.paletteAnimPhase = 0; gHighScoreScreenState.inputRepeatDelay = 0; gHighScoreScreenState.linkWaitTimer = 0; - gHighScoreScreenState.arrowBlinkToggle = 0; + gHighScoreScreenState.pressStartBlinkToggle = 0; gHighScoreScreenState.displayModeVisible = 1; - gShowDialogFlag = 0; - gDialogType = 1; + gHighScoreShowPopupFlag = FALSE; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMITTING_ACTIVE; gCompletionBannerVisible = 0; gResetComboTimer = 0; gResetComboCount = 0; @@ -350,7 +359,7 @@ void HighScore_BrowseScores(void) if(!(gMain.systemFrameCount % 0xC)) { gHighScoreScreenState.flashElapsedFrames = 1 - gHighScoreScreenState.flashElapsedFrames; - gHighScoreScreenState.arrowBlinkToggle = 1 - gHighScoreScreenState.arrowBlinkToggle; + gHighScoreScreenState.pressStartBlinkToggle = 1 - gHighScoreScreenState.pressStartBlinkToggle; } if(JOY_NEW(DPAD_LEFT)) { @@ -386,8 +395,8 @@ void HighScore_BrowseScores(void) if(gScrollXOffset == 0 || (gScrollXOffset == 0xF0)) { m4aSongNumStart(SE_MENU_POPUP_OPEN); - gShowDialogFlag = 1; - gDialogType = 0; + gHighScoreShowPopupFlag = TRUE; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMISSION_CONNECT_PROMPT; gMain.subState = HIGH_SCORE_STATE_INIT_LINK_EXCHANGE; } } @@ -405,8 +414,8 @@ void HighScore_BrowseScores(void) gResetComboCount = 0; gResetComboTimer = 0; m4aSongNumStart(SE_MENU_POPUP_OPEN); - gShowDialogFlag = 1; - gDialogType = 4; + gHighScoreShowPopupFlag = TRUE; + gHighScorePopupType = HIGH_SCORE_POPUP_DELETE_CONFIRMATION_PROMPT; gMain.subState = HIGH_SCORE_STATE_RESET_CONFIRMATION; } } @@ -580,8 +589,8 @@ void HighScore_LinkExchangeLoop(void) if (JOY_NEW(B_BUTTON)) { m4aSongNumStart(SE_MENU_CANCEL); - gShowDialogFlag = 0; - gDialogType = 0; + gHighScoreShowPopupFlag = FALSE; + gHighScorePopupType = HIGH_SCORE_POPUP_DEFAULT; ResetSerialAndInterrupts(); gMain.subState = HIGH_SCORE_STATE_BROWSE_SCORES; } @@ -603,7 +612,7 @@ void HighScore_LinkExchangeLoop(void) } else if (var0 == 1) { - gDialogType = 2; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMISSION_ERROR; gMain.subState = HIGH_SCORE_STATE_LINK_ERROR; m4aSongNumStart(SE_FAILURE); } @@ -612,7 +621,7 @@ void HighScore_LinkExchangeLoop(void) gLinkExchangeFrameCounter++; if ((gLinkStatusResult & 0x7f0000) != 0 && gLinkExchangeResult == -1 && ++gLinkTimeoutCounter > 180) { - gDialogType = 2; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMISSION_ERROR; gMain.subState = HIGH_SCORE_STATE_LINK_ERROR; m4aSongNumStart(SE_FAILURE); } @@ -637,8 +646,8 @@ void HighScore_LinkError(void) if (++gHighScoreScreenState.linkWaitTimer > 90) { gHighScoreScreenState.linkWaitTimer = 0; - gShowDialogFlag = 0; - gDialogType = 0; + gHighScoreShowPopupFlag = FALSE; + gHighScorePopupType = HIGH_SCORE_POPUP_DEFAULT; ResetSerialAndInterrupts(); DisableSerial(); for (i = 0; i < MAIN_FIELD_COUNT; i++) @@ -667,13 +676,13 @@ void HighScore_LinkSuccess(void) DisableSerial(); break; case 130: - gDialogType = 3; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMISSION_COMPLETE; m4aSongNumStart(SE_MENU_SELECT); break; case 250: gHighScoreScreenState.linkWaitTimer = 0; - gShowDialogFlag = 0; - gDialogType = 0; + gHighScoreShowPopupFlag = FALSE; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMISSION_CONNECT_PROMPT; gMergedRubyScoreIndex = MergeReceivedTopScore(0); gMergedSapphireScoreIndex = MergeReceivedTopScore(1); for (i = 0; i < MAIN_FIELD_COUNT; i++) @@ -713,8 +722,8 @@ void HighScore_ResetConfirmation(void) else if (JOY_NEW(B_BUTTON)) { m4aSongNumStart(SE_MENU_CANCEL); - gShowDialogFlag = 0; - gDialogType = 0; + gHighScoreShowPopupFlag = FALSE; + gHighScorePopupType = HIGH_SCORE_POPUP_DEFAULT; gMain.subState = HIGH_SCORE_STATE_BROWSE_SCORES; } } @@ -998,7 +1007,7 @@ void RenderHighScoreSprites(void) spriteGroups = gMain.spriteGroups; spriteGroup1 = spriteGroups; spriteGroup2 = &spriteGroups[1]; - spriteGroup3 = &spriteGroups[2 + (s8)gDialogType]; + spriteGroup3 = &spriteGroups[2 + (s8)gHighScorePopupType]; var1_02002858 = &gHighScoreScreenState; spriteGroup4 = &spriteGroups[7 + gHighScoreDisplayMode]; @@ -1006,7 +1015,7 @@ void RenderHighScoreSprites(void) { spriteGroups->active = TRUE; spriteGroup2->active = FALSE; - spriteGroup3->active = gShowDialogFlag; + spriteGroup3->active = gHighScoreShowPopupFlag; spriteGroup4->active = var1_02002858->collisionCooldownTimer; LoadSpriteSets(gHighScoreScreenSpriteSets, 9, spriteGroups); RenderHighScoreSprites_HELPER(220, spriteGroup1, spriteGroup4, spriteGroup3); @@ -1024,7 +1033,7 @@ void RenderHighScoreSprites(void) } if (spriteGroup3->active == TRUE) { - switch ((s8)gDialogType) + switch ((s8)gHighScorePopupType) { case 0: case 4: @@ -1036,7 +1045,7 @@ void RenderHighScoreSprites(void) spriteGroup3->baseY = 80; break; } - spriteSet = gHighScoreScreenSpriteSets[(s8)gDialogType + 2]; + spriteSet = gHighScoreScreenSpriteSets[(s8)gHighScorePopupType + 2]; for (i = 0; i < spriteSet->count; i++) { oamData = &spriteGroup3->oam[i]; @@ -1049,7 +1058,7 @@ void RenderHighScoreSprites(void) { spriteGroup1->active = FALSE; spriteGroup2->active = TRUE; - spriteGroup3->active = gShowDialogFlag; + spriteGroup3->active = gHighScoreShowPopupFlag; spriteGroup4->active = var1_02002858->collisionCooldownTimer; LoadSpriteSets(gHighScoreScreenSpriteSets, 2, gMain.spriteGroups); RenderHighScoreSprites_HELPER(4, spriteGroup2, spriteGroup4, spriteGroup3); @@ -1067,7 +1076,7 @@ void RenderHighScoreSprites(void) } if (spriteGroup3->active == TRUE) { - switch ((s8)gDialogType) + switch ((s8)gHighScorePopupType) { case 0: case 4: @@ -1079,7 +1088,7 @@ void RenderHighScoreSprites(void) spriteGroup3->baseY = 80; break; } - spriteSet = gHighScoreScreenSpriteSets[(s8)gDialogType + 2]; + spriteSet = gHighScoreScreenSpriteSets[(s8)gHighScorePopupType + 2]; for (i = 0; i < spriteSet->count; i++) { oamData = &spriteGroup3->oam[i]; @@ -1115,7 +1124,7 @@ void RenderHighScoreSprites(void) adds r0, r0, r6\n\ mov sl, r0\n\ mov r5, sl\n\ - ldr r0, _0800E5D0 @ =gDialogType\n\ + ldr r0, _0800E5D0 @ =gHighScorePopupType\n\ ldrb r0, [r0]\n\ lsls r0, r0, #0x18\n\ asrs r0, r0, #0x18\n\ @@ -1148,7 +1157,7 @@ _0800E4B4:\n\ movs r0, #1\n\ strh r0, [r6]\n\ strh r1, [r5]\n\ - ldr r0, _0800E5E0 @ =gShowDialogFlag\n\ + ldr r0, _0800E5E0 @ =gHighScoreShowPopupFlag\n\ ldrb r0, [r0]\n\ lsls r0, r0, #0x18\n\ asrs r0, r0, #0x18\n\ @@ -1274,7 +1283,7 @@ _0800E5AA:\n\ beq _0800E5B2\n\ b _0800E846\n\ _0800E5B2:\n\ - ldr r0, _0800E5D0 @ =gDialogType\n\ + ldr r0, _0800E5D0 @ =gHighScorePopupType\n\ movs r1, #0\n\ ldrsb r1, [r0, r1]\n\ adds r2, r0, #0\n\ @@ -1289,11 +1298,11 @@ _0800E5C2:\n\ b _0800E602\n\ .align 2, 0\n\ _0800E5CC: .4byte gMain_spriteGroups\n\ -_0800E5D0: .4byte gDialogType\n\ +_0800E5D0: .4byte gHighScorePopupType\n\ _0800E5D4: .4byte gHighScoreScreenState\n\ _0800E5D8: .4byte gHighScoreDisplayMode\n\ _0800E5DC: .4byte gScrollXOffset\n\ -_0800E5E0: .4byte gShowDialogFlag\n\ +_0800E5E0: .4byte gHighScoreShowPopupFlag\n\ _0800E5E4: .4byte gHighScoreScreenSpriteSets\n\ _0800E5E8: .4byte gOamBuffer\n\ _0800E5EC: .4byte 0x000003FF\n\ @@ -1370,7 +1379,7 @@ _0800E67A:\n\ movs r0, #1\n\ mov r1, sl\n\ strh r0, [r1]\n\ - ldr r0, _0800E79C @ =gShowDialogFlag\n\ + ldr r0, _0800E79C @ =gHighScoreShowPopupFlag\n\ ldrb r0, [r0]\n\ lsls r0, r0, #0x18\n\ asrs r0, r0, #0x18\n\ @@ -1498,7 +1507,7 @@ _0800E77C:\n\ ldrh r0, [r7]\n\ cmp r0, #1\n\ bne _0800E846\n\ - ldr r0, _0800E7BC @ =gDialogType\n\ + ldr r0, _0800E7BC @ =gHighScorePopupType\n\ movs r1, #0\n\ ldrsb r1, [r0, r1]\n\ adds r2, r0, #0\n\ @@ -1512,7 +1521,7 @@ _0800E792:\n\ movs r0, #0x64\n\ b _0800E7C6\n\ .align 2, 0\n\ -_0800E79C: .4byte gShowDialogFlag\n\ +_0800E79C: .4byte gHighScoreShowPopupFlag\n\ _0800E7A0: .4byte gHighScoreScreenSpriteSets\n\ _0800E7A4: .4byte gOamBuffer\n\ _0800E7A8: .4byte 0x000003FF\n\ @@ -1520,7 +1529,7 @@ _0800E7AC: .4byte 0xFFFFFC00\n\ _0800E7B0: .4byte 0x000001FF\n\ _0800E7B4: .4byte 0xFFFFFE00\n\ _0800E7B8: .4byte gHighScoreDisplayMode\n\ -_0800E7BC: .4byte gDialogType\n\ +_0800E7BC: .4byte gHighScorePopupType\n\ _0800E7C0:\n\ movs r0, #0x78\n\ strh r0, [r7, #2]\n\ @@ -1795,7 +1804,7 @@ s16 MasterReceiveHighScores(void) if (gLinkRecvBuffer[0][0] == 0xEDED && gLinkRecvBuffer[0][1] == 0xEDED) { gLinkExchangeResult = -1; - gDialogType = 1; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMITTING_ACTIVE; gLinkPacketCounter = 1; } else @@ -1850,7 +1859,7 @@ s16 SlaveReceiveHighScores(void) if (gLinkRecvBuffer[0][0] == 0xEDED && gLinkRecvBuffer[0][1] == 0xEDED) { gLinkExchangeResult = -1; - gDialogType = 1; + gHighScorePopupType = HIGH_SCORE_POPUP_TRANSMITTING_ACTIVE; gLinkPacketCounter = 1; } else diff --git a/sym_ewram.txt b/sym_ewram.txt index c656eb10..fe12a7ef 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -339,7 +339,7 @@ gMergedSapphireScoreIndex: @ 0x0201B170 .space 0x4 gEReaderTransitionStep: @ 0x0201B174 .space 0x4 -gShowDialogFlag: @ 0x0201B178 +gHighScoreShowPopupFlag: @ 0x0201B178 .space 0x8 gIntroScene3_AltBG1TilemapBuffer: @ 0x0201B180 .space 0x1000 @@ -435,7 +435,7 @@ gIntroScene6EntitySpawnIndex: @ 0x0202BEB4 .space 0x4 gPokedexNumSeen: @ 0x0202BEB8 .space 0x4 -gDialogType: @ 0x0202BEBC +gHighScorePopupType: @ 0x0202BEBC .space 0x4 gEReaderHeaderAnimSpriteGroup: @ 0x0202BEC0 .space 0x4 From 2b6947404608ab09404ee1859a484238f793a0dc Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Wed, 27 May 2026 00:59:46 -0500 Subject: [PATCH 20/33] checkpoint --- asmdiff.sh | 2 +- include/constants/spriteGroups.h | 16 ++++ src/options.c | 124 +++++++++++++++---------------- 3 files changed, 77 insertions(+), 65 deletions(-) diff --git a/asmdiff.sh b/asmdiff.sh index 35418ea0..9441660b 100755 --- a/asmdiff.sh +++ b/asmdiff.sh @@ -1,6 +1,6 @@ #!/bin/bash -OBJDUMP="arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" +OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" $OBJDUMP $OPTIONS baserom.gba > baserom.dump $OBJDUMP $OPTIONS pokepinballrs.gba > pokepinballrs.dump diff --git a/include/constants/spriteGroups.h b/include/constants/spriteGroups.h index a3870ff9..014aa40f 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/spriteGroups.h @@ -233,6 +233,22 @@ #define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_UP_0 27 #define SG_POKEDEX_TEXT_PAGE_CHANGE_ARROW_UP_1 28 +// Options +#define SG_OPTIONS_CURSOR_HAND 0 +#define SG_OPTIONS_BMG_NUMBER_100S 1 +#define SG_OPTIONS_BMG_NUMBER_10S 2 +#define SG_OPTIONS_BMG_NUMBER_1S 3 +#define SG_OPTIONS_SE_NUMBER_100S 4 +#define SG_OPTIONS_SE_NUMBER_10S 5 +#define SG_OPTIONS_SE_NUMBER_1S 6 +#define SG_OPTIONS_SOUND_SELECT_ARROWS 7 // Paired with 27 for motion +#define SG_OPTIONS_BUTTON_CONFIG_TYPE_SETTING_ARROW 8 +#define SG_OPTIONS_SOUND_SELECT_ARROWS_ALT 27 // Paired with 7 for motion +#define SG_OPTIONS_BUTTON_CONFIG_EDIT_PRESS_BUTTON_TEXT 28 +#define SG_OPTIONS_RUMBLE_SETTING_ARROW 29 +#define SG_OPTIONS_TORCHIC 30 +#define SG_OPTIONS_TORCHIC_NOTE 31 + // Raw list. (can be removed later) #define SG_0 0 #define SG_1 1 diff --git a/src/options.c b/src/options.c index 064f5924..33b63ced 100644 --- a/src/options.c +++ b/src/options.c @@ -38,19 +38,15 @@ struct OptionsData { s16 stateMain; u16 cursorBlinkToggle; - u16 soundTestBlinkToggle; - u16 buttonFlashVisible; + s16 soundTestBlinkToggle; + s16 buttonFlashVisible; s16 buttonFlashTimer; s16 cursorPosition; - u16 buttonConfigType; + s16 buttonConfigType; s16 selectedBGM; s16 selectedSE; - u8 digit100sBGM; - u8 digit10sBGM; - u8 digit1sBGM; - u8 digit100sSE; - u8 digit10sSE; - u8 digit1sSE; + u8 digitsBGM[3]; + u8 digitsSE[3]; s16 scollWaitFrames; u8 buttonEditFlags[6]; s16 captureFramesRemaining; @@ -58,12 +54,12 @@ struct OptionsData s16 capturedButtonSlots[2]; s16 capturedButtonCount; bool8 rumbleEnabled; - s8 rumbleAnimTimer; - s8 rumbleAnimFrame; - u8 rumbleAnimTileId; - s8 rumbleAnimActive; - u8 rumbleIdleBlinkState; - u8 soundTestActive; + s8 torchicAnimTimer; + s8 torchicAnimFrame; + u8 torchicAnimTileId; + s8 torchicHeadShakeAnimActive; + u8 noteSizeBlinkState; + s8 soundTestActive; }; extern struct OptionsData gOptionsData; @@ -133,12 +129,12 @@ void Options_InitStates(void) gOptionsData.buttonConfigType = gMain_saveData.buttonConfigType; gOptionsData.selectedBGM = 0; gOptionsData.selectedSE = 0; - gOptionsData.digit100sBGM = 0; - gOptionsData.digit10sBGM = 0; - gOptionsData.digit1sBGM = 1; - gOptionsData.digit100sSE = 0; - gOptionsData.digit10sSE = 0; - gOptionsData.digit1sSE = 1; + gOptionsData.digitsBGM[0] = 0; + gOptionsData.digitsBGM[1] = 0; + gOptionsData.digitsBGM[2] = 1; + gOptionsData.digitsSE[0] = 0; + gOptionsData.digitsSE[1] = 0; + gOptionsData.digitsSE[2] = 1; gOptionsData.scollWaitFrames = 0; for (i = 0; i < 6; i++) gOptionsData.buttonEditFlags[i] = 0; @@ -163,11 +159,11 @@ void Options_InitStates(void) gOptionsData.rumbleEnabled = FALSE; gMain_saveData.rumbleEnabled = FALSE; } - gOptionsData.rumbleAnimActive = 0; - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimFrame = 0; - gOptionsData.rumbleAnimTileId = 0; - gOptionsData.rumbleIdleBlinkState = 0; + gOptionsData.torchicHeadShakeAnimActive = 0; + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimFrame = 0; + gOptionsData.torchicAnimTileId = 0; + gOptionsData.noteSizeBlinkState = 0; gOptionsData.soundTestActive = 0; } @@ -232,12 +228,12 @@ void Options_HandleInput(void) gOptionsData.stateMain = OPTIONS_STATE_BGM_SELECT, gOptionsData.scollWaitFrames = 0; gOptionsData.soundTestActive = 1; - if (gOptionsData.rumbleAnimActive == 1) + if (gOptionsData.torchicHeadShakeAnimActive == 1) { - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimTileId = 0; - gOptionsData.rumbleAnimFrame = 0; - gOptionsData.rumbleAnimActive = 0; + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimTileId = 0; + gOptionsData.torchicAnimFrame = 0; + gOptionsData.torchicHeadShakeAnimActive = 0; } break; case CURSOR_POS_SE: @@ -245,12 +241,12 @@ void Options_HandleInput(void) gOptionsData.stateMain = OPTIONS_STATE_SE_MENU_MOVE_0x67, gOptionsData.scollWaitFrames = 0; gOptionsData.soundTestActive = 1; - if (gOptionsData.rumbleAnimActive == 1) + if (gOptionsData.torchicHeadShakeAnimActive == 1) { - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimTileId = 0; - gOptionsData.rumbleAnimFrame = 0; - gOptionsData.rumbleAnimActive = 0; + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimTileId = 0; + gOptionsData.torchicAnimFrame = 0; + gOptionsData.torchicHeadShakeAnimActive = 0; } break; case CURSOR_POS_BUTTON_CONFIG_TYPE_A: @@ -272,11 +268,11 @@ void Options_HandleInput(void) if (gGameBoyPlayerEnabled == TRUE) { m4aSongNumStart(SE_MENU_SELECT); - gOptionsData.rumbleAnimTileId = 0; - if (gOptionsData.rumbleAnimActive == 1) - gOptionsData.rumbleAnimActive = 0; - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimFrame = 0; + gOptionsData.torchicAnimTileId = 0; + if (gOptionsData.torchicHeadShakeAnimActive == 1) + gOptionsData.torchicHeadShakeAnimActive = 0; + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimFrame = 0; gOptionsData.rumbleEnabled = FALSE; } break; @@ -285,11 +281,11 @@ void Options_HandleInput(void) { m4aSongNumStart(SE_MENU_SELECT); PlayRumble(11); - if (gOptionsData.rumbleAnimActive == 0) - gOptionsData.rumbleAnimActive = 1; + if (gOptionsData.torchicHeadShakeAnimActive == 0) + gOptionsData.torchicHeadShakeAnimActive = 1; - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimFrame = 0; + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimFrame = 0; gOptionsData.rumbleEnabled = TRUE; } break; @@ -333,10 +329,10 @@ void Options_HandleInput(void) gOptionsData.selectedBGM = 0; r4 = gOptionsData.selectedBGM + 1; - gOptionsData.digit100sBGM = r4 / 100; + gOptionsData.digitsBGM[0] = r4 / 100; r4 %= 100; - gOptionsData.digit10sBGM = r4 / 10; - gOptionsData.digit1sBGM = r4 % 10; + gOptionsData.digitsBGM[1] = r4 / 10; + gOptionsData.digitsBGM[2] = r4 % 10; if (JOY_NEW(A_BUTTON)) { m4aMPlayAllStop(); @@ -384,10 +380,10 @@ void Options_HandleInput(void) gOptionsData.selectedSE = 0; r4 = gOptionsData.selectedSE + 1; - gOptionsData.digit100sSE = r4 / 100; + gOptionsData.digitsSE[0] = r4 / 100; r4 %= 100; - gOptionsData.digit10sSE = r4 / 10; - gOptionsData.digit1sSE = r4 % 10; + gOptionsData.digitsSE[1] = r4 / 10; + gOptionsData.digitsSE[2] = r4 % 10; if (JOY_NEW(A_BUTTON)) { m4aMPlayAllStop(); @@ -474,28 +470,28 @@ void Options_HandleInput(void) } break; } - if (gOptionsData.rumbleAnimActive == 1) + if (gOptionsData.torchicHeadShakeAnimActive == 1) { - if (++gOptionsData.rumbleAnimTimer > gButtonAnimData[gOptionsData.rumbleAnimFrame].frameDuration) + if (++gOptionsData.torchicAnimTimer > gButtonAnimData[gOptionsData.torchicAnimFrame].frameDuration) { - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimFrame++; - if (gOptionsData.rumbleAnimFrame > 12) + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimFrame++; + if (gOptionsData.torchicAnimFrame > 12) { - gOptionsData.rumbleAnimFrame = 0; - gOptionsData.rumbleAnimTileId = 0; - gOptionsData.rumbleAnimActive = 0; + gOptionsData.torchicAnimFrame = 0; + gOptionsData.torchicAnimTileId = 0; + gOptionsData.torchicHeadShakeAnimActive = 0; } - gOptionsData.rumbleAnimTileId = gButtonAnimData[gOptionsData.rumbleAnimFrame].tileId; + gOptionsData.torchicAnimTileId = gButtonAnimData[gOptionsData.torchicAnimFrame].tileId; } } else { - gOptionsData.rumbleAnimTimer++; - if (gOptionsData.rumbleAnimTimer > 18) + gOptionsData.torchicAnimTimer++; + if (gOptionsData.torchicAnimTimer > 18) { - gOptionsData.rumbleAnimTimer = 0; - gOptionsData.rumbleAnimTileId = 1 - gOptionsData.rumbleAnimTileId; + gOptionsData.torchicAnimTimer = 0; + gOptionsData.torchicAnimTileId = 1 - gOptionsData.torchicAnimTileId; } } ProcessRumbleFrame(); From b5a4a5b1172fb383ff71135ce0f29d5d5057aff3 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Wed, 27 May 2026 02:35:32 -0500 Subject: [PATCH 21/33] Ruby Board through 22 --- data/rom_2.s | 226 +++++++++--------- include/constants/board/main_board.h | 11 + .../{spriteGroups.h => sprite_groups.h} | 19 +- include/main.h | 2 +- src/all_board_banners.c | 14 +- src/main_board_bumpers.c | 2 +- src/main_board_catch_holes.c | 10 +- ...ain_board_catch_normal_and_jirachi_modes.c | 8 +- src/main_board_center_capture_hole.c | 2 +- src/main_board_launcher_and_cutscenes.c | 6 +- src/main_board_to_be_split.c | 4 +- src/ruby_process3_entities_2.c | 6 +- src/ruby_trigger_targets.c | 2 +- src/sapphire_seedot_egg_shop.c | 6 +- 14 files changed, 173 insertions(+), 145 deletions(-) rename include/constants/{spriteGroups.h => sprite_groups.h} (94%) diff --git a/data/rom_2.s b/data/rom_2.s index 02e9b806..8f7bb47d 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -5449,12 +5449,12 @@ gMonIconPalettes:: @ 0x086B15B4 .4byte gMonCatchSpriteGroup15_Pal .4byte gMonCatchSpriteGroup16_Pal -gUnknown_086B15F8:: @ 0x086B15F8 +gMainLeftFlipperSpriteSet:: @ 0x086B15F8 .2byte 1 packed_sprite_oam x=-0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x0, priority=0x2, paletteNum=0x0 .2byte 0 -gUnknown_086B1602:: @ 0x086B1602 +gMainRightFlipperSpriteSet:: @ 0x086B1602 .2byte 1 packed_sprite_oam x=0x1, y=0x0, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, tileNum=0x10, priority=0x2, paletteNum=0x0 .2byte 0 @@ -5596,7 +5596,7 @@ gUnknown_086B17A4:: @ 0x086B17A4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb6, priority=0x1, paletteNum=0xf .2byte 0 -gUnknown_086B17AE:: @ 0x086B17AE +gMainBoardPausePanelSpriteSet:: @ 0x086B17AE .2byte 11 packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xc6, priority=0x0, paletteNum=0x9 .2byte 0 @@ -5621,14 +5621,14 @@ gUnknown_086B17AE:: @ 0x086B17AE packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0xd0, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086B1808:: @ 0x086B1808 +gMainBoardPauseTopBorderSpriteSet:: @ 0x086B1808 .2byte 2 packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0xd1, priority=0x0, paletteNum=0x9 .2byte 0 packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0xd1, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086B181A:: @ 0x086B181A +gMainBoardPauseBottomBorderSpriteSet:: @ 0x086B181A .2byte 3 packed_sprite_oam x=0x0, y=-0x10, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0xd5, priority=0x0, paletteNum=0x9 .2byte 0 @@ -5772,12 +5772,12 @@ gUnknown_086B19A0:: @ 0x086B19A0 packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x20c, priority=0x0, paletteNum=0x2 .2byte 0 -gUnknown_086B19BA:: @ 0x086B19BA +gRubyChikoritaProjectileSpriteSet:: @ 0x086B19BA .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x210, priority=0x0, paletteNum=0x3 .2byte 0 -gUnknown_086B19C4:: @ 0x086B19C4 +gRubyChikoritaProjectileCollisionFxSpriteSet:: @ 0x086B19C4 .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x214, priority=0x0, paletteNum=0x3 .2byte 0 @@ -6170,7 +6170,7 @@ gMonCatchBallTrailSpriteSet:: @ 0x086B1E46 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086B1E50:: @ 0x086B1E50 +gMainTravelBannerSpriteSet:: @ 0x086B1E50 .2byte 15 packed_sprite_oam x=-0x7F, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6203,7 +6203,7 @@ gUnknown_086B1E50:: @ 0x086B1E50 packed_sprite_oam x=0x61, y=0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3cc, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B1ECA:: @ 0x086B1ECA +gMainTravelBanner_SignpostSpriteSet:: @ 0x086B1ECA .2byte 7 packed_sprite_oam x=0x18, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x3b5, priority=0x0, paletteNum=0xe .2byte 0 @@ -6231,7 +6231,7 @@ gUnknown_086B1F04:: @ 0x086B1F04 packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x2c8, priority=0x2, paletteNum=0x3 .2byte 0 -gLegendaryCatchNameBannerSpriteSheet:: @ 0x086B1F26 +gLegendaryCatchNameBannerSpriteSet:: @ 0x086B1F26 .2byte 10 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2c0, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6254,7 +6254,7 @@ gLegendaryCatchNameBannerSpriteSheet:: @ 0x086B1F26 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d2, priority=0x0, paletteNum=0x1 .2byte 0 -gLegendaryCatchWasCaughtTextSpriteSheet:: @ 0x086B1F78 +gLegendaryCatchWasCaughtTextSpriteSet:: @ 0x086B1F78 .2byte 10 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2d4, priority=0x0, paletteNum=0x1 .2byte 0 @@ -6278,7 +6278,7 @@ gLegendaryCatchWasCaughtTextSpriteSheet:: @ 0x086B1F78 .2byte 0 -gUnknown_086B1FCA:: @ 0x086B1FCA +gRubyAerodactylEggDeliverySpriteSet:: @ 0x086B1FCA .2byte 5 packed_sprite_oam x=0x23, y=0x2, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2d2, priority=0x0, paletteNum=0xe .2byte 0 @@ -6291,7 +6291,7 @@ gUnknown_086B1FCA:: @ 0x086B1FCA packed_sprite_oam x=0x3, y=0x2, spriteSize=SPRITE_SIZE_8x8, tileNum=0x2de, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B1FF4:: @ 0x086B1FF4 +gMainShopArrowsSpriteSet:: @ 0x086B1FF4 .2byte 6 packed_sprite_oam x=-0x9, y=0x8, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6306,7 +6306,7 @@ gUnknown_086B1FF4:: @ 0x086B1FF4 packed_sprite_oam x=0x10, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2e7, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B2026:: @ 0x086B2026 +gMainShopPriceSpriteSet:: @ 0x086B2026 .2byte 4 packed_sprite_oam x=0x15, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2ed, priority=0x0, paletteNum=0xe .2byte 0 @@ -6317,7 +6317,7 @@ gUnknown_086B2026:: @ 0x086B2026 packed_sprite_oam x=0x1E, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2f3, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B2048:: @ 0x086B2048 +gMainShopConfirmationPanelSpriteSet:: @ 0x086B2048 .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2f5, priority=0x0, paletteNum=0xe .2byte 0 @@ -6330,33 +6330,33 @@ gUnknown_086B2048:: @ 0x086B2048 packed_sprite_oam x=0x68, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x309, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B2072:: @ 0x086B2072 +gMainShopPortraitOverlaySpriteSet:: @ 0x086B2072 .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x311, priority=0x0, paletteNum=0xe .2byte 0 packed_sprite_oam x=0x20, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x321, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B2084:: @ 0x086B2084 +gMainBallSaveBannerSpriteSet:: @ 0x086B2084 .2byte 2 packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x1, paletteNum=0xe .2byte 0 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x300, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B2096:: @ 0x086B2096 +gMainBallSaveLatiSpriteSet:: @ 0x086B2096 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x340, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B20A0:: @ 0x086B20A0 +gMainBallSaveLatiArmSpriteSet:: @ 0x086B20A0 .2byte 2 packed_sprite_oam x=0x10, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x380, priority=0x0, paletteNum=0xe .2byte 0 packed_sprite_oam x=0x10, y=0x30, spriteSize=SPRITE_SIZE_16x8, tileNum=0x384, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B20B2:: @ 0x086B20B2 +gMainEndOfBallBonusBannerSpriteSet:: @ 0x086B20B2 .2byte 14 packed_sprite_oam x=-0x68, y=0x10, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x1, paletteNum=0xe .2byte 0 @@ -6388,7 +6388,7 @@ gUnknown_086B20B2:: @ 0x086B20B2 .2byte 0 -gUnknown_086B2124:: @ 0x086B2124 +gMainEndOfBallBonusTextLine0SpriteSet:: @ 0x086B2124 .2byte 5 packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3a0, priority=0x1, paletteNum=0xe .2byte 0 @@ -6401,7 +6401,7 @@ gUnknown_086B2124:: @ 0x086B2124 packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b0, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B214E:: @ 0x086B214E +gMainEndOfBallBonusTextLine1SpriteSet:: @ 0x086B214E .2byte 5 packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3b6, priority=0x1, paletteNum=0xe .2byte 0 @@ -6414,7 +6414,7 @@ gUnknown_086B214E:: @ 0x086B214E packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3c6, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B2178:: @ 0x086B2178 +gMainEndOfBallBonusTextLine2SpriteSet:: @ 0x086B2178 .2byte 5 packed_sprite_oam x=-0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3cc, priority=0x1, paletteNum=0xe .2byte 0 @@ -6581,29 +6581,29 @@ gUnknown_086B235E:: @ 0x086B235E gRubyBoardSpriteSets:: @ 0x086B2390 -.4byte gUnknown_086B17AE -.4byte gUnknown_086B1808 -.4byte gUnknown_086B181A -.4byte gUnknown_086B20A0 -.4byte gUnknown_086B2096 -.4byte gUnknown_086B2084 -.4byte gUnknown_086B2124 -.4byte gUnknown_086B214E -.4byte gUnknown_086B2178 -.4byte gUnknown_086B20B2 -.4byte gUnknown_086B15F8 @ 10 -.4byte gUnknown_086B1602 -.4byte gUnknown_086B1FCA -.4byte gUnknown_086B19BA -.4byte gUnknown_086B19C4 -.4byte gLegendaryCatchNameBannerSpriteSheet -.4byte gLegendaryCatchWasCaughtTextSpriteSheet -.4byte gUnknown_086B1FF4 -.4byte gUnknown_086B2026 -.4byte gUnknown_086B2048 -.4byte gUnknown_086B2072 @ 20 -.4byte gUnknown_086B1ECA -.4byte gUnknown_086B1E50 +.4byte gMainBoardPausePanelSpriteSet +.4byte gMainBoardPauseTopBorderSpriteSet +.4byte gMainBoardPauseBottomBorderSpriteSet +.4byte gMainBallSaveLatiArmSpriteSet +.4byte gMainBallSaveLatiSpriteSet +.4byte gMainBallSaveBannerSpriteSet +.4byte gMainEndOfBallBonusTextLine0SpriteSet +.4byte gMainEndOfBallBonusTextLine1SpriteSet +.4byte gMainEndOfBallBonusTextLine2SpriteSet +.4byte gMainEndOfBallBonusBannerSpriteSet +.4byte gMainLeftFlipperSpriteSet @ 10 +.4byte gMainRightFlipperSpriteSet +.4byte gRubyAerodactylEggDeliverySpriteSet +.4byte gRubyChikoritaProjectileSpriteSet +.4byte gRubyChikoritaProjectileCollisionFxSpriteSet +.4byte gLegendaryCatchNameBannerSpriteSet +.4byte gLegendaryCatchWasCaughtTextSpriteSet +.4byte gMainShopArrowsSpriteSet +.4byte gMainShopPriceSpriteSet +.4byte gMainShopConfirmationPanelSpriteSet +.4byte gMainShopPortraitOverlaySpriteSet @ 20 +.4byte gMainTravelBanner_SignpostSpriteSet +.4byte gMainTravelBannerSpriteSet .4byte gUnknown_086B1D0C .4byte gUnknown_086B1782 .4byte gUnknown_086B22AE @@ -6667,26 +6667,26 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gUnknown_086B1A98 gSapphireBoardSpriteSets:: @ 0x086B24E0 -.4byte gUnknown_086B17AE -.4byte gUnknown_086B1808 -.4byte gUnknown_086B181A -.4byte gUnknown_086B20A0 -.4byte gUnknown_086B2096 -.4byte gUnknown_086B2084 -.4byte gUnknown_086B2124 -.4byte gUnknown_086B214E -.4byte gUnknown_086B2178 -.4byte gUnknown_086B20B2 -.4byte gUnknown_086B15F8 @ 10 -.4byte gUnknown_086B1602 -.4byte gLegendaryCatchNameBannerSpriteSheet -.4byte gLegendaryCatchWasCaughtTextSpriteSheet -.4byte gUnknown_086B1FF4 -.4byte gUnknown_086B2026 -.4byte gUnknown_086B2048 -.4byte gUnknown_086B2072 -.4byte gUnknown_086B1ECA -.4byte gUnknown_086B1E50 +.4byte gMainBoardPausePanelSpriteSet +.4byte gMainBoardPauseTopBorderSpriteSet +.4byte gMainBoardPauseBottomBorderSpriteSet +.4byte gMainBallSaveLatiArmSpriteSet +.4byte gMainBallSaveLatiSpriteSet +.4byte gMainBallSaveBannerSpriteSet +.4byte gMainEndOfBallBonusTextLine0SpriteSet +.4byte gMainEndOfBallBonusTextLine1SpriteSet +.4byte gMainEndOfBallBonusTextLine2SpriteSet +.4byte gMainEndOfBallBonusBannerSpriteSet +.4byte gMainLeftFlipperSpriteSet @ 10 +.4byte gMainRightFlipperSpriteSet +.4byte gLegendaryCatchNameBannerSpriteSet +.4byte gLegendaryCatchWasCaughtTextSpriteSet +.4byte gMainShopArrowsSpriteSet +.4byte gMainShopPriceSpriteSet +.4byte gMainShopConfirmationPanelSpriteSet +.4byte gMainShopPortraitOverlaySpriteSet +.4byte gMainTravelBanner_SignpostSpriteSet +.4byte gMainTravelBannerSpriteSet .4byte gUnknown_086B1D0C @ 20 .4byte gUnknown_086B1782 .4byte gUnknown_086B22AE @@ -13608,8 +13608,8 @@ gKyogreBoardSpriteSets:: @ 0x086BB4A4 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gLegendaryCatchNameBannerSpriteSheet - .4byte gLegendaryCatchWasCaughtTextSpriteSheet + .4byte gLegendaryCatchNameBannerSpriteSet + .4byte gLegendaryCatchWasCaughtTextSpriteSet .4byte gLegendaryCatchPortraitSpriteSet .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gKyogreCrystalTopRightSpriteSet @@ -13637,8 +13637,8 @@ gGroudonBoardSpriteSets:: @ 0x086BB510 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gLegendaryCatchNameBannerSpriteSheet - .4byte gLegendaryCatchWasCaughtTextSpriteSheet + .4byte gLegendaryCatchNameBannerSpriteSet + .4byte gLegendaryCatchWasCaughtTextSpriteSet .4byte gLegendaryCatchPortraitSpriteSet .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gGroudonCrystalTopRightSpriteSet @@ -13671,8 +13671,8 @@ gRayquazaBoardSpriteSets:: @ 0x086BB590 .4byte gBonusBoardRightFlipperSpriteSet .4byte gBonusBoardEndScoreSpriteSet .4byte gBonusBoardScoreBannerGraphicSpriteSet - .4byte gLegendaryCatchNameBannerSpriteSheet - .4byte gLegendaryCatchWasCaughtTextSpriteSheet + .4byte gLegendaryCatchNameBannerSpriteSet + .4byte gLegendaryCatchWasCaughtTextSpriteSet .4byte gLegendaryCatchPortraitSpriteSet .4byte gLegendaryCatchPortraitBordersSpriteSet .4byte gRaquazaIntroCloud0SpriteSet @@ -13797,31 +13797,31 @@ gMonPortraitGroupGfx:: @ 0x086BB738 .4byte gMonPortraitsGroup12_Gfx .4byte gMonPortraitsGroup13_Gfx -gUnknown_086BB770:: @ 0x086BB770 +gOptionsSoundDigitSpriteSet:: @ 0x086BB770 .incbin "baserom.gba", 0x6BB770, 0x64 -gUnknown_086BB7D4:: @ 0x086BB7D4 +gOptionsHandCursorSpriteSet:: @ 0x086BB7D4 .incbin "baserom.gba", 0x6BB7D4, 0x14 -gUnknown_086BB7E8:: @ 0x086BB7E8 +gOptionsSettingSelectionArrowSpriteSet:: @ 0x086BB7E8 .incbin "baserom.gba", 0x6BB7E8, 0x6E -gUnknown_086BB856:: @ 0x086BB856 +gOptionsButtonEditPressButtonTextSpriteSet:: @ 0x086BB856 .incbin "baserom.gba", 0x6BB856, 0x12 -gUnknown_086BB868:: @ 0x086BB868 +gOptionsGbaButtonIconSpriteSet:: @ 0x086BB868 .incbin "baserom.gba", 0x6BB868, 0xA -gUnknown_086BB872:: @ 0x086BB872 +gOptionsSoundSelectionArrow0SpriteSet:: @ 0x086BB872 .incbin "baserom.gba", 0x6BB872, 0x12 -gUnknown_086BB884:: @ 0x086BB884 +gOptionsSoundSelectionArrow1SpriteSet:: @ 0x086BB884 .incbin "baserom.gba", 0x6BB884, 0x1C -gUnknown_086BB8A0:: @ 0x086BB8A0 +gOptionsTorchicEntitySpriteSet:: @ 0x086BB8A0 .incbin "baserom.gba", 0x6BB8A0, 0x5A -gUnknown_086BB8FA:: @ 0x086BB8FA +gOptionsTorchicNoteBubbleSpriteSet:: @ 0x086BB8FA .incbin "baserom.gba", 0x6BB8FA, 0x16 gButtonInfoTable:: @ 0x086BB910 @@ -13847,38 +13847,38 @@ gButtonAnimData:: @ 0x086BB9B4 .incbin "baserom.gba", 0x6BB9B4, 0x38 gOptionsSpriteSets:: @ 0x086BB9EC - .4byte gUnknown_086BB7D4 - .4byte gUnknown_086BB770 - .4byte gUnknown_086BB770 - .4byte gUnknown_086BB770 - .4byte gUnknown_086BB770 - .4byte gUnknown_086BB770 - .4byte gUnknown_086BB770 - .4byte gUnknown_086BB872 - .4byte gUnknown_086BB7E8 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB868 - .4byte gUnknown_086BB884 - .4byte gUnknown_086BB856 - .4byte gUnknown_086BB7E8 - .4byte gUnknown_086BB8A0 - .4byte gUnknown_086BB8FA + .4byte gOptionsHandCursorSpriteSet + .4byte gOptionsSoundDigitSpriteSet + .4byte gOptionsSoundDigitSpriteSet + .4byte gOptionsSoundDigitSpriteSet + .4byte gOptionsSoundDigitSpriteSet + .4byte gOptionsSoundDigitSpriteSet + .4byte gOptionsSoundDigitSpriteSet + .4byte gOptionsSoundSelectionArrow0SpriteSet @ Paired with one in slot 27 + .4byte gOptionsSettingSelectionArrowSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsGbaButtonIconSpriteSet + .4byte gOptionsSoundSelectionArrow1SpriteSet @ Paired with one in slot 7 + .4byte gOptionsButtonEditPressButtonTextSpriteSet + .4byte gOptionsSettingSelectionArrowSpriteSet + .4byte gOptionsTorchicEntitySpriteSet + .4byte gOptionsTorchicNoteBubbleSpriteSet gSaveFileSignature:: @ 0x086BBA6C .ascii "POKEPINAGB" diff --git a/include/constants/board/main_board.h b/include/constants/board/main_board.h index e0c9a4c6..37fa149c 100644 --- a/include/constants/board/main_board.h +++ b/include/constants/board/main_board.h @@ -137,4 +137,15 @@ enum BoardStateDispatchStates{ BOARD_STATE_DISPATCHER_STATE_CHANGING = 2, }; +enum BannerGfxModes{ + BANNER_MODE_NONE = 0, + BANNER_MODE_CHINCHOU_CATCH_BURST = 1, + BANNER_MODE_CATCH_EM = 2, + BANNER_MODE_EVOLUTION = 3, + BANNER_MODE_TRAVEL = 4, + BANNER_MODE_JIRACHI = 5, + BANNER_MODE_LOTAD_CATCH_BURST = 6, + BANNER_MODE_SHROOMISH_CATCH_BURST = 7, +}; + #endif // GUARD_CONSTANTS_MAIN_BOARD_H \ No newline at end of file diff --git a/include/constants/spriteGroups.h b/include/constants/sprite_groups.h similarity index 94% rename from include/constants/spriteGroups.h rename to include/constants/sprite_groups.h index 014aa40f..18de5980 100644 --- a/include/constants/spriteGroups.h +++ b/include/constants/sprite_groups.h @@ -56,7 +56,22 @@ #define SG_RUBY_WAS_CAUGHT_TEXT 16 #define SG_RUBY_SHOP_ARROWS 17 // Left/Right, and evo Up/down arrow #define SG_RUBY_SHOP_COINS 18 - #define SG_RUBY_SHOP_CONFIRMATION_PANEL 19 + #define SG_RUBY_SHOP_CONFIRMATION_PANEL 19 + #define SG_RUBY_SHOP_PORTRAIT_OVERLAY 20 + #define SG_RUBY_TARVEL_BANNER_SIGNPOST 21 + #define SG_RUBY_MODE_START_BANNER 22 + +// Sapphire board +// 0-11 shared + #define SG_SAPPHIRE_POKEMON_NAME_TEXT 12 + #define SG_SAPPHIRE_WAS_CAUGHT_TEXT 13 + #define SG_SAPPHIRE_SHOP_ARROWS 14 // Left/Right, and evo Up/down arrow + #define SG_SAPPHIRE_SHOP_COINS 15 + #define SG_SAPPHIRE_SHOP_CONFIRMATION_PANEL 16 + #define SG_SAPPHIRE_SHOP_PORTRAIT_OVERLAY 17 + #define SG_SAPPHIRE_TARVEL_BANNER_SIGNPOST 18 + #define SG_SAPPHIRE_MODE_START_BANNER 19 + // Shared by bonus / boss boards #define SG_BONUS_BOARD_FLIPPER_BASE 3 // Of 2. Left, Right @@ -372,6 +387,8 @@ #define FIELD_SG_MAIN_SHOP_COINS 7 #define FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL 8 // Yellow bar displaying cost/mon name #define FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY 9 // Change sheen, Sold Out indicator +#define FIELD_SG_MAIN_TRAVEL_BANNER_SIGNPOST 10 //Crossroads with torchic sitting on it +#define FIELD_SG_MAIN_MODE_START_BANNER 11 #define FIELD_SG_MAIN_BOARD_LEGENDARY_CATCH_PORTRAIT 19 #define FIELD_SG_MAIN_BOARD_LEGENDARY_CATCH_PORTRAIT_BORDERS 22 #define FIELD_SG_MAIN_BOARD_BALL_OVERRIDE 49 diff --git a/include/main.h b/include/main.h index 8308e122..67df156b 100644 --- a/include/main.h +++ b/include/main.h @@ -6,7 +6,7 @@ #include "constants/high_scores.h" #include "constants/pinball_inputs.h" #include "constants/species.h" -#include "constants/spriteGroups.h" +#include "constants/sprite_groups.h" struct HighScoreEntry { diff --git a/src/all_board_banners.c b/src/all_board_banners.c index aac052dc..708ae3fb 100644 --- a/src/all_board_banners.c +++ b/src/all_board_banners.c @@ -50,7 +50,7 @@ void ProcessBannerCameraTransition(void) } } - if (gCurrentPinballGame->bannerGfxIndex != 0) + if (gCurrentPinballGame->bannerGfxIndex != BANNER_MODE_NONE) { RenderBannerSlideAnimation(); } @@ -118,14 +118,14 @@ void RenderBannerSlideAnimation(void) u32 frameCount; sp00 = gCurrentPinballGame->bannerGfxIndex - 1; - spriteGroup = gMain.fieldSpriteGroups[11]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_MAIN_MODE_START_BANNER]; frameCount = ((gMain.systemFrameCount & 7) / 4); if (spriteGroup->active) { spriteGroup->baseX = 0; spriteGroup->baseY = 200; - if (gCurrentPinballGame->bannerGfxIndex == 4) + if (gCurrentPinballGame->bannerGfxIndex == BANNER_MODE_TRAVEL) { if (gCurrentPinballGame->bannerDelayTimer != 0) { @@ -153,8 +153,8 @@ void RenderBannerSlideAnimation(void) { spriteGroup->baseX = -110; spriteGroup->baseY = 44; - gMain.fieldSpriteGroups[11]->active = FALSE; // direct index required here - gCurrentPinballGame->bannerGfxIndex = 0; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_MODE_START_BANNER]->active = FALSE; // direct index required here + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->activePortraitType = 0; } } @@ -286,8 +286,8 @@ void RenderBannerSlideAnimation(void) } if (gCurrentPinballGame->bannerSlideTimer == 0x1E) { - gMain.fieldSpriteGroups[11]->active = FALSE; - gCurrentPinballGame->bannerGfxIndex = 0; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_MODE_START_BANNER]->active = FALSE; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->activePortraitType = 0; if ((gCurrentPinballGame->ballCatchState != TRAP_EVO_SHOP_HOLE || gCurrentPinballGame->evolutionShopActive != 1) diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index 292448e2..81894d1d 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -360,7 +360,7 @@ void HandleRubyBumperHit(void) gCurrentPinballGame->cameraYScrollTarget = 0xEC; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 4; - gCurrentPinballGame->bannerGfxIndex = 7; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_SHROOMISH_CATCH_BURST; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 3b9aaedf..70c11d2f 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -88,7 +88,7 @@ void UpdateShopEntryAnimation(s16 arg0) gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_COINS]->active = TRUE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = TRUE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = TRUE; - gMain.fieldSpriteGroups[9]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY]->active = TRUE; DmaCopy16(3, gShopEvoUI_Pals, OBJ_PLTT + 0x1C0, 0x20); DmaCopy16(3, gShopModeBG_Gfx, BG_VRAM + 0x2000, 0xC40); @@ -346,7 +346,7 @@ void UpdateShopEntryAnimation(s16 arg0) gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_COINS]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = FALSE; - gMain.fieldSpriteGroups[9]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } @@ -368,7 +368,7 @@ void UpdateShopEntryAnimation(s16 arg0) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 3; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_EVOLUTION; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; @@ -424,7 +424,7 @@ void UpdateShopEntryAnimation(s16 arg0) RenderEvolutionUI(var_r7); gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = TRUE; - gMain.fieldSpriteGroups[9]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY]->active = TRUE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = TRUE; DmaCopy16(3, &gShopEvoUI_Pals, PLTT + 0x3C0, 0x20); @@ -757,7 +757,7 @@ void UpdateShopEntryAnimation(s16 arg0) gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_CONFIRMATION_PANEL]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_ARROWS]->active = FALSE; - gMain.fieldSpriteGroups[9]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY]->active = FALSE; gCurrentPinballGame->evoBlinkTimer = 0; gCurrentPinballGame->catchLights[0] = 4; diff --git a/src/main_board_catch_normal_and_jirachi_modes.c b/src/main_board_catch_normal_and_jirachi_modes.c index 1b673b2d..acdaaab4 100644 --- a/src/main_board_catch_normal_and_jirachi_modes.c +++ b/src/main_board_catch_normal_and_jirachi_modes.c @@ -162,7 +162,7 @@ void UpdateCatchEmMode(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 2; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CATCH_EM; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; @@ -197,7 +197,7 @@ void UpdateCatchEmMode(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 2; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CATCH_EM; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; @@ -370,7 +370,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 5; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_JIRACHI; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; @@ -404,7 +404,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 5; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_JIRACHI; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index 565e21fd..8525f051 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -288,7 +288,7 @@ void GivePrize(void) gCurrentPinballGame->cameraYScrollTarget = 272; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 2; - gCurrentPinballGame->bannerGfxIndex = 0; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->pichuWalkMode = 1; diff --git a/src/main_board_launcher_and_cutscenes.c b/src/main_board_launcher_and_cutscenes.c index 6067d6de..00f172da 100644 --- a/src/main_board_launcher_and_cutscenes.c +++ b/src/main_board_launcher_and_cutscenes.c @@ -158,7 +158,7 @@ void AnimateBannerSlide(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[10]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_TRAVEL_BANNER_SIGNPOST]; if (group->active) { group->baseX = gCurrentPinballGame->bannerSlideX; @@ -174,11 +174,11 @@ void AnimateBannerSlide(void) if (gCurrentPinballGame->bannerDisplayDuration > 0) { if (gCurrentPinballGame->bannerDisplayDuration == 120) - gMain.fieldSpriteGroups[10]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TRAVEL_BANNER_SIGNPOST]->active = TRUE; gCurrentPinballGame->bannerSlideX = 270 - ((120 - gCurrentPinballGame->bannerDisplayDuration) * 3); if (gCurrentPinballGame->bannerDisplayDuration == 1) - gMain.fieldSpriteGroups[10]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TRAVEL_BANNER_SIGNPOST]->active = FALSE; } } diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 64afd8c5..c9774b81 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -690,7 +690,7 @@ void RenderEvolutionUI(s16 arg0) } } - group = gMain.fieldSpriteGroups[9]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY]; if (group->active) { group->baseX = 48; @@ -1466,7 +1466,7 @@ void UpdateHatchCave(void) gCurrentPinballGame->cameraYScrollTarget = 72; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 2; - gCurrentPinballGame->bannerGfxIndex = 0; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->eggCaveLiftTimer = 48; diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index 2d7c6c0a..b07f66a3 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -198,7 +198,7 @@ void AnimateRubyShopDoor(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 0; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; m4aSongNumStart(SE_UNKNOWN_0xBD); @@ -754,7 +754,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->cameraYScrollTarget = 236; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 4; - gCurrentPinballGame->bannerGfxIndex = 6; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_LOTAD_CATCH_BURST; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; @@ -772,7 +772,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->cameraYScrollTarget = 236; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 4; - gCurrentPinballGame->bannerGfxIndex = 1; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CHINCHOU_CATCH_BURST; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index 7c01c88a..a61b9304 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -474,7 +474,7 @@ void DrawRubySideBumperSprites(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 4; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_TRAVEL; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 120; diff --git a/src/sapphire_seedot_egg_shop.c b/src/sapphire_seedot_egg_shop.c index ea1a374b..9077c38d 100644 --- a/src/sapphire_seedot_egg_shop.c +++ b/src/sapphire_seedot_egg_shop.c @@ -332,7 +332,7 @@ void UpdateSapphireSeedotCollection(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 4; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_TRAVEL; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 120; @@ -590,7 +590,7 @@ void UpdateSapphireEggMachine(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 0; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->sapphireHatchMachineState = 1; @@ -679,7 +679,7 @@ void UpdateSapphireEggMachine(void) gCurrentPinballGame->cameraYScrollTarget = 0; gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; - gCurrentPinballGame->bannerGfxIndex = 0; + gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = 1; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->sapphireHatchMachineState = 5; From e77f2161907d33d50406a63cfa3e6db8e268a23b Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Thu, 28 May 2026 22:54:30 -0500 Subject: [PATCH 22/33] SpriteGroups through 42 --- data/rom_2.s | 106 +++++++------- include/constants/sprite_groups.h | 44 +++++- include/global.h | 8 +- src/all_board_banners.c | 6 +- src/all_board_mode_change_and_debug_menu.c | 4 +- src/all_board_pinball_game_main.c | 2 +- src/all_board_portrait_display.c | 18 +-- src/all_board_process7.c | 4 +- src/all_board_state_transitions_and_idle.c | 2 +- src/groudon_process3.c | 6 +- src/kyogre_process3.c | 6 +- src/main_board_bumpers.c | 2 +- src/main_board_catch_holes.c | 6 +- ...ain_board_catch_normal_and_jirachi_modes.c | 48 +++---- src/main_board_catch_tile_logic.c | 52 +++---- src/main_board_catch_tile_particles.c | 16 +-- src/main_board_center_capture_hole.c | 18 +-- src/main_board_charge_spinner.c | 2 +- src/main_board_evolution_mode.c | 22 +-- src/main_board_intro_mode.c | 22 +-- src/main_board_launcher_and_cutscenes.c | 52 +++---- src/main_board_pichu_entity.c | 16 +-- src/main_board_to_be_split.c | 24 ++-- src/main_board_travel_mode.c | 4 +- src/options.c | 130 ++++++++++-------- src/rayquaza_process3.c | 6 +- src/ruby_board_indicators.c | 2 +- src/ruby_process3_entities_2.c | 6 +- src/ruby_trigger_targets.c | 14 +- src/sapphire_seedot_egg_shop.c | 18 +-- 30 files changed, 356 insertions(+), 310 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 8f7bb47d..5bdee93b 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -5489,7 +5489,7 @@ gUnknown_086B163A:: @ 0x086B163A packed_sprite_oam x=0x10, y=0x10, mosaic=0x1, spriteSize=SPRITE_SIZE_8x8, tileNum=0x44, priority=0x3, paletteNum=0x3 .2byte 0 -gUnknown_086B165C:: @ 0x086B165C +gChargeIndicatorDeviceSpriteSet:: @ 0x086B165C .2byte 3 packed_sprite_oam x=0x8, y=-0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x45, priority=0x0, paletteNum=0x9 .2byte 0 @@ -5498,7 +5498,7 @@ gUnknown_086B165C:: @ 0x086B165C packed_sprite_oam x=-0x8, y=-0x10, spriteSize=SPRITE_SIZE_16x32, tileNum=0x55, priority=0x0, paletteNum=0x9 .2byte 0 -gLegendaryCatchPortraitSpriteSet:: @ 0x086B1676 +gPortraitBordersSpriteSet:: @ 0x086B1676 .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x5d, priority=0x3, paletteNum=0x1 .2byte 0 @@ -5513,7 +5513,7 @@ gLegendaryCatchPortraitSpriteSet:: @ 0x086B1676 packed_sprite_oam x=0x0, y=0x8, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x61, priority=0x3, paletteNum=0x1 .2byte 0 -gLegendaryCatchPortraitBordersSpriteSet:: @ 0x086B16A8 +gPortraitSpriteSet:: @ 0x086B16A8 .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x65, priority=0x3, paletteNum=0x0 .2byte 0 @@ -5528,7 +5528,7 @@ gLegendaryCatchPortraitBordersSpriteSet:: @ 0x086B16A8 packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x79, priority=0x3, paletteNum=0x0 .2byte 0 -gUnknown_086B16DA:: @ 0x086B16DA +gPortrait1SpriteSet:: @ 0x086B16DA .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x7d, priority=0x3, paletteNum=0x0 .2byte 0 @@ -5543,7 +5543,7 @@ gUnknown_086B16DA:: @ 0x086B16DA packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x91, priority=0x3, paletteNum=0x0 .2byte 0 -gUnknown_086B170C:: @ 0x086B170C +gPortraitTrimSpriteSet:: @ 0x086B170C .2byte 6 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x7d, priority=0x3, paletteNum=0x0 .2byte 0 @@ -5580,7 +5580,7 @@ gUnknown_086B1760:: @ 0x086B1760 packed_sprite_oam x=0x10, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x9d, priority=0x1, paletteNum=0xd .2byte 0 -gUnknown_086B1782:: @ 0x086B1782 +gCenterHoleGravityFxSpriteSet:: @ 0x086B1782 .2byte 4 packed_sprite_oam x=-0x8, y=0x0, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, vFlip=0x1, tileNum=0x9e, priority=0x3, paletteNum=0x1 .2byte 0 @@ -6074,7 +6074,7 @@ gUnknown_086B1CDA:: @ 0x086B1CDA packed_sprite_oam x=0x7, y=0x5, spriteSize=SPRITE_SIZE_32x32, hFlip=0x1, vFlip=0x1, tileNum=0x379, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B1D0C:: @ 0x086B1D0C +gMainTileBreakSpriteSet:: @ 0x086B1D0C .2byte 6 packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 @@ -6170,7 +6170,7 @@ gMonCatchBallTrailSpriteSet:: @ 0x086B1E46 packed_sprite_oam x=0x0, y=0x0, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 -gMainTravelBannerSpriteSet:: @ 0x086B1E50 +gMainModeStartBannerSpriteSet:: @ 0x086B1E50 .2byte 15 packed_sprite_oam x=-0x7F, y=0x0, spriteSize=SPRITE_SIZE_64x64, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6446,7 +6446,7 @@ gUnknown_086B21A2:: @ 0x086B21A2 packed_sprite_oam x=0x70, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2dc, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B21E4:: @ 0x086B21E4 +gEvolutionBannerTextLargeBottomSpriteSet:: @ 0x086B21E4 .2byte 4 packed_sprite_oam x=0x18, y=0x21, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6457,7 +6457,7 @@ gUnknown_086B21E4:: @ 0x086B21E4 packed_sprite_oam x=-0x40, y=0x21, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B2206:: @ 0x086B2206 +gEvolutionBannerTextLargeTopSpriteSet:: @ 0x086B2206 .2byte 4 packed_sprite_oam x=0x18, y=-0x28, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6468,7 +6468,7 @@ gUnknown_086B2206:: @ 0x086B2206 packed_sprite_oam x=-0x40, y=-0x28, spriteSize=SPRITE_SIZE_64x32, tileNum=0x2e0, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B2228:: @ 0x086B2228 +gEvolutionBannerTextMediumLowerSpriteSet:: @ 0x086B2228 .2byte 4 packed_sprite_oam x=-0x80, y=0x16, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 @@ -6479,7 +6479,7 @@ gUnknown_086B2228:: @ 0x086B2228 packed_sprite_oam x=0x6A, y=0x16, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B224A:: @ 0x086B224A +gEvolutionBannerTextMediumUpperSpriteSet:: @ 0x086B224A .2byte 4 packed_sprite_oam x=-0x32, y=-0xD, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 @@ -6490,7 +6490,7 @@ gUnknown_086B224A:: @ 0x086B224A packed_sprite_oam x=0x1C, y=-0xE, spriteSize=SPRITE_SIZE_64x32, tileNum=0x300, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B226C:: @ 0x086B226C +gEvolutionBannerTextSmallMiddleSpriteSet:: @ 0x086B226C .2byte 8 packed_sprite_oam x=-0x40, y=0x4, spriteSize=SPRITE_SIZE_32x8, tileNum=0x320, priority=0x0, paletteNum=0xe .2byte 0 @@ -6521,7 +6521,7 @@ gUnknown_086B22AE:: @ 0x086B22AE packed_sprite_oam x=0x38, y=-0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_8x32, hFlip=0x1, tileNum=0x346, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B22D0:: @ 0x086B22D0 +gEvolutionBannerLightningSpriteSet:: @ 0x086B22D0 .2byte 4 packed_sprite_oam x=-0x38, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x38e, priority=0x0, paletteNum=0xe .2byte 0 @@ -6532,7 +6532,7 @@ gUnknown_086B22D0:: @ 0x086B22D0 packed_sprite_oam x=0x20, y=0x18, spriteSize=SPRITE_SIZE_16x16, tileNum=0x3a6, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B22F2:: @ 0x086B22F2 +gTravelPainterSpriteSet:: @ 0x086B22F2 .2byte 6 packed_sprite_oam x=0x0, y=-0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2c0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6603,24 +6603,24 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gMainShopConfirmationPanelSpriteSet .4byte gMainShopPortraitOverlaySpriteSet @ 20 .4byte gMainTravelBanner_SignpostSpriteSet -.4byte gMainTravelBannerSpriteSet -.4byte gUnknown_086B1D0C -.4byte gUnknown_086B1782 +.4byte gMainModeStartBannerSpriteSet +.4byte gMainTileBreakSpriteSet +.4byte gCenterHoleGravityFxSpriteSet .4byte gUnknown_086B22AE -.4byte gUnknown_086B22D0 -.4byte gUnknown_086B22F2 -.4byte gUnknown_086B165C +.4byte gEvolutionBannerLightningSpriteSet +.4byte gTravelPainterSpriteSet +.4byte gChargeIndicatorDeviceSpriteSet .4byte gUnknown_086B1CDA -.4byte gLegendaryCatchPortraitSpriteSet @ 30 -.4byte gUnknown_086B170C -.4byte gUnknown_086B170C -.4byte gLegendaryCatchPortraitBordersSpriteSet -.4byte gUnknown_086B16DA -.4byte gUnknown_086B21E4 -.4byte gUnknown_086B2206 -.4byte gUnknown_086B2228 -.4byte gUnknown_086B224A -.4byte gUnknown_086B226C +.4byte gPortraitBordersSpriteSet @ 30 +.4byte gPortraitTrimSpriteSet +.4byte gPortraitTrimSpriteSet +.4byte gPortraitSpriteSet +.4byte gPortrait1SpriteSet +.4byte gEvolutionBannerTextLargeBottomSpriteSet +.4byte gEvolutionBannerTextLargeTopSpriteSet +.4byte gEvolutionBannerTextMediumLowerSpriteSet +.4byte gEvolutionBannerTextMediumUpperSpriteSet +.4byte gEvolutionBannerTextSmallMiddleSpriteSet .4byte gMainBoardBallSpriteSet @ 40 .4byte gMonCatchBallTrailSpriteSet .4byte gMonCatchBallTrailSpriteSet @@ -6686,26 +6686,26 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gMainShopConfirmationPanelSpriteSet .4byte gMainShopPortraitOverlaySpriteSet .4byte gMainTravelBanner_SignpostSpriteSet -.4byte gMainTravelBannerSpriteSet -.4byte gUnknown_086B1D0C @ 20 -.4byte gUnknown_086B1782 +.4byte gMainModeStartBannerSpriteSet +.4byte gMainTileBreakSpriteSet @ 20 +.4byte gCenterHoleGravityFxSpriteSet .4byte gUnknown_086B22AE -.4byte gUnknown_086B22D0 -.4byte gUnknown_086B22F2 -.4byte gUnknown_086B165C +.4byte gEvolutionBannerLightningSpriteSet +.4byte gTravelPainterSpriteSet +.4byte gChargeIndicatorDeviceSpriteSet .4byte gUnknown_086B1AE6 .4byte gUnknown_086B2324 .4byte gUnknown_086B1CDA -.4byte gLegendaryCatchPortraitSpriteSet -.4byte gUnknown_086B170C @ 30 -.4byte gUnknown_086B170C -.4byte gLegendaryCatchPortraitBordersSpriteSet -.4byte gUnknown_086B16DA -.4byte gUnknown_086B21E4 -.4byte gUnknown_086B2206 -.4byte gUnknown_086B2228 -.4byte gUnknown_086B224A -.4byte gUnknown_086B226C +.4byte gPortraitBordersSpriteSet +.4byte gPortraitTrimSpriteSet @ 30 +.4byte gPortraitTrimSpriteSet +.4byte gPortraitSpriteSet +.4byte gPortrait1SpriteSet +.4byte gEvolutionBannerTextLargeBottomSpriteSet +.4byte gEvolutionBannerTextLargeTopSpriteSet +.4byte gEvolutionBannerTextMediumLowerSpriteSet +.4byte gEvolutionBannerTextMediumUpperSpriteSet +.4byte gEvolutionBannerTextSmallMiddleSpriteSet .4byte gMonCatchBallTrailSpriteSet .4byte gMonCatchBallTrailSpriteSet @40 .4byte gMainBoardBallSpriteSet @@ -13610,8 +13610,8 @@ gKyogreBoardSpriteSets:: @ 0x086BB4A4 .4byte gBonusBoardScoreBannerGraphicSpriteSet .4byte gLegendaryCatchNameBannerSpriteSet .4byte gLegendaryCatchWasCaughtTextSpriteSet - .4byte gLegendaryCatchPortraitSpriteSet - .4byte gLegendaryCatchPortraitBordersSpriteSet + .4byte gPortraitBordersSpriteSet + .4byte gPortraitSpriteSet .4byte gKyogreCrystalTopRightSpriteSet .4byte gKyogreCrystalTopLeftSpriteSet .4byte gKyogreCrystalBottomRightSpriteSet @@ -13639,8 +13639,8 @@ gGroudonBoardSpriteSets:: @ 0x086BB510 .4byte gBonusBoardScoreBannerGraphicSpriteSet .4byte gLegendaryCatchNameBannerSpriteSet .4byte gLegendaryCatchWasCaughtTextSpriteSet - .4byte gLegendaryCatchPortraitSpriteSet - .4byte gLegendaryCatchPortraitBordersSpriteSet + .4byte gPortraitBordersSpriteSet + .4byte gPortraitSpriteSet .4byte gGroudonCrystalTopRightSpriteSet .4byte gGroudonCrystalBottomRightSpriteSet .4byte gGroudonCrystalTopLeftSpriteSet @@ -13673,8 +13673,8 @@ gRayquazaBoardSpriteSets:: @ 0x086BB590 .4byte gBonusBoardScoreBannerGraphicSpriteSet .4byte gLegendaryCatchNameBannerSpriteSet .4byte gLegendaryCatchWasCaughtTextSpriteSet - .4byte gLegendaryCatchPortraitSpriteSet - .4byte gLegendaryCatchPortraitBordersSpriteSet + .4byte gPortraitBordersSpriteSet + .4byte gPortraitSpriteSet .4byte gRaquazaIntroCloud0SpriteSet .4byte gRaquazaIntroCloud1SpriteSet .4byte gRaquazaIntroCloud2SpriteSet diff --git a/include/constants/sprite_groups.h b/include/constants/sprite_groups.h index 18de5980..c8d0af1a 100644 --- a/include/constants/sprite_groups.h +++ b/include/constants/sprite_groups.h @@ -81,8 +81,8 @@ #define SG_BONUS_COMPLETE_BANNER 6 #define SG_LEGENDARY_POKEMON_CATCH_NAME_TEXT 7 #define SG_LEGENDARY_POKEMON_WAS_CAUGHT_TEXT 8 -#define SG_LEGENDARY_CATCH_PORTRAIT 9 -#define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 10 +#define SG_LEGENDARY_CATCH_PORTRAIT_BORDERS 9 +#define SG_LEGENDARY_CATCH_PORTRAIT 10 // Dusclops board //0-6 shared @@ -389,9 +389,45 @@ #define FIELD_SG_MAIN_SHOP_PORTRAIT_OVERLAY 9 // Change sheen, Sold Out indicator #define FIELD_SG_MAIN_TRAVEL_BANNER_SIGNPOST 10 //Crossroads with torchic sitting on it #define FIELD_SG_MAIN_MODE_START_BANNER 11 -#define FIELD_SG_MAIN_BOARD_LEGENDARY_CATCH_PORTRAIT 19 -#define FIELD_SG_MAIN_BOARD_LEGENDARY_CATCH_PORTRAIT_BORDERS 22 +#define FIELD_SG_MAIN_TILE_BREAK 12 +#define FIELD_SG_CENTER_HOLE_GRAVITY_FX 13 +#define FIELD_SG_14 14 // Unused? +#define FIELD_SG_EVOLUTION_LIGHTNING 15 +#define FIELD_SG_TRAVEL_PAINTER 16 +#define FIELD_SG_CHARGE_INDICATOR_DEVICE 17 +#define FIELD_SG_18 18 // Related to catch tiles... but I can't properly isolate to confirm. +#define FIELD_SG_MAIN_BOARD_PORTRAIT_BORDERS 19 +#define FIELD_SG_PORTRAIT0_TRIM 20 +#define FIELD_SG_PORTRAIT1_TRIM 21 +#define FIELD_SG_MAIN_BOARD_PORTRAIT 22 +#define FIELD_SG_PORTRAIT1 23 //Used for roulette +#define FIELD_SG_EVOLUTION_TEXT_LARGE_BOTTOM 24 +#define FIELD_SG_EVOLUTION_TEXT_LARGE_TOP 25 +#define FIELD_SG_EVOLUTION_TEXT_MEDIUM_LOWER 26 +#define FIELD_SG_EVOLUTION_TEXT_MEDIUM_UPPER 27 +#define FIELD_SG_EVOLUTION_TEXT_SMALL_MIDDLE 28 +#define FIELD_SG_29 29 +#define FIELD_SG_30 30 +#define FIELD_SG_31 31 +#define FIELD_SG_32 32 +#define FIELD_SG_33 33 +#define FIELD_SG_34 34 +#define FIELD_SG_35 35 +#define FIELD_SG_36 36 +#define FIELD_SG_37 37 +#define FIELD_SG_38 38 +#define FIELD_SG_39 39 +#define FIELD_SG_40 40 +#define FIELD_SG_41 41 +#define FIELD_SG_42 42 +#define FIELD_SG_43 43 +#define FIELD_SG_44 44 +#define FIELD_SG_45 45 +#define FIELD_SG_46 46 +#define FIELD_SG_47 47 +#define FIELD_SG_48 48 #define FIELD_SG_MAIN_BOARD_BALL_OVERRIDE 49 +#define FIELD_SG_50 50 // bonus/legendary boards //0,3-5 shared diff --git a/include/global.h b/include/global.h index 653bfb6e..70f4be19 100644 --- a/include/global.h +++ b/include/global.h @@ -378,7 +378,7 @@ struct PinballGame /*0x298*/ u16 cutsceneTilemapColumn; /*0x29A*/ u16 catchEmModeStartCount; /*0x29C*/ u16 bgmFadeTimer; - /*0x29E*/ u8 boardCollisionConfigChanged; + /*0x29E*/ u8 boardCollisionConfigChanged; //swapped after launch, preventing ball falling into launch ramp. /*0x29F*/ s8 rampPrizeType; /*0x2A0*/ u16 rampPrizeRespawnTimer; /*0x2A2*/ s8 whiscashState; @@ -755,12 +755,12 @@ struct PinballGame /*0x6BE*/ s8 seedotExitSequenceActive; /*0x6BF*/ u8 filler6BF[0x1]; /*0x6C0*/ u16 seedotExitSequenceTimer; - /*0x6C2*/ u16 seedotModeStartDelay; + /*0x6C2*/ u16 travelModeStartDelay; /*0x6C4*/ s8 portraitDisplayState; /*0x6C5*/ s8 catchTileRevealState; /*0x6C6*/ s8 catchTilesBoardAcknowledged; - /*0x6C7*/ s8 hatchSequentialTilesRevealed; - /*0x6C8*/ s8 hatchGridCellIndex; + /*0x6C7*/ s8 catchSequentialTilesRevealed; + /*0x6C8*/ s8 catchGridCellIndex; /*0x6C9*/ s8 catchTilesRemaining; /*0x6CA*/ u16 catchTileRevealFrameAnimTimer; /*0x6CC*/ s8 catchRevealFrameId; diff --git a/src/all_board_banners.c b/src/all_board_banners.c index 708ae3fb..8d79f993 100644 --- a/src/all_board_banners.c +++ b/src/all_board_banners.c @@ -11,7 +11,7 @@ void ProcessBannerCameraTransition(void) if ((gMain.modeChangeFlags & MODE_CHANGE_BANNER) != 0) { gCurrentPinballGame->ballUpgradeTimerFrozen = 1; - if (gCurrentPinballGame->bannerActive != 0) + if (gCurrentPinballGame->bannerActive) { gCurrentPinballGame->ballFrozenState = 2; gCurrentPinballGame->boardEntityActive = 1; @@ -27,7 +27,7 @@ void ProcessBannerCameraTransition(void) } else { - gCurrentPinballGame->bannerActive = 0; + gCurrentPinballGame->bannerActive = FALSE; } } else @@ -46,7 +46,7 @@ void ProcessBannerCameraTransition(void) } else { - gCurrentPinballGame->bannerActive = 0; + gCurrentPinballGame->bannerActive = FALSE; } } diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index a49ec3af..c1eff6f7 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -127,7 +127,7 @@ void GameOverAnimation(void) struct OamDataSimple *oamSimple; u16 var0; - group = gMain.fieldSpriteGroups[42]; + group = gMain.fieldSpriteGroups[FIELD_SG_42]; if (group->active) { group->baseX = 63; @@ -155,7 +155,7 @@ void GameOverAnimation(void) if (gMain.animationTimer == 3600) { DmaCopy16(3, gMainBoardGameOverText_Gfx, (void *)0x06015800, 0x400); - gMain.fieldSpriteGroups[42]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_42]->active = TRUE; for (i = 0; i < 8; i++) { gGameOverLetterYOffsets[i] = 0xE0C0; diff --git a/src/all_board_pinball_game_main.c b/src/all_board_pinball_game_main.c index 3233109a..0be0d341 100644 --- a/src/all_board_pinball_game_main.c +++ b/src/all_board_pinball_game_main.c @@ -287,7 +287,7 @@ void InitPinballGameState(void) gCurrentPinballGame->fullChargeIndicatorBlinkTimer = 60; DmaCopy16(3, gDxModePikachuObjTiles, (void *)OBJ_VRAM0 + 0x600, 0x180); gCurrentPinballGame->outLanePikaPosition = 2; - gMain.fieldSpriteGroups[41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; gCurrentPinballGame->ballUpgradeType = BALL_UPGRADE_TYPE_MASTER_BALL; gCurrentPinballGame->ballUpgradeCounter = 60 * 60; diff --git a/src/all_board_portrait_display.c b/src/all_board_portrait_display.c index c9b751b0..1035122d 100644 --- a/src/all_board_portrait_display.c +++ b/src/all_board_portrait_display.c @@ -216,7 +216,7 @@ void UpdatePortraitSpritePositions(void) var2 = 300 - gCurrentPinballGame->cameraYOffset; } - group = gMain.fieldSpriteGroups[22]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_PORTRAIT]; group->baseX = baseX; group->baseY = var1; gCurrentPinballGame->rouletteBasePos.x = baseX; @@ -235,7 +235,7 @@ void UpdatePortraitSpritePositions(void) if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_ROULETTE) { - group = gMain.fieldSpriteGroups[23]; + group = gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]; group->baseX = baseX; group->baseY = var1 - 0x20; if (group->baseY >= 180) @@ -249,7 +249,7 @@ void UpdatePortraitSpritePositions(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[20]; + group = gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]; group->baseX = baseX; group->baseY = 267 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -262,7 +262,7 @@ void UpdatePortraitSpritePositions(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[21]; + group = gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]; group->baseX = baseX; group->baseY = 333 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -276,7 +276,7 @@ void UpdatePortraitSpritePositions(void) } } - group = gMain.fieldSpriteGroups[19]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_PORTRAIT_BORDERS]; group->baseX = baseX - 8; group->baseY = var2 - 8; if (group->baseY >= 200) @@ -299,7 +299,7 @@ void ClampPortraitSpritesToOffscreen(void) if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_ROULETTE) { - group = gMain.fieldSpriteGroups[22]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_PORTRAIT]; group->baseY = 180; for (i = 0; i < 6; i++) { @@ -307,7 +307,7 @@ void ClampPortraitSpritesToOffscreen(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[23]; + group = gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 180) group->baseY = 180; @@ -318,7 +318,7 @@ void ClampPortraitSpritesToOffscreen(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[20]; + group = gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]; group->baseY = 180; for (i = 0; i < 6; i++) { @@ -326,7 +326,7 @@ void ClampPortraitSpritesToOffscreen(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[21]; + group = gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]; group->baseY = 180; for (i = 0; i < 6; i++) { diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 80c5a9f8..5b5430f4 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -198,7 +198,7 @@ void MainBoardProcess_7B_12524(void) gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; } - spriteGroup = gMain.fieldSpriteGroups[43]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_43]; if (spriteGroup->active) { @@ -225,7 +225,7 @@ void MainBoardProcess_7B_12524(void) gOamBuffer[oam->oamId].priority = currentBallState->oamPriority; if (gCurrentPinballGame->ballShadowTimer < 14) - gMain.fieldSpriteGroups[43]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_43]->active = FALSE; } } diff --git a/src/all_board_state_transitions_and_idle.c b/src/all_board_state_transitions_and_idle.c index 38bc7a1d..a36797e5 100644 --- a/src/all_board_state_transitions_and_idle.c +++ b/src/all_board_state_transitions_and_idle.c @@ -14,7 +14,7 @@ void RequestBoardStateTransition(u8 arg0) gCurrentPinballGame->boardTransitionPhase = BOARD_STATE_DISPATCHER_STATE_CHANGING; gCurrentPinballGame->nextBoardState = arg0; if (gCurrentPinballGame->boardState == MAIN_BOARD_STATE_BONUS_HOLE_ACTIVE) - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; } void BoardStateDispatcher(void) diff --git a/src/groudon_process3.c b/src/groudon_process3.c index ae9216ed..a0ca559e 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -607,8 +607,8 @@ void UpdateGroudonEntityLogic(void) // catch groudon gCurrentPinballGame->bossEntityState = GROUDON_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_GROUDON; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -961,7 +961,7 @@ void UpdateGroudonFieldEntities(void) s8 var0; varSL = 0; - group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -989,7 +989,7 @@ void UpdateGroudonFieldEntities(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 98b4aeb3..9eda0748 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -494,8 +494,8 @@ void UpdateKyogreEntityLogic(void) // catch kyogre gCurrentPinballGame->bossEntityState = KYOGRE_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_KYOGRE; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -813,7 +813,7 @@ void UpdateKyogreFieldEntities(void) index = 0; //Portrait display (during catch) - group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -841,7 +841,7 @@ void UpdateKyogreFieldEntities(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index 81894d1d..d19f069c 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -361,7 +361,7 @@ void HandleRubyBumperHit(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 4; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_SHROOMISH_CATCH_BURST; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 70c11d2f..348ecf96 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -369,7 +369,7 @@ void UpdateShopEntryAnimation(s16 arg0) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_EVOLUTION; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = 0xF63C; //-2500 @@ -777,7 +777,7 @@ void UpdateShopEntryAnimation(s16 arg0) void InitCenterTrapMode(void) { gCurrentPinballGame->modeAnimTimer = 0x96; - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->bonusTrapEnabled = 0; gCurrentPinballGame->scoreAddedInFrame = 10000; gCurrentPinballGame->ballUpgradeTimerFrozen = 1; @@ -858,7 +858,7 @@ void AnimateCenterTrapSequence(void) void TransitionToBonusField(void) { - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; SaveGameStateSnapshot(0); gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; diff --git a/src/main_board_catch_normal_and_jirachi_modes.c b/src/main_board_catch_normal_and_jirachi_modes.c index acdaaab4..ab7f4c5a 100644 --- a/src/main_board_catch_normal_and_jirachi_modes.c +++ b/src/main_board_catch_normal_and_jirachi_modes.c @@ -40,8 +40,8 @@ void CleanupCatchEmState(void) gCurrentPinballGame->creatureHitCount = 0; gCurrentPinballGame->captureFlashTimer = 0; - gMain.fieldSpriteGroups[18]->active = FALSE; - gMain.fieldSpriteGroups[12]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_18]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]->active = FALSE; gCurrentPinballGame->catchMonCollisionEnabled = 0; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_MAIN_SLOT); @@ -72,7 +72,7 @@ void InitCatchEmMode(void) gCurrentPinballGame->creatureHitCooldown = 0; gCurrentPinballGame->captureFlashTimer = 0; gCurrentPinballGame->catchTilesBoardAcknowledged = 0; - gCurrentPinballGame->hatchSequentialTilesRevealed = 0; + gCurrentPinballGame->catchSequentialTilesRevealed = 0; gCurrentPinballGame->catchTilesBumperAcknowledged = 0; gCurrentPinballGame->catchTileRevealFrameAnimTimer = 0; gCurrentPinballGame->catchRevealFrameId = 0; @@ -96,10 +96,10 @@ void InitCatchEmMode(void) gCurrentPinballGame->catchTileShufflePool[i] = i; } - gCurrentPinballGame->hatchGridCellIndex = gMain.systemFrameCount % 6; + gCurrentPinballGame->catchGridCellIndex = gMain.systemFrameCount % 6; gCurrentPinballGame->catchTilesRemaining = 5; - for (j = gCurrentPinballGame->hatchGridCellIndex; j < gCurrentPinballGame->catchTilesRemaining; j++) + for (j = gCurrentPinballGame->catchGridCellIndex; j < gCurrentPinballGame->catchTilesRemaining; j++) { gCurrentPinballGame->catchTileShufflePool[j] = gCurrentPinballGame->catchTileShufflePool[j+1]; } @@ -163,7 +163,7 @@ void UpdateCatchEmMode(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CATCH_EM; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; @@ -198,7 +198,7 @@ void UpdateCatchEmMode(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CATCH_EM; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; @@ -371,7 +371,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_JIRACHI; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; @@ -405,7 +405,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_JIRACHI; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 1; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; @@ -441,7 +441,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->catchLights[1] = 2; gCurrentPinballGame->catchLights[2] = 2; gCurrentPinballGame->catchMonCollisionEnabled = 1; - gMain.fieldSpriteGroups[33]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_33]->active = TRUE; DmaCopy16(3, gCatchSpriteGfxBuffer, (void *)0x06010CA0, 0x480); gCurrentPinballGame->modeAnimTimer = 40; gCurrentPinballGame->jirachiLogicX = 900; @@ -608,7 +608,7 @@ void DrawCatchMonBoardSprite(void) s16 index; index = (gMain.fieldFrameCount % 50) / 25; - group = gMain.fieldSpriteGroups[33]; + group = gMain.fieldSpriteGroups[FIELD_SG_33]; if (!group->active) return; @@ -658,7 +658,7 @@ void CleanupCatchMonBoardSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[33]; + group = gMain.fieldSpriteGroups[FIELD_SG_33]; if (group->active) { for (i = 0; i < 4; i++) @@ -669,7 +669,7 @@ void CleanupCatchMonBoardSprite(void) } } - gMain.fieldSpriteGroups[33]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_33]->active = FALSE; } void DrawJirachiSprites(void) @@ -684,7 +684,7 @@ void DrawJirachiSprites(void) s16 var1; index = (gMain.fieldFrameCount % 50) / 25; - group = gMain.fieldSpriteGroups[33]; + group = gMain.fieldSpriteGroups[FIELD_SG_33]; if (group->active) { gCurrentPinballGame->jirachiCenterX = gCurrentPinballGame->jirachiDisplayX / 10 + 96; @@ -751,7 +751,7 @@ void DrawJirachiSprites(void) for (j = 0; j < 4; j++) { - group = gMain.fieldSpriteGroups[45 + j]; + group = gMain.fieldSpriteGroups[FIELD_SG_45 + j]; if (group->active) { group->baseX = gCurrentPinballGame->jirachiStarTagPos[j].x - gCurrentPinballGame->cameraXOffset; @@ -784,7 +784,7 @@ void DrawJirachiSprites(void) gCurrentPinballGame->jirachiTagTimer[j] = 40; gCurrentPinballGame->jirachiStarTagPos[j].x = gCurrentPinballGame->jirachiCenterX; gCurrentPinballGame->jirachiStarTagPos[j].y = gCurrentPinballGame->jirachiCenterY + 16; - gMain.fieldSpriteGroups[45 + j]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_45 + j]->active = TRUE; } } @@ -792,7 +792,7 @@ void DrawJirachiSprites(void) { gCurrentPinballGame->jirachiTagTimer[j]--; if (gCurrentPinballGame->jirachiTagTimer[j] == 0) - gMain.fieldSpriteGroups[45 + j]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_45 + j]->active = FALSE; } } } @@ -803,7 +803,7 @@ void CleanupJirachiSprites(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[33]; + group = gMain.fieldSpriteGroups[FIELD_SG_33]; if (group->active) { for (i = 0; i < 4; i++) @@ -814,9 +814,9 @@ void CleanupJirachiSprites(void) } } - gMain.fieldSpriteGroups[33]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_33]->active = FALSE; for (i = 0; i < 4; i++) - gMain.fieldSpriteGroups[45 + i]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_45 + i]->active = FALSE; } //draw_catch_tiles @@ -869,7 +869,7 @@ void PlayCatchMonAppearsAnimation(void) if (gCurrentPinballGame->catchRevealFrameId == 2 && gCurrentPinballGame->catchTileRevealFrameAnimTimer > 3) { gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; - gMain.fieldSpriteGroups[33]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_33]->active = TRUE; } if (gCurrentPinballGame->catchRevealFrameId > 2) @@ -879,7 +879,7 @@ void PlayCatchMonAppearsAnimation(void) DrawCatchMonBoardSprite(); } - group = gMain.fieldSpriteGroups[18]; + group = gMain.fieldSpriteGroups[FIELD_SG_18]; if (group->active) { group->baseX = 96 - gCurrentPinballGame->cameraXOffset; @@ -900,11 +900,11 @@ void PlayCatchMonAppearsAnimation(void) } } - gMain.fieldSpriteGroups[18]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_18]->active = TRUE; if (gCurrentPinballGame->catchRevealFrameId > 6) { gCurrentPinballGame->boardSubState++; - gMain.fieldSpriteGroups[18]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_18]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } } diff --git a/src/main_board_catch_tile_logic.c b/src/main_board_catch_tile_logic.c index 480eab48..fb6c2480 100644 --- a/src/main_board_catch_tile_logic.c +++ b/src/main_board_catch_tile_logic.c @@ -29,7 +29,7 @@ void DisableCatchTileDisplay(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[18]; + group = gMain.fieldSpriteGroups[FIELD_SG_18]; if (group->active) { for (i = 0; i < 6; i++) @@ -39,8 +39,8 @@ void DisableCatchTileDisplay(void) gOamBuffer[oamSimple->oamId].y = 180; } } - gMain.fieldSpriteGroups[18]->active = FALSE; - group = gMain.fieldSpriteGroups[12]; + gMain.fieldSpriteGroups[FIELD_SG_18]->active = FALSE; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]; if (group->active) { for (i = 0; i < 6; i++) @@ -50,7 +50,7 @@ void DisableCatchTileDisplay(void) gOamBuffer[oamSimple->oamId].y = 180; } } - gMain.fieldSpriteGroups[12]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } @@ -64,11 +64,11 @@ void RevealCatchTilesSequential(void) int var1; var1 = 1; - gMain.fieldSpriteGroups[18]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_18]->active = TRUE; if (gCurrentPinballGame->catchRevealFrameId > 0) UpdateSequentialTileParticles(); - if (gCurrentPinballGame->hatchSequentialTilesRevealed < gCurrentPinballGame->catchTilesBoardAcknowledged) + if (gCurrentPinballGame->catchSequentialTilesRevealed < gCurrentPinballGame->catchTilesBoardAcknowledged) { if (gCurrentPinballGame->catchRevealFrameId == 0 && gCurrentPinballGame->catchTileRevealFrameAnimTimer == 0) { @@ -87,11 +87,11 @@ void RevealCatchTilesSequential(void) gCurrentPinballGame->catchRevealFrameId++; if (gCurrentPinballGame->catchRevealFrameId > 12) { - gCurrentPinballGame->hatchSequentialTilesRevealed++; + gCurrentPinballGame->catchSequentialTilesRevealed++; gCurrentPinballGame->catchRevealFrameId = 0; var1 = 0; gCurrentPinballGame->catchTilesRemaining--; - if (gCurrentPinballGame->hatchSequentialTilesRevealed == gCurrentPinballGame->catchTilesBoardAcknowledged) + if (gCurrentPinballGame->catchSequentialTilesRevealed == gCurrentPinballGame->catchTilesBoardAcknowledged) { if (gCurrentPinballGame->catchTilesRemaining >= 0) gCurrentPinballGame->activePortraitType = 0; @@ -100,7 +100,7 @@ void RevealCatchTilesSequential(void) if (gCurrentPinballGame->catchTilesRemaining < 0) { gCurrentPinballGame->catchTilesBoardAcknowledged = 0; - gCurrentPinballGame->hatchSequentialTilesRevealed = 0; + gCurrentPinballGame->catchSequentialTilesRevealed = 0; gCurrentPinballGame->catchTilesBumperAcknowledged = 0; for (i = 0; i < 6; i++) gCurrentPinballGame->catchTileShufflePool[i] = i; @@ -108,7 +108,7 @@ void RevealCatchTilesSequential(void) var0 = gMain.systemFrameCount % 6; gCurrentPinballGame->catchTilesRemaining = 5; gCurrentPinballGame->boardSubState++; //Move to next Catch phase - gMain.fieldSpriteGroups[18]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_18]->active = FALSE; } else if (gCurrentPinballGame->catchTilesRemaining == 0) { @@ -119,14 +119,14 @@ void RevealCatchTilesSequential(void) var0 = gMain.systemFrameCount % gCurrentPinballGame->catchTilesRemaining; } - gCurrentPinballGame->hatchGridCellIndex = gCurrentPinballGame->catchTileShufflePool[var0]; + gCurrentPinballGame->catchGridCellIndex = gCurrentPinballGame->catchTileShufflePool[var0]; for (i = var0; i < gCurrentPinballGame->catchTilesRemaining; i++) gCurrentPinballGame->catchTileShufflePool[i] = gCurrentPinballGame->catchTileShufflePool[i + 1]; } else { if (gCurrentPinballGame->catchRevealFrameId == 1) - gCurrentPinballGame->catchTilePalette[gCurrentPinballGame->hatchGridCellIndex] = 13; + gCurrentPinballGame->catchTilePalette[gCurrentPinballGame->catchGridCellIndex] = 13; } } } @@ -144,11 +144,11 @@ void RevealCatchTilesSequential(void) if (gCurrentPinballGame->catchRevealFrameId == 12) var1 = 0; - group = gMain.fieldSpriteGroups[18]; + group = gMain.fieldSpriteGroups[FIELD_SG_18]; if (var1) { - group->baseX = (gCurrentPinballGame->hatchGridCellIndex % 3) * 16 - (gCurrentPinballGame->cameraXOffset - 96); - group->baseY = (gCurrentPinballGame->hatchGridCellIndex / 3) * 16 - (gCurrentPinballGame->cameraYOffset - 300); + group->baseX = (gCurrentPinballGame->catchGridCellIndex % 3) * 16 - (gCurrentPinballGame->cameraXOffset - 96); + group->baseY = (gCurrentPinballGame->catchGridCellIndex / 3) * 16 - (gCurrentPinballGame->cameraYOffset - 300); } else { @@ -198,7 +198,7 @@ void RevealCatchTilesBurst(void) gCurrentPinballGame->activePortraitType = 5; DmaCopy16(3, gCatchTile_BurstStart_Gfx, (void *)0x06015800, 0x2000); DmaCopy16(3, gCatchTile_BurstStart_Pal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[35]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_35]->active = TRUE; m4aSongNumStart(SE_CATCH_ALL_REVEAL_LIGHTNING); gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->revealAnimFrameCounter = 0; @@ -217,12 +217,12 @@ void RevealCatchTilesBurst(void) { gCurrentPinballGame->revealFramesetIndex = 7; gCurrentPinballGame->hatchRevealPhase++; - gMain.fieldSpriteGroups[35]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_35]->active = FALSE; } } var0 = gCurrentPinballGame->revealFramesetIndex; - group = gMain.fieldSpriteGroups[35]; + group = gMain.fieldSpriteGroups[FIELD_SG_35]; group->baseX = 124 - gCurrentPinballGame->cameraXOffset; group->baseY = 244 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -244,7 +244,7 @@ void RevealCatchTilesBurst(void) gCurrentPinballGame->activePortraitType = 6; DmaCopy16(3, gCatchTile_BurstStage2_Gfx, (void *)0x06015800, 0x800); DmaCopy16(3, gCatchTile_BurstStage2_Pal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[36]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_36]->active = TRUE; gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->revealAnimFrameCounter = 0; gCurrentPinballGame->startButtonDisabled = 1; @@ -257,13 +257,13 @@ void RevealCatchTilesBurst(void) } else { - gMain.fieldSpriteGroups[36]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_36]->active = FALSE; gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->revealAnimFrameCounter = 0; gCurrentPinballGame->revealFramesetIndex = 0; } - group = gMain.fieldSpriteGroups[36]; + group = gMain.fieldSpriteGroups[FIELD_SG_36]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -329,7 +329,7 @@ void RevealCatchTilesBurst(void) gCurrentPinballGame->activePortraitType = 8; DmaCopy16(3, gCatchTile_BurstStage4_Gfx, (void *)0x06015800, 0x1800); DmaCopy16(3, gCatchTile_BurstStage4_Pal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[37]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_37]->active = TRUE; gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->startButtonDisabled = 0; break; @@ -345,20 +345,20 @@ void RevealCatchTilesBurst(void) if (gCurrentPinballGame->revealFramesetIndex > 10) { gCurrentPinballGame->boardSubState++; //Move to next Catch phase - gMain.fieldSpriteGroups[37]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_37]->active = FALSE; gCurrentPinballGame->catchTilesBoardAcknowledged = 0; - gCurrentPinballGame->hatchSequentialTilesRevealed = 0; + gCurrentPinballGame->catchSequentialTilesRevealed = 0; gCurrentPinballGame->catchTilesBumperAcknowledged = 0; gMain.blendControl = 0xCE; gMain.blendBrightness = 0; - gMain.fieldSpriteGroups[37]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_37]->active = FALSE; gCurrentPinballGame->revealFramesetIndex = 10; gCurrentPinballGame->activePortraitType = 0; } } var0 = gCurrentPinballGame->revealFramesetIndex; - group = gMain.fieldSpriteGroups[37]; + group = gMain.fieldSpriteGroups[FIELD_SG_37]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) diff --git a/src/main_board_catch_tile_particles.c b/src/main_board_catch_tile_particles.c index dbe09ba7..cf3ac147 100644 --- a/src/main_board_catch_tile_particles.c +++ b/src/main_board_catch_tile_particles.c @@ -23,7 +23,7 @@ void InitSequentialTileParticles(void) } gCurrentPinballGame->particleAnimTimer = 0; - gMain.fieldSpriteGroups[12]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]->active = TRUE; } void UpdateSequentialTileParticles(void) @@ -36,7 +36,7 @@ void UpdateSequentialTileParticles(void) s16 var0; struct Vector16 tempVector; - group = gMain.fieldSpriteGroups[12]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]; if (group->active) { for (i = 0; i < 6; i++) @@ -49,8 +49,8 @@ void UpdateSequentialTileParticles(void) gCurrentPinballGame->tileParticlePos[i].y += gCurrentPinballGame->tileParticleVel[i].y; } - tempVector.x = ((gCurrentPinballGame->hatchGridCellIndex % 3) * 16 + 96u - gCurrentPinballGame->cameraXOffset) + (gCurrentPinballGame->tileParticlePos[i].x / 100); - tempVector.y = ((gCurrentPinballGame->hatchGridCellIndex / 3) * 16 + 300u - gCurrentPinballGame->cameraYOffset) + (gCurrentPinballGame->tileParticlePos[i].y / 100); + tempVector.x = ((gCurrentPinballGame->catchGridCellIndex % 3) * 16 + 96u - gCurrentPinballGame->cameraXOffset) + (gCurrentPinballGame->tileParticlePos[i].x / 100); + tempVector.y = ((gCurrentPinballGame->catchGridCellIndex / 3) * 16 + 300u - gCurrentPinballGame->cameraYOffset) + (gCurrentPinballGame->tileParticlePos[i].y / 100); if (tempVector.y >= 200) tempVector.y = 200; @@ -72,7 +72,7 @@ void UpdateSequentialTileParticles(void) else { gCurrentPinballGame->catchTileRevealFrameAnimTimer = 0x7100; - gMain.fieldSpriteGroups[12]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]->active = FALSE; } } @@ -97,7 +97,7 @@ void InitBurstTileParticles(void) gCurrentPinballGame->tileParticlePos[4].y = -4400; gCurrentPinballGame->tileParticleGravity[4] = 3; gCurrentPinballGame->particleAnimTimer = 0; - gMain.fieldSpriteGroups[12]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]->active = TRUE; } void UpdateBurstTileParticles(void) @@ -111,7 +111,7 @@ void UpdateBurstTileParticles(void) s16 sp0[6]; s16 scale; - group = gMain.fieldSpriteGroups[12]; + group = gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]; if (group->active) { for (i = 0; i < 6; i++) @@ -173,6 +173,6 @@ void UpdateBurstTileParticles(void) else { gCurrentPinballGame->catchTileRevealFrameAnimTimer = 0x7100; - gMain.fieldSpriteGroups[12]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_TILE_BREAK]->active = FALSE; } } diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index 8525f051..d5f4d807 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -28,9 +28,9 @@ void InitRouletteWheel(void) { s16 i; - gMain.fieldSpriteGroups[23]->active = TRUE; - gMain.fieldSpriteGroups[20]->active = TRUE; - gMain.fieldSpriteGroups[21]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]->active = TRUE; gMain.blendControl = 0x1C10; gMain.blendAlpha = BLDALPHA_BLEND(0, 16); gCurrentPinballGame->rouletteStopRequested = 0; @@ -191,9 +191,9 @@ void RunRouletteWheel(void) if (gCurrentPinballGame->rouletteFrameIndex == 0) { gCurrentPinballGame->modeAnimTimer = 140; - gMain.fieldSpriteGroups[23]->active = FALSE; - gMain.fieldSpriteGroups[20]->active = FALSE; - gMain.fieldSpriteGroups[21]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]->active = FALSE; gCurrentPinballGame->rouletteSubOffset = 0; gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BOARD_CENTER; m4aMPlayStop(&gMPlayInfo_BGM); @@ -274,7 +274,7 @@ void GivePrize(void) gCurrentPinballGame->fullChargeIndicatorBlinkTimer = 60; DmaCopy16(3, gPikachuSaverTilesGfx, (void *)0x06010600, 0x180); gCurrentPinballGame->outLanePikaPosition = 2; - gMain.fieldSpriteGroups[41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; } } @@ -289,7 +289,7 @@ void GivePrize(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 2; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->pichuWalkMode = 1; gCurrentPinballGame->pichuEntranceTimer = 800; @@ -408,7 +408,7 @@ void GivePrize(void) if (gCurrentPinballGame->outcomeFrameCounter == 130) { gCurrentPinballGame->coinRewardLevel = 1; - gCurrentPinballGame->coinRewardAmount = (gCurrentPinballGame->prizeId - 17) * 20 + 10; + gCurrentPinballGame->coinRewardAmount = (gCurrentPinballGame->prizeId - PRIZE_10_COINS) * 20 + 10; gCurrentPinballGame->coinRewardTimer = 0; } diff --git a/src/main_board_charge_spinner.c b/src/main_board_charge_spinner.c index 58bb0d30..41502e3f 100644 --- a/src/main_board_charge_spinner.c +++ b/src/main_board_charge_spinner.c @@ -126,7 +126,7 @@ void DrawPikachuSpinner(void) s16 index; index = gCurrentPinballGame->pikachuSpinFrame; - group = gMain.fieldSpriteGroups[31]; + group = gMain.fieldSpriteGroups[FIELD_SG_31]; group->baseX = 206 - gCurrentPinballGame->cameraXOffset; if (gMain.selectedField == FIELD_RUBY) group->baseY = 174 - gCurrentPinballGame->cameraYOffset; diff --git a/src/main_board_evolution_mode.c b/src/main_board_evolution_mode.c index 5b6d39b7..cbb8c08b 100644 --- a/src/main_board_evolution_mode.c +++ b/src/main_board_evolution_mode.c @@ -29,7 +29,7 @@ void CleanupEvolutionModeState(void) gCurrentPinballGame->catchLights[i] = 0; } - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->bonusTrapEnabled = 0; ResetEventState(); @@ -155,7 +155,7 @@ void UpdateEvolutionMode(void) gCurrentPinballGame->evoItemPosX = gEvoItemPositions[gMain.selectedField][gCurrentPinballGame->evoItemSlotIndex].x; gCurrentPinballGame->evoItemPosY = gEvoItemPositions[gMain.selectedField][gCurrentPinballGame->evoItemSlotIndex].y; gCurrentPinballGame->evoItemAppearTimer = 80; - gMain.fieldSpriteGroups[40]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_40]->active = TRUE; gCurrentPinballGame->boardSubState++; break; case EVOLUTION_SUBSTATE_SPAWN_EVO_ITEM_AND_CHECK_FOR_COLLECTION: @@ -324,17 +324,17 @@ void UpdateEvolutionMode(void) } break; case EVOLUTION_SUBSTATE_END_EVO_PHASE: - group = gMain.fieldSpriteGroups[32]; + group = gMain.fieldSpriteGroups[FIELD_SG_32]; oamSimple = &group->oam[0]; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset - 56; - gMain.fieldSpriteGroups[32]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_32]->active = FALSE; UpdateEvolutionItemAnimation(); - gMain.fieldSpriteGroups[40]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_40]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; AnimateBonusTrapSprite(); - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->shopTransitionActive = 1; gCurrentPinballGame->shopAnimTimer = 0; gCurrentPinballGame->evolutionShopActive = 0; @@ -377,10 +377,10 @@ void UpdateEvolutionItemAnimation(void) s16 index; index = (gMain.systemFrameCount % 75) / 3; - group = gMain.fieldSpriteGroups[32]; + group = gMain.fieldSpriteGroups[FIELD_SG_32]; if (gCurrentPinballGame->evoItemAppearTimer) { - group = gMain.fieldSpriteGroups[40]; + group = gMain.fieldSpriteGroups[FIELD_SG_40]; if (gCurrentPinballGame->evoItemAppearTimer == 80) { gCurrentPinballGame->activePortraitType = 15; @@ -405,8 +405,8 @@ void UpdateEvolutionItemAnimation(void) { gCurrentPinballGame->evoItemAnimFrame = 28; gCurrentPinballGame->evoItemAppearTimer = 1; - gMain.fieldSpriteGroups[40]->active = FALSE; - gMain.fieldSpriteGroups[32]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_40]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_32]->active = TRUE; MPlayStart(&gMPlayInfo_SE1, &se_evo_item_finish_appear); gCurrentPinballGame->activePortraitType = 0; } @@ -449,7 +449,7 @@ void UpdateEvolutionItemAnimation(void) gCurrentPinballGame->boardSubState = EVOLUTION_SUBSTATE_PREP_SPAWN_EVO_ITEM; gCurrentPinballGame->catchLights[gCurrentPinballGame->evoItemsCaught] = 5; gCurrentPinballGame->evoItemsCaught++; - gMain.fieldSpriteGroups[32]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_32]->active = FALSE; if (gCurrentPinballGame->evoItemsCaught == 3) { gCurrentPinballGame->evoItemsCaught = 0; diff --git a/src/main_board_intro_mode.c b/src/main_board_intro_mode.c index 2b1b4c4e..dc376e7f 100644 --- a/src/main_board_intro_mode.c +++ b/src/main_board_intro_mode.c @@ -54,11 +54,11 @@ void UpdateBoardIntroMode(void) gCurrentPinballGame->rouletteSubOffset = 0; gCurrentPinballGame->cameraScrollTarget = 0; gCurrentPinballGame->cameraScrollEnabled = 1; - gMain.fieldSpriteGroups[20]->active = TRUE; - gMain.fieldSpriteGroups[21]->active = TRUE; - gMain.fieldSpriteGroups[23]->active = TRUE; - gMain.fieldSpriteGroups[22]->active = TRUE; - gMain.fieldSpriteGroups[19]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_PORTRAIT]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_MAIN_BOARD_PORTRAIT_BORDERS]->active = TRUE; gCurrentPinballGame->rouletteFrameIndex = 30; gCurrentPinballGame->rouletteRotationPeriod = 30; gCurrentPinballGame->rouletteSpinSpeed = 0; @@ -181,10 +181,10 @@ void UpdateBoardIntroMode(void) { gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState++; - gMain.fieldSpriteGroups[23]->active = FALSE; - gMain.fieldSpriteGroups[20]->active = FALSE; - gMain.fieldSpriteGroups[21]->active = FALSE; - gMain.fieldSpriteGroups[34]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_34]->active = TRUE; m4aSongNumStart(SE_AREA_ROULETTE_SELECTED); } } @@ -235,7 +235,7 @@ void UpdateBoardIntroMode(void) else var0 = ((gCurrentPinballGame->stageTimer - 8) / 3) + 2; - group = gMain.fieldSpriteGroups[34]; + group = gMain.fieldSpriteGroups[FIELD_SG_34]; if (group->active) { group->baseX = 96u - gCurrentPinballGame->cameraXOffset; @@ -257,7 +257,7 @@ void UpdateBoardIntroMode(void) } if (gCurrentPinballGame->stageTimer == 28) { - gMain.fieldSpriteGroups[34]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_34]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } } diff --git a/src/main_board_launcher_and_cutscenes.c b/src/main_board_launcher_and_cutscenes.c index 00f172da..5185183d 100644 --- a/src/main_board_launcher_and_cutscenes.c +++ b/src/main_board_launcher_and_cutscenes.c @@ -43,7 +43,7 @@ void AnimateOneUpSprite(void) s16 scale; var0 = 0; - group = gMain.fieldSpriteGroups[50]; + group = gMain.fieldSpriteGroups[FIELD_SG_50]; if (group->active) { group->baseX = 202; @@ -276,7 +276,7 @@ void DrawSpoinkSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = gMain.fieldSpriteGroups[44]; + group = gMain.fieldSpriteGroups[FIELD_SG_44]; if (group->active) { if (gCurrentPinballGame->spoinkAnimFrameIx == 0) @@ -323,12 +323,12 @@ void RunEvolutionCutscene(void) gCurrentPinballGame->activePortraitType = 16; DmaCopy16(3, gBoardActionTilesGfx, (void *)0x06015800, 0x2400); DmaCopy16(3, gBoardActionObjPal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[24]->active = TRUE; - gMain.fieldSpriteGroups[25]->active = TRUE; - gMain.fieldSpriteGroups[26]->active = TRUE; - gMain.fieldSpriteGroups[27]->active = TRUE; - gMain.fieldSpriteGroups[28]->active = TRUE; - gMain.fieldSpriteGroups[15]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_LARGE_BOTTOM]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_LARGE_TOP]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_MEDIUM_LOWER]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_MEDIUM_UPPER]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_SMALL_MIDDLE]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_LIGHTNING]->active = TRUE; } if (gCurrentPinballGame->scrollEffectY < 236) @@ -406,7 +406,7 @@ void RunEvolutionCutscene(void) if (gCurrentPinballGame->stageTimer > 10) { - group = gMain.fieldSpriteGroups[24]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_LARGE_BOTTOM]; var0 = -120 + gCurrentPinballGame->stageTimer; if (var0 >= 22) sp0[0] = ((var0 - 22) % 102) * 3 - 160; @@ -458,7 +458,7 @@ void RunEvolutionCutscene(void) else sp0[3] = -161; - group = gMain.fieldSpriteGroups[25]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_LARGE_TOP]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 308 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 4; i++) @@ -468,7 +468,7 @@ void RunEvolutionCutscene(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[26]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_MEDIUM_LOWER]; var0 = -100 + gCurrentPinballGame->stageTimer; if (var0 >= 0) sp0[0] = (var0 % 152) * 2 - 160; @@ -499,7 +499,7 @@ void RunEvolutionCutscene(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[27]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_MEDIUM_UPPER]; var0 = -80 + gCurrentPinballGame->stageTimer; if (var0 >= 0) sp0[0] = (var0 % 152) * 2 - 160; @@ -571,7 +571,7 @@ void RunEvolutionCutscene(void) else sp0[7] = -128; - group = gMain.fieldSpriteGroups[28]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_SMALL_MIDDLE]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 308 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 8; i++) @@ -581,7 +581,7 @@ void RunEvolutionCutscene(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = gMain.fieldSpriteGroups[15]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_LIGHTNING]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 308 - gCurrentPinballGame->cameraYOffset; var0 = -120 + gCurrentPinballGame->stageTimer; @@ -620,12 +620,12 @@ void RunEvolutionCutscene(void) if (gCurrentPinballGame->stageTimer == 360) { - gMain.fieldSpriteGroups[24]->active = FALSE; - gMain.fieldSpriteGroups[25]->active = FALSE; - gMain.fieldSpriteGroups[26]->active = FALSE; - gMain.fieldSpriteGroups[27]->active = FALSE; - gMain.fieldSpriteGroups[28]->active = FALSE; - gMain.fieldSpriteGroups[15]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_LARGE_BOTTOM]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_LARGE_TOP]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_MEDIUM_LOWER]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_MEDIUM_UPPER]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_TEXT_SMALL_MIDDLE]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVOLUTION_LIGHTNING]->active = FALSE; gCurrentPinballGame->currentSpecies = gCurrentPinballGame->postEvoSpecies; LoadPortraitGraphics(PORTRAIT_STATE_POKEMON_DISPLAY, PORTRAIT_MAIN_SLOT); gCurrentPinballGame->activePortraitType = 17; @@ -654,7 +654,7 @@ void RunEvolutionCutscene(void) { gCurrentPinballGame->revealAnimFrameCounter = 0; gCurrentPinballGame->revealFramesetIndex = 0; - gMain.fieldSpriteGroups[37]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_37]->active = TRUE; } } else @@ -670,7 +670,7 @@ void RunEvolutionCutscene(void) gCurrentPinballGame->revealFramesetIndex++; if (gCurrentPinballGame->revealFramesetIndex > 10) { - gMain.fieldSpriteGroups[37]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_37]->active = FALSE; gCurrentPinballGame->revealFramesetIndex = 10; gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState++; @@ -680,7 +680,7 @@ void RunEvolutionCutscene(void) } index = gCurrentPinballGame->revealFramesetIndex; - group = gMain.fieldSpriteGroups[37]; + group = gMain.fieldSpriteGroups[FIELD_SG_37]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -712,7 +712,7 @@ void RunTravelEventCutscene(void) index = 0; if (gCurrentPinballGame->stageTimer == 0) { - gMain.fieldSpriteGroups[16]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_TRAVEL_PAINTER]->active = TRUE; gCurrentPinballGame->travelPainterPosX = 1400; gCurrentPinballGame->travelPainterPosY = -600; gCurrentPinballGame->activePortraitType = 21; @@ -838,7 +838,7 @@ void RunTravelEventCutscene(void) } index = gTravelEventAnimData[gCurrentPinballGame->travelAnimKeyframeIndex][0]; - group = gMain.fieldSpriteGroups[16]; + group = gMain.fieldSpriteGroups[FIELD_SG_TRAVEL_PAINTER]; group->baseX = gCurrentPinballGame->travelPainterPosX / 10 + 96u - gCurrentPinballGame->cameraXOffset; group->baseY = gCurrentPinballGame->travelPainterPosY / 10 + 300u - gCurrentPinballGame->cameraYOffset; @@ -856,7 +856,7 @@ void RunTravelEventCutscene(void) if (gCurrentPinballGame->stageTimer == 489) { - gMain.fieldSpriteGroups[16]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_TRAVEL_PAINTER]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } } diff --git a/src/main_board_pichu_entity.c b/src/main_board_pichu_entity.c index 905ffc80..b3561ae9 100644 --- a/src/main_board_pichu_entity.c +++ b/src/main_board_pichu_entity.c @@ -209,7 +209,7 @@ void UpdateKickbackLogic(void) if (gCurrentPinballGame->kickbackLaunchTimer == 100) { - gMain.fieldSpriteGroups[38]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_38]->active = TRUE; if (gCurrentPinballGame->outLanePikaPosition == 2 && gCurrentPinballGame->outLaneSide == 2) { @@ -240,7 +240,7 @@ void UpdateKickbackLogic(void) { gCurrentPinballGame->kickbackFrameId = 25; gCurrentPinballGame->kickbackFiring = 0; - gMain.fieldSpriteGroups[38]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_38]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; @@ -264,7 +264,7 @@ void UpdateKickbackLogic(void) oamIx = gCatchOverlayAnimData[gCurrentPinballGame->kickbackFrameId][0]; outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; - spriteGroup = gMain.fieldSpriteGroups[38]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_38]; spriteGroup->baseX = (outlaneChuteIx * 177) - (gCurrentPinballGame->cameraXOffset - 16); if (gCurrentPinballGame->kickbackFiring) { @@ -290,13 +290,13 @@ void UpdateKickbackLogic(void) } } } - spriteGroup = gMain.fieldSpriteGroups[29]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_29]; if (spriteGroup->active) { for (outlaneChuteIx = 0; outlaneChuteIx <= 1; outlaneChuteIx++) { - spriteGroup = gMain.fieldSpriteGroups[29 + outlaneChuteIx]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_29 + outlaneChuteIx]; spriteGroup->baseX = (outlaneChuteIx * 177) - (gCurrentPinballGame->cameraXOffset - 16); if (gCurrentPinballGame->kickbackOccupied[outlaneChuteIx]) { @@ -334,7 +334,7 @@ void PichuArrivalSequence(void) int squaredMagnitude; s16 index; - group = gMain.fieldSpriteGroups[41]; + group = gMain.fieldSpriteGroups[FIELD_SG_41]; if (gCurrentPinballGame->pichuEntranceTimer == 0) return; @@ -404,14 +404,14 @@ void PichuArrivalSequence(void) { DmaCopy16(3, gPikachuSaverTilesGfx, (void *)0x06010600, 0x180); gCurrentPinballGame->outLanePikaPosition = 2; - gMain.fieldSpriteGroups[41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; m4aSongNumStart(SE_PICHU_IN_POSITION_CHIRP); } } else if (gCurrentPinballGame->creatureWaypointIndex == 7) { - gMain.fieldSpriteGroups[41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; } } diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index c9774b81..8751c86b 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -155,7 +155,7 @@ void UpdateCatchTrigger(void) break; case BONUS_HOLE_SUBSTATE_START_CLOSING: AnimateBonusTrapSprite(); - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->boardSubState++; break; case BONUS_HOLE_SUBSTATE_BOARD_STATE_CLEANUP: @@ -359,7 +359,7 @@ void UpdateBonusStageSelect(void) break; case BOSS_HOLE_SUBSTATE_CANCEL_BONUS: AnimateBonusTrapSprite(); - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->boardSubState++; gCurrentPinballGame->stageTimer = 0; break; @@ -376,7 +376,7 @@ void UpdateBonusStageSelect(void) void ShowBonusTrapSprite(void) { DmaCopy16(3, gMainStageBonusTrap_Gfx[0], (void *)0x060113C0, 0x300); - gMain.fieldSpriteGroups[13]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = TRUE; gCurrentPinballGame->bonusTrapEnabled = 1; } @@ -386,7 +386,7 @@ void AnimateBonusTrapSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[13]; + group = gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]; gCurrentPinballGame->bonusTrapAnimFrame = (gCurrentPinballGame->globalAnimFrameCounter % 35) / 7; if (group->active) { @@ -425,7 +425,7 @@ void ProcessChargeIndicator(void) s16 chargeLevelIx; s16 sp0[3]; - group = gMain.fieldSpriteGroups[17]; + group = gMain.fieldSpriteGroups[FIELD_SG_CHARGE_INDICATOR_DEVICE]; memset(sp0, 0, sizeof(sp0)); if (gCurrentPinballGame->chargeFillValue != gCurrentPinballGame->prevChargeFillValue) { @@ -741,7 +741,7 @@ void AnimateCoinReward(void) int var1; s16 var2; - group = gMain.fieldSpriteGroups[39]; + group = gMain.fieldSpriteGroups[FIELD_SG_39]; if (gCurrentPinballGame->coinRewardTimer < ((gCurrentPinballGame->coinRewardAmount - 1) * 9) + 19) { if (gCurrentPinballGame->coinRewardTimer == 0) @@ -834,7 +834,7 @@ void AnimateCoinReward(void) gCurrentPinballGame->coinRewardTimer++; if (gCurrentPinballGame->coinRewardTimer == ((gCurrentPinballGame->coinRewardAmount - 1) * 9) + 19) { - gMain.fieldSpriteGroups[39]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_39]->active = FALSE; gCurrentPinballGame->coinRewardAmount = 0; if (gCurrentPinballGame->ballCatchState == TRAP_CENTER_HOLE) gCurrentPinballGame->outcomeFrameCounter = 170; @@ -1467,7 +1467,7 @@ void UpdateHatchCave(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 2; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->eggCaveLiftTimer = 48; } @@ -1633,13 +1633,13 @@ void UpdateEggMode(void) int xx, yy; int squaredMagnitude; - group = gMain.fieldSpriteGroups[41]; + group = gMain.fieldSpriteGroups[FIELD_SG_41]; priority = 1; switch (gCurrentPinballGame->boardSubState) { case EGG_HATCH_SUBSTATE_INIT: gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; - gMain.fieldSpriteGroups[41]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = TRUE; gCurrentPinballGame->boardSubState++; break; case EGG_HATCH_SUBSTATE_SETUP_WANDERING: @@ -1978,7 +1978,7 @@ void UpdateEggMode(void) DmaCopy16(3, gCatchAnimTileBuffer, (void *)0x060112A0, 0x120); if (gCurrentPinballGame->captureSequenceTimer == 23) - gMain.fieldSpriteGroups[41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; } break; case EGG_HATCH_SUBSTATE_CLEANUP_MON_SPRITES: @@ -1993,7 +1993,7 @@ void UpdateEggMode(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } } - gMain.fieldSpriteGroups[41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; gCurrentPinballGame->boardSubState++; break; case EGG_HATCH_SUBSTATE_BOARD_STATE_CLEANUP: diff --git a/src/main_board_travel_mode.c b/src/main_board_travel_mode.c index b16f85c5..c2ff2901 100644 --- a/src/main_board_travel_mode.c +++ b/src/main_board_travel_mode.c @@ -21,7 +21,7 @@ void CleanupTravelModeState(void) gCurrentPinballGame->seedotExitSequenceTimer = 0; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_MAIN_SLOT); gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BOARD_CENTER; - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->bonusTrapEnabled = 0; gCurrentPinballGame->prevTravelArrowTiles[0] = gCurrentPinballGame->travelArrowTiles[0] = 0; @@ -205,7 +205,7 @@ void UpdateTravelMode(void) break; case TRAVEL_SUBSTATE_BOARD_STATE_CLEANUP: AnimateBonusTrapSprite(); - gMain.fieldSpriteGroups[13]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; CleanupTravelModeState(); gCurrentPinballGame->boardSubState++; break; diff --git a/src/options.c b/src/options.c index 33b63ced..c810467c 100644 --- a/src/options.c +++ b/src/options.c @@ -1632,16 +1632,16 @@ void SetButtonConfigInputs(s8 buttonConfigType) switch (buttonConfigType) { case BUTTON_CONFIG_RESET: - gMain.buttonConfigs[0][0] = gButtonInfoTable[5][0]; - gMain.buttonConfigs[0][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[1][0] = gButtonInfoTable[0][0]; - gMain.buttonConfigs[1][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[2][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[2][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[3][0] = gButtonInfoTable[8][0]; - gMain.buttonConfigs[3][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[4][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[4][1] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][0] = gButtonInfoTable[5][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][0] = gButtonInfoTable[0][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][0] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][1] = gButtonInfoTable[8][0]; gMain_saveData.customButtonConfig[PINBALL_INPUT_LEFT_FLIPPER][0] = gButtonInfoTable[1][0]; gMain_saveData.customButtonConfig[PINBALL_INPUT_LEFT_FLIPPER][1] = gButtonInfoTable[10][0]; gMain_saveData.customButtonConfig[PINBALL_INPUT_RIGHT_FLIPPER][0] = gButtonInfoTable[0][0]; @@ -1656,64 +1656,74 @@ void SetButtonConfigInputs(s8 buttonConfigType) gCustomButtonConfigTileIds[i] = gDefaultCustomButtonConfigTileIds[i]; break; case BUTTON_CONFIG_TYPE_A: - gMain.buttonConfigs[0][0] = gButtonInfoTable[5][0]; - gMain.buttonConfigs[0][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[1][0] = gButtonInfoTable[0][0]; - gMain.buttonConfigs[1][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[2][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[2][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[3][0] = gButtonInfoTable[8][0]; - gMain.buttonConfigs[3][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[4][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[4][1] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][0] = gButtonInfoTable[5][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][0] = gButtonInfoTable[0][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][0] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][1] = gButtonInfoTable[8][0]; break; case BUTTON_CONFIG_TYPE_B: - gMain.buttonConfigs[0][0] = gButtonInfoTable[5][0]; - gMain.buttonConfigs[0][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[1][0] = gButtonInfoTable[0][0]; - gMain.buttonConfigs[1][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[2][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[2][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[3][0] = gButtonInfoTable[8][0]; - gMain.buttonConfigs[3][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[4][0] = gButtonInfoTable[1][0]; - gMain.buttonConfigs[4][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][0] = gButtonInfoTable[5][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][0] = gButtonInfoTable[0][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][0] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][0] = gButtonInfoTable[1][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][1] = gButtonInfoTable[10][0]; break; case BUTTON_CONFIG_TYPE_C: - gMain.buttonConfigs[0][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[0][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[1][0] = gButtonInfoTable[8][0]; - gMain.buttonConfigs[1][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[2][0] = gButtonInfoTable[5][0]; - gMain.buttonConfigs[2][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[3][0] = gButtonInfoTable[0][0]; - gMain.buttonConfigs[3][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[4][0] = gButtonInfoTable[5][0]; - gMain.buttonConfigs[4][1] = gButtonInfoTable[0][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][0] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][0] = gButtonInfoTable[5][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][0] = gButtonInfoTable[0][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][0] = gButtonInfoTable[5][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][1] = gButtonInfoTable[0][0]; break; case BUTTON_CONFIG_TYPE_D: - gMain.buttonConfigs[0][0] = gButtonInfoTable[9][0]; - gMain.buttonConfigs[0][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[1][0] = gButtonInfoTable[8][0]; - gMain.buttonConfigs[1][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[2][0] = gButtonInfoTable[5][0]; - gMain.buttonConfigs[2][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[3][0] = gButtonInfoTable[4][0]; - gMain.buttonConfigs[3][1] = gButtonInfoTable[10][0]; - gMain.buttonConfigs[4][0] = gButtonInfoTable[6][0]; - gMain.buttonConfigs[4][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][0] = gButtonInfoTable[9][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][0] = gButtonInfoTable[8][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][0] = gButtonInfoTable[5][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][0] = gButtonInfoTable[4][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][1] = gButtonInfoTable[10][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][0] = gButtonInfoTable[6][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][1] = gButtonInfoTable[10][0]; break; case BUTTON_CONFIG_TYPE_EDIT: - gMain.buttonConfigs[0][0] = gMain_saveData.customButtonConfig[PINBALL_INPUT_LEFT_FLIPPER][0]; - gMain.buttonConfigs[0][1] = gMain_saveData.customButtonConfig[PINBALL_INPUT_LEFT_FLIPPER][1]; - gMain.buttonConfigs[1][0] = gMain_saveData.customButtonConfig[PINBALL_INPUT_RIGHT_FLIPPER][0]; - gMain.buttonConfigs[1][1] = gMain_saveData.customButtonConfig[PINBALL_INPUT_RIGHT_FLIPPER][1]; - gMain.buttonConfigs[2][0] = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_LEFT][0]; - gMain.buttonConfigs[2][1] = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_LEFT][1]; - gMain.buttonConfigs[3][0] = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_RIGHT][0]; - gMain.buttonConfigs[3][1] = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_RIGHT][1]; - gMain.buttonConfigs[4][0] = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_UP][0]; - gMain.buttonConfigs[4][1] = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_UP][1]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][0] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_LEFT_FLIPPER][0]; + gMain.buttonConfigs[PINBALL_INPUT_LEFT_FLIPPER][1] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_LEFT_FLIPPER][1]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][0] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_RIGHT_FLIPPER][0]; + gMain.buttonConfigs[PINBALL_INPUT_RIGHT_FLIPPER][1] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_RIGHT_FLIPPER][1]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][0] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_LEFT][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_LEFT][1] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_LEFT][1]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][0] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_RIGHT][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_RIGHT][1] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_RIGHT][1]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][0] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_UP][0]; + gMain.buttonConfigs[PINBALL_INPUT_TILT_UP][1] + = gMain_saveData.customButtonConfig[PINBALL_INPUT_TILT_UP][1]; break; } } diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 147822bf..31507217 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -565,8 +565,8 @@ void UpdateRayquazaEntityLogic(void) // Catch Rayquaza gCurrentPinballGame->bossEntityState = RAYQUAZA_ENTITY_STATE_CAPTURE; gCurrentPinballGame->bossFramesetIndex = 0; - gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT].active = TRUE; + gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS].active = TRUE; gCurrentPinballGame->currentSpecies = SPECIES_RAYQUAZA; gCurrentPinballGame->bossAttackTimer = 0; gCurrentPinballGame->captureSequenceTimer = 0; @@ -947,7 +947,7 @@ void UpdateRayquazaMinionsAndEffects(void) sp0 = 0; //screen, used for catch mon display. - group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; if (group->active) { if (gCurrentPinballGame->portraitDisplayState == PORTRAIT_DISPLAY_MODE_BANNER) @@ -975,7 +975,7 @@ void UpdateRayquazaMinionsAndEffects(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT]; + group = &gMain.spriteGroups[SG_LEGENDARY_CATCH_PORTRAIT_BORDERS]; group->baseX = gCurrentPinballGame->rouletteBasePos.x - 8; group->baseY = gCurrentPinballGame->rouletteBasePos.y - 8; if (group->baseY >= 200) diff --git a/src/ruby_board_indicators.c b/src/ruby_board_indicators.c index d731788f..7192817c 100644 --- a/src/ruby_board_indicators.c +++ b/src/ruby_board_indicators.c @@ -383,7 +383,7 @@ void AnimateRubyBallPowerUpSequence(void) MPlayStart(&gMPlayInfo_SE1, &se_ball_upgrade); if (gCurrentPinballGame->ballShadowTimer == 60) - gMain.fieldSpriteGroups[43]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_43]->active = TRUE; gCurrentPinballGame->ballShadowTileIndex = gBallShadowTileIndices[30 - gCurrentPinballGame->ballShadowTimer / 2]; gCurrentPinballGame->ballShadowTimer--; diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index b07f66a3..81bb7906 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -199,7 +199,7 @@ void AnimateRubyShopDoor(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; m4aSongNumStart(SE_UNKNOWN_0xBD); } @@ -755,7 +755,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 4; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_LOTAD_CATCH_BURST; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; @@ -773,7 +773,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 4; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CHINCHOU_CATCH_BURST; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index a61b9304..56497e9b 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -384,7 +384,7 @@ void UpdateRubySideBumperAnimation(void) { gCurrentPinballGame->gulpinAnimFrameIndex = 24; gCurrentPinballGame->gulpinAnimFrameTimer = 0; - gCurrentPinballGame->seedotModeStartDelay = 1; + gCurrentPinballGame->travelModeStartDelay = 1; } } } @@ -456,17 +456,17 @@ void DrawRubySideBumperSprites(void) } } - if (gCurrentPinballGame->seedotModeStartDelay) + if (gCurrentPinballGame->travelModeStartDelay) { - gCurrentPinballGame->seedotModeStartDelay--; - if (gCurrentPinballGame->seedotModeStartDelay == 0) + gCurrentPinballGame->travelModeStartDelay--; + if (gCurrentPinballGame->travelModeStartDelay == 0) { if (gCurrentPinballGame->activePortraitType) - gCurrentPinballGame->seedotModeStartDelay = 1; + gCurrentPinballGame->travelModeStartDelay = 1; else gCurrentPinballGame->activePortraitType = 4; - if (gCurrentPinballGame->seedotModeStartDelay == 0) + if (gCurrentPinballGame->travelModeStartDelay == 0) { gMain.modeChangeFlags |= MODE_CHANGE_BANNER; gCurrentPinballGame->bannerDelayTimer = 70; @@ -475,7 +475,7 @@ void DrawRubySideBumperSprites(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_TRAVEL; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 120; gCurrentPinballGame->bannerSlidePosition = 0; diff --git a/src/sapphire_seedot_egg_shop.c b/src/sapphire_seedot_egg_shop.c index 9077c38d..e6fa0fc6 100644 --- a/src/sapphire_seedot_egg_shop.c +++ b/src/sapphire_seedot_egg_shop.c @@ -203,7 +203,7 @@ void UpdateSapphireSeedotCollection(void) gCurrentPinballGame->seedotCount++; gCurrentPinballGame->seedotDecayTimer = 1800; if (gCurrentPinballGame->seedotCount == 3) - gCurrentPinballGame->seedotModeStartDelay = 1; + gCurrentPinballGame->travelModeStartDelay = 1; } } else @@ -314,17 +314,17 @@ void UpdateSapphireSeedotCollection(void) gCurrentPinballGame->basketBounceTimer--; } - if (gCurrentPinballGame->seedotModeStartDelay) + if (gCurrentPinballGame->travelModeStartDelay) { - gCurrentPinballGame->seedotModeStartDelay--; - if (gCurrentPinballGame->seedotModeStartDelay == 0) + gCurrentPinballGame->travelModeStartDelay--; + if (gCurrentPinballGame->travelModeStartDelay == 0) { if (gCurrentPinballGame->activePortraitType) - gCurrentPinballGame->seedotModeStartDelay = 1; + gCurrentPinballGame->travelModeStartDelay = 1; else gCurrentPinballGame->activePortraitType = 4; - if (gCurrentPinballGame->seedotModeStartDelay == 0) + if (gCurrentPinballGame->travelModeStartDelay == 0) { gMain.modeChangeFlags |= MODE_CHANGE_BANNER; gCurrentPinballGame->bannerDelayTimer = 70; @@ -333,7 +333,7 @@ void UpdateSapphireSeedotCollection(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_TRAVEL; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->bannerDisplayDuration = 120; gCurrentPinballGame->bannerSlidePosition = 0; @@ -591,7 +591,7 @@ void UpdateSapphireEggMachine(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->sapphireHatchMachineState = 1; gCurrentPinballGame->holeAnimFrameCounter = 0; @@ -680,7 +680,7 @@ void UpdateSapphireEggMachine(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; - gCurrentPinballGame->bannerActive = 1; + gCurrentPinballGame->bannerActive = TRUE; gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->sapphireHatchMachineState = 5; gCurrentPinballGame->holeAnimFrameCounter = 0; From 1b3cb90a43816a9b8cfa8f8692f1c72121f99dde Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Fri, 29 May 2026 01:13:12 -0500 Subject: [PATCH 23/33] remaining field sprite groups --- data/rom_2.s | 140 +++++++++--------- include/constants/sprite_groups.h | 46 +++--- src/all_board_mode_change_and_debug_menu.c | 4 +- src/all_board_pinball_game_main.c | 2 +- src/all_board_process0_sprite_init.c | 6 +- src/all_board_process5.c | 14 +- src/all_board_process6_collision.c | 24 +-- src/all_board_process7.c | 4 +- src/groudon_process3.c | 12 +- src/kecleon_process3.c | 16 +- src/kyogre_process3.c | 14 +- ...ain_board_catch_normal_and_jirachi_modes.c | 30 ++-- src/main_board_catch_tile_logic.c | 20 +-- src/main_board_center_capture_hole.c | 2 +- src/main_board_charge_spinner.c | 2 +- src/main_board_evolution_mode.c | 24 +-- src/main_board_intro_mode.c | 6 +- src/main_board_launcher_and_cutscenes.c | 10 +- src/main_board_pichu_entity.c | 22 +-- src/main_board_to_be_split.c | 26 ++-- src/rayquaza_process3.c | 10 +- src/ruby_board_indicators.c | 2 +- src/ruby_process3_entities_2.c | 6 +- src/ruby_ramp.c | 8 +- src/sapphire_collision.c | 10 +- 25 files changed, 231 insertions(+), 229 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 5bdee93b..08941f06 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -5464,21 +5464,21 @@ gMainBoardBallSpriteSet:: @ 0x086B160C packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20, priority=0x0, paletteNum=0x1 .2byte 0 -gUnknown_086B1616:: @ 0x086B1616 +gPikachuKickbackSpriteSet:: @ 0x086B1616 .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x24, priority=0x2, paletteNum=0x3 .2byte 0 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x2c, priority=0x2, paletteNum=0x3 .2byte 0 -gUnknown_086B1628:: @ 0x086B1628 +gPichuKickbackSpriteSet:: @ 0x086B1628 .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x30, priority=0x2, paletteNum=0x3 .2byte 0 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x38, priority=0x2, paletteNum=0x3 .2byte 0 -gUnknown_086B163A:: @ 0x086B163A +gPikaChargingSpinnerSpriteSet:: @ 0x086B163A .2byte 4 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x16, tileNum=0x3c, priority=0x3, paletteNum=0x3 .2byte 0 @@ -5558,7 +5558,7 @@ gPortraitTrimSpriteSet:: @ 0x086B170C packed_sprite_oam x=0x20, y=0x10, objMode=ST_OAM_OBJ_BLEND, spriteSize=SPRITE_SIZE_16x16, tileNum=0x91, priority=0x3, paletteNum=0x0 .2byte 0 -gUnknown_086B173E:: @ 0x086B173E +gCatchMonEntitySpriteSet:: @ 0x086B173E .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x65, priority=0x1, paletteNum=0xd .2byte 0 @@ -5569,7 +5569,7 @@ gUnknown_086B173E:: @ 0x086B173E packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x85, priority=0x1, paletteNum=0xd .2byte 0 -gUnknown_086B1760:: @ 0x086B1760 +gHatchMonEntitySpriteSet:: @ 0x086B1760 .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x95, priority=0x1, paletteNum=0xd .2byte 0 @@ -5591,7 +5591,7 @@ gCenterHoleGravityFxSpriteSet:: @ 0x086B1782 packed_sprite_oam x=0x8, y=-0x20, spriteSize=SPRITE_SIZE_16x32, tileNum=0xae, priority=0x3, paletteNum=0x1 .2byte 0 -gUnknown_086B17A4:: @ 0x086B17A4 +gEvoItemSpriteSet:: @ 0x086B17A4 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xb6, priority=0x1, paletteNum=0xf .2byte 0 @@ -5637,7 +5637,7 @@ gMainBoardPauseBottomBorderSpriteSet:: @ 0x086B181A packed_sprite_oam x=0x20, y=-0x10, spriteSize=SPRITE_SIZE_32x8, vFlip=0x1, tileNum=0xd5, priority=0x0, paletteNum=0x9 .2byte 0 -gUnknown_086B1834:: @ 0x086B1834 +gCoinsCollectedSpriteSet:: @ 0x086B1834 .2byte 2 packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xdb, priority=0x0, paletteNum=0x3 .2byte 0 @@ -5651,12 +5651,12 @@ gUnknown_086B1846:: @ 0x086B1846 packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x32, tileNum=0xe7, priority=0x1, paletteNum=0xb .2byte 0 -gUnknown_086B1858:: @ 0x086B1858 +gBallUpgradeFxSpriteSet:: @ 0x086B1858 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0xf7, priority=0x3, paletteNum=0x1 .2byte 0 -gUnknown_086B1862:: @ 0x086B1862 +gSpoinkLauncherSpriteSet:: @ 0x086B1862 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x107, priority=0x1, paletteNum=0xb .2byte 0 @@ -5825,31 +5825,31 @@ gUnknown_086B1A3E:: @ 0x086B1A3E packed_sprite_oam x=-0x11, y=-0xF, spriteSize=SPRITE_SIZE_32x32, tileNum=0x25c, priority=0x0, paletteNum=0x3 .2byte 0 -gUnknown_086B1A48:: @ 0x086B1A48 +gJirachiStarTrailFx0SpriteSet:: @ 0x086B1A48 .2byte 3 packed_sprite_oam x=0x8, y=0x19, spriteSize=SPRITE_SIZE_8x8, tileNum=0x294, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x18, y=0x1E, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_8x8, tileNum=0x291, priority=0x1, paletteNum=0xd -gUnknown_086B1A5C:: @ 0x086B1A5C +gJirachiStarTrailFx1SpriteSet:: @ 0x086B1A5C .2byte 3 packed_sprite_oam x=0x8, y=0x1C, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x18, y=0x21, spriteSize=SPRITE_SIZE_8x8, tileNum=0x294, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x20, y=0x13, spriteSize=SPRITE_SIZE_8x8, tileNum=0x292, priority=0x1, paletteNum=0xd -gUnknown_086B1A70:: @ 0x086B1A70 +gJirachiStarTrailFx2SpriteSet:: @ 0x086B1A70 .2byte 3 packed_sprite_oam x=0x8, y=0x1F, spriteSize=SPRITE_SIZE_8x8, tileNum=0x292, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x18, y=0x24, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x20, y=0x16, spriteSize=SPRITE_SIZE_8x8, tileNum=0x293, priority=0x1, paletteNum=0xd -gUnknown_086B1A84:: @ 0x086B1A84 +gJirachiStarTrailFx3SpriteSet:: @ 0x086B1A84 .2byte 3 packed_sprite_oam x=0x8, y=0x22, spriteSize=SPRITE_SIZE_8x8, tileNum=0x291, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x18, y=0x27, spriteSize=SPRITE_SIZE_8x8, tileNum=0x292, priority=0x1, paletteNum=0xd packed_sprite_oam x=0x20, y=0x1A, spriteSize=SPRITE_SIZE_8x8, tileNum=0x294, priority=0x1, paletteNum=0xd -gUnknown_086B1A98:: @ 0x086B1A98 +gTreecko1UpDeliverySpriteSet:: @ 0x086B1A98 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x295, priority=0x0, paletteNum=0xc .2byte 0 @@ -6025,7 +6025,7 @@ gUnknown_086B1C3C:: @ 0x086B1C3C packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 -gUnknown_086B1C66:: @ 0x086B1C66 +gEvoItemSpawnFxSpriteSet:: @ 0x086B1C66 .2byte 5 packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 @@ -6038,7 +6038,7 @@ gUnknown_086B1C66:: @ 0x086B1C66 packed_sprite_oam x=-0x10, y=-0x10, spriteSize=SPRITE_SIZE_32x16, tileNum=0x2c0, priority=0x0, paletteNum=0xf .2byte 0 -gUnknown_086B1C90:: @ 0x086B1C90 +gInitialLocationSelectedFxSpriteSet:: @ 0x086B1C90 .2byte 9 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0xe .2byte 0 @@ -6089,7 +6089,7 @@ gMainTileBreakSpriteSet:: @ 0x086B1D0C packed_sprite_oam x=-0x4, y=-0x4, spriteSize=SPRITE_SIZE_16x32, tileNum=0x324, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B1D3E:: @ 0x086B1D3E +gCatchBurstLightningStrikeSpriteSet:: @ 0x086B1D3E .2byte 6 packed_sprite_oam x=0x0, y=-0x18, spriteSize=SPRITE_SIZE_16x32, tileNum=0x2c8, priority=0x0, paletteNum=0xe .2byte 0 @@ -6104,7 +6104,7 @@ gUnknown_086B1D3E:: @ 0x086B1D3E packed_sprite_oam x=-0x20, y=0x30, spriteSize=SPRITE_SIZE_8x32, tileNum=0x2f0, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B1D70:: @ 0x086B1D70 +gCatchBurstTileFlashFxSpriteSet:: @ 0x086B1D70 .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x4, priority=0x0, paletteNum=0x0 .2byte 0 @@ -6119,7 +6119,7 @@ gUnknown_086B1D70:: @ 0x086B1D70 packed_sprite_oam x=0x20, y=0x10, spriteSize=SPRITE_SIZE_16x16, tileNum=0x0, priority=0x0, paletteNum=0x0 .2byte 0 -gUnknown_086B1DA2:: @ 0x086B1DA2 +gCatchBurstPanelElectrifyFxSpriteSet:: @ 0x086B1DA2 .2byte 4 packed_sprite_oam x=0x9, y=-0x8, spriteSize=SPRITE_SIZE_32x32, tileNum=0x34, priority=0x0, paletteNum=0x0 .2byte 0 @@ -6220,7 +6220,7 @@ gMainTravelBanner_SignpostSpriteSet:: @ 0x086B1ECA packed_sprite_oam x=0x20, y=0x40, spriteSize=SPRITE_SIZE_16x8, tileNum=0x3ed, priority=0x0, paletteNum=0xe .2byte 0 -gUnknown_086B1F04:: @ 0x086B1F04 +gPikaKickbackLaunchFxSpriteSet:: @ 0x086B1F04 .2byte 4 packed_sprite_oam x=0x3, y=-0x8, spriteSize=SPRITE_SIZE_16x8, tileNum=0x304, priority=0x2, paletteNum=0x3 .2byte 0 @@ -6427,7 +6427,7 @@ gMainEndOfBallBonusTextLine2SpriteSet:: @ 0x086B2178 packed_sprite_oam x=0x40, y=0x0, spriteSize=SPRITE_SIZE_32x8, tileNum=0x3dc, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B21A2:: @ 0x086B21A2 +gGameOverTextSpriteSet:: @ 0x086B21A2 .2byte 8 packed_sprite_oam x=-0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2c0, priority=0x1, paletteNum=0xe .2byte 0 @@ -6591,7 +6591,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gMainEndOfBallBonusTextLine1SpriteSet .4byte gMainEndOfBallBonusTextLine2SpriteSet .4byte gMainEndOfBallBonusBannerSpriteSet -.4byte gMainLeftFlipperSpriteSet @ 10 +.4byte gMainLeftFlipperSpriteSet @ 10 .4byte gMainRightFlipperSpriteSet .4byte gRubyAerodactylEggDeliverySpriteSet .4byte gRubyChikoritaProjectileSpriteSet @@ -6601,7 +6601,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gMainShopArrowsSpriteSet .4byte gMainShopPriceSpriteSet .4byte gMainShopConfirmationPanelSpriteSet -.4byte gMainShopPortraitOverlaySpriteSet @ 20 +.4byte gMainShopPortraitOverlaySpriteSet @ 20 .4byte gMainTravelBanner_SignpostSpriteSet .4byte gMainModeStartBannerSpriteSet .4byte gMainTileBreakSpriteSet @@ -6611,7 +6611,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gTravelPainterSpriteSet .4byte gChargeIndicatorDeviceSpriteSet .4byte gUnknown_086B1CDA -.4byte gPortraitBordersSpriteSet @ 30 +.4byte gPortraitBordersSpriteSet @ 30 .4byte gPortraitTrimSpriteSet .4byte gPortraitTrimSpriteSet .4byte gPortraitSpriteSet @@ -6621,50 +6621,50 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gEvolutionBannerTextMediumLowerSpriteSet .4byte gEvolutionBannerTextMediumUpperSpriteSet .4byte gEvolutionBannerTextSmallMiddleSpriteSet -.4byte gMainBoardBallSpriteSet @ 40 +.4byte gMainBoardBallSpriteSet @ 40 .4byte gMonCatchBallTrailSpriteSet .4byte gMonCatchBallTrailSpriteSet -.4byte gUnknown_086B173E -.4byte gUnknown_086B1A48 -.4byte gUnknown_086B1A5C -.4byte gUnknown_086B1A70 -.4byte gUnknown_086B1A84 +.4byte gCatchMonEntitySpriteSet +.4byte gJirachiStarTrailFx0SpriteSet +.4byte gJirachiStarTrailFx1SpriteSet +.4byte gJirachiStarTrailFx2SpriteSet +.4byte gJirachiStarTrailFx3SpriteSet .4byte gUnknown_086B1846 -.4byte gUnknown_086B1760 -.4byte gMonCatchBallAbsorbPokemonFxSpriteSet @ 50 +.4byte gHatchMonEntitySpriteSet +.4byte gMonCatchBallAbsorbPokemonFxSpriteSet @ 50 .4byte gUnknown_086B1942 .4byte gUnknown_086B187C .4byte gUnknown_086B189E -.4byte gUnknown_086B1616 -.4byte gUnknown_086B1628 -.4byte gUnknown_086B1862 +.4byte gPikachuKickbackSpriteSet +.4byte gPichuKickbackSpriteSet +.4byte gSpoinkLauncherSpriteSet .4byte gUnknown_086B196E .4byte gUnknown_086B1954 .4byte gUnknown_086B18B0 -.4byte gUnknown_086B18CA @ 60 +.4byte gUnknown_086B18CA @ 60 .4byte gUnknown_086B18E4 .4byte gUnknown_086B18FE .4byte gUnknown_086B1A12 -.4byte gUnknown_086B163A +.4byte gPikaChargingSpinnerSpriteSet .4byte gUnknown_086B1930 .4byte gUnknown_086B1A34 -.4byte gUnknown_086B17A4 +.4byte gEvoItemSpriteSet .4byte gUnknown_086B1A3E -.4byte gUnknown_086B1858 -.4byte gMainBoardBallSpriteSet @ 70 +.4byte gBallUpgradeFxSpriteSet +.4byte gMainBoardBallSpriteSet @ 70 .4byte gUnknown_086B19D6 -.4byte gUnknown_086B1C90 -.4byte gUnknown_086B1D3E -.4byte gUnknown_086B1D70 -.4byte gUnknown_086B1DA2 -.4byte gUnknown_086B1F04 -.4byte gUnknown_086B1834 +.4byte gInitialLocationSelectedFxSpriteSet +.4byte gCatchBurstLightningStrikeSpriteSet +.4byte gCatchBurstTileFlashFxSpriteSet +.4byte gCatchBurstPanelElectrifyFxSpriteSet +.4byte gPikaKickbackLaunchFxSpriteSet +.4byte gCoinsCollectedSpriteSet .4byte gUnknown_086B19A0 -.4byte gUnknown_086B1C66 -.4byte gUnknown_086B21A2 @ 80 +.4byte gEvoItemSpawnFxSpriteSet +.4byte gGameOverTextSpriteSet @ 80 .4byte gUnknown_086B19E8 .4byte gUnknown_086B235E -.4byte gUnknown_086B1A98 +.4byte gTreecko1UpDeliverySpriteSet gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gMainBoardPausePanelSpriteSet @@ -6709,22 +6709,22 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gMonCatchBallTrailSpriteSet .4byte gMonCatchBallTrailSpriteSet @40 .4byte gMainBoardBallSpriteSet -.4byte gUnknown_086B173E -.4byte gUnknown_086B1A48 -.4byte gUnknown_086B1A5C -.4byte gUnknown_086B1A70 -.4byte gUnknown_086B1A84 +.4byte gCatchMonEntitySpriteSet +.4byte gJirachiStarTrailFx0SpriteSet +.4byte gJirachiStarTrailFx1SpriteSet +.4byte gJirachiStarTrailFx2SpriteSet +.4byte gJirachiStarTrailFx3SpriteSet .4byte gUnknown_086B1B90 .4byte gUnknown_086B1BAA .4byte gUnknown_086B1BC4 .4byte gUnknown_086B1BDE @ 50 .4byte gUnknown_086B1BF8 .4byte gUnknown_086B1846 -.4byte gUnknown_086B1760 +.4byte gHatchMonEntitySpriteSet .4byte gMonCatchBallAbsorbPokemonFxSpriteSet -.4byte gUnknown_086B1616 -.4byte gUnknown_086B1628 -.4byte gUnknown_086B1862 +.4byte gPikachuKickbackSpriteSet +.4byte gPichuKickbackSpriteSet +.4byte gSpoinkLauncherSpriteSet .4byte gUnknown_086B1C0C .4byte gUnknown_086B1C16 .4byte gUnknown_086B1AB2 @ 60 @@ -6738,22 +6738,22 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1B50 .4byte gUnknown_086B1C20 .4byte gUnknown_086B1C32 @ 70 -.4byte gUnknown_086B17A4 -.4byte gUnknown_086B163A -.4byte gUnknown_086B1858 +.4byte gEvoItemSpriteSet +.4byte gPikaChargingSpinnerSpriteSet +.4byte gBallUpgradeFxSpriteSet .4byte gMainBoardBallSpriteSet .4byte gUnknown_086B1AD4 .4byte gUnknown_086B1C02 -.4byte gUnknown_086B1C90 -.4byte gUnknown_086B1D3E -.4byte gUnknown_086B1D70 -.4byte gUnknown_086B1DA2 @ 80 -.4byte gUnknown_086B1F04 -.4byte gUnknown_086B1834 -.4byte gUnknown_086B1C66 -.4byte gUnknown_086B21A2 +.4byte gInitialLocationSelectedFxSpriteSet +.4byte gCatchBurstLightningStrikeSpriteSet +.4byte gCatchBurstTileFlashFxSpriteSet +.4byte gCatchBurstPanelElectrifyFxSpriteSet @ 80 +.4byte gPikaKickbackLaunchFxSpriteSet +.4byte gCoinsCollectedSpriteSet +.4byte gEvoItemSpawnFxSpriteSet +.4byte gGameOverTextSpriteSet .4byte gUnknown_086B1C3C -.4byte gUnknown_086B1A98 +.4byte gTreecko1UpDeliverySpriteSet gJirachiFloatOamFramesets:: @ 0x086B263C diff --git a/include/constants/sprite_groups.h b/include/constants/sprite_groups.h index c8d0af1a..57d45a5e 100644 --- a/include/constants/sprite_groups.h +++ b/include/constants/sprite_groups.h @@ -60,6 +60,7 @@ #define SG_RUBY_SHOP_PORTRAIT_OVERLAY 20 #define SG_RUBY_TARVEL_BANNER_SIGNPOST 21 #define SG_RUBY_MODE_START_BANNER 22 +#define SG_RUBY_RAMP_PRIZE 66 // Sapphire board // 0-11 shared @@ -331,7 +332,7 @@ #define SG_63 63 #define SG_64 64 #define SG_65 65 -#define SG_66 66 +#define SG_RUBY_RAMP_PRIZE 66 #define SG_67 67 #define SG_68 68 #define SG_69 69 @@ -406,28 +407,29 @@ #define FIELD_SG_EVOLUTION_TEXT_MEDIUM_LOWER 26 #define FIELD_SG_EVOLUTION_TEXT_MEDIUM_UPPER 27 #define FIELD_SG_EVOLUTION_TEXT_SMALL_MIDDLE 28 -#define FIELD_SG_29 29 -#define FIELD_SG_30 30 -#define FIELD_SG_31 31 -#define FIELD_SG_32 32 -#define FIELD_SG_33 33 -#define FIELD_SG_34 34 -#define FIELD_SG_35 35 -#define FIELD_SG_36 36 -#define FIELD_SG_37 37 -#define FIELD_SG_38 38 -#define FIELD_SG_39 39 -#define FIELD_SG_40 40 -#define FIELD_SG_41 41 -#define FIELD_SG_42 42 -#define FIELD_SG_43 43 -#define FIELD_SG_44 44 -#define FIELD_SG_45 45 -#define FIELD_SG_46 46 -#define FIELD_SG_47 47 -#define FIELD_SG_48 48 +#define FIELD_SG_PIKACHU_KICKBACK 29 +#define FIELD_SG_PICHU_KICKBACK 30 +#define FIELD_SG_PIKA_CHARGING_SPINNER 31 +#define FIELD_SG_EVO_ITEM 32 +#define FIELD_SG_CATCH_MON_ENTITY 33 +#define FIELD_SG_INITIAL_LOCATION_SELECTED_FX 34 +#define FIELD_SG_CATCH_BURST_LIGHTNING_STRIKE 35 +#define FIELD_SG_CATCH_BURST_TILE_FLASH_FX 36 +#define FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX 37 +#define FIELD_SG_PIKA_KICKBACK_LAUNCH_FX 38 +#define FIELD_SG_COIN_COLLECTED 39 +#define FIELD_SG_EVO_ITEM_SPAWN_FX 40 +#define FIELD_SG_HATCH_MON_ENTITY 41 // Also used for Pichu Ramp Entry +#define FIELD_SG_GAME_OVER_TEXT 42 +#define FIELD_SG_BALL_UPGRADE_FX 43 +#define FIELD_SG_SPOINK_LAUNCHER 44 +#define FIELD_SG_JIRACHI_STAR_TRAIL_FX_BASE 45 // Of 4 +#define FIELD_SG_JIRACHI_STAR_TRAIL_FX0 45 +#define FIELD_SG_JIRACHI_STAR_TRAIL_FX1 46 +#define FIELD_SG_JIRACHI_STAR_TRAIL_FX2 47 +#define FIELD_SG_JIRACHI_STAR_TRAIL_FX3 48 #define FIELD_SG_MAIN_BOARD_BALL_OVERRIDE 49 -#define FIELD_SG_50 50 +#define FIELD_SG_TREECKO_1UP_DELIVERY 50 // bonus/legendary boards //0,3-5 shared diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index c1eff6f7..240da5c3 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -127,7 +127,7 @@ void GameOverAnimation(void) struct OamDataSimple *oamSimple; u16 var0; - group = gMain.fieldSpriteGroups[FIELD_SG_42]; + group = gMain.fieldSpriteGroups[FIELD_SG_GAME_OVER_TEXT]; if (group->active) { group->baseX = 63; @@ -155,7 +155,7 @@ void GameOverAnimation(void) if (gMain.animationTimer == 3600) { DmaCopy16(3, gMainBoardGameOverText_Gfx, (void *)0x06015800, 0x400); - gMain.fieldSpriteGroups[FIELD_SG_42]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_GAME_OVER_TEXT]->active = TRUE; for (i = 0; i < 8; i++) { gGameOverLetterYOffsets[i] = 0xE0C0; diff --git a/src/all_board_pinball_game_main.c b/src/all_board_pinball_game_main.c index 0be0d341..6a82945b 100644 --- a/src/all_board_pinball_game_main.c +++ b/src/all_board_pinball_game_main.c @@ -287,7 +287,7 @@ void InitPinballGameState(void) gCurrentPinballGame->fullChargeIndicatorBlinkTimer = 60; DmaCopy16(3, gDxModePikachuObjTiles, (void *)OBJ_VRAM0 + 0x600, 0x180); gCurrentPinballGame->outLanePikaPosition = 2; - gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; gCurrentPinballGame->ballUpgradeType = BALL_UPGRADE_TYPE_MASTER_BALL; gCurrentPinballGame->ballUpgradeCounter = 60 * 60; diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 0218866a..465d5f0a 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -20,7 +20,7 @@ void RubyBoardProcess_0A_50848(void) gMain.spriteGroups[SG_81].active = TRUE; gMain.spriteGroups[SG_65].active = TRUE; gMain.spriteGroups[SG_71].active = TRUE; - gMain.spriteGroups[SG_66].active = TRUE; + gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; gMain.spriteGroups[SG_51].active = TRUE; gMain.spriteGroups[SG_61].active = TRUE; group->active = TRUE; @@ -48,7 +48,7 @@ void RubyBoardProcess_0B_50918(void) { gMain.spriteGroups[SG_65].active = TRUE; gMain.spriteGroups[SG_71].active = TRUE; - gMain.spriteGroups[SG_66].active = TRUE; + gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 168) @@ -171,7 +171,7 @@ void SapphireBoardProcess_0B_50B80(void) gMain.spriteGroups[SG_64].active = TRUE; gMain.spriteGroups[SG_68].active = TRUE; gMain.spriteGroups[SG_65].active = TRUE; - gMain.spriteGroups[SG_66].active = TRUE; + gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; gMain.spriteGroups[SG_67].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) diff --git a/src/all_board_process5.c b/src/all_board_process5.c index e9ba6ba4..46488787 100644 --- a/src/all_board_process5.c +++ b/src/all_board_process5.c @@ -62,7 +62,7 @@ extern const u16 gGravityDeltas_Light[4]; #define UPDATE_BALL_POSITION(max_speed, angle) \ { \ maxSpeed = (max_speed); \ - if (squaredMagnitude > maxSpeed * maxSpeed) \ + if (squaredSpeed > maxSpeed * maxSpeed) \ { \ velocity.x = (maxSpeed * Cos((angle))) / 20000; \ velocity.y = (-maxSpeed * Sin((angle))) / 20000; \ @@ -81,7 +81,7 @@ void MainBoardProcess_5B_11C98(void) struct Vector16 velocity; struct BallState *currentBall; int xx, yy; - int squaredMagnitude; + int squaredSpeed; int maxSpeed; currentBall = gCurrentPinballGame->ball; @@ -108,7 +108,7 @@ void MainBoardProcess_5B_11C98(void) angle = ArcTan2(currentBall->velocity.x, -currentBall->velocity.y); xx = currentBall->velocity.x * currentBall->velocity.x; yy = currentBall->velocity.y * currentBall->velocity.y; - squaredMagnitude = xx + yy; + squaredSpeed = xx + yy; if (currentBall->positionQ0.y < 380) { @@ -138,7 +138,7 @@ void MainBoardProcess_5B_11C98(void) angle = ArcTan2(currentBall->velocity.x, -currentBall->velocity.y); xx = currentBall->velocity.x * currentBall->velocity.x; yy = currentBall->velocity.y * currentBall->velocity.y; - squaredMagnitude = xx + yy; + squaredSpeed = xx + yy; if (currentBall->positionQ0.y < 380) { @@ -167,7 +167,7 @@ void BonusBoardProcess_5B_11F88(void) struct Vector16 velocity; struct BallState *currentBall; int xx, yy; - int squaredMagnitude; + int squaredSpeed; int maxSpeed; currentBall = gCurrentPinballGame->ball; @@ -192,7 +192,7 @@ void BonusBoardProcess_5B_11F88(void) angle = ArcTan2(currentBall->velocity.x, -currentBall->velocity.y); xx = currentBall->velocity.x * currentBall->velocity.x; yy = currentBall->velocity.y * currentBall->velocity.y; - squaredMagnitude = xx + yy; + squaredSpeed = xx + yy; if (gMain.selectedField < FIELD_BOSS_START) { @@ -234,7 +234,7 @@ void BonusBoardProcess_5B_11F88(void) angle = ArcTan2(currentBall->velocity.x, -currentBall->velocity.y); xx = currentBall->velocity.x * currentBall->velocity.x; yy = currentBall->velocity.y * currentBall->velocity.y; - squaredMagnitude = xx + yy; + squaredSpeed = xx + yy; if (gMain.selectedField < FIELD_BOSS_START) { diff --git a/src/all_board_process6_collision.c b/src/all_board_process6_collision.c index 4890eb60..25edab05 100644 --- a/src/all_board_process6_collision.c +++ b/src/all_board_process6_collision.c @@ -484,7 +484,7 @@ void ComputeWallReflection(u16 arg0, struct Vector16 *arg1, struct Vector16 *arg void ApplyBounceBackForce(u16 arg0, struct Vector32 *arg1, u16 arg2) { const u16 VECTORSCALEDOWN = 20000; - s32 vMagSquared; + s32 squaredSpeed; s16 x, y; s16 var0; @@ -492,7 +492,7 @@ void ApplyBounceBackForce(u16 arg0, struct Vector32 *arg1, u16 arg2) x = gCurrentPinballGame->ball->velocity.x; y = gCurrentPinballGame->ball->velocity.y; - vMagSquared = (x * x) + (y * y); + squaredSpeed = (x * x) + (y * y); if (gCurrentPinballGame->collisionSurfaceType == 2) { @@ -509,7 +509,7 @@ void ApplyBounceBackForce(u16 arg0, struct Vector32 *arg1, u16 arg2) arg0 = 0x15e4; } - if (var0 >= 0 && var0 <= 0x1200 && vMagSquared < 0x4000) + if (var0 >= 0 && var0 <= 0x1200 && squaredSpeed < 0x4000) { tempVec.x = 0; tempVec.y = 0; @@ -580,11 +580,11 @@ void ApplyBounceBackForce(u16 arg0, struct Vector32 *arg1, u16 arg2) if (gCurrentPinballGame->captureState == MON_CAPTURE_SPECIAL_STATE_MON_HIT_IN_CATCH_MODE) { gCurrentPinballGame->captureState = MON_CAPTURE_SPECIAL_STATE_INACTIVE; - vMagSquared = 0x80; + squaredSpeed = 0x80; } else { - vMagSquared = 0x280; + squaredSpeed = 0x280; } if (x2 < 0) @@ -598,8 +598,8 @@ void ApplyBounceBackForce(u16 arg0, struct Vector32 *arg1, u16 arg2) gCurrentPinballGame->ball->spinSpeed = 0; angle = ArcTan2(arg1->x, -arg1->y); - arg1->x = vMagSquared * Cos(angle) / VECTORSCALEDOWN; - arg1->y = -vMagSquared * Sin(angle) / VECTORSCALEDOWN; + arg1->x = squaredSpeed * Cos(angle) / VECTORSCALEDOWN; + arg1->y = -squaredSpeed * Sin(angle) / VECTORSCALEDOWN; } } @@ -834,15 +834,15 @@ void ProcessBonusTrapPhysics(void) { struct Vector16 vec1; struct Vector32 vec2; - int squaredMagnitude; + int squaredDistance; u16 angle; u8 temp_adjust; vec1.x = gCurrentPinballGame->ball->positionQ1.x - 238; vec1.y = gCurrentPinballGame->ball->positionQ1.y - 558; - squaredMagnitude = (vec1.x * vec1.x) + (vec1.y * vec1.y); + squaredDistance = (vec1.x * vec1.x) + (vec1.y * vec1.y); - if (squaredMagnitude < 1764 && (gCurrentPinballGame->gravityStrengthIndex & 1) == 0) + if (squaredDistance < 1764 && (gCurrentPinballGame->gravityStrengthIndex & 1) == 0) { angle = ArcTan2(-vec1.x, vec1.y); temp_adjust = 30; @@ -854,7 +854,7 @@ void ProcessBonusTrapPhysics(void) if (gCurrentPinballGame->collisionMapScrollY < 20) { - if (squaredMagnitude < 40) + if (squaredDistance < 40) { gCurrentPinballGame->collisionMapScrollY++; gCurrentPinballGame->ball->scale = 0x100; @@ -862,7 +862,7 @@ void ProcessBonusTrapPhysics(void) else { gCurrentPinballGame->ball->scale = 0x100; - if (squaredMagnitude > 100) + if (squaredDistance > 100) gCurrentPinballGame->collisionMapScrollY = 0; } } diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 5b5430f4..8cf13b68 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -198,7 +198,7 @@ void MainBoardProcess_7B_12524(void) gMain.fieldSpriteGroups[FIELD_SG_BALL]->active = TRUE; } - spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_43]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_BALL_UPGRADE_FX]; if (spriteGroup->active) { @@ -225,7 +225,7 @@ void MainBoardProcess_7B_12524(void) gOamBuffer[oam->oamId].priority = currentBallState->oamPriority; if (gCurrentPinballGame->ballShadowTimer < 14) - gMain.fieldSpriteGroups[FIELD_SG_43]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_BALL_UPGRADE_FX]->active = FALSE; } } diff --git a/src/groudon_process3.c b/src/groudon_process3.c index a0ca559e..1bae8e17 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -956,7 +956,7 @@ void UpdateGroudonFieldEntities(void) const u16 *src; s16 varSL; int xx, yy; - int squaredMagnitude; + int squaredDistance; struct Vector32 tempVector; s8 var0; @@ -1091,14 +1091,14 @@ void UpdateGroudonFieldEntities(void) tempVector.y = gCurrentPinballGame->projectilePosition.y / 10 - gCurrentPinballGame->ball->positionQ0.y; xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; if (gCurrentPinballGame->projectileFlightTimer) { gCurrentPinballGame->projectileFlightTimer--; if (gCurrentPinballGame->projectileFlightTimer >= 10) { varSL = (gCurrentPinballGame->projectileFlightTimer % 8) / 4 + gCurrentPinballGame->projectileDirection * 2; - if (squaredMagnitude <= 240 && gCurrentPinballGame->ballRespawnState == 0 && gCurrentPinballGame->ballGrabTimer < 600) + if (squaredDistance <= 240 && gCurrentPinballGame->ballRespawnState == 0 && gCurrentPinballGame->ballGrabTimer < 600) { MPlayStart(&gMPlayInfo_SE1, &se_unk_11f); gCurrentPinballGame->projectileFlightTimer = 10; @@ -1116,7 +1116,7 @@ void UpdateGroudonFieldEntities(void) varSL = (gCurrentPinballGame->projectileDirection * 2) - ((gCurrentPinballGame->projectileFlightTimer / 5) - 7); if (gCurrentPinballGame->projectileFlightTimer == 9) { - if (squaredMagnitude <= 240) + if (squaredDistance <= 240) { gCurrentPinballGame->projectilePosition.x = (gCurrentPinballGame->ball->positionQ0.x + 4) * 10; gCurrentPinballGame->projectilePosition.y = (gCurrentPinballGame->ball->positionQ0.y + 14) * 10; @@ -1646,8 +1646,8 @@ void UpdateGroudonFieldEntities(void) tempVector.y = gCurrentPinballGame->ball->positionQ0.y - 147; xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; - if (gCurrentPinballGame->ballRespawnState == 0 && squaredMagnitude < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) + squaredDistance = xx + yy; + if (gCurrentPinballGame->ballRespawnState == 0 && squaredDistance < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) { gCurrentPinballGame->trapAngleQ16 = ArcTan2(-tempVector.x, tempVector.y); gCurrentPinballGame->ball->velocity.x = (Cos(gCurrentPinballGame->trapAngleQ16) * -400) / 20000; diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index 9a0fc8c8..5952c5f0 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -239,7 +239,7 @@ void UpdateKecleonEntityLogic(void) struct Vector32 deltaVec; u16 angle; int xx, yy; - int deltaMagSquared; + int squaredDistance; switch (gCurrentPinballGame->bossEntityState) { @@ -342,13 +342,13 @@ void UpdateKecleonEntityLogic(void) deltaVec.y = gCurrentPinballGame->bossTargetYPosition - gCurrentPinballGame->bossPositionY; xx = deltaVec.x * deltaVec.x; yy = deltaVec.y * deltaVec.y; - deltaMagSquared = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(deltaVec.x, -deltaVec.y); tempVec.x = 6 * Cos(angle) / VECTORSCALEDOWN; tempVec.y = -6 * Sin(angle) / VECTORSCALEDOWN; gCurrentPinballGame->bossPositionX += tempVec.x; gCurrentPinballGame->bossPositionY += tempVec.y; - if (deltaMagSquared < 2500) + if (squaredDistance < 2500) { gCurrentPinballGame->bossEntityState = KECLEON_ENTITY_STATE_OBSERVING; if (gCurrentPinballGame->kecleonFramesetBase == 3) @@ -407,13 +407,13 @@ void UpdateKecleonEntityLogic(void) deltaVec.y = gCurrentPinballGame->bossTargetYPosition - gCurrentPinballGame->bossPositionY; xx = deltaVec.x * deltaVec.x; yy = deltaVec.y * deltaVec.y; - deltaMagSquared = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(deltaVec.x, -deltaVec.y); tempVec.x = 10 * Cos(angle) / VECTORSCALEDOWN; tempVec.y = -10 * Sin(angle) / VECTORSCALEDOWN; gCurrentPinballGame->bossPositionX += tempVec.x; gCurrentPinballGame->bossPositionY += tempVec.y; - if (deltaMagSquared < 2500) + if (squaredDistance < 2500) { if (gCurrentPinballGame->bonusModeHitCount > 9) { @@ -929,7 +929,7 @@ void UpdateKecleonScopeItem(void) struct OamDataSimple *oamSimple; struct Vector32 tempVector; int xx, yy; - int squaredMagnitude; + int squaredDistance; group = &gMain.spriteGroups[SG_KECLEON_SCOPE_ITEM]; if (!group->active) @@ -969,8 +969,8 @@ void UpdateKecleonScopeItem(void) tempVector.y = gCurrentPinballGame->ball->positionQ0.y - (gCurrentPinballGame->orbCollisionPosition.y / 10 + 8); xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; - if (squaredMagnitude <= 120) + squaredDistance = xx + yy; + if (squaredDistance <= 120) { gCurrentPinballGame->kecleonBoardHitState = 0; gCurrentPinballGame->kecleonTargetActive = 1; diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 9eda0748..3b835413 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -805,7 +805,7 @@ void UpdateKyogreFieldEntities(void) s16 index; int xx, yy; u16 angle; - int squaredMagnitude; + int squaredDistance; struct Vector32 tempVector2; struct Vector32 tempVector; struct Vector32 tempVector3; @@ -1063,10 +1063,10 @@ void UpdateKyogreFieldEntities(void) tempVector.y = (gCurrentPinballGame->ball->positionQ0.y - yoff) - (gCurrentPinballGame->vortexScreenPosition[i].y / 10); xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; if (gCurrentPinballGame->ballGrabbed == 0 && gCurrentPinballGame->ballRespawnState == 0 && gCurrentPinballGame->bonusModeHitCount < gCurrentPinballGame->legendaryHitsRequired && - gCurrentPinballGame->bossHitFlashTimer == 0 && squaredMagnitude < 400) + gCurrentPinballGame->bossHitFlashTimer == 0 && squaredDistance < 400) { m4aSongNumStart(SE_UNKNOWN_0x113); PlayRumble(12); @@ -1174,13 +1174,13 @@ void UpdateKyogreFieldEntities(void) tempVector.y = gCurrentPinballGame->vortexOrbitCenter[i].y - gCurrentPinballGame->vortexScreenPosition[i].y; xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(tempVector.x, -tempVector.y); tempVector3.x = (Cos(angle) * 4) / 20000; tempVector3.y = -(Sin(angle) * 4) / 20000; gCurrentPinballGame->vortexScreenPosition[i].x += tempVector3.x; gCurrentPinballGame->vortexScreenPosition[i].y += tempVector3.y; - if (squaredMagnitude < 2500) + if (squaredDistance < 2500) { gCurrentPinballGame->vortexTargetWaypointIndex[i] = i * 7 + ((Random() + gMain.systemFrameCount) % 7); gCurrentPinballGame->vortexOrbitCenter[i].x = gKyogreWhirlpoolTargetPositions[gCurrentPinballGame->vortexTargetWaypointIndex[i]].x; @@ -1275,10 +1275,10 @@ void UpdateKyogreFieldEntities(void) tempVector.y = gCurrentPinballGame->ball->positionQ0.y - 127; xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; //Check if shockwave close enough to the ball. - if (gCurrentPinballGame->ballRespawnState == 0 && squaredMagnitude < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) + if (gCurrentPinballGame->ballRespawnState == 0 && squaredDistance < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) { gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_ENCLOSE_BALL; gCurrentPinballGame->freezeTrapAnimFrame = 0; diff --git a/src/main_board_catch_normal_and_jirachi_modes.c b/src/main_board_catch_normal_and_jirachi_modes.c index ab7f4c5a..c0bd7091 100644 --- a/src/main_board_catch_normal_and_jirachi_modes.c +++ b/src/main_board_catch_normal_and_jirachi_modes.c @@ -343,7 +343,7 @@ void UpdateJirachiBonus(void) struct Vector32 deltaVec; u16 angle; int xx, yy; - int deltaMagSquared; + int squaredDistance; u16 var0; switch (gCurrentPinballGame->boardSubState) @@ -441,7 +441,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->catchLights[1] = 2; gCurrentPinballGame->catchLights[2] = 2; gCurrentPinballGame->catchMonCollisionEnabled = 1; - gMain.fieldSpriteGroups[FIELD_SG_33]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]->active = TRUE; DmaCopy16(3, gCatchSpriteGfxBuffer, (void *)0x06010CA0, 0x480); gCurrentPinballGame->modeAnimTimer = 40; gCurrentPinballGame->jirachiLogicX = 900; @@ -467,9 +467,9 @@ void UpdateJirachiBonus(void) deltaVec.y = gCurrentPinballGame->jirachiTargetY - gCurrentPinballGame->jirachiLogicY; xx = deltaVec.x * deltaVec.x; yy = deltaVec.y * deltaVec.y; - deltaMagSquared = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(deltaVec.x, -deltaVec.y); - if (deltaMagSquared < 2500) + if (squaredDistance < 2500) { tempVec.x = 0; tempVec.y = 0; @@ -608,7 +608,7 @@ void DrawCatchMonBoardSprite(void) s16 index; index = (gMain.fieldFrameCount % 50) / 25; - group = gMain.fieldSpriteGroups[FIELD_SG_33]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]; if (!group->active) return; @@ -658,7 +658,7 @@ void CleanupCatchMonBoardSprite(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[FIELD_SG_33]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]; if (group->active) { for (i = 0; i < 4; i++) @@ -669,7 +669,7 @@ void CleanupCatchMonBoardSprite(void) } } - gMain.fieldSpriteGroups[FIELD_SG_33]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]->active = FALSE; } void DrawJirachiSprites(void) @@ -684,7 +684,7 @@ void DrawJirachiSprites(void) s16 var1; index = (gMain.fieldFrameCount % 50) / 25; - group = gMain.fieldSpriteGroups[FIELD_SG_33]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]; if (group->active) { gCurrentPinballGame->jirachiCenterX = gCurrentPinballGame->jirachiDisplayX / 10 + 96; @@ -751,7 +751,7 @@ void DrawJirachiSprites(void) for (j = 0; j < 4; j++) { - group = gMain.fieldSpriteGroups[FIELD_SG_45 + j]; + group = gMain.fieldSpriteGroups[FIELD_SG_JIRACHI_STAR_TRAIL_FX_BASE + j]; if (group->active) { group->baseX = gCurrentPinballGame->jirachiStarTagPos[j].x - gCurrentPinballGame->cameraXOffset; @@ -784,7 +784,7 @@ void DrawJirachiSprites(void) gCurrentPinballGame->jirachiTagTimer[j] = 40; gCurrentPinballGame->jirachiStarTagPos[j].x = gCurrentPinballGame->jirachiCenterX; gCurrentPinballGame->jirachiStarTagPos[j].y = gCurrentPinballGame->jirachiCenterY + 16; - gMain.fieldSpriteGroups[FIELD_SG_45 + j]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_JIRACHI_STAR_TRAIL_FX_BASE + j]->active = TRUE; } } @@ -792,7 +792,7 @@ void DrawJirachiSprites(void) { gCurrentPinballGame->jirachiTagTimer[j]--; if (gCurrentPinballGame->jirachiTagTimer[j] == 0) - gMain.fieldSpriteGroups[FIELD_SG_45 + j]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_JIRACHI_STAR_TRAIL_FX_BASE + j]->active = FALSE; } } } @@ -803,7 +803,7 @@ void CleanupJirachiSprites(void) struct SpriteGroup *group; struct OamDataSimple *oamSimple; - group = gMain.fieldSpriteGroups[FIELD_SG_33]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]; if (group->active) { for (i = 0; i < 4; i++) @@ -814,9 +814,9 @@ void CleanupJirachiSprites(void) } } - gMain.fieldSpriteGroups[FIELD_SG_33]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]->active = FALSE; for (i = 0; i < 4; i++) - gMain.fieldSpriteGroups[FIELD_SG_45 + i]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_JIRACHI_STAR_TRAIL_FX_BASE + i]->active = FALSE; } //draw_catch_tiles @@ -869,7 +869,7 @@ void PlayCatchMonAppearsAnimation(void) if (gCurrentPinballGame->catchRevealFrameId == 2 && gCurrentPinballGame->catchTileRevealFrameAnimTimer > 3) { gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; - gMain.fieldSpriteGroups[FIELD_SG_33]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_MON_ENTITY]->active = TRUE; } if (gCurrentPinballGame->catchRevealFrameId > 2) diff --git a/src/main_board_catch_tile_logic.c b/src/main_board_catch_tile_logic.c index fb6c2480..1d78a25b 100644 --- a/src/main_board_catch_tile_logic.c +++ b/src/main_board_catch_tile_logic.c @@ -198,7 +198,7 @@ void RevealCatchTilesBurst(void) gCurrentPinballGame->activePortraitType = 5; DmaCopy16(3, gCatchTile_BurstStart_Gfx, (void *)0x06015800, 0x2000); DmaCopy16(3, gCatchTile_BurstStart_Pal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[FIELD_SG_35]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_LIGHTNING_STRIKE]->active = TRUE; m4aSongNumStart(SE_CATCH_ALL_REVEAL_LIGHTNING); gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->revealAnimFrameCounter = 0; @@ -217,12 +217,12 @@ void RevealCatchTilesBurst(void) { gCurrentPinballGame->revealFramesetIndex = 7; gCurrentPinballGame->hatchRevealPhase++; - gMain.fieldSpriteGroups[FIELD_SG_35]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_LIGHTNING_STRIKE]->active = FALSE; } } var0 = gCurrentPinballGame->revealFramesetIndex; - group = gMain.fieldSpriteGroups[FIELD_SG_35]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_LIGHTNING_STRIKE]; group->baseX = 124 - gCurrentPinballGame->cameraXOffset; group->baseY = 244 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -244,7 +244,7 @@ void RevealCatchTilesBurst(void) gCurrentPinballGame->activePortraitType = 6; DmaCopy16(3, gCatchTile_BurstStage2_Gfx, (void *)0x06015800, 0x800); DmaCopy16(3, gCatchTile_BurstStage2_Pal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[FIELD_SG_36]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_TILE_FLASH_FX]->active = TRUE; gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->revealAnimFrameCounter = 0; gCurrentPinballGame->startButtonDisabled = 1; @@ -257,13 +257,13 @@ void RevealCatchTilesBurst(void) } else { - gMain.fieldSpriteGroups[FIELD_SG_36]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_TILE_FLASH_FX]->active = FALSE; gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->revealAnimFrameCounter = 0; gCurrentPinballGame->revealFramesetIndex = 0; } - group = gMain.fieldSpriteGroups[FIELD_SG_36]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_TILE_FLASH_FX]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) @@ -329,7 +329,7 @@ void RevealCatchTilesBurst(void) gCurrentPinballGame->activePortraitType = 8; DmaCopy16(3, gCatchTile_BurstStage4_Gfx, (void *)0x06015800, 0x1800); DmaCopy16(3, gCatchTile_BurstStage4_Pal, (void *)0x050003C0, 0x20); - gMain.fieldSpriteGroups[FIELD_SG_37]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]->active = TRUE; gCurrentPinballGame->hatchRevealPhase++; gCurrentPinballGame->startButtonDisabled = 0; break; @@ -345,20 +345,20 @@ void RevealCatchTilesBurst(void) if (gCurrentPinballGame->revealFramesetIndex > 10) { gCurrentPinballGame->boardSubState++; //Move to next Catch phase - gMain.fieldSpriteGroups[FIELD_SG_37]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]->active = FALSE; gCurrentPinballGame->catchTilesBoardAcknowledged = 0; gCurrentPinballGame->catchSequentialTilesRevealed = 0; gCurrentPinballGame->catchTilesBumperAcknowledged = 0; gMain.blendControl = 0xCE; gMain.blendBrightness = 0; - gMain.fieldSpriteGroups[FIELD_SG_37]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]->active = FALSE; gCurrentPinballGame->revealFramesetIndex = 10; gCurrentPinballGame->activePortraitType = 0; } } var0 = gCurrentPinballGame->revealFramesetIndex; - group = gMain.fieldSpriteGroups[FIELD_SG_37]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index d5f4d807..9697f01c 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -274,7 +274,7 @@ void GivePrize(void) gCurrentPinballGame->fullChargeIndicatorBlinkTimer = 60; DmaCopy16(3, gPikachuSaverTilesGfx, (void *)0x06010600, 0x180); gCurrentPinballGame->outLanePikaPosition = 2; - gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; } } diff --git a/src/main_board_charge_spinner.c b/src/main_board_charge_spinner.c index 41502e3f..8e25aacd 100644 --- a/src/main_board_charge_spinner.c +++ b/src/main_board_charge_spinner.c @@ -126,7 +126,7 @@ void DrawPikachuSpinner(void) s16 index; index = gCurrentPinballGame->pikachuSpinFrame; - group = gMain.fieldSpriteGroups[FIELD_SG_31]; + group = gMain.fieldSpriteGroups[FIELD_SG_PIKA_CHARGING_SPINNER]; group->baseX = 206 - gCurrentPinballGame->cameraXOffset; if (gMain.selectedField == FIELD_RUBY) group->baseY = 174 - gCurrentPinballGame->cameraYOffset; diff --git a/src/main_board_evolution_mode.c b/src/main_board_evolution_mode.c index cbb8c08b..9d7c1989 100644 --- a/src/main_board_evolution_mode.c +++ b/src/main_board_evolution_mode.c @@ -155,7 +155,7 @@ void UpdateEvolutionMode(void) gCurrentPinballGame->evoItemPosX = gEvoItemPositions[gMain.selectedField][gCurrentPinballGame->evoItemSlotIndex].x; gCurrentPinballGame->evoItemPosY = gEvoItemPositions[gMain.selectedField][gCurrentPinballGame->evoItemSlotIndex].y; gCurrentPinballGame->evoItemAppearTimer = 80; - gMain.fieldSpriteGroups[FIELD_SG_40]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM_SPAWN_FX]->active = TRUE; gCurrentPinballGame->boardSubState++; break; case EVOLUTION_SUBSTATE_SPAWN_EVO_ITEM_AND_CHECK_FOR_COLLECTION: @@ -324,14 +324,14 @@ void UpdateEvolutionMode(void) } break; case EVOLUTION_SUBSTATE_END_EVO_PHASE: - group = gMain.fieldSpriteGroups[FIELD_SG_32]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM]; oamSimple = &group->oam[0]; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset - 56; - gMain.fieldSpriteGroups[FIELD_SG_32]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM]->active = FALSE; UpdateEvolutionItemAnimation(); - gMain.fieldSpriteGroups[FIELD_SG_40]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM_SPAWN_FX]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; AnimateBonusTrapSprite(); gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; @@ -373,14 +373,14 @@ void UpdateEvolutionItemAnimation(void) const u16 *src; struct Vector32 tempVector; int xx, yy; - int squaredMagnitude; + int squaredDistance; s16 index; index = (gMain.systemFrameCount % 75) / 3; - group = gMain.fieldSpriteGroups[FIELD_SG_32]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM]; if (gCurrentPinballGame->evoItemAppearTimer) { - group = gMain.fieldSpriteGroups[FIELD_SG_40]; + group = gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM_SPAWN_FX]; if (gCurrentPinballGame->evoItemAppearTimer == 80) { gCurrentPinballGame->activePortraitType = 15; @@ -405,8 +405,8 @@ void UpdateEvolutionItemAnimation(void) { gCurrentPinballGame->evoItemAnimFrame = 28; gCurrentPinballGame->evoItemAppearTimer = 1; - gMain.fieldSpriteGroups[FIELD_SG_40]->active = FALSE; - gMain.fieldSpriteGroups[FIELD_SG_32]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM_SPAWN_FX]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM]->active = TRUE; MPlayStart(&gMPlayInfo_SE1, &se_evo_item_finish_appear); gCurrentPinballGame->activePortraitType = 0; } @@ -439,8 +439,8 @@ void UpdateEvolutionItemAnimation(void) tempVector.y = gCurrentPinballGame->ball->positionQ0.y - (gCurrentPinballGame->evoItemPosY + 8); xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; - if (squaredMagnitude < 82 && + squaredDistance = xx + yy; + if (squaredDistance < 82 && ((gCurrentPinballGame->boardLayerDepth == 0 && gCurrentPinballGame->evoItemSlotIndex <= 5) || (gCurrentPinballGame->boardLayerDepth == 2 && gCurrentPinballGame->evoItemSlotIndex > 5)) && gCurrentPinballGame->evoItemsCaught < 3) { @@ -449,7 +449,7 @@ void UpdateEvolutionItemAnimation(void) gCurrentPinballGame->boardSubState = EVOLUTION_SUBSTATE_PREP_SPAWN_EVO_ITEM; gCurrentPinballGame->catchLights[gCurrentPinballGame->evoItemsCaught] = 5; gCurrentPinballGame->evoItemsCaught++; - gMain.fieldSpriteGroups[FIELD_SG_32]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_EVO_ITEM]->active = FALSE; if (gCurrentPinballGame->evoItemsCaught == 3) { gCurrentPinballGame->evoItemsCaught = 0; diff --git a/src/main_board_intro_mode.c b/src/main_board_intro_mode.c index dc376e7f..0ccd575f 100644 --- a/src/main_board_intro_mode.c +++ b/src/main_board_intro_mode.c @@ -184,7 +184,7 @@ void UpdateBoardIntroMode(void) gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT0_TRIM]->active = FALSE; gMain.fieldSpriteGroups[FIELD_SG_PORTRAIT1_TRIM]->active = FALSE; - gMain.fieldSpriteGroups[FIELD_SG_34]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_INITIAL_LOCATION_SELECTED_FX]->active = TRUE; m4aSongNumStart(SE_AREA_ROULETTE_SELECTED); } } @@ -235,7 +235,7 @@ void UpdateBoardIntroMode(void) else var0 = ((gCurrentPinballGame->stageTimer - 8) / 3) + 2; - group = gMain.fieldSpriteGroups[FIELD_SG_34]; + group = gMain.fieldSpriteGroups[FIELD_SG_INITIAL_LOCATION_SELECTED_FX]; if (group->active) { group->baseX = 96u - gCurrentPinballGame->cameraXOffset; @@ -257,7 +257,7 @@ void UpdateBoardIntroMode(void) } if (gCurrentPinballGame->stageTimer == 28) { - gMain.fieldSpriteGroups[FIELD_SG_34]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_INITIAL_LOCATION_SELECTED_FX]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; } } diff --git a/src/main_board_launcher_and_cutscenes.c b/src/main_board_launcher_and_cutscenes.c index 5185183d..7c7e056e 100644 --- a/src/main_board_launcher_and_cutscenes.c +++ b/src/main_board_launcher_and_cutscenes.c @@ -43,7 +43,7 @@ void AnimateOneUpSprite(void) s16 scale; var0 = 0; - group = gMain.fieldSpriteGroups[FIELD_SG_50]; + group = gMain.fieldSpriteGroups[FIELD_SG_TREECKO_1UP_DELIVERY]; if (group->active) { group->baseX = 202; @@ -276,7 +276,7 @@ void DrawSpoinkSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = gMain.fieldSpriteGroups[FIELD_SG_44]; + group = gMain.fieldSpriteGroups[FIELD_SG_SPOINK_LAUNCHER]; if (group->active) { if (gCurrentPinballGame->spoinkAnimFrameIx == 0) @@ -654,7 +654,7 @@ void RunEvolutionCutscene(void) { gCurrentPinballGame->revealAnimFrameCounter = 0; gCurrentPinballGame->revealFramesetIndex = 0; - gMain.fieldSpriteGroups[FIELD_SG_37]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]->active = TRUE; } } else @@ -670,7 +670,7 @@ void RunEvolutionCutscene(void) gCurrentPinballGame->revealFramesetIndex++; if (gCurrentPinballGame->revealFramesetIndex > 10) { - gMain.fieldSpriteGroups[FIELD_SG_37]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]->active = FALSE; gCurrentPinballGame->revealFramesetIndex = 10; gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState++; @@ -680,7 +680,7 @@ void RunEvolutionCutscene(void) } index = gCurrentPinballGame->revealFramesetIndex; - group = gMain.fieldSpriteGroups[FIELD_SG_37]; + group = gMain.fieldSpriteGroups[FIELD_SG_CATCH_BURST_PANEL_ELECTRIFY_FX]; group->baseX = 96 - gCurrentPinballGame->cameraXOffset; group->baseY = 300 - gCurrentPinballGame->cameraYOffset; if (group->baseY >= 200) diff --git a/src/main_board_pichu_entity.c b/src/main_board_pichu_entity.c index b3561ae9..56c81722 100644 --- a/src/main_board_pichu_entity.c +++ b/src/main_board_pichu_entity.c @@ -209,7 +209,7 @@ void UpdateKickbackLogic(void) if (gCurrentPinballGame->kickbackLaunchTimer == 100) { - gMain.fieldSpriteGroups[FIELD_SG_38]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_PIKA_KICKBACK_LAUNCH_FX]->active = TRUE; if (gCurrentPinballGame->outLanePikaPosition == 2 && gCurrentPinballGame->outLaneSide == 2) { @@ -240,7 +240,7 @@ void UpdateKickbackLogic(void) { gCurrentPinballGame->kickbackFrameId = 25; gCurrentPinballGame->kickbackFiring = 0; - gMain.fieldSpriteGroups[FIELD_SG_38]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_PIKA_KICKBACK_LAUNCH_FX]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; @@ -264,7 +264,7 @@ void UpdateKickbackLogic(void) oamIx = gCatchOverlayAnimData[gCurrentPinballGame->kickbackFrameId][0]; outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; - spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_38]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_PIKA_KICKBACK_LAUNCH_FX]; spriteGroup->baseX = (outlaneChuteIx * 177) - (gCurrentPinballGame->cameraXOffset - 16); if (gCurrentPinballGame->kickbackFiring) { @@ -290,13 +290,13 @@ void UpdateKickbackLogic(void) } } } - spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_29]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_PIKACHU_KICKBACK]; if (spriteGroup->active) { for (outlaneChuteIx = 0; outlaneChuteIx <= 1; outlaneChuteIx++) { - spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_29 + outlaneChuteIx]; + spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_PIKACHU_KICKBACK + outlaneChuteIx]; spriteGroup->baseX = (outlaneChuteIx * 177) - (gCurrentPinballGame->cameraXOffset - 16); if (gCurrentPinballGame->kickbackOccupied[outlaneChuteIx]) { @@ -331,10 +331,10 @@ void PichuArrivalSequence(void) struct Vector32 tempVec2; u16 angle; int xx, yy; - int squaredMagnitude; + int squaredDistance; s16 index; - group = gMain.fieldSpriteGroups[FIELD_SG_41]; + group = gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]; if (gCurrentPinballGame->pichuEntranceTimer == 0) return; @@ -369,7 +369,7 @@ void PichuArrivalSequence(void) tempVec.y = gPikaSaverWaypoints[gCurrentPinballGame->creatureWaypointIndex].y - 160 - gCurrentPinballGame->walkMonYPos; xx = tempVec.x * tempVec.x; yy = tempVec.y * tempVec.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(tempVec.x, -tempVec.y); tempVec2.x = (Cos(angle) * 7) / 20000; tempVec2.y = (Sin(angle) * -7) / 20000; @@ -395,7 +395,7 @@ void PichuArrivalSequence(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } } - if (squaredMagnitude < 2500) + if (squaredDistance < 2500) { gCurrentPinballGame->creatureWaypointIndex++; if (gCurrentPinballGame->pichuWalkMode == 1) @@ -404,14 +404,14 @@ void PichuArrivalSequence(void) { DmaCopy16(3, gPikachuSaverTilesGfx, (void *)0x06010600, 0x180); gCurrentPinballGame->outLanePikaPosition = 2; - gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; m4aSongNumStart(SE_PICHU_IN_POSITION_CHIRP); } } else if (gCurrentPinballGame->creatureWaypointIndex == 7) { - gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; } } diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 8751c86b..3112cea2 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -741,7 +741,7 @@ void AnimateCoinReward(void) int var1; s16 var2; - group = gMain.fieldSpriteGroups[FIELD_SG_39]; + group = gMain.fieldSpriteGroups[FIELD_SG_COIN_COLLECTED]; if (gCurrentPinballGame->coinRewardTimer < ((gCurrentPinballGame->coinRewardAmount - 1) * 9) + 19) { if (gCurrentPinballGame->coinRewardTimer == 0) @@ -834,7 +834,7 @@ void AnimateCoinReward(void) gCurrentPinballGame->coinRewardTimer++; if (gCurrentPinballGame->coinRewardTimer == ((gCurrentPinballGame->coinRewardAmount - 1) * 9) + 19) { - gMain.fieldSpriteGroups[FIELD_SG_39]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_COIN_COLLECTED]->active = FALSE; gCurrentPinballGame->coinRewardAmount = 0; if (gCurrentPinballGame->ballCatchState == TRAP_CENTER_HOLE) gCurrentPinballGame->outcomeFrameCounter = 170; @@ -1631,15 +1631,15 @@ void UpdateEggMode(void) u16 angle; u16 angle2; int xx, yy; - int squaredMagnitude; + int squaredDistance; - group = gMain.fieldSpriteGroups[FIELD_SG_41]; + group = gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]; priority = 1; switch (gCurrentPinballGame->boardSubState) { case EGG_HATCH_SUBSTATE_INIT: gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; - gMain.fieldSpriteGroups[FIELD_SG_41]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = TRUE; gCurrentPinballGame->boardSubState++; break; case EGG_HATCH_SUBSTATE_SETUP_WANDERING: @@ -1750,7 +1750,7 @@ void UpdateEggMode(void) tempVec.y = gSapphireEggWaypoints[gCurrentPinballGame->creatureWaypointIndex].y - 160 - gCurrentPinballGame->walkMonYPos; xx = tempVec.x * tempVec.x; yy = tempVec.y * tempVec.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(tempVec.x,-tempVec.y); if (gCurrentPinballGame->waypointSubTimer < 324) priority = 2; @@ -1772,7 +1772,7 @@ void UpdateEggMode(void) gCurrentPinballGame->walkMonXPos += tempVec2.x; gCurrentPinballGame->walkMonYPos += tempVec2.y; - if (squaredMagnitude < 2500) + if (squaredDistance < 2500) { if (gCurrentPinballGame->creatureWaypointIndex < 6) { @@ -1820,7 +1820,7 @@ void UpdateEggMode(void) tempVec.y = gEggWalkPathWaypoints[gMain.selectedField][gCurrentPinballGame->creatureWaypointIndex].y - 160 - gCurrentPinballGame->walkMonYPos; xx = tempVec.x * tempVec.x; yy = tempVec.y * tempVec.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; angle = ArcTan2(tempVec.x, -tempVec.y); tempVec2.x = (Cos(angle) * 7) / 20000; tempVec2.y = -(Sin(angle) * 7) / 20000; @@ -1844,7 +1844,7 @@ void UpdateEggMode(void) gCurrentPinballGame->walkMonYPos += tempVec2.y; } - if (squaredMagnitude < 2500) + if (squaredDistance < 2500) { if (gCurrentPinballGame->creatureWaypointIndex < 28) { @@ -1902,8 +1902,8 @@ void UpdateEggMode(void) tempVec.y = gCurrentPinballGame->ball->positionQ0.y - (gCurrentPinballGame->walkMonYPos / 10 + 14); xx = tempVec.x * tempVec.x; yy = tempVec.y * tempVec.y; - squaredMagnitude = xx + yy; - if (squaredMagnitude < 82) + squaredDistance = xx + yy; + if (squaredDistance < 82) { gCurrentPinballGame->creatureHitCount++; gCurrentPinballGame->creatureHitCooldown = 4; @@ -1978,7 +1978,7 @@ void UpdateEggMode(void) DmaCopy16(3, gCatchAnimTileBuffer, (void *)0x060112A0, 0x120); if (gCurrentPinballGame->captureSequenceTimer == 23) - gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; } break; case EGG_HATCH_SUBSTATE_CLEANUP_MON_SPRITES: @@ -1993,7 +1993,7 @@ void UpdateEggMode(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } } - gMain.fieldSpriteGroups[FIELD_SG_41]->active = FALSE; + gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->boardSubState++; break; case EGG_HATCH_SUBSTATE_BOARD_STATE_CLEANUP: diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 31507217..90c15586 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -936,7 +936,7 @@ void UpdateRayquazaMinionsAndEffects(void) s16 var0; int x, y; int xx, yy; - int squaredMagnitude; + int squaredDistance; u16 *dst; const u16 *src; struct OamDataSimple *oamSimple; @@ -1094,12 +1094,12 @@ void UpdateRayquazaMinionsAndEffects(void) tempVector.y = gCurrentPinballGame->ball->positionQ0.y - b - gCurrentPinballGame->lightningTargetPosition.y; xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; PlayRumble(8); if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL - && gCurrentPinballGame->ballRespawnState == 0 && squaredMagnitude < 200) + && gCurrentPinballGame->ballRespawnState == 0 && squaredDistance < 200) { gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX].active = TRUE; gCurrentPinballGame->ballGrabTimer = 600; @@ -1270,10 +1270,10 @@ void UpdateRayquazaMinionsAndEffects(void) tempVector.y = gCurrentPinballGame->ball->positionQ0.y - (gCurrentPinballGame->vortexScreenPosition[i].y / 10) - 32;; xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; - squaredMagnitude = xx + yy; + squaredDistance = xx + yy; if (gCurrentPinballGame->ballGrabbed == 0 && gCurrentPinballGame->ballRespawnState == 0 && gCurrentPinballGame->bonusModeHitCount < gCurrentPinballGame->legendaryHitsRequired && - gCurrentPinballGame->bossHitFlashTimer == 0 && squaredMagnitude < 300) + gCurrentPinballGame->bossHitFlashTimer == 0 && squaredDistance < 300) { gCurrentPinballGame->ballGrabTimer = 6; gCurrentPinballGame->ballFrozenState = 1; diff --git a/src/ruby_board_indicators.c b/src/ruby_board_indicators.c index 7192817c..c25b1663 100644 --- a/src/ruby_board_indicators.c +++ b/src/ruby_board_indicators.c @@ -383,7 +383,7 @@ void AnimateRubyBallPowerUpSequence(void) MPlayStart(&gMPlayInfo_SE1, &se_ball_upgrade); if (gCurrentPinballGame->ballShadowTimer == 60) - gMain.fieldSpriteGroups[FIELD_SG_43]->active = TRUE; + gMain.fieldSpriteGroups[FIELD_SG_BALL_UPGRADE_FX]->active = TRUE; gCurrentPinballGame->ballShadowTileIndex = gBallShadowTileIndices[30 - gCurrentPinballGame->ballShadowTimer / 2]; gCurrentPinballGame->ballShadowTimer--; diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index 81bb7906..478a0611 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -282,7 +282,7 @@ void RubyPond_EntityLogic(void) s16 frameDecidedNextPondState; struct Vector32 tempVec; struct Vector32 tempVec2; - int squaredMagnitude; + int squaredDistance; if (gCurrentPinballGame->shouldProcessWhiscash) { @@ -688,13 +688,13 @@ void RubyPond_EntityLogic(void) case RUBY_POND_STATE_CHINCHOU_SINGLE_CLOCKWISE: tempVec.x = gChinchouWaypointPositions[gCurrentPinballGame->chinchouWaypointTarget].x * 10 - gCurrentPinballGame->rubyBumperLogicPosition[0].x; tempVec.y = gChinchouWaypointPositions[gCurrentPinballGame->chinchouWaypointTarget].y * 10 - gCurrentPinballGame->rubyBumperLogicPosition[0].y; - squaredMagnitude = (tempVec.x * tempVec.x) + (tempVec.y * tempVec.y); + squaredDistance = (tempVec.x * tempVec.x) + (tempVec.y * tempVec.y); angle2 = ArcTan2(tempVec.x, -tempVec.y); tempVec2.x = (Cos(angle2) * 7) / 20000; tempVec2.y = (Sin(angle2) * -7) / 20000; gCurrentPinballGame->rubyBumperLogicPosition[0].x += tempVec2.x; gCurrentPinballGame->rubyBumperLogicPosition[0].y += tempVec2.y; - if (squaredMagnitude < 2500) + if (squaredDistance < 2500) gCurrentPinballGame->chinchouWaypointTarget = Random() % 4; // moved off screen diff --git a/src/ruby_ramp.c b/src/ruby_ramp.c index c75ba5ec..7a2ae7d1 100644 --- a/src/ruby_ramp.c +++ b/src/ruby_ramp.c @@ -13,7 +13,7 @@ void UpdateRubyRampPrizeGate(void) struct OamDataSimple *oamSimple; struct SpriteGroup *group; int x, y; - int squaredMagnitude; + int squaredDistance; s16 index; index = 0; @@ -116,8 +116,8 @@ void UpdateRubyRampPrizeGate(void) { x = gCurrentPinballGame->ball->positionQ0.x - 190; y = gCurrentPinballGame->ball->positionQ0.y - 285; - squaredMagnitude = (x * x) + (y * y); - if(squaredMagnitude >= 0 && squaredMagnitude <= 140) + squaredDistance = (x * x) + (y * y); + if(squaredDistance >= 0 && squaredDistance <= 140) { if (gCurrentPinballGame->rampPrizeVisibilityTimer <= 0) { @@ -154,7 +154,7 @@ void DrawRubyNuzleafPlatformSprite(void) struct SpriteGroup *group; s16 index; - group = &gMain.spriteGroups[SG_66]; + group = &gMain.spriteGroups[SG_RUBY_RAMP_PRIZE]; if (group->active) { if (gCurrentPinballGame->rampPrizeType) diff --git a/src/sapphire_collision.c b/src/sapphire_collision.c index 2fc504f9..f47ca5bb 100644 --- a/src/sapphire_collision.c +++ b/src/sapphire_collision.c @@ -161,7 +161,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) s16 modRes; s16 index; u16 angle; - int squaredMagnitude; + int squaredSpeed; switch (arg0) { @@ -304,13 +304,13 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) if (gCurrentPinballGame->ball->velocity.y > 0) { angle = 0xDA00; - squaredMagnitude = + squaredSpeed = gCurrentPinballGame->ball->velocity.x * gCurrentPinballGame->ball->velocity.x + gCurrentPinballGame->ball->velocity.y * gCurrentPinballGame->ball->velocity.y; - squaredMagnitude = Sqrt(squaredMagnitude * 4) / 2; - gCurrentPinballGame->ball->velocity.x = squaredMagnitude * Cos(angle) / 20000; - gCurrentPinballGame->ball->velocity.y = -squaredMagnitude * Sin(angle) / 20000; + squaredSpeed = Sqrt(squaredSpeed * 4) / 2; + gCurrentPinballGame->ball->velocity.x = squaredSpeed * Cos(angle) / 20000; + gCurrentPinballGame->ball->velocity.y = -squaredSpeed * Sin(angle) / 20000; } } else From 8fe5ec5f3725c3aef4fcbe4d67034802258b4e97 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Fri, 29 May 2026 02:15:35 -0500 Subject: [PATCH 24/33] placeholders for board specific graphic consts --- data/rom_2.s | 16 ++-- include/constants/sprite_groups.h | 131 +++++++++++++++++++++++++- include/functions.h | 2 +- include/functions_main_boards.h | 2 +- src/all_board_process0_sprite_init.c | 132 +++++++++++++-------------- src/main_board_bumpers.c | 12 +-- src/main_board_edge.c | 4 +- src/main_board_to_be_split.c | 18 ++-- src/ruby_process3_entities.c | 2 +- src/ruby_process3_entities_2.c | 12 +-- src/ruby_ramp.c | 8 +- src/ruby_trigger_targets.c | 6 +- src/sapphire_collision.c | 4 +- src/sapphire_pond_and_zigzagoon.c | 14 +-- src/sapphire_seedot_egg_shop.c | 14 +-- 15 files changed, 252 insertions(+), 125 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 08941f06..25940883 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -6677,7 +6677,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gMainEndOfBallBonusTextLine1SpriteSet .4byte gMainEndOfBallBonusTextLine2SpriteSet .4byte gMainEndOfBallBonusBannerSpriteSet -.4byte gMainLeftFlipperSpriteSet @ 10 +.4byte gMainLeftFlipperSpriteSet @ 10 .4byte gMainRightFlipperSpriteSet .4byte gLegendaryCatchNameBannerSpriteSet .4byte gLegendaryCatchWasCaughtTextSpriteSet @@ -6687,7 +6687,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gMainShopPortraitOverlaySpriteSet .4byte gMainTravelBanner_SignpostSpriteSet .4byte gMainModeStartBannerSpriteSet -.4byte gMainTileBreakSpriteSet @ 20 +.4byte gMainTileBreakSpriteSet @ 20 .4byte gCenterHoleGravityFxSpriteSet .4byte gUnknown_086B22AE .4byte gEvolutionBannerLightningSpriteSet @@ -6697,7 +6697,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B2324 .4byte gUnknown_086B1CDA .4byte gPortraitBordersSpriteSet -.4byte gPortraitTrimSpriteSet @ 30 +.4byte gPortraitTrimSpriteSet @ 30 .4byte gPortraitTrimSpriteSet .4byte gPortraitSpriteSet .4byte gPortrait1SpriteSet @@ -6707,7 +6707,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gEvolutionBannerTextMediumUpperSpriteSet .4byte gEvolutionBannerTextSmallMiddleSpriteSet .4byte gMonCatchBallTrailSpriteSet -.4byte gMonCatchBallTrailSpriteSet @40 +.4byte gMonCatchBallTrailSpriteSet @40 .4byte gMainBoardBallSpriteSet .4byte gCatchMonEntitySpriteSet .4byte gJirachiStarTrailFx0SpriteSet @@ -6717,7 +6717,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1B90 .4byte gUnknown_086B1BAA .4byte gUnknown_086B1BC4 -.4byte gUnknown_086B1BDE @ 50 +.4byte gUnknown_086B1BDE @ 50 .4byte gUnknown_086B1BF8 .4byte gUnknown_086B1846 .4byte gHatchMonEntitySpriteSet @@ -6727,7 +6727,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gSpoinkLauncherSpriteSet .4byte gUnknown_086B1C0C .4byte gUnknown_086B1C16 -.4byte gUnknown_086B1AB2 @ 60 +.4byte gUnknown_086B1AB2 @ 60 .4byte gUnknown_086B1B00 .4byte gUnknown_086B1B12 .4byte gUnknown_086B1B24 @@ -6737,7 +6737,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1B7E .4byte gUnknown_086B1B50 .4byte gUnknown_086B1C20 -.4byte gUnknown_086B1C32 @ 70 +.4byte gUnknown_086B1C32 @ 70 .4byte gEvoItemSpriteSet .4byte gPikaChargingSpinnerSpriteSet .4byte gBallUpgradeFxSpriteSet @@ -6747,7 +6747,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gInitialLocationSelectedFxSpriteSet .4byte gCatchBurstLightningStrikeSpriteSet .4byte gCatchBurstTileFlashFxSpriteSet -.4byte gCatchBurstPanelElectrifyFxSpriteSet @ 80 +.4byte gCatchBurstPanelElectrifyFxSpriteSet @ 80 .4byte gPikaKickbackLaunchFxSpriteSet .4byte gCoinsCollectedSpriteSet .4byte gEvoItemSpawnFxSpriteSet diff --git a/include/constants/sprite_groups.h b/include/constants/sprite_groups.h index 57d45a5e..7bb71a54 100644 --- a/include/constants/sprite_groups.h +++ b/include/constants/sprite_groups.h @@ -60,7 +60,67 @@ #define SG_RUBY_SHOP_PORTRAIT_OVERLAY 20 #define SG_RUBY_TARVEL_BANNER_SIGNPOST 21 #define SG_RUBY_MODE_START_BANNER 22 + #define SG_RUBY_TILE_BREAK_FX 23 + #define SG_RUBY_CENTER_HOLE_GRAVITY_FX 24 + #define SG_RUBY_25 25 // FG 14; apparently unused + #define SG_RUBY_EVOLUTION_BANNER_LIGHTNING 26 + #define SG_RUBY_TRAVEL_PAINTER 27 +#define SG_RUBY_CHARGE_INDICATOR_DEVICE 28 + #define SG_RUBY_29 29 // FG 18; Catch tile, evading identification + #define SG_RUBY_PORTRAIT_BORDERS 30 + #define SG_RUBY_PORTRAIT_TRIM_0 31 + #define SG_RUBY_PORTRAIT_TRIM_1 32 + #define SG_RUBY_PORTRAIT_0 33 + #define SG_RUBY_PORTRAIT_1 34 + #define SG_RUBY_EVOLUTION_BANNER_TEXT_LARGE_BOTTOM 35 + #define SG_RUBY_EVOLUTION_BANNER_TEXT_LARGE_TOP 36 + #define SG_RUBY_EVOLUTION_BANNER_TEXT_MEDIUM_LOWER 37 + #define SG_RUBY_EVOLUTION_BANNER_TEXT_MEDIUM_UPPER 38 + #define SG_RUBY_EVOLUTION_BANNER_TEXT_SMALL_MIDDLE 39 + #define SG_RUBY_BALL_OVERRIDE 40 + #define SG_RUBY_BALL_TRAIL_0 41 + #define SG_RUBY_BALL_TRAIL_1 42 + #define SG_RUBY_CATCH_MON_ENTITY 43 + #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_0 44 + #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_1 45 + #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_2 46 + #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_3 47 +#define SG_RUBY_48 48 + #define SG_RUBY_HATCH_MON_ENTITY 49 + #define SG_RUBY_CATCH_CUTSCENE_BALL_ABSORB_MON_FX 50 +#define SG_RUBY_51 51 +#define SG_RUBY_52 52 +#define SG_RUBY_53 53 +#define SG_RUBY_PIKACHU_KICKBACK_ENTITY 54 +#define SG_RUBY_PICHU_KICKBACK_ENTITY 55 +#define SG_RUBY_SPOINK_LAUNCHER 56 +#define SG_RUBY_57 57 +#define SG_RUBY_58 58 +#define SG_RUBY_59 59 +#define SG_RUBY_60 60 +#define SG_RUBY_61 61 +#define SG_RUBY_62 62 +#define SG_RUBY_63 63 +#define SG_RUBY_PIKA_CHARGING_SPINNER 64 +#define SG_RUBY_65 65 #define SG_RUBY_RAMP_PRIZE 66 + #define SG_RUBY_EVO_ITEM 67 +#define SG_RUBY_68 68 + #define SG_RUBY_BALL_UPGRADE_FX 69 +#define SG_RUBY_BALL 70 +#define SG_RUBY_71 71 + #define SG_RUBY_INITIAL_LOCATION_SELECTED_FX 72 + #define SG_RUBY_CATCH_BURST_LIGHTNING_STRIKE_FX 73 + #define SG_RUBY_CATCH_BURST_TILE_FLASH_FX 74 + #define SG_RUBY_PANEL_ELECTRIFY_FX 75 + #define SG_RUBY_PIKA_KICKBACK_LAUNCH_FX 76 + #define SG_RUBY_COINS_COLLECTED 77 +#define SG_RUBY_78 78 + #define SG_RUBY_EVO_ITEM_SPAWN_FX 79 + #define SG_RUBY_GAME_OVER_TEXT 80 +#define SG_RUBY_81 81 +#define SG_RUBY_82 82 + #define SG_RUBY_TREECKO_1UP_DELIVERY 83 // Sapphire board // 0-11 shared @@ -72,6 +132,73 @@ #define SG_SAPPHIRE_SHOP_PORTRAIT_OVERLAY 17 #define SG_SAPPHIRE_TARVEL_BANNER_SIGNPOST 18 #define SG_SAPPHIRE_MODE_START_BANNER 19 + #define SG_SAPPHIRE_TILE_BREAK_FX 20 + #define SG_SAPPHIRE_CENTER_HOLE_GRAVITY_FX 21 + #define SG_SAPPHIRE_22 22 // FG 14; apparently unused + #define SG_SAPPHIRE_EVOLUTION_BANNER_LIGHTNING 23 + #define SG_SAPPHIRE_TRAVEL_PAINTER 24 +#define SG_SAPPHIRE_CHARGE_INDICATOR_DEVICE 25 +#define SG_SAPPHIRE_26 26 +#define SG_SAPPHIRE_27 27 + #define SG_SAPPHIRE_28 28 // FG 18; Catch tile, evading identification + #define SG_SAPPHIRE_PORTRAIT_BORDERS 29 + #define SG_SAPPHIRE_PORTRAIT_TRIM_0 30 + #define SG_SAPPHIRE_PORTRAIT_TRIM_1 31 + #define SG_SAPPHIRE_PORTRAIT_0 32 + #define SG_SAPPHIRE_PORTRAIT_1 33 + #define SG_SAPPHIRE_EVOLUTION_BANNER_TEXT_LARGE_BOTTOM 34 + #define SG_SAPPHIRE_EVOLUTION_BANNER_TEXT_LARGE_TOP 35 + #define SG_SAPPHIRE_EVOLUTION_BANNER_TEXT_MEDIUM_LOWER 36 + #define SG_SAPPHIRE_EVOLUTION_BANNER_TEXT_MEDIUM_UPPER 37 + #define SG_SAPPHIRE_EVOLUTION_BANNER_TEXT_SMALL_MIDDLE 38 + #define SG_SAPPHIRE_BALL_OVERRIDE 39 + #define SG_SAPPHIRE_BALL_TRAIL_0 40 + #define SG_SAPPHIRE_BALL_TRAIL_1 41 + #define SG_SAPPHIRE_CATCH_MON_ENTITY 42 + #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_0 43 + #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_1 44 + #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_2 45 + #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_3 46 +#define SG_SAPPHIRE_47 47 +#define SG_SAPPHIRE_48 48 +#define SG_SAPPHIRE_49 49 +#define SG_SAPPHIRE_50 50 +#define SG_SAPPHIRE_51 51 +#define SG_SAPPHIRE_52 52 + #define SG_SAPPHIRE_HATCH_MON_ENTITY 53 + #define SG_SAPPHIRE_CATCH_CUTSCENE_BALL_ABSORB_MON_FX 54 +#define SG_SAPPHIRE_PIKACHU_KICKBACK_ENTITY 55 +#define SG_SAPPHIRE_PICHU_KICKBACK_ENTITY 56 +#define SG_SAPPHIRE_SPOINK_LAUNCHER 57 +#define SG_SAPPHIRE_58 58 +#define SG_SAPPHIRE_59 59 +#define SG_SAPPHIRE_60 60 +#define SG_SAPPHIRE_61 61 +#define SG_SAPPHIRE_62 62 +#define SG_SAPPHIRE_63 63 +#define SG_SAPPHIRE_64 64 +#define SG_SAPPHIRE_65 65 +#define SG_SAPPHIRE_66 66 +#define SG_SAPPHIRE_67 67 +#define SG_SAPPHIRE_68 68 +#define SG_SAPPHIRE_69 69 +#define SG_SAPPHIRE_70 70 + #define SG_SAPPHIRE_EVO_ITEM 71 +#define SG_SAPPHIRE_PIKA_CHARGING_SPINNER 72 + #define SG_SAPPHIRE_BALL_UPGRADE_FX 73 +#define SG_SAPPHIRE_BALL 74 +#define SG_SAPPHIRE_75 75 +#define SG_SAPPHIRE_76 76 + #define SG_SAPPHIRE_INITIAL_LOCATION_SELECTED_FX 77 + #define SG_SAPPHIRE_CATCH_BURST_LIGHTNING_STRIKE_FX 78 + #define SG_SAPPHIRE_CATCH_BURST_TILE_FLASH_FX 79 + #define SG_SAPPHIRE_PANEL_ELECTRIFY_FX 80 + #define SG_SAPPHIRE_PIKA_KICKBACK_LAUNCH_FX 81 + #define SG_SAPPHIRE_COINS_COLLECTED 82 + #define SG_SAPPHIRE_EVO_ITEM_SPAWN_FX 83 + #define SG_SAPPHIRE_GAME_OVER_TEXT 84 +#define SG_SAPPHIRE_85 85 + #define SG_SAPPHIRE_TREECKO_1UP_DELIVERY 86 // Shared by bonus / boss boards @@ -332,7 +459,7 @@ #define SG_63 63 #define SG_64 64 #define SG_65 65 -#define SG_RUBY_RAMP_PRIZE 66 +#define SG_66 66 #define SG_67 67 #define SG_68 68 #define SG_69 69 @@ -428,7 +555,7 @@ #define FIELD_SG_JIRACHI_STAR_TRAIL_FX1 46 #define FIELD_SG_JIRACHI_STAR_TRAIL_FX2 47 #define FIELD_SG_JIRACHI_STAR_TRAIL_FX3 48 -#define FIELD_SG_MAIN_BOARD_BALL_OVERRIDE 49 +#define FIELD_SG_MAIN_BOARD_BALL_OVERRIDE 49 // Used with some sequences that move the ball #define FIELD_SG_TREECKO_1UP_DELIVERY 50 // bonus/legendary boards diff --git a/include/functions.h b/include/functions.h index 7fadc4f8..93950ea0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -471,7 +471,7 @@ extern void FullCatchStateCleanup(void); extern void ShowBonusTrapSprite(void); extern void AnimateBonusTrapSprite(void); extern void ProcessChargeIndicator(); -//extern ? UpdateEvolutionShopSprite(); +//extern ? UpdateRubyEvolutionShopSprite(); extern void RenderEvolutionUI(s16); extern void AnimateCoinReward(); extern void InitTotodileEggDelivery(); diff --git a/include/functions_main_boards.h b/include/functions_main_boards.h index c1b78d11..972a8672 100644 --- a/include/functions_main_boards.h +++ b/include/functions_main_boards.h @@ -8,7 +8,7 @@ extern void UpdateHatchCave(void); extern void DrawPikachuSpinner(void); -extern void UpdateEvolutionShopSprite(void); +extern void UpdateRubyEvolutionShopSprite(void); extern void InitRubyEggHatchAnimation(void); extern void LoadShopItemGraphics(s16); diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 465d5f0a..0aafa4e9 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -10,22 +10,22 @@ void RubyBoardProcess_0A_50848(void) for (i = 0; i < 84; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[SG_64].active = TRUE; - group = &gMain.spriteGroups[SG_48]; // fake match? - gMain.spriteGroups[SG_70].active = TRUE; + gMain.spriteGroups[SG_RUBY_PIKA_CHARGING_SPINNER].active = TRUE; + group = &gMain.spriteGroups[SG_RUBY_48]; // fake match? + gMain.spriteGroups[SG_RUBY_BALL].active = TRUE; gMain.spriteGroups[SG_PAUSE_PANEL].active = TRUE; gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER].active = TRUE; - gMain.spriteGroups[SG_28].active = TRUE; - gMain.spriteGroups[SG_81].active = TRUE; - gMain.spriteGroups[SG_65].active = TRUE; - gMain.spriteGroups[SG_71].active = TRUE; + gMain.spriteGroups[SG_RUBY_CHARGE_INDICATOR_DEVICE].active = TRUE; + gMain.spriteGroups[SG_RUBY_81].active = TRUE; + gMain.spriteGroups[SG_RUBY_65].active = TRUE; + gMain.spriteGroups[SG_RUBY_71].active = TRUE; gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; - gMain.spriteGroups[SG_51].active = TRUE; - gMain.spriteGroups[SG_61].active = TRUE; + gMain.spriteGroups[SG_RUBY_51].active = TRUE; + gMain.spriteGroups[SG_RUBY_61].active = TRUE; group->active = TRUE; - gMain.spriteGroups[SG_52].active = TRUE; - gMain.spriteGroups[SG_62].active = TRUE; + gMain.spriteGroups[SG_RUBY_52].active = TRUE; + gMain.spriteGroups[SG_RUBY_62].active = TRUE; LoadSpriteSets( gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -38,56 +38,56 @@ void RubyBoardProcess_0B_50918(void) gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = FALSE; gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = FALSE; - gMain.spriteGroups[SG_48].active = FALSE; - gMain.spriteGroups[SG_71].active = FALSE; + gMain.spriteGroups[SG_RUBY_48].active = FALSE; + gMain.spriteGroups[SG_RUBY_71].active = FALSE; for (i = 51; i < 67; i++) gMain.spriteGroups[i].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 110) { - gMain.spriteGroups[SG_65].active = TRUE; - gMain.spriteGroups[SG_71].active = TRUE; + gMain.spriteGroups[SG_RUBY_65].active = TRUE; + gMain.spriteGroups[SG_RUBY_71].active = TRUE; gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 168) { - gMain.spriteGroups[SG_48].active = TRUE; - gMain.spriteGroups[SG_52].active = TRUE; + gMain.spriteGroups[SG_RUBY_48].active = TRUE; + gMain.spriteGroups[SG_RUBY_52].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 220) { - gMain.spriteGroups[SG_51].active = TRUE; - gMain.spriteGroups[SG_61].active = TRUE; - gMain.spriteGroups[SG_64].active = TRUE; + gMain.spriteGroups[SG_RUBY_51].active = TRUE; + gMain.spriteGroups[SG_RUBY_61].active = TRUE; + gMain.spriteGroups[SG_RUBY_PIKA_CHARGING_SPINNER].active = TRUE; if (gCurrentPinballGame->shouldProcessWhiscash) - gMain.spriteGroups[SG_63].active = TRUE; + gMain.spriteGroups[SG_RUBY_63].active = TRUE; else - gMain.spriteGroups[SG_62].active = TRUE; + gMain.spriteGroups[SG_RUBY_62].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 63) { - gMain.spriteGroups[SG_53].active = TRUE; - gMain.spriteGroups[SG_57].active = TRUE; + gMain.spriteGroups[SG_RUBY_53].active = TRUE; + gMain.spriteGroups[SG_RUBY_57].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 115) - gMain.spriteGroups[SG_58].active = TRUE; + gMain.spriteGroups[SG_RUBY_58].active = TRUE; if (gCurrentPinballGame->cameraYViewport > 130) { - gMain.spriteGroups[SG_59].active = TRUE; - gMain.spriteGroups[SG_60].active = TRUE; + gMain.spriteGroups[SG_RUBY_59].active = TRUE; + gMain.spriteGroups[SG_RUBY_60].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) { - gMain.spriteGroups[SG_56].active = TRUE; - gMain.spriteGroups[SG_54].active = TRUE; - gMain.spriteGroups[SG_55].active = TRUE; + gMain.spriteGroups[SG_RUBY_SPOINK_LAUNCHER].active = TRUE; + gMain.spriteGroups[SG_RUBY_PIKACHU_KICKBACK_ENTITY].active = TRUE; + gMain.spriteGroups[SG_RUBY_PICHU_KICKBACK_ENTITY].active = TRUE; gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = TRUE; gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = TRUE; } @@ -105,17 +105,17 @@ void SapphireBoardProcess_0A_50AD4(void) for (i = 0; i < 87; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[SG_72].active = TRUE; - gMain.spriteGroups[SG_63].active = TRUE; - gMain.spriteGroups[SG_60].active = TRUE; - gMain.spriteGroups[SG_69].active = TRUE; - gMain.spriteGroups[SG_52].active = TRUE; - gMain.spriteGroups[SG_74].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PIKA_CHARGING_SPINNER].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_63].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_60].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_69].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_52].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_BALL].active = TRUE; gMain.spriteGroups[SG_PAUSE_PANEL].active = TRUE; gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER].active = TRUE; - gMain.spriteGroups[SG_25].active = TRUE; - gMain.spriteGroups[SG_85].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_CHARGE_INDICATOR_DEVICE].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_85].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, gMain.spriteGroups); @@ -128,57 +128,57 @@ void SapphireBoardProcess_0B_50B80(void) for (i = 55; i < 71; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[SG_52].active = FALSE; - gMain.spriteGroups[SG_72].active = FALSE; - gMain.spriteGroups[SG_26].active = FALSE; - gMain.spriteGroups[SG_51].active = FALSE; - gMain.spriteGroups[SG_76].active = FALSE; - gMain.spriteGroups[SG_75].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_52].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_PIKA_CHARGING_SPINNER].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_26].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_51].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_76].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_75].active = FALSE; gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = FALSE; gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 90) { - gMain.spriteGroups[SG_52].active = TRUE; - gMain.spriteGroups[SG_51].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_52].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_51].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 220) { - gMain.spriteGroups[SG_72].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PIKA_CHARGING_SPINNER].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 150) { - gMain.spriteGroups[SG_60].active = TRUE; - gMain.spriteGroups[SG_69].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_60].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_69].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 196) { - gMain.spriteGroups[SG_63].active = TRUE; - gMain.spriteGroups[SG_75].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_63].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_75].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 202) { - gMain.spriteGroups[SG_61].active = TRUE; - gMain.spriteGroups[SG_58].active = TRUE; - gMain.spriteGroups[SG_62].active = TRUE; - gMain.spriteGroups[SG_59].active = TRUE; - gMain.spriteGroups[SG_76].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_61].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_58].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_62].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_59].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_76].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 118) { - gMain.spriteGroups[SG_70].active = TRUE; - gMain.spriteGroups[SG_26].active = TRUE; - gMain.spriteGroups[SG_64].active = TRUE; - gMain.spriteGroups[SG_68].active = TRUE; - gMain.spriteGroups[SG_65].active = TRUE; - gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; - gMain.spriteGroups[SG_67].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_70].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_26].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_64].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_68].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_65].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_66].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_67].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) { - gMain.spriteGroups[SG_57].active = TRUE; - gMain.spriteGroups[SG_55].active = TRUE; - gMain.spriteGroups[SG_56].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SPOINK_LAUNCHER].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PIKACHU_KICKBACK_ENTITY].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PICHU_KICKBACK_ENTITY].active = TRUE; gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = TRUE; gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = TRUE; } diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index d19f069c..c0266cfd 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -218,7 +218,7 @@ void DrawSapphireBumperSprites(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_61]; + group = &gMain.spriteGroups[SG_SAPPHIRE_61]; if (!group->active) return; @@ -233,7 +233,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_58]; + group = &gMain.spriteGroups[SG_SAPPHIRE_58]; group->baseX = 68 - gCurrentPinballGame->cameraXOffset; if (gCurrentPinballGame->sapphireBumperHitFxTimer[0] < 14) { @@ -250,7 +250,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[SG_62]; + group = &gMain.spriteGroups[SG_SAPPHIRE_62]; group->baseX = 36 - gCurrentPinballGame->cameraXOffset; group->baseY = 163 - gCurrentPinballGame->cameraYOffset; index = gSapphireBumperAnimFrames[gCurrentPinballGame->sapphireBumperAnimKeyframe[1]][0]; @@ -262,7 +262,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_59]; + group = &gMain.spriteGroups[SG_SAPPHIRE_59]; group->baseX = 36 - gCurrentPinballGame->cameraXOffset; if (gCurrentPinballGame->sapphireBumperHitFxTimer[1] < 14) { @@ -279,7 +279,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[SG_76]; + group = &gMain.spriteGroups[SG_SAPPHIRE_76]; group->baseX = 61 - gCurrentPinballGame->cameraXOffset; group->baseY = 186 - gCurrentPinballGame->cameraYOffset; if (gCurrentPinballGame->eggHatchShockWallOverride) @@ -330,7 +330,7 @@ void HandleRubyBumperHit(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_63]; + group = &gMain.spriteGroups[SG_RUBY_63]; if (gCurrentPinballGame->bumperHitCountdown > 0) { if (gCurrentPinballGame->bumperHitCountdown == 2) diff --git a/src/main_board_edge.c b/src/main_board_edge.c index c7685241..c9e85dcf 100644 --- a/src/main_board_edge.c +++ b/src/main_board_edge.c @@ -13,9 +13,9 @@ void DrawBoardEdgeBanner(void) struct SpriteGroup *group; if (gMain.selectedField == FIELD_RUBY) - group = &gMain.spriteGroups[SG_81]; + group = &gMain.spriteGroups[SG_RUBY_81]; else - group = &gMain.spriteGroups[SG_85]; + group = &gMain.spriteGroups[SG_SAPPHIRE_85]; if (group->active) { diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 3112cea2..208d9201 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -491,14 +491,14 @@ void ProcessChargeIndicator(void) } } -void UpdateEvolutionShopSprite(void) +void UpdateRubyEvolutionShopSprite(void) { s16 i; struct SpriteGroup *group; struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_78]; + group = &gMain.spriteGroups[SG_RUBY_78]; if (gCurrentPinballGame->shopTransitionActive == 0) { if (gCurrentPinballGame->evoArrowProgress > 2) @@ -554,7 +554,7 @@ void UpdateEvolutionShopSprite(void) { LoadShopItemGraphics(gCurrentPinballGame->evolutionShopActive); gCurrentPinballGame->shopTransitionActive = 0; - gMain.spriteGroups[SG_78].active = FALSE; + gMain.spriteGroups[SG_RUBY_78].active = FALSE; } } } @@ -848,7 +848,7 @@ void InitTotodileEggDelivery(void) gCurrentPinballGame->eggDeliveryY = 2080; gCurrentPinballGame->totodileDeliveryFrame = 0; gCurrentPinballGame->totodileDeliveryTimer = 0; - gMain.spriteGroups[SG_82].active = TRUE; + gMain.spriteGroups[SG_RUBY_82].active = TRUE; gCurrentPinballGame->eggAnimationPhase = 1; gCurrentPinballGame->portraitOffsetX = 240; gCurrentPinballGame->portraitOffsetY = 160; @@ -867,7 +867,7 @@ void AnimateTotodileEggDelivery(void) s16 var0; var0 = 0; - group = &gMain.spriteGroups[SG_82]; + group = &gMain.spriteGroups[SG_RUBY_82]; if (gPikaSaverFrameData[gCurrentPinballGame->totodileDeliveryFrame][1] > gCurrentPinballGame->totodileDeliveryTimer) { gCurrentPinballGame->totodileDeliveryTimer++; @@ -1294,7 +1294,7 @@ void UpdateRubyEggHatchAnimation(void) var0 = 0; var1 = 0; var2 = 0; - group = &gMain.spriteGroups[SG_48]; + group = &gMain.spriteGroups[SG_RUBY_48]; var3 = 0; switch (gCurrentPinballGame->eggAnimationPhase) { @@ -1414,12 +1414,12 @@ void UpdateRubyEggHatchAnimation(void) gOamBuffer[oamSimple->oamId].y += group->baseY; } - group = &gMain.spriteGroups[SG_52]; + group = &gMain.spriteGroups[SG_RUBY_52]; group->baseX = gCurrentPinballGame->eggBasePosX; group->baseY = gCurrentPinballGame->eggBasePosY; for (i = 0; i < 4; i++) { - oamSimple = &gMain.spriteGroups[SG_52].oam[i]; + oamSimple = &gMain.spriteGroups[SG_RUBY_52].oam[i]; gOamBuffer[oamSimple->oamId].priority = priority; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; @@ -1435,7 +1435,7 @@ void UpdateHatchCave(void) s16 var0; priority = 1; - group = &gMain.spriteGroups[SG_51]; + group = &gMain.spriteGroups[SG_RUBY_51]; var0 = gMain.systemFrameCount % 36; gCurrentPinballGame->cyndaquilFrame = 0; gCurrentPinballGame->cyndaquilCollisionEnabled = 1; diff --git a/src/ruby_process3_entities.c b/src/ruby_process3_entities.c index 02e28a44..c50dd65f 100644 --- a/src/ruby_process3_entities.c +++ b/src/ruby_process3_entities.c @@ -68,7 +68,7 @@ void UpdateRubyBoardEntityRendering(void) ProcessChargeIndicator(); UpdateRubyBoardAnimations(); UpdatePortraitSpritePositions(); - UpdateEvolutionShopSprite(); + UpdateRubyEvolutionShopSprite(); DrawBoardEdgeBanner(); if (gCurrentPinballGame->coinRewardAmount != 0) diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index 478a0611..f8c19bd4 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -40,7 +40,7 @@ void UpdateNuzleafEntity(void) s16 var0; s16 var1; - group = &gMain.spriteGroups[SG_71]; + group = &gMain.spriteGroups[SG_RUBY_71]; var0 = 0; var1 = 0; switch (gCurrentPinballGame->nuzleafAnimState) @@ -185,7 +185,7 @@ void AnimateRubyShopDoor(void) struct OamDataSimple *oamSimple; s16 priority; - group = &gMain.spriteGroups[SG_65]; + group = &gMain.spriteGroups[SG_RUBY_65]; if ((gCurrentPinballGame->shopDoorTargetFrame & 0xF) != gCurrentPinballGame->shopDoorCurrentFrame) { if (gCurrentPinballGame->shopDoorAnimDelay) @@ -232,7 +232,7 @@ void AnimateRubyShopDoor(void) group->baseY = 80 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 2; i++) { - oamSimple = &gMain.spriteGroups[SG_65].oam[i]; + oamSimple = &gMain.spriteGroups[SG_RUBY_65].oam[i]; gOamBuffer[oamSimple->oamId].priority = priority; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; @@ -247,7 +247,7 @@ void DrawWhiscash(void) s16 var0; const s16 *var1; - group = &gMain.spriteGroups[SG_63]; + group = &gMain.spriteGroups[SG_RUBY_63]; var1 = gWhiscashFramesetData[gCurrentPinballGame->whiscashFrameIx]; if (group->active) { @@ -795,7 +795,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->bumperHitCountdown--; } - group = &gMain.spriteGroups[SG_62]; + group = &gMain.spriteGroups[SG_RUBY_62]; if (gCurrentPinballGame->rubyPondState == RUBY_POND_STATE_LOTAD) { for (i = 0; i < 3; i++) @@ -885,7 +885,7 @@ void AnimateSharpedoEntity(void) s16 var0; index = (gMain.systemFrameCount % 55) / 11; - group = &gMain.spriteGroups[SG_61]; + group = &gMain.spriteGroups[SG_RUBY_61]; DmaCopy16(3, gRubyBoardSharpedo_Gfx[gCurrentPinballGame->catchHoleTileVariant], (void *)0x06012C20, 0x260); if (gCurrentPinballGame->catchHoleAnimFrame) index = gCurrentPinballGame->catchHoleAnimFrame; diff --git a/src/ruby_ramp.c b/src/ruby_ramp.c index 7a2ae7d1..99c258f0 100644 --- a/src/ruby_ramp.c +++ b/src/ruby_ramp.c @@ -86,7 +86,7 @@ void UpdateRubyRampPrizeGate(void) break; } - group = &gMain.spriteGroups[SG_68]; + group = &gMain.spriteGroups[SG_RUBY_68]; if (group->active) { if (gCurrentPinballGame->rampGateState < 3) @@ -104,7 +104,7 @@ void UpdateRubyRampPrizeGate(void) { gCurrentPinballGame->rampPrizeVisibilityTimer--; if (gCurrentPinballGame->rampPrizeVisibilityTimer == 0) - gMain.spriteGroups[SG_68].active = FALSE; + gMain.spriteGroups[SG_RUBY_68].active = FALSE; } oamSimple = &group->oam[0]; @@ -126,14 +126,14 @@ void UpdateRubyRampPrizeGate(void) gCurrentPinballGame->ball->velocity.x = -600; gCurrentPinballGame->ball->velocity.y = -300; gCurrentPinballGame->ball->spinSpeed = 0; - gMain.spriteGroups[SG_68].active = TRUE; + gMain.spriteGroups[SG_RUBY_68].active = TRUE; gCurrentPinballGame->rampPrizeVisibilityTimer = 6; PlayRumble(8); } } } - group = &gMain.spriteGroups[SG_58]; + group = &gMain.spriteGroups[SG_RUBY_58]; if (group->active) { group->baseX = 184 - gCurrentPinballGame->cameraXOffset; diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index 56497e9b..9c952aab 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -149,7 +149,7 @@ void AnimateChikoritaSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_53]; + group = &gMain.spriteGroups[SG_RUBY_53]; if (gCurrentPinballGame->chikoritaFlashActive) { index = gChikoritaFlashFrameIndices[gCurrentPinballGame->chikoritaFlashTimer / 5]; @@ -200,7 +200,7 @@ void UpdateGulpinBossState(void) s16 index; var0 = gGulpinAnimData[gCurrentPinballGame->gulpinAnimFrameIndex]; - group = &gMain.spriteGroups[SG_57]; + group = &gMain.spriteGroups[SG_RUBY_57]; group->baseX = 9 - gCurrentPinballGame->cameraXOffset; group->baseY = 288 - gCurrentPinballGame->cameraYOffset; if (gCurrentPinballGame->gulpinCurrentLevel > gCurrentPinballGame->seedotCount) @@ -441,7 +441,7 @@ void DrawRubySideBumperSprites(void) { index = gSideBumperGfxFrameIndices[gCurrentPinballGame->sideBumperAnimPhase[i]][0]; DmaCopy16(3, gSideBumperGfx[index], (void *)0x06012A20 + i * 0x100, 0x100); - group = &gMain.spriteGroups[SG_59 + i]; + group = &gMain.spriteGroups[SG_RUBY_59 + i]; if (group->active) { int var0 = i * 120 - (gCurrentPinballGame->cameraXOffset - 48); diff --git a/src/sapphire_collision.c b/src/sapphire_collision.c index f47ca5bb..a5f84cd3 100644 --- a/src/sapphire_collision.c +++ b/src/sapphire_collision.c @@ -598,7 +598,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) gCurrentPinballGame->secondaryBall = gCurrentPinballGame->ballStates; modRes = (gCurrentPinballGame->targetBumperHitCounter - 1) % 4; - gMain.spriteGroups[SG_47 + modRes].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_47 + modRes].active = TRUE; gCurrentPinballGame->splashEffectFrameIndex[modRes] = 0; gCurrentPinballGame->splashEffectFrameTimer[modRes] = 0; gCurrentPinballGame->splashEffectPositionIndex[modRes] = gCurrentPinballGame->targetBumperHitCounter - 1; @@ -622,7 +622,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) gCurrentPinballGame->targetBumperHitCounter++; modRes = (gCurrentPinballGame->targetBumperHitCounter -1) % 4; - gMain.spriteGroups[SG_47 + modRes].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_47 + modRes].active = TRUE; gCurrentPinballGame->splashEffectFrameIndex[modRes] = 0; gCurrentPinballGame->splashEffectFrameTimer[modRes] = 0; gCurrentPinballGame->splashEffectPositionIndex[modRes] = gCurrentPinballGame->targetBumperHitCounter - 1; diff --git a/src/sapphire_pond_and_zigzagoon.c b/src/sapphire_pond_and_zigzagoon.c index 308b0ab1..83fffdef 100644 --- a/src/sapphire_pond_and_zigzagoon.c +++ b/src/sapphire_pond_and_zigzagoon.c @@ -35,7 +35,7 @@ void DecrementPelipperTimer(void) void UpdatePelipperPondEntity(void) { s16 i; - struct SpriteGroup *group = &gMain.spriteGroups[SG_60]; + struct SpriteGroup *group = &gMain.spriteGroups[SG_SAPPHIRE_60]; struct OamDataSimple *oamSimple; u16 *dst; const u16 *src; @@ -340,7 +340,7 @@ void AnimateWailmerEntity(void) s16 var0; index = (gCurrentPinballGame->globalAnimFrameCounter % 32) / 16; - group = &gMain.spriteGroups[SG_75]; + group = &gMain.spriteGroups[SG_SAPPHIRE_75]; if (gCurrentPinballGame->catchHoleAnimFrame) index = gCurrentPinballGame->catchHoleAnimFrame; @@ -406,7 +406,7 @@ void UpdateZigzagoonEntity(void) gCurrentPinballGame->sapphireBumperAnimFrame = 0; gCurrentPinballGame->zigzagoonState = 3; gCurrentPinballGame->zigzagoonFxFrame = 0; - gMain.spriteGroups[SG_27].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_27].active = TRUE; gCurrentPinballGame->activePortraitType = 22; DmaCopy16(3, gSapphireBoardZigzagoonFx_Gfx, (void *)0x06015800, 0xC00); m4aSongNumStart(SE_UNKNOWN_0xEC); @@ -437,7 +437,7 @@ void UpdateZigzagoonEntity(void) break; case 4: gCurrentPinballGame->activePortraitType = 0; - gMain.spriteGroups[SG_27].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_27].active = FALSE; gCurrentPinballGame->zigzagoonState = 0; break; } @@ -452,7 +452,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) const u16 *src; s16 index; - group = &gMain.spriteGroups[SG_26]; + group = &gMain.spriteGroups[SG_SAPPHIRE_26]; if (group->active) { group->baseX = 198 - gCurrentPinballGame->cameraXOffset; @@ -474,7 +474,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) } } - group = &gMain.spriteGroups[SG_27]; + group = &gMain.spriteGroups[SG_SAPPHIRE_27]; if (group->active) { group->baseX = 198 - gCurrentPinballGame->cameraXOffset; @@ -494,7 +494,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) } } - group = &gMain.spriteGroups[SG_70]; + group = &gMain.spriteGroups[SG_SAPPHIRE_70]; if (group->active) { group->baseX = 206 - gCurrentPinballGame->cameraXOffset; diff --git a/src/sapphire_seedot_egg_shop.c b/src/sapphire_seedot_egg_shop.c index e6fa0fc6..92ceb39a 100644 --- a/src/sapphire_seedot_egg_shop.c +++ b/src/sapphire_seedot_egg_shop.c @@ -52,7 +52,7 @@ void UpdateSapphireEggHatchAnimation(void) var3 = 0; var1 = 0; var2 = 0; - group = &gMain.spriteGroups[SG_52]; + group = &gMain.spriteGroups[SG_SAPPHIRE_52]; sp0 = 0; switch (gCurrentPinballGame->eggAnimationPhase) { @@ -167,7 +167,7 @@ void UpdateSapphireEggHatchAnimation(void) gOamBuffer[oamSimple->oamId].y += group->baseY; } - group = &gMain.spriteGroups[SG_51]; + group = &gMain.spriteGroups[SG_SAPPHIRE_51]; if (group->active) { group->baseX = 192 - gCurrentPinballGame->cameraXOffset; @@ -392,7 +392,7 @@ void DrawSapphireSeedotAndBasketSprites(void) s16 index; int var0; - group = &gMain.spriteGroups[SG_64]; + group = &gMain.spriteGroups[SG_SAPPHIRE_64]; if (!group->active) return; @@ -408,7 +408,7 @@ void DrawSapphireSeedotAndBasketSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_68]; + group = &gMain.spriteGroups[SG_SAPPHIRE_68]; group->baseX = 10 - gCurrentPinballGame->cameraXOffset; group->baseY = 298 - gCurrentPinballGame->cameraYOffset; oamSimple = &group->oam[0]; @@ -417,7 +417,7 @@ void DrawSapphireSeedotAndBasketSprites(void) for (j = 0; j < 3; j++) { - group = &gMain.spriteGroups[SG_65 + j]; + group = &gMain.spriteGroups[SG_SAPPHIRE_65 + j]; var0 = gSeedotBaseXPositions[j] - j; group->baseX = var0 - gCurrentPinballGame->cameraXOffset; @@ -545,7 +545,7 @@ void DrawSapphireShopSignSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_69]; + group = &gMain.spriteGroups[SG_SAPPHIRE_69]; if (group->active) { group->baseX = 16 - gCurrentPinballGame->cameraXOffset; @@ -727,7 +727,7 @@ void UpdateSapphireEggMachine(void) for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[SG_47 + i]; + group = &gMain.spriteGroups[SG_SAPPHIRE_47 + i]; if (group->active) { if (gSplashEffectFrameDurations[gCurrentPinballGame->splashEffectFrameIndex[i]][0] > gCurrentPinballGame->splashEffectFrameTimer[i]) From 75b9f585bdbb08dd2916cbb4155f022fb928605d Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 00:41:10 -0500 Subject: [PATCH 25/33] Remaining Ruby Board SGs --- data/rom_1.s | 2 +- data/rom_2.s | 86 +++++++++++----------- include/constants/sprite_groups.h | 36 ++++----- include/functions.h | 4 +- include/functions_ruby.h | 4 +- include/global.h | 8 +- src/all_board_process0_sprite_init.c | 48 ++++++------ src/all_board_process2.c | 2 +- src/main_board_bumpers.c | 2 +- src/main_board_edge.c | 4 +- src/main_board_to_be_split.c | 16 ++-- src/ruby_process3.c | 2 +- src/ruby_process3_entities.c | 8 +- src/ruby_process3_entities_2.c | 12 +-- src/ruby_ramp.c | 106 +++++++++++++-------------- src/ruby_trigger_targets.c | 12 +-- 16 files changed, 176 insertions(+), 176 deletions(-) diff --git a/data/rom_1.s b/data/rom_1.s index 28460c02..54b24bb9 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -1319,7 +1319,7 @@ gSapphireBumperLeft_Gfx:: @ 0x0847A40C gSapphireBumperLeftHit_Gfx:: @ 0x0847D10C .incbin "baserom.gba", 0x47D10C, 0xE00 -gRubyRampGateTileGfx:: @ 0x0847DF0C +gRubyMakuhitaGfx:: @ 0x0847DF0C .incbin "baserom.gba", 0x47DF0C, 0x1E00 gSideBumperGfx:: @ 0x0847FD0C diff --git a/data/rom_2.s b/data/rom_2.s index 25940883..6680c298 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -5644,7 +5644,7 @@ gCoinsCollectedSpriteSet:: @ 0x086B1834 packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xdb, priority=0x0, paletteNum=0x3 .2byte 0 -gUnknown_086B1846:: @ 0x086B1846 +gRubyHatchEggSprite:: @ 0x086B1846 .2byte 2 packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x32, tileNum=0xe7, priority=0x1, paletteNum=0xb .2byte 0 @@ -5665,7 +5665,7 @@ gSpoinkLauncherSpriteSet:: @ 0x086B1862 packed_sprite_oam x=0x4, y=0x20, spriteSize=SPRITE_SIZE_16x8, tileNum=0x113, priority=0x1, paletteNum=0xb .2byte 0 -gUnknown_086B187C:: @ 0x086B187C +gRubyHatchCaveSpriteSet:: @ 0x086B187C .2byte 4 packed_sprite_oam x=-0x18, y=-0x20, spriteSize=SPRITE_SIZE_32x32, tileNum=0x115, priority=0x1, paletteNum=0xb .2byte 0 @@ -5676,14 +5676,14 @@ gUnknown_086B187C:: @ 0x086B187C packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x135, priority=0x1, paletteNum=0xb .2byte 0 -gUnknown_086B189E:: @ 0x086B189E +gRubyChikoritaSpriteSet:: @ 0x086B189E .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x139, priority=0x1, paletteNum=0x3 .2byte 0 packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x16, tileNum=0x149, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086B18B0:: @ 0x086B18B0 +gRubyLinooneLeftSpriteSet:: @ 0x086B18B0 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x151, priority=0x2, paletteNum=0x4 .2byte 0 @@ -5692,7 +5692,7 @@ gUnknown_086B18B0:: @ 0x086B18B0 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x157, priority=0x2, paletteNum=0x4 .2byte 0 -gUnknown_086B18CA:: @ 0x086B18CA +gRubyLinooneRightSpriteSet:: @ 0x086B18CA .2byte 3 packed_sprite_oam x=0x8, y=0x0, spriteSize=SPRITE_SIZE_16x16, hFlip=0x1, tileNum=0x159, priority=0x2, paletteNum=0x4 .2byte 0 @@ -5701,7 +5701,7 @@ gUnknown_086B18CA:: @ 0x086B18CA packed_sprite_oam x=0x8, y=0x10, spriteSize=SPRITE_SIZE_16x8, hFlip=0x1, tileNum=0x15f, priority=0x2, paletteNum=0x4 .2byte 0 -gUnknown_086B18E4:: @ 0x086B18E4 +gRubySharpedoSpriteSet:: @ 0x086B18E4 .2byte 3 packed_sprite_oam x=0xA, y=-0x1, spriteSize=SPRITE_SIZE_8x16, tileNum=0x161, priority=0x1, paletteNum=0x6 .2byte 0 @@ -5710,7 +5710,7 @@ gUnknown_086B18E4:: @ 0x086B18E4 packed_sprite_oam x=0x20, y=0x17, spriteSize=SPRITE_SIZE_8x8, tileNum=0x173, priority=0x1, paletteNum=0x6 .2byte 0 -gUnknown_086B18FE:: @ 0x086B18FE +gRubyBumpersSpriteSet:: @ 0x086B18FE .2byte 6 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x174, priority=0x2, paletteNum=0x9 .2byte 0 @@ -5725,21 +5725,21 @@ gUnknown_086B18FE:: @ 0x086B18FE packed_sprite_oam x=0xF, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, tileNum=0x184, priority=0x2, paletteNum=0x9 .2byte 0 -gUnknown_086B1930:: @ 0x086B1930 +gRubyMartDoorSpriteSet:: @ 0x086B1930 .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x18c, priority=0x1, paletteNum=0x5 .2byte 0 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x194, priority=0x1, paletteNum=0x5 .2byte 0 -gUnknown_086B1942:: @ 0x086B1942 +gRubyCyndaquilSpriteSet:: @ 0x086B1942 .2byte 2 packed_sprite_oam x=-0x11, y=-0xE, spriteSize=SPRITE_SIZE_32x32, tileNum=0x198, priority=0x1, paletteNum=0x3 .2byte 0 packed_sprite_oam x=-0x11, y=0x12, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1a8, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086B1954:: @ 0x086B1954 +gRubyMakuhitaSpriteSet:: @ 0x086B1954 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1ac, priority=0x1, paletteNum=0x8 .2byte 0 @@ -5748,7 +5748,7 @@ gUnknown_086B1954:: @ 0x086B1954 packed_sprite_oam x=0x8, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1c0, priority=0x1, paletteNum=0x8 .2byte 0 -gUnknown_086B196E:: @ 0x086B196E +gRubyGulpinStackSpriteSet:: @ 0x086B196E .2byte 6 packed_sprite_oam x=-0x20, y=-0xE, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1c4, priority=0x1, paletteNum=0x7 .2byte 0 @@ -5763,7 +5763,7 @@ gUnknown_086B196E:: @ 0x086B196E packed_sprite_oam x=-0xF, y=-0x3, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1e4, priority=0x1, paletteNum=0x7 .2byte 0 -gUnknown_086B19A0:: @ 0x086B19A0 +gRubyShopSignChangeSpriteSet:: @ 0x086B19A0 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_64x32, tileNum=0x1e8, priority=0x0, paletteNum=0x2 .2byte 0 @@ -5784,14 +5784,14 @@ gRubyChikoritaProjectileCollisionFxSpriteSet:: @ 0x086B19C4 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_16x32, hFlip=0x1, vFlip=0x1, tileNum=0x214, priority=0x0, paletteNum=0x3 .2byte 0 -gUnknown_086B19D6:: @ 0x086B19D6 +gRubyNuzleafSpriteSet:: @ 0x086B19D6 .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x21c, priority=0x2, paletteNum=0x4 .2byte 0 packed_sprite_oam x=0x0, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x22c, priority=0x2, paletteNum=0x4 .2byte 0 -gUnknown_086B19E8:: @ 0x086B19E8 +gRubyBoardRightEdgeSpriteSet:: @ 0x086B19E8 .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 @@ -5804,7 +5804,7 @@ gUnknown_086B19E8:: @ 0x086B19E8 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x230, priority=0x0, paletteNum=0x7 .2byte 0 -gUnknown_086B1A12:: @ 0x086B1A12 +gRubyWhiscashSpriteSet:: @ 0x086B1A12 .2byte 4 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x234, priority=0x1, paletteNum=0x9 .2byte 0 @@ -5815,12 +5815,12 @@ gUnknown_086B1A12:: @ 0x086B1A12 packed_sprite_oam x=0x20, y=0x20, spriteSize=SPRITE_SIZE_16x16, tileNum=0x254, priority=0x1, paletteNum=0x9 .2byte 0 -gUnknown_086B1A34:: @ 0x086B1A34 +gRubyRampPrizeSpriteSet:: @ 0x086B1A34 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x258, priority=0x1, paletteNum=0xa .2byte 0 -gUnknown_086B1A3E:: @ 0x086B1A3E +gRubyMakuhitaPunchFxSpriteSet:: @ 0x086B1A3E .2byte 1 packed_sprite_oam x=-0x11, y=-0xF, spriteSize=SPRITE_SIZE_32x32, tileNum=0x25c, priority=0x0, paletteNum=0x3 .2byte 0 @@ -6012,7 +6012,7 @@ gUnknown_086B1C32:: @ 0x086B1C32 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x27d, priority=0x1, paletteNum=0x3 .2byte 0 -gUnknown_086B1C3C:: @ 0x086B1C3C +gSapphireBoardRightEdgeSpriteSet:: @ 0x086B1C3C .2byte 5 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x28d, priority=0x0, paletteNum=0x5 .2byte 0 @@ -6564,7 +6564,7 @@ gUnknown_086B2324:: @ 0x086B2324 packed_sprite_oam x=-0x52, y=0x2C, spriteSize=SPRITE_SIZE_16x16, tileNum=0x2f6, priority=0x1, paletteNum=0x6 .2byte 0 -gUnknown_086B235E:: @ 0x086B235E +gRubyTotodileEggDeliverySpriteSet:: @ 0x086B235E .2byte 6 packed_sprite_oam x=0xC, y=-0x33, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2f8, priority=0x0, paletteNum=0xe .2byte 0 @@ -6606,11 +6606,11 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gMainModeStartBannerSpriteSet .4byte gMainTileBreakSpriteSet .4byte gCenterHoleGravityFxSpriteSet -.4byte gUnknown_086B22AE +.4byte gUnknown_086B22AE @ Unused? .4byte gEvolutionBannerLightningSpriteSet .4byte gTravelPainterSpriteSet .4byte gChargeIndicatorDeviceSpriteSet -.4byte gUnknown_086B1CDA +.4byte gUnknown_086B1CDA @ Catch tile related, can't narrow further .4byte gPortraitBordersSpriteSet @ 30 .4byte gPortraitTrimSpriteSet .4byte gPortraitTrimSpriteSet @@ -6629,41 +6629,41 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gJirachiStarTrailFx1SpriteSet .4byte gJirachiStarTrailFx2SpriteSet .4byte gJirachiStarTrailFx3SpriteSet -.4byte gUnknown_086B1846 +.4byte gRubyHatchEggSprite .4byte gHatchMonEntitySpriteSet .4byte gMonCatchBallAbsorbPokemonFxSpriteSet @ 50 -.4byte gUnknown_086B1942 -.4byte gUnknown_086B187C -.4byte gUnknown_086B189E +.4byte gRubyCyndaquilSpriteSet +.4byte gRubyHatchCaveSpriteSet +.4byte gRubyChikoritaSpriteSet .4byte gPikachuKickbackSpriteSet .4byte gPichuKickbackSpriteSet .4byte gSpoinkLauncherSpriteSet -.4byte gUnknown_086B196E -.4byte gUnknown_086B1954 -.4byte gUnknown_086B18B0 -.4byte gUnknown_086B18CA @ 60 -.4byte gUnknown_086B18E4 -.4byte gUnknown_086B18FE -.4byte gUnknown_086B1A12 +.4byte gRubyGulpinStackSpriteSet +.4byte gRubyMakuhitaSpriteSet +.4byte gRubyLinooneLeftSpriteSet +.4byte gRubyLinooneRightSpriteSet @ 60 +.4byte gRubySharpedoSpriteSet +.4byte gRubyBumpersSpriteSet +.4byte gRubyWhiscashSpriteSet .4byte gPikaChargingSpinnerSpriteSet -.4byte gUnknown_086B1930 -.4byte gUnknown_086B1A34 +.4byte gRubyMartDoorSpriteSet +.4byte gRubyRampPrizeSpriteSet .4byte gEvoItemSpriteSet -.4byte gUnknown_086B1A3E +.4byte gRubyMakuhitaPunchFxSpriteSet .4byte gBallUpgradeFxSpriteSet .4byte gMainBoardBallSpriteSet @ 70 -.4byte gUnknown_086B19D6 +.4byte gRubyNuzleafSpriteSet .4byte gInitialLocationSelectedFxSpriteSet .4byte gCatchBurstLightningStrikeSpriteSet .4byte gCatchBurstTileFlashFxSpriteSet .4byte gCatchBurstPanelElectrifyFxSpriteSet .4byte gPikaKickbackLaunchFxSpriteSet .4byte gCoinsCollectedSpriteSet -.4byte gUnknown_086B19A0 +.4byte gRubyShopSignChangeSpriteSet .4byte gEvoItemSpawnFxSpriteSet .4byte gGameOverTextSpriteSet @ 80 -.4byte gUnknown_086B19E8 -.4byte gUnknown_086B235E +.4byte gRubyBoardRightEdgeSpriteSet +.4byte gRubyTotodileEggDeliverySpriteSet .4byte gTreecko1UpDeliverySpriteSet gSapphireBoardSpriteSets:: @ 0x086B24E0 @@ -6689,13 +6689,13 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gMainModeStartBannerSpriteSet .4byte gMainTileBreakSpriteSet @ 20 .4byte gCenterHoleGravityFxSpriteSet -.4byte gUnknown_086B22AE +.4byte gUnknown_086B22AE @ Unused? .4byte gEvolutionBannerLightningSpriteSet .4byte gTravelPainterSpriteSet .4byte gChargeIndicatorDeviceSpriteSet .4byte gUnknown_086B1AE6 .4byte gUnknown_086B2324 -.4byte gUnknown_086B1CDA +.4byte gUnknown_086B1CDA @ Catch tile related, can't narrow further .4byte gPortraitBordersSpriteSet .4byte gPortraitTrimSpriteSet @ 30 .4byte gPortraitTrimSpriteSet @@ -6719,7 +6719,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gUnknown_086B1BC4 .4byte gUnknown_086B1BDE @ 50 .4byte gUnknown_086B1BF8 -.4byte gUnknown_086B1846 +.4byte gRubyHatchEggSprite .4byte gHatchMonEntitySpriteSet .4byte gMonCatchBallAbsorbPokemonFxSpriteSet .4byte gPikachuKickbackSpriteSet @@ -6752,7 +6752,7 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gCoinsCollectedSpriteSet .4byte gEvoItemSpawnFxSpriteSet .4byte gGameOverTextSpriteSet -.4byte gUnknown_086B1C3C +.4byte gSapphireBoardRightEdgeSpriteSet .4byte gTreecko1UpDeliverySpriteSet diff --git a/include/constants/sprite_groups.h b/include/constants/sprite_groups.h index 7bb71a54..1d8faa8e 100644 --- a/include/constants/sprite_groups.h +++ b/include/constants/sprite_groups.h @@ -85,41 +85,41 @@ #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_1 45 #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_2 46 #define SG_RUBY_JIRACHI_STAR_TRAIL_FX_3 47 -#define SG_RUBY_48 48 +#define SG_RUBY_HATCH_EGG 48 #define SG_RUBY_HATCH_MON_ENTITY 49 #define SG_RUBY_CATCH_CUTSCENE_BALL_ABSORB_MON_FX 50 -#define SG_RUBY_51 51 -#define SG_RUBY_52 52 -#define SG_RUBY_53 53 +#define SG_RUBY_CYNDAQUIL 51 +#define SG_RUBY_HATCH_CAVE 52 +#define SG_RUBY_CHIKORITA 53 #define SG_RUBY_PIKACHU_KICKBACK_ENTITY 54 #define SG_RUBY_PICHU_KICKBACK_ENTITY 55 #define SG_RUBY_SPOINK_LAUNCHER 56 -#define SG_RUBY_57 57 -#define SG_RUBY_58 58 -#define SG_RUBY_59 59 -#define SG_RUBY_60 60 -#define SG_RUBY_61 61 -#define SG_RUBY_62 62 -#define SG_RUBY_63 63 +#define SG_RUBY_GULPIN_STACK 57 +#define SG_RUBY_MAKUHITA 58 +#define SG_RUBY_LINOONE_LEFT 59 +#define SG_RUBY_LINOONE_RIGHT 60 +#define SG_RUBY_SHARPEDO 61 +#define SG_RUBY_BUMPERS 62 // Lotad/Chinchou +#define SG_RUBY_WHISCASH 63 #define SG_RUBY_PIKA_CHARGING_SPINNER 64 -#define SG_RUBY_65 65 +#define SG_RUBY_MART_DOOR 65 #define SG_RUBY_RAMP_PRIZE 66 #define SG_RUBY_EVO_ITEM 67 -#define SG_RUBY_68 68 +#define SG_RUBY_MAKUHITA_PUNCH_CONTACT_FX 68 #define SG_RUBY_BALL_UPGRADE_FX 69 #define SG_RUBY_BALL 70 -#define SG_RUBY_71 71 +#define SG_RUBY_NUZLEAF 71 #define SG_RUBY_INITIAL_LOCATION_SELECTED_FX 72 #define SG_RUBY_CATCH_BURST_LIGHTNING_STRIKE_FX 73 #define SG_RUBY_CATCH_BURST_TILE_FLASH_FX 74 #define SG_RUBY_PANEL_ELECTRIFY_FX 75 #define SG_RUBY_PIKA_KICKBACK_LAUNCH_FX 76 #define SG_RUBY_COINS_COLLECTED 77 -#define SG_RUBY_78 78 +#define SG_RUBY_SHOP_SIGN_CHANGE 78 // Anim when activating/losing Evo mode. (Poke Mart/Center sign) #define SG_RUBY_EVO_ITEM_SPAWN_FX 79 #define SG_RUBY_GAME_OVER_TEXT 80 -#define SG_RUBY_81 81 -#define SG_RUBY_82 82 +#define SG_RUBY_BOARD_RIGHT_EDGE 81 // Board color rectangles along the right of the launch ramp +#define SG_RUBY_TOTODILE_EGG_DELIVERY 82 #define SG_RUBY_TREECKO_1UP_DELIVERY 83 // Sapphire board @@ -197,7 +197,7 @@ #define SG_SAPPHIRE_COINS_COLLECTED 82 #define SG_SAPPHIRE_EVO_ITEM_SPAWN_FX 83 #define SG_SAPPHIRE_GAME_OVER_TEXT 84 -#define SG_SAPPHIRE_85 85 +#define SG_SAPPHIRE_BOARD_RIGHT_EDGE 85 // Board color rectangles along the right of the launch ramp #define SG_SAPPHIRE_TREECKO_1UP_DELIVERY 86 diff --git a/include/functions.h b/include/functions.h index 93950ea0..f8f5c459 100644 --- a/include/functions.h +++ b/include/functions.h @@ -525,8 +525,8 @@ extern void InitRouletteWheel(void); extern void RunRouletteWheel(void); extern void GivePrize(); //extern ? sub_2C518(); -//extern ? UpdateRubyRampPrizeGate(); -//extern ? DrawRubyNuzleafPlatformSprite(); +//extern ? UpdateMakuhitaEntity(); +//extern ? DrawRubyRampPrize(); extern void AnimateOneUpSprite(); extern void AnimateBannerSlide(void); extern void UpdateSpoinkAnimation(); diff --git a/include/functions_ruby.h b/include/functions_ruby.h index 220a9688..871d277a 100644 --- a/include/functions_ruby.h +++ b/include/functions_ruby.h @@ -4,7 +4,7 @@ #include "functions_main_boards.h" extern void UpdateNuzleafEntity(void); -extern void DrawRubyNuzleafPlatformSprite(void); +extern void DrawRubyRampPrize(void); extern void RubyPondTriBumperHandleHitAndDraw(void); extern void DrawWhiscash(void); extern void AnimateSharpedoEntity(void); @@ -12,7 +12,7 @@ extern void UpdateChikoritaAttackAnimation(void); extern void AnimateChikoritaSprite(void); extern void UpdateGulpinBossState(void); -extern void UpdateRubyRampPrizeGate(void); +extern void UpdateMakuhitaEntity(void); extern void DrawRubySideBumperSprites(void); extern void UpdateRubySideBumperAnimation(void); extern void UpdateRubyBoardEntityRendering(void); diff --git a/include/global.h b/include/global.h index 70f4be19..b207baff 100644 --- a/include/global.h +++ b/include/global.h @@ -437,11 +437,11 @@ struct PinballGame /*0x2FC*/ s8 nuzleafGfxTileIndex; /*0x2FD*/ s8 nuzleafFrameIndex; /*0x2FE*/ u16 nuzleafFrameTimer; - /*0x300*/ s8 rampGateState; - /*0x301*/ s8 rampGateHitFlag; - /*0x302*/ s8 rampPrizeVisibilityTimer; + /*0x300*/ s8 makuhitaPunchState; + /*0x301*/ s8 makuhitaPunchTriggeredFlag; + /*0x302*/ s8 makuhitaHitAnimationTimer; /*0x303*/ s8 unk303; - /*0x304*/ u16 rampGateAnimCounter; + /*0x304*/ u16 makuhitaAnimCounter; /*0x306*/ s8 pelipperState; /*0x307*/ s8 pelipperSwallowAnimIndex; /*0x308*/ u16 bumperHitsSinceReset; diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 0aafa4e9..2a3a1494 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -11,21 +11,21 @@ void RubyBoardProcess_0A_50848(void) gMain.spriteGroups[i].active = FALSE; gMain.spriteGroups[SG_RUBY_PIKA_CHARGING_SPINNER].active = TRUE; - group = &gMain.spriteGroups[SG_RUBY_48]; // fake match? + group = &gMain.spriteGroups[SG_RUBY_HATCH_EGG]; // fake match? gMain.spriteGroups[SG_RUBY_BALL].active = TRUE; gMain.spriteGroups[SG_PAUSE_PANEL].active = TRUE; gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER].active = TRUE; gMain.spriteGroups[SG_RUBY_CHARGE_INDICATOR_DEVICE].active = TRUE; - gMain.spriteGroups[SG_RUBY_81].active = TRUE; - gMain.spriteGroups[SG_RUBY_65].active = TRUE; - gMain.spriteGroups[SG_RUBY_71].active = TRUE; + gMain.spriteGroups[SG_RUBY_BOARD_RIGHT_EDGE].active = TRUE; + gMain.spriteGroups[SG_RUBY_MART_DOOR].active = TRUE; + gMain.spriteGroups[SG_RUBY_NUZLEAF].active = TRUE; gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; - gMain.spriteGroups[SG_RUBY_51].active = TRUE; - gMain.spriteGroups[SG_RUBY_61].active = TRUE; + gMain.spriteGroups[SG_RUBY_CYNDAQUIL].active = TRUE; + gMain.spriteGroups[SG_RUBY_SHARPEDO].active = TRUE; group->active = TRUE; - gMain.spriteGroups[SG_RUBY_52].active = TRUE; - gMain.spriteGroups[SG_RUBY_62].active = TRUE; + gMain.spriteGroups[SG_RUBY_HATCH_CAVE].active = TRUE; + gMain.spriteGroups[SG_RUBY_BUMPERS].active = TRUE; LoadSpriteSets( gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, @@ -38,49 +38,49 @@ void RubyBoardProcess_0B_50918(void) gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = FALSE; gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = FALSE; - gMain.spriteGroups[SG_RUBY_48].active = FALSE; - gMain.spriteGroups[SG_RUBY_71].active = FALSE; + gMain.spriteGroups[SG_RUBY_HATCH_EGG].active = FALSE; + gMain.spriteGroups[SG_RUBY_NUZLEAF].active = FALSE; for (i = 51; i < 67; i++) gMain.spriteGroups[i].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 110) { - gMain.spriteGroups[SG_RUBY_65].active = TRUE; - gMain.spriteGroups[SG_RUBY_71].active = TRUE; + gMain.spriteGroups[SG_RUBY_MART_DOOR].active = TRUE; + gMain.spriteGroups[SG_RUBY_NUZLEAF].active = TRUE; gMain.spriteGroups[SG_RUBY_RAMP_PRIZE].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 168) { - gMain.spriteGroups[SG_RUBY_48].active = TRUE; - gMain.spriteGroups[SG_RUBY_52].active = TRUE; + gMain.spriteGroups[SG_RUBY_HATCH_EGG].active = TRUE; + gMain.spriteGroups[SG_RUBY_HATCH_CAVE].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 220) { - gMain.spriteGroups[SG_RUBY_51].active = TRUE; - gMain.spriteGroups[SG_RUBY_61].active = TRUE; + gMain.spriteGroups[SG_RUBY_CYNDAQUIL].active = TRUE; + gMain.spriteGroups[SG_RUBY_SHARPEDO].active = TRUE; gMain.spriteGroups[SG_RUBY_PIKA_CHARGING_SPINNER].active = TRUE; if (gCurrentPinballGame->shouldProcessWhiscash) - gMain.spriteGroups[SG_RUBY_63].active = TRUE; + gMain.spriteGroups[SG_RUBY_WHISCASH].active = TRUE; else - gMain.spriteGroups[SG_RUBY_62].active = TRUE; + gMain.spriteGroups[SG_RUBY_BUMPERS].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 63) { - gMain.spriteGroups[SG_RUBY_53].active = TRUE; - gMain.spriteGroups[SG_RUBY_57].active = TRUE; + gMain.spriteGroups[SG_RUBY_CHIKORITA].active = TRUE; + gMain.spriteGroups[SG_RUBY_GULPIN_STACK].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 115) - gMain.spriteGroups[SG_RUBY_58].active = TRUE; + gMain.spriteGroups[SG_RUBY_MAKUHITA].active = TRUE; if (gCurrentPinballGame->cameraYViewport > 130) { - gMain.spriteGroups[SG_RUBY_59].active = TRUE; - gMain.spriteGroups[SG_RUBY_60].active = TRUE; + gMain.spriteGroups[SG_RUBY_LINOONE_LEFT].active = TRUE; + gMain.spriteGroups[SG_RUBY_LINOONE_RIGHT].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) @@ -115,7 +115,7 @@ void SapphireBoardProcess_0A_50AD4(void) gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; gMain.spriteGroups[SG_PAUSE_BOTTOM_BORDER].active = TRUE; gMain.spriteGroups[SG_SAPPHIRE_CHARGE_INDICATOR_DEVICE].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_85].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_BOARD_RIGHT_EDGE].active = TRUE; LoadSpriteSets(gFieldSpriteSets[gMain.selectedField].spriteSets, gFieldSpriteSets[gMain.selectedField].numSpriteSets, gMain.spriteGroups); diff --git a/src/all_board_process2.c b/src/all_board_process2.c index 3029ade0..e7078dc0 100644 --- a/src/all_board_process2.c +++ b/src/all_board_process2.c @@ -588,5 +588,5 @@ void ResetBoardStateOnDeath(void) } - gCurrentPinballGame->rampGateState = 0; + gCurrentPinballGame->makuhitaPunchState = 0; } diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index c0266cfd..8d6b174c 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -330,7 +330,7 @@ void HandleRubyBumperHit(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_RUBY_63]; + group = &gMain.spriteGroups[SG_RUBY_WHISCASH]; if (gCurrentPinballGame->bumperHitCountdown > 0) { if (gCurrentPinballGame->bumperHitCountdown == 2) diff --git a/src/main_board_edge.c b/src/main_board_edge.c index c9e85dcf..e921743f 100644 --- a/src/main_board_edge.c +++ b/src/main_board_edge.c @@ -13,9 +13,9 @@ void DrawBoardEdgeBanner(void) struct SpriteGroup *group; if (gMain.selectedField == FIELD_RUBY) - group = &gMain.spriteGroups[SG_RUBY_81]; + group = &gMain.spriteGroups[SG_RUBY_BOARD_RIGHT_EDGE]; else - group = &gMain.spriteGroups[SG_SAPPHIRE_85]; + group = &gMain.spriteGroups[SG_SAPPHIRE_BOARD_RIGHT_EDGE]; if (group->active) { diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 208d9201..4c37453f 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -498,7 +498,7 @@ void UpdateRubyEvolutionShopSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_RUBY_78]; + group = &gMain.spriteGroups[SG_RUBY_SHOP_SIGN_CHANGE]; if (gCurrentPinballGame->shopTransitionActive == 0) { if (gCurrentPinballGame->evoArrowProgress > 2) @@ -554,7 +554,7 @@ void UpdateRubyEvolutionShopSprite(void) { LoadShopItemGraphics(gCurrentPinballGame->evolutionShopActive); gCurrentPinballGame->shopTransitionActive = 0; - gMain.spriteGroups[SG_RUBY_78].active = FALSE; + gMain.spriteGroups[SG_RUBY_SHOP_SIGN_CHANGE].active = FALSE; } } } @@ -848,7 +848,7 @@ void InitTotodileEggDelivery(void) gCurrentPinballGame->eggDeliveryY = 2080; gCurrentPinballGame->totodileDeliveryFrame = 0; gCurrentPinballGame->totodileDeliveryTimer = 0; - gMain.spriteGroups[SG_RUBY_82].active = TRUE; + gMain.spriteGroups[SG_RUBY_TOTODILE_EGG_DELIVERY].active = TRUE; gCurrentPinballGame->eggAnimationPhase = 1; gCurrentPinballGame->portraitOffsetX = 240; gCurrentPinballGame->portraitOffsetY = 160; @@ -867,7 +867,7 @@ void AnimateTotodileEggDelivery(void) s16 var0; var0 = 0; - group = &gMain.spriteGroups[SG_RUBY_82]; + group = &gMain.spriteGroups[SG_RUBY_TOTODILE_EGG_DELIVERY]; if (gPikaSaverFrameData[gCurrentPinballGame->totodileDeliveryFrame][1] > gCurrentPinballGame->totodileDeliveryTimer) { gCurrentPinballGame->totodileDeliveryTimer++; @@ -1294,7 +1294,7 @@ void UpdateRubyEggHatchAnimation(void) var0 = 0; var1 = 0; var2 = 0; - group = &gMain.spriteGroups[SG_RUBY_48]; + group = &gMain.spriteGroups[SG_RUBY_HATCH_EGG]; var3 = 0; switch (gCurrentPinballGame->eggAnimationPhase) { @@ -1414,12 +1414,12 @@ void UpdateRubyEggHatchAnimation(void) gOamBuffer[oamSimple->oamId].y += group->baseY; } - group = &gMain.spriteGroups[SG_RUBY_52]; + group = &gMain.spriteGroups[SG_RUBY_HATCH_CAVE]; group->baseX = gCurrentPinballGame->eggBasePosX; group->baseY = gCurrentPinballGame->eggBasePosY; for (i = 0; i < 4; i++) { - oamSimple = &gMain.spriteGroups[SG_RUBY_52].oam[i]; + oamSimple = &gMain.spriteGroups[SG_RUBY_HATCH_CAVE].oam[i]; gOamBuffer[oamSimple->oamId].priority = priority; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; @@ -1435,7 +1435,7 @@ void UpdateHatchCave(void) s16 var0; priority = 1; - group = &gMain.spriteGroups[SG_RUBY_51]; + group = &gMain.spriteGroups[SG_RUBY_CYNDAQUIL]; var0 = gMain.systemFrameCount % 36; gCurrentPinballGame->cyndaquilFrame = 0; gCurrentPinballGame->cyndaquilCollisionEnabled = 1; diff --git a/src/ruby_process3.c b/src/ruby_process3.c index 4169ef3b..d56ec125 100644 --- a/src/ruby_process3.c +++ b/src/ruby_process3.c @@ -37,7 +37,7 @@ void RubyBoardProcess_3A_19A20(void) gCurrentPinballGame->chargeIndicatorScaleX = 256; gCurrentPinballGame->chargeIndicatorScaleY = 256; gCurrentPinballGame->rampPrizeType = 2; - DrawRubyNuzleafPlatformSprite(); + DrawRubyRampPrize(); gCurrentPinballGame->sideBumperShakeOffset[0] = 3; gCurrentPinballGame->sideBumperShakeOffset[1] = 3; diff --git a/src/ruby_process3_entities.c b/src/ruby_process3_entities.c index c50dd65f..5f159901 100644 --- a/src/ruby_process3_entities.c +++ b/src/ruby_process3_entities.c @@ -23,7 +23,7 @@ void UpdateRubyBoardEntityRendering(void) { UpdateNuzleafEntity(); AnimateRubyShopDoor(); - DrawRubyNuzleafPlatformSprite(); + DrawRubyRampPrize(); } AnimateOneUpSprite(); if (gCurrentPinballGame->cameraYViewport < 168) @@ -52,7 +52,7 @@ void UpdateRubyBoardEntityRendering(void) } if (gCurrentPinballGame->cameraYViewport > 115) { - UpdateRubyRampPrizeGate(); + UpdateMakuhitaEntity(); } if (gCurrentPinballGame->cameraYViewport > 130) { @@ -99,7 +99,7 @@ void UpdateRubyBoardEntityLogic(void) } } -//Duplicate of HandleSapphireFlipperButtonInput, with "gCurrentPinballGame->rampGateHitFlag = 1;" added in the final if statement +//Duplicate of HandleSapphireFlipperButtonInput, with "gCurrentPinballGame->makuhitaPunchTriggeredFlag = 1;" added in the final if statement void HandleRubyFlipperButtonInput(void) { int tmp; @@ -143,6 +143,6 @@ void HandleRubyFlipperButtonInput(void) gCurrentPinballGame->ballPowerUpLight[1] = gCurrentPinballGame->ballPowerUpLight[0]; gCurrentPinballGame->ballPowerUpLight[0] = tmp; - gCurrentPinballGame->rampGateHitFlag = 1; + gCurrentPinballGame->makuhitaPunchTriggeredFlag = 1; } } diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index f8c19bd4..d76f2b18 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -40,7 +40,7 @@ void UpdateNuzleafEntity(void) s16 var0; s16 var1; - group = &gMain.spriteGroups[SG_RUBY_71]; + group = &gMain.spriteGroups[SG_RUBY_NUZLEAF]; var0 = 0; var1 = 0; switch (gCurrentPinballGame->nuzleafAnimState) @@ -185,7 +185,7 @@ void AnimateRubyShopDoor(void) struct OamDataSimple *oamSimple; s16 priority; - group = &gMain.spriteGroups[SG_RUBY_65]; + group = &gMain.spriteGroups[SG_RUBY_MART_DOOR]; if ((gCurrentPinballGame->shopDoorTargetFrame & 0xF) != gCurrentPinballGame->shopDoorCurrentFrame) { if (gCurrentPinballGame->shopDoorAnimDelay) @@ -232,7 +232,7 @@ void AnimateRubyShopDoor(void) group->baseY = 80 - gCurrentPinballGame->cameraYOffset; for (i = 0; i < 2; i++) { - oamSimple = &gMain.spriteGroups[SG_RUBY_65].oam[i]; + oamSimple = &gMain.spriteGroups[SG_RUBY_MART_DOOR].oam[i]; gOamBuffer[oamSimple->oamId].priority = priority; gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; @@ -247,7 +247,7 @@ void DrawWhiscash(void) s16 var0; const s16 *var1; - group = &gMain.spriteGroups[SG_RUBY_63]; + group = &gMain.spriteGroups[SG_RUBY_WHISCASH]; var1 = gWhiscashFramesetData[gCurrentPinballGame->whiscashFrameIx]; if (group->active) { @@ -795,7 +795,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->bumperHitCountdown--; } - group = &gMain.spriteGroups[SG_RUBY_62]; + group = &gMain.spriteGroups[SG_RUBY_BUMPERS]; if (gCurrentPinballGame->rubyPondState == RUBY_POND_STATE_LOTAD) { for (i = 0; i < 3; i++) @@ -885,7 +885,7 @@ void AnimateSharpedoEntity(void) s16 var0; index = (gMain.systemFrameCount % 55) / 11; - group = &gMain.spriteGroups[SG_RUBY_61]; + group = &gMain.spriteGroups[SG_RUBY_SHARPEDO]; DmaCopy16(3, gRubyBoardSharpedo_Gfx[gCurrentPinballGame->catchHoleTileVariant], (void *)0x06012C20, 0x260); if (gCurrentPinballGame->catchHoleAnimFrame) index = gCurrentPinballGame->catchHoleAnimFrame; diff --git a/src/ruby_ramp.c b/src/ruby_ramp.c index 99c258f0..dec4d57f 100644 --- a/src/ruby_ramp.c +++ b/src/ruby_ramp.c @@ -3,11 +3,11 @@ #include "main.h" #include "constants/bg_music.h" -extern const u8 gRubyRampGateTileGfx[][0x300]; +extern const u8 gRubyMakuhitaGfx[][0x300]; extern const u8 gRubyBoardRampPrize_Gfx[][0x80]; -void UpdateRubyRampPrizeGate(void) +void UpdateMakuhitaEntity(void) { s16 i; struct OamDataSimple *oamSimple; @@ -17,79 +17,79 @@ void UpdateRubyRampPrizeGate(void) s16 index; index = 0; - switch (gCurrentPinballGame->rampGateState) + switch (gCurrentPinballGame->makuhitaPunchState) { case 0: - index = (gCurrentPinballGame->rampGateAnimCounter % 36) / 18; - gCurrentPinballGame->rampGateAnimCounter++; - gCurrentPinballGame->rampGateHitFlag = 0; + index = (gCurrentPinballGame->makuhitaAnimCounter % 36) / 18; + gCurrentPinballGame->makuhitaAnimCounter++; + gCurrentPinballGame->makuhitaPunchTriggeredFlag = 0; break; case 1: - index = (gCurrentPinballGame->rampGateAnimCounter % 36) / 18 + 2; - gCurrentPinballGame->rampGateAnimCounter++; - if (gCurrentPinballGame->rampGateHitFlag) + index = (gCurrentPinballGame->makuhitaAnimCounter % 36) / 18 + 2; + gCurrentPinballGame->makuhitaAnimCounter++; + if (gCurrentPinballGame->makuhitaPunchTriggeredFlag) { - gCurrentPinballGame->rampGateState = 2; - gCurrentPinballGame->rampGateAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchState = 2; + gCurrentPinballGame->makuhitaAnimCounter = 0; } - gCurrentPinballGame->rampGateHitFlag = 0; + gCurrentPinballGame->makuhitaPunchTriggeredFlag = 0; break; case 2: - index = (gCurrentPinballGame->rampGateAnimCounter % 9) / 3 + 4; - gCurrentPinballGame->rampGateAnimCounter++; - if (gCurrentPinballGame->rampGateAnimCounter == 9) + index = (gCurrentPinballGame->makuhitaAnimCounter % 9) / 3 + 4; + gCurrentPinballGame->makuhitaAnimCounter++; + if (gCurrentPinballGame->makuhitaAnimCounter == 9) { - gCurrentPinballGame->rampGateState = 3; - gCurrentPinballGame->rampGateAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchState = 3; + gCurrentPinballGame->makuhitaAnimCounter = 0; } break; case 3: - index = (gCurrentPinballGame->rampGateAnimCounter % 36) / 18 + 2; - gCurrentPinballGame->rampGateAnimCounter++; - if (gCurrentPinballGame->rampGateAnimCounter > 65) + index = (gCurrentPinballGame->makuhitaAnimCounter % 36) / 18 + 2; + gCurrentPinballGame->makuhitaAnimCounter++; + if (gCurrentPinballGame->makuhitaAnimCounter > 65) { - gCurrentPinballGame->rampGateState = 1; - gCurrentPinballGame->rampGateAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchState = 1; + gCurrentPinballGame->makuhitaAnimCounter = 0; } - if (gCurrentPinballGame->rampGateAnimCounter > 6 && gCurrentPinballGame->rampGateHitFlag) + if (gCurrentPinballGame->makuhitaAnimCounter > 6 && gCurrentPinballGame->makuhitaPunchTriggeredFlag) { - gCurrentPinballGame->rampGateState = 4; - gCurrentPinballGame->rampGateAnimCounter = 0; - gCurrentPinballGame->rampGateHitFlag = 0; + gCurrentPinballGame->makuhitaPunchState = 4; + gCurrentPinballGame->makuhitaAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchTriggeredFlag = 0; } break; case 4: - index = (gCurrentPinballGame->rampGateAnimCounter % 9) / 3 + 7; - gCurrentPinballGame->rampGateAnimCounter++; - if (gCurrentPinballGame->rampGateAnimCounter == 9) + index = (gCurrentPinballGame->makuhitaAnimCounter % 9) / 3 + 7; + gCurrentPinballGame->makuhitaAnimCounter++; + if (gCurrentPinballGame->makuhitaAnimCounter == 9) { - gCurrentPinballGame->rampGateState = 5; - gCurrentPinballGame->rampGateAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchState = 5; + gCurrentPinballGame->makuhitaAnimCounter = 0; } break; case 5: - index = (gCurrentPinballGame->rampGateAnimCounter % 36) / 18 + 2; - gCurrentPinballGame->rampGateAnimCounter++; - if (gCurrentPinballGame->rampGateAnimCounter > 65) + index = (gCurrentPinballGame->makuhitaAnimCounter % 36) / 18 + 2; + gCurrentPinballGame->makuhitaAnimCounter++; + if (gCurrentPinballGame->makuhitaAnimCounter > 65) { - gCurrentPinballGame->rampGateState = 1; - gCurrentPinballGame->rampGateAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchState = 1; + gCurrentPinballGame->makuhitaAnimCounter = 0; } - if (gCurrentPinballGame->rampGateAnimCounter > 6 && gCurrentPinballGame->rampGateHitFlag) + if (gCurrentPinballGame->makuhitaAnimCounter > 6 && gCurrentPinballGame->makuhitaPunchTriggeredFlag) { - gCurrentPinballGame->rampGateState = 2; - gCurrentPinballGame->rampGateAnimCounter = 0; - gCurrentPinballGame->rampGateHitFlag = 0; + gCurrentPinballGame->makuhitaPunchState = 2; + gCurrentPinballGame->makuhitaAnimCounter = 0; + gCurrentPinballGame->makuhitaPunchTriggeredFlag = 0; } break; } - group = &gMain.spriteGroups[SG_RUBY_68]; + group = &gMain.spriteGroups[SG_RUBY_MAKUHITA_PUNCH_CONTACT_FX]; if (group->active) { - if (gCurrentPinballGame->rampGateState < 3) + if (gCurrentPinballGame->makuhitaPunchState < 3) { group->baseX = 188 - gCurrentPinballGame->cameraXOffset; group->baseY = 281 - gCurrentPinballGame->cameraYOffset; @@ -100,11 +100,11 @@ void UpdateRubyRampPrizeGate(void) group->baseY = 278 - gCurrentPinballGame->cameraYOffset; } - if (gCurrentPinballGame->rampPrizeVisibilityTimer > 0) + if (gCurrentPinballGame->makuhitaHitAnimationTimer > 0) { - gCurrentPinballGame->rampPrizeVisibilityTimer--; - if (gCurrentPinballGame->rampPrizeVisibilityTimer == 0) - gMain.spriteGroups[SG_RUBY_68].active = FALSE; + gCurrentPinballGame->makuhitaHitAnimationTimer--; + if (gCurrentPinballGame->makuhitaHitAnimationTimer == 0) + gMain.spriteGroups[SG_RUBY_MAKUHITA_PUNCH_CONTACT_FX].active = FALSE; } oamSimple = &group->oam[0]; @@ -112,33 +112,33 @@ void UpdateRubyRampPrizeGate(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - if (gCurrentPinballGame->rampGateState == 4 || gCurrentPinballGame->rampGateState == 2) + if (gCurrentPinballGame->makuhitaPunchState == 4 || gCurrentPinballGame->makuhitaPunchState == 2) { x = gCurrentPinballGame->ball->positionQ0.x - 190; y = gCurrentPinballGame->ball->positionQ0.y - 285; squaredDistance = (x * x) + (y * y); if(squaredDistance >= 0 && squaredDistance <= 140) { - if (gCurrentPinballGame->rampPrizeVisibilityTimer <= 0) + if (gCurrentPinballGame->makuhitaHitAnimationTimer <= 0) { m4aSongNumStart(SE_UNKNOWN_0xC5); gCurrentPinballGame->scoreAddedInFrame = 10000; gCurrentPinballGame->ball->velocity.x = -600; gCurrentPinballGame->ball->velocity.y = -300; gCurrentPinballGame->ball->spinSpeed = 0; - gMain.spriteGroups[SG_RUBY_68].active = TRUE; - gCurrentPinballGame->rampPrizeVisibilityTimer = 6; + gMain.spriteGroups[SG_RUBY_MAKUHITA_PUNCH_CONTACT_FX].active = TRUE; + gCurrentPinballGame->makuhitaHitAnimationTimer = 6; PlayRumble(8); } } } - group = &gMain.spriteGroups[SG_RUBY_58]; + group = &gMain.spriteGroups[SG_RUBY_MAKUHITA]; if (group->active) { group->baseX = 184 - gCurrentPinballGame->cameraXOffset; group->baseY = 277 - gCurrentPinballGame->cameraYOffset; - DmaCopy16(3, gRubyRampGateTileGfx[index], (void*) 0x06013580, 0x300); + DmaCopy16(3, gRubyMakuhitaGfx[index], (void*) 0x06013580, 0x300); for (i = 0; i < 3;i++) { oamSimple = &group->oam[i]; @@ -148,7 +148,7 @@ void UpdateRubyRampPrizeGate(void) } } -void DrawRubyNuzleafPlatformSprite(void) +void DrawRubyRampPrize(void) { struct OamDataSimple *oamSimple; struct SpriteGroup *group; diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index 9c952aab..033fd5b5 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -149,7 +149,7 @@ void AnimateChikoritaSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_RUBY_53]; + group = &gMain.spriteGroups[SG_RUBY_CHIKORITA]; if (gCurrentPinballGame->chikoritaFlashActive) { index = gChikoritaFlashFrameIndices[gCurrentPinballGame->chikoritaFlashTimer / 5]; @@ -200,7 +200,7 @@ void UpdateGulpinBossState(void) s16 index; var0 = gGulpinAnimData[gCurrentPinballGame->gulpinAnimFrameIndex]; - group = &gMain.spriteGroups[SG_RUBY_57]; + group = &gMain.spriteGroups[SG_RUBY_GULPIN_STACK]; group->baseX = 9 - gCurrentPinballGame->cameraXOffset; group->baseY = 288 - gCurrentPinballGame->cameraYOffset; if (gCurrentPinballGame->gulpinCurrentLevel > gCurrentPinballGame->seedotCount) @@ -409,10 +409,10 @@ void UpdateRubySideBumperAnimation(void) } else { - if (gCurrentPinballGame->rampGateState == 0) - gCurrentPinballGame->rampGateState = 1; + if (gCurrentPinballGame->makuhitaPunchState == 0) + gCurrentPinballGame->makuhitaPunchState = 1; else - gCurrentPinballGame->rampGateState = 0; + gCurrentPinballGame->makuhitaPunchState = 0; } gCurrentPinballGame->sideBumperBounceCount[0] = 0; @@ -441,7 +441,7 @@ void DrawRubySideBumperSprites(void) { index = gSideBumperGfxFrameIndices[gCurrentPinballGame->sideBumperAnimPhase[i]][0]; DmaCopy16(3, gSideBumperGfx[index], (void *)0x06012A20 + i * 0x100, 0x100); - group = &gMain.spriteGroups[SG_RUBY_59 + i]; + group = &gMain.spriteGroups[SG_RUBY_LINOONE_LEFT + i]; if (group->active) { int var0 = i * 120 - (gCurrentPinballGame->cameraXOffset - 48); From c0b3b6c35b35652acdf20826c98f5dc93f3fa20c Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 02:07:05 -0500 Subject: [PATCH 26/33] remaining sapphire SGs --- data/rom_2.s | 94 ++++++++++++++-------------- include/constants/sprite_groups.h | 48 +++++++------- src/all_board_process0_sprite_init.c | 54 ++++++++-------- src/main_board_bumpers.c | 10 +-- src/sapphire_collision.c | 4 +- src/sapphire_pond_and_zigzagoon.c | 14 ++--- src/sapphire_seedot_egg_shop.c | 14 ++--- 7 files changed, 120 insertions(+), 118 deletions(-) diff --git a/data/rom_2.s b/data/rom_2.s index 6680c298..62bdbb37 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -5644,7 +5644,7 @@ gCoinsCollectedSpriteSet:: @ 0x086B1834 packed_sprite_oam x=-0x10, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0xdb, priority=0x0, paletteNum=0x3 .2byte 0 -gRubyHatchEggSprite:: @ 0x086B1846 +gMainBoardHatchEggSprite:: @ 0x086B1846 .2byte 2 packed_sprite_oam x=-0x10, y=-0x28, spriteSize=SPRITE_SIZE_32x32, tileNum=0xe7, priority=0x1, paletteNum=0xb .2byte 0 @@ -5858,7 +5858,7 @@ gTreecko1UpDeliverySpriteSet:: @ 0x086B1A98 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_8x16, tileNum=0x2a9, priority=0x0, paletteNum=0xc .2byte 0 -gUnknown_086B1AB2:: @ 0x086B1AB2 +gSapphirePelipperSpriteSet:: @ 0x086B1AB2 .2byte 4 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x115, priority=0x1, paletteNum=0x4 .2byte 0 @@ -5870,14 +5870,14 @@ gUnknown_086B1AB2:: @ 0x086B1AB2 .2byte 0 -gUnknown_086B1AD4:: @ 0x086B1AD4 +gSapphireWailmerSpriteSet:: @ 0x086B1AD4 .2byte 2 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x139, priority=0x3, paletteNum=0x2 .2byte 0 packed_sprite_oam x=0x20, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_16x32, tileNum=0x149, priority=0x3, paletteNum=0x2 .2byte 0 -gUnknown_086B1AE6:: @ 0x086B1AE6 +gSapphireZigzagoonSpriteSet:: @ 0x086B1AE6 .2byte 3 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x151, priority=0x1, paletteNum=0x6 .2byte 0 @@ -5887,14 +5887,14 @@ gUnknown_086B1AE6:: @ 0x086B1AE6 .2byte 0 -gUnknown_086B1B00:: @ 0x086B1B00 +gSapphireMinunSpriteSet:: @ 0x086B1B00 .2byte 2 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x16d, priority=0x1, paletteNum=0xa .2byte 0 packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x16, tileNum=0x17d, priority=0x1, paletteNum=0xa .2byte 0 -gUnknown_086B1B12:: @ 0x086B1B12 +gSapphirePlusleSpriteSet:: @ 0x086B1B12 .2byte 2 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x185, priority=0x1, paletteNum=0xa .2byte 0 @@ -5902,7 +5902,7 @@ gUnknown_086B1B12:: @ 0x086B1B12 .2byte 0 -gUnknown_086B1B24:: @ 0x086B1B24 +gSapphireShroomishBumpersSpriteSet:: @ 0x086B1B24 .2byte 3 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x19d, priority=0x2, paletteNum=0x5 .2byte 0 @@ -5911,40 +5911,40 @@ gUnknown_086B1B24:: @ 0x086B1B24 packed_sprite_oam x=0x0, y=-0x1, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x1bd, priority=0x2, paletteNum=0x5 .2byte 0 -gUnknown_086B1B3E:: @ 0x086B1B3E +gSapphireSeedotBasketBackSpriteSet:: @ 0x086B1B3E .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1cd, priority=0x1, paletteNum=0x7 .2byte 0 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_32x8, tileNum=0x1d5, priority=0x1, paletteNum=0x7 .2byte 0 -gUnknown_086B1B50:: @ 0x086B1B50 +gSapphireSeedotBasketFrontSpriteSet:: @ 0x086B1B50 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x16, tileNum=0x1d9, priority=0x2, paletteNum=0x7 .2byte 0 -gUnknown_086B1B5A:: @ 0x086B1B5A +gSapphireSeedotEntity0SpriteSet:: @ 0x086B1B5A .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1e1, priority=0x1, paletteNum=0x7 .2byte 0 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1e9, priority=0x1, paletteNum=0x7 .2byte 0 -gUnknown_086B1B6C:: @ 0x086B1B6C +gSapphireSeedotEntity1SpriteSet:: @ 0x086B1B6C .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1ed, priority=0x1, paletteNum=0x7 .2byte 0 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x1f5, priority=0x1, paletteNum=0x7 .2byte 0 -gUnknown_086B1B7E:: @ 0x086B1B7E +gSapphireSeedotEntity2SpriteSet:: @ 0x086B1B7E .2byte 2 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x32, tileNum=0x1f9, priority=0x1, paletteNum=0x7 .2byte 0 packed_sprite_oam x=0x10, y=0x0, spriteSize=SPRITE_SIZE_8x32, tileNum=0x201, priority=0x1, paletteNum=0x7 .2byte 0 -gUnknown_086B1B90:: @ 0x086B1B90 +gSapphireHatchMachineLightSparkFx0SpriteSet:: @ 0x086B1B90 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x205, priority=0x1, paletteNum=0x0 .2byte 0 @@ -5953,7 +5953,7 @@ gUnknown_086B1B90:: @ 0x086B1B90 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x20b, priority=0x1, paletteNum=0x0 .2byte 0 -gUnknown_086B1BAA:: @ 0x086B1BAA +gSapphireHatchMachineLightSparkFx1SpriteSet:: @ 0x086B1BAA .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x20d, priority=0x1, paletteNum=0x0 .2byte 0 @@ -5962,7 +5962,7 @@ gUnknown_086B1BAA:: @ 0x086B1BAA packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x213, priority=0x1, paletteNum=0x0 .2byte 0 -gUnknown_086B1BC4:: @ 0x086B1BC4 +gSapphireHatchMachineLightSparkFx2SpriteSet:: @ 0x086B1BC4 .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x215, priority=0x1, paletteNum=0x0 .2byte 0 @@ -5971,7 +5971,7 @@ gUnknown_086B1BC4:: @ 0x086B1BC4 packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x21b, priority=0x1, paletteNum=0x0 .2byte 0 -gUnknown_086B1BDE:: @ 0x086B1BDE +gSapphireHatchMachineLightSparkFx3SpriteSet:: @ 0x086B1BDE .2byte 3 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x21d, priority=0x1, paletteNum=0x0 .2byte 0 @@ -5980,34 +5980,34 @@ gUnknown_086B1BDE:: @ 0x086B1BDE packed_sprite_oam x=0x0, y=0x10, spriteSize=SPRITE_SIZE_16x8, tileNum=0x223, priority=0x1, paletteNum=0x0 .2byte 0 -gUnknown_086B1BF8:: @ 0x086B1BF8 +gSapphireHatchMachineLowerSegmentSpriteSet:: @ 0x086B1BF8 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x225, priority=0x0, paletteNum=0xb .2byte 0 -gUnknown_086B1C02:: @ 0x086B1C02 +gSapphireMartElectricalGateFxSpriteSet:: @ 0x086B1C02 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_16x16, tileNum=0x235, priority=0x3, paletteNum=0xa .2byte 0 -gUnknown_086B1C0C:: @ 0x086B1C0C +gSapphireMinunElectricityFxSpriteSet:: @ 0x086B1C0C .2byte 1 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x239, priority=0x1, paletteNum=0xa .2byte 0 -gUnknown_086B1C16:: @ 0x086B1C16 +gSapphirePlusleElectricityFxSpriteSet:: @ 0x086B1C16 .2byte 1 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_32x32, tileNum=0x249, priority=0x1, paletteNum=0xa .2byte 0 -gUnknown_086B1C20:: @ 0x086B1C20 +gSapphireMartSignSpriteSet:: @ 0x086B1C20 .2byte 2 packed_sprite_oam x=0x0, y=0x0, mosaic=0x1, spriteSize=SPRITE_SIZE_64x32, tileNum=0x259, priority=0x1, paletteNum=0x8 .2byte 0 packed_sprite_oam x=0x0, y=0x20, mosaic=0x1, spriteSize=SPRITE_SIZE_32x8, tileNum=0x279, priority=0x1, paletteNum=0x8 .2byte 0 -gUnknown_086B1C32:: @ 0x086B1C32 +gSapphireZigzagoonSpeechBubbleSpriteSet:: @ 0x086B1C32 .2byte 1 packed_sprite_oam x=0x0, y=0x0, spriteSize=SPRITE_SIZE_32x32, tileNum=0x27d, priority=0x1, paletteNum=0x3 .2byte 0 @@ -6547,7 +6547,7 @@ gTravelPainterSpriteSet:: @ 0x086B22F2 packed_sprite_oam x=0x18, y=0x20, spriteSize=SPRITE_SIZE_32x8, tileNum=0x304, priority=0x1, paletteNum=0xe .2byte 0 -gUnknown_086B2324:: @ 0x086B2324 +gSapphireZigzagoonTrailFxSpriteSet:: @ 0x086B2324 .2byte 7 packed_sprite_oam x=-0x47, y=0x10, spriteSize=SPRITE_SIZE_32x32, tileNum=0x2c0, priority=0x1, paletteNum=0x6 .2byte 0 @@ -6629,7 +6629,7 @@ gRubyBoardSpriteSets:: @ 0x086B2390 .4byte gJirachiStarTrailFx1SpriteSet .4byte gJirachiStarTrailFx2SpriteSet .4byte gJirachiStarTrailFx3SpriteSet -.4byte gRubyHatchEggSprite +.4byte gMainBoardHatchEggSprite .4byte gHatchMonEntitySpriteSet .4byte gMonCatchBallAbsorbPokemonFxSpriteSet @ 50 .4byte gRubyCyndaquilSpriteSet @@ -6693,8 +6693,8 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gEvolutionBannerLightningSpriteSet .4byte gTravelPainterSpriteSet .4byte gChargeIndicatorDeviceSpriteSet -.4byte gUnknown_086B1AE6 -.4byte gUnknown_086B2324 +.4byte gSapphireZigzagoonSpriteSet +.4byte gSapphireZigzagoonTrailFxSpriteSet .4byte gUnknown_086B1CDA @ Catch tile related, can't narrow further .4byte gPortraitBordersSpriteSet .4byte gPortraitTrimSpriteSet @ 30 @@ -6714,36 +6714,36 @@ gSapphireBoardSpriteSets:: @ 0x086B24E0 .4byte gJirachiStarTrailFx1SpriteSet .4byte gJirachiStarTrailFx2SpriteSet .4byte gJirachiStarTrailFx3SpriteSet -.4byte gUnknown_086B1B90 -.4byte gUnknown_086B1BAA -.4byte gUnknown_086B1BC4 -.4byte gUnknown_086B1BDE @ 50 -.4byte gUnknown_086B1BF8 -.4byte gRubyHatchEggSprite +.4byte gSapphireHatchMachineLightSparkFx0SpriteSet +.4byte gSapphireHatchMachineLightSparkFx1SpriteSet +.4byte gSapphireHatchMachineLightSparkFx2SpriteSet +.4byte gSapphireHatchMachineLightSparkFx3SpriteSet @ 50 +.4byte gSapphireHatchMachineLowerSegmentSpriteSet +.4byte gMainBoardHatchEggSprite .4byte gHatchMonEntitySpriteSet .4byte gMonCatchBallAbsorbPokemonFxSpriteSet .4byte gPikachuKickbackSpriteSet .4byte gPichuKickbackSpriteSet .4byte gSpoinkLauncherSpriteSet -.4byte gUnknown_086B1C0C -.4byte gUnknown_086B1C16 -.4byte gUnknown_086B1AB2 @ 60 -.4byte gUnknown_086B1B00 -.4byte gUnknown_086B1B12 -.4byte gUnknown_086B1B24 -.4byte gUnknown_086B1B3E -.4byte gUnknown_086B1B5A -.4byte gUnknown_086B1B6C -.4byte gUnknown_086B1B7E -.4byte gUnknown_086B1B50 -.4byte gUnknown_086B1C20 -.4byte gUnknown_086B1C32 @ 70 +.4byte gSapphireMinunElectricityFxSpriteSet +.4byte gSapphirePlusleElectricityFxSpriteSet +.4byte gSapphirePelipperSpriteSet @ 60 +.4byte gSapphireMinunSpriteSet +.4byte gSapphirePlusleSpriteSet +.4byte gSapphireShroomishBumpersSpriteSet +.4byte gSapphireSeedotBasketBackSpriteSet +.4byte gSapphireSeedotEntity0SpriteSet +.4byte gSapphireSeedotEntity1SpriteSet +.4byte gSapphireSeedotEntity2SpriteSet +.4byte gSapphireSeedotBasketFrontSpriteSet +.4byte gSapphireMartSignSpriteSet +.4byte gSapphireZigzagoonSpeechBubbleSpriteSet @ 70 .4byte gEvoItemSpriteSet .4byte gPikaChargingSpinnerSpriteSet .4byte gBallUpgradeFxSpriteSet .4byte gMainBoardBallSpriteSet -.4byte gUnknown_086B1AD4 -.4byte gUnknown_086B1C02 +.4byte gSapphireWailmerSpriteSet +.4byte gSapphireMartElectricalGateFxSpriteSet .4byte gInitialLocationSelectedFxSpriteSet .4byte gCatchBurstLightningStrikeSpriteSet .4byte gCatchBurstTileFlashFxSpriteSet diff --git a/include/constants/sprite_groups.h b/include/constants/sprite_groups.h index 1d8faa8e..870439de 100644 --- a/include/constants/sprite_groups.h +++ b/include/constants/sprite_groups.h @@ -138,8 +138,8 @@ #define SG_SAPPHIRE_EVOLUTION_BANNER_LIGHTNING 23 #define SG_SAPPHIRE_TRAVEL_PAINTER 24 #define SG_SAPPHIRE_CHARGE_INDICATOR_DEVICE 25 -#define SG_SAPPHIRE_26 26 -#define SG_SAPPHIRE_27 27 +#define SG_SAPPHIRE_ZIGZAGOON 26 +#define SG_SAPPHIRE_ZIGZAGOON_TRAIL_FX 27 #define SG_SAPPHIRE_28 28 // FG 18; Catch tile, evading identification #define SG_SAPPHIRE_PORTRAIT_BORDERS 29 #define SG_SAPPHIRE_PORTRAIT_TRIM_0 30 @@ -159,36 +159,38 @@ #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_1 44 #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_2 45 #define SG_SAPPHIRE_JIRACHI_STAR_TRAIL_FX_3 46 -#define SG_SAPPHIRE_47 47 -#define SG_SAPPHIRE_48 48 -#define SG_SAPPHIRE_49 49 -#define SG_SAPPHIRE_50 50 -#define SG_SAPPHIRE_51 51 -#define SG_SAPPHIRE_52 52 +#define SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_BASE 47 // Of 4 +#define SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_0 47 +#define SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_1 48 +#define SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_2 49 +#define SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_3 50 +#define SG_SAPPHIRE_HATCH_MACHINE_LOWER_SEGMENT 51 +#define SG_SAPPHIRE_HATCH_EGG 52 #define SG_SAPPHIRE_HATCH_MON_ENTITY 53 #define SG_SAPPHIRE_CATCH_CUTSCENE_BALL_ABSORB_MON_FX 54 #define SG_SAPPHIRE_PIKACHU_KICKBACK_ENTITY 55 #define SG_SAPPHIRE_PICHU_KICKBACK_ENTITY 56 #define SG_SAPPHIRE_SPOINK_LAUNCHER 57 -#define SG_SAPPHIRE_58 58 -#define SG_SAPPHIRE_59 59 -#define SG_SAPPHIRE_60 60 -#define SG_SAPPHIRE_61 61 -#define SG_SAPPHIRE_62 62 -#define SG_SAPPHIRE_63 63 -#define SG_SAPPHIRE_64 64 -#define SG_SAPPHIRE_65 65 -#define SG_SAPPHIRE_66 66 -#define SG_SAPPHIRE_67 67 -#define SG_SAPPHIRE_68 68 -#define SG_SAPPHIRE_69 69 -#define SG_SAPPHIRE_70 70 +#define SG_SAPPHIRE_MINUN_ELECTRICITY_FX 58 +#define SG_SAPPHIRE_PLUSLE_ELECTRICITY_FX 59 +#define SG_SAPPHIRE_PELIPPER 60 +#define SG_SAPPHIRE_MINUN 61 +#define SG_SAPPHIRE_PLUSLE 62 +#define SG_SAPPHIRE_SHROOMISH_BUMPERS 63 +#define SG_SAPPHIRE_SEEDOT_BASKET_BACK 64 +#define SG_SAPPHIRE_SEEDOT_ENTITY_BASE 65 +#define SG_SAPPHIRE_SEEDOT_ENTITY_0 65 +#define SG_SAPPHIRE_SEEDOT_ENTITY_1 66 +#define SG_SAPPHIRE_SEEDOT_ENTITY_2 67 +#define SG_SAPPHIRE_SEEDOT_BASKET_FRONT 68 +#define SG_SAPPHIRE_MART_SIGN 69 +#define SG_SAPPHIRE_ZIGZAGOON_SPEECH_BUBBLE 70 #define SG_SAPPHIRE_EVO_ITEM 71 #define SG_SAPPHIRE_PIKA_CHARGING_SPINNER 72 #define SG_SAPPHIRE_BALL_UPGRADE_FX 73 #define SG_SAPPHIRE_BALL 74 -#define SG_SAPPHIRE_75 75 -#define SG_SAPPHIRE_76 76 +#define SG_SAPPHIRE_WAILMER 75 +#define SG_SAPPHIRE_MART_ELECTRICAL_GATE_FX 76 #define SG_SAPPHIRE_INITIAL_LOCATION_SELECTED_FX 77 #define SG_SAPPHIRE_CATCH_BURST_LIGHTNING_STRIKE_FX 78 #define SG_SAPPHIRE_CATCH_BURST_TILE_FLASH_FX 79 diff --git a/src/all_board_process0_sprite_init.c b/src/all_board_process0_sprite_init.c index 2a3a1494..3cc4bcd3 100644 --- a/src/all_board_process0_sprite_init.c +++ b/src/all_board_process0_sprite_init.c @@ -106,10 +106,10 @@ void SapphireBoardProcess_0A_50AD4(void) gMain.spriteGroups[i].active = FALSE; gMain.spriteGroups[SG_SAPPHIRE_PIKA_CHARGING_SPINNER].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_63].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_60].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_69].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_52].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SHROOMISH_BUMPERS].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PELIPPER].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_MART_SIGN].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_EGG].active = TRUE; gMain.spriteGroups[SG_SAPPHIRE_BALL].active = TRUE; gMain.spriteGroups[SG_PAUSE_PANEL].active = TRUE; gMain.spriteGroups[SG_PAUSE_TOP_BORDER].active = TRUE; @@ -128,19 +128,19 @@ void SapphireBoardProcess_0B_50B80(void) for (i = 55; i < 71; i++) gMain.spriteGroups[i].active = FALSE; - gMain.spriteGroups[SG_SAPPHIRE_52].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_EGG].active = FALSE; gMain.spriteGroups[SG_SAPPHIRE_PIKA_CHARGING_SPINNER].active = FALSE; - gMain.spriteGroups[SG_SAPPHIRE_26].active = FALSE; - gMain.spriteGroups[SG_SAPPHIRE_51].active = FALSE; - gMain.spriteGroups[SG_SAPPHIRE_76].active = FALSE; - gMain.spriteGroups[SG_SAPPHIRE_75].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_MACHINE_LOWER_SEGMENT].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_MART_ELECTRICAL_GATE_FX].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_WAILMER].active = FALSE; gMain.spriteGroups[SG_MAIN_BOARD_LEFT_FLIPPER].active = FALSE; gMain.spriteGroups[SG_MAIN_BOARD_RIGHT_FLIPPER].active = FALSE; gCurrentPinballGame->randomSpriteVariantSeed = gMain.systemFrameCount % 25; if (gCurrentPinballGame->cameraYViewport < 90) { - gMain.spriteGroups[SG_SAPPHIRE_52].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_51].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_EGG].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_MACHINE_LOWER_SEGMENT].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 220) { @@ -148,31 +148,31 @@ void SapphireBoardProcess_0B_50B80(void) } if (gCurrentPinballGame->cameraYViewport < 150) { - gMain.spriteGroups[SG_SAPPHIRE_60].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_69].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PELIPPER].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_MART_SIGN].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 196) { - gMain.spriteGroups[SG_SAPPHIRE_63].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_75].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SHROOMISH_BUMPERS].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_WAILMER].active = TRUE; } if (gCurrentPinballGame->cameraYViewport < 202) { - gMain.spriteGroups[SG_SAPPHIRE_61].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_58].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_62].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_59].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_76].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_MINUN].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_MINUN_ELECTRICITY_FX].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PLUSLE].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_PLUSLE_ELECTRICITY_FX].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_MART_ELECTRICAL_GATE_FX].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 118) { - gMain.spriteGroups[SG_SAPPHIRE_70].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_26].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_64].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_68].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_65].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_66].active = TRUE; - gMain.spriteGroups[SG_SAPPHIRE_67].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON_SPEECH_BUBBLE].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_BASKET_BACK].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_BASKET_FRONT].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_ENTITY_0].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_ENTITY_1].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_ENTITY_2].active = TRUE; } if (gCurrentPinballGame->cameraYViewport > 216) { diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index 8d6b174c..26ea0248 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -218,7 +218,7 @@ void DrawSapphireBumperSprites(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_SAPPHIRE_61]; + group = &gMain.spriteGroups[SG_SAPPHIRE_MINUN]; if (!group->active) return; @@ -233,7 +233,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_SAPPHIRE_58]; + group = &gMain.spriteGroups[SG_SAPPHIRE_MINUN_ELECTRICITY_FX]; group->baseX = 68 - gCurrentPinballGame->cameraXOffset; if (gCurrentPinballGame->sapphireBumperHitFxTimer[0] < 14) { @@ -250,7 +250,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[SG_SAPPHIRE_62]; + group = &gMain.spriteGroups[SG_SAPPHIRE_PLUSLE]; group->baseX = 36 - gCurrentPinballGame->cameraXOffset; group->baseY = 163 - gCurrentPinballGame->cameraYOffset; index = gSapphireBumperAnimFrames[gCurrentPinballGame->sapphireBumperAnimKeyframe[1]][0]; @@ -262,7 +262,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_SAPPHIRE_59]; + group = &gMain.spriteGroups[SG_SAPPHIRE_PLUSLE_ELECTRICITY_FX]; group->baseX = 36 - gCurrentPinballGame->cameraXOffset; if (gCurrentPinballGame->sapphireBumperHitFxTimer[1] < 14) { @@ -279,7 +279,7 @@ void DrawSapphireBumperSprites(void) gOamBuffer[oamSimple->oamId].x = oamSimple->xOffset + group->baseX; gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; - group = &gMain.spriteGroups[SG_SAPPHIRE_76]; + group = &gMain.spriteGroups[SG_SAPPHIRE_MART_ELECTRICAL_GATE_FX]; group->baseX = 61 - gCurrentPinballGame->cameraXOffset; group->baseY = 186 - gCurrentPinballGame->cameraYOffset; if (gCurrentPinballGame->eggHatchShockWallOverride) diff --git a/src/sapphire_collision.c b/src/sapphire_collision.c index a5f84cd3..e8473e61 100644 --- a/src/sapphire_collision.c +++ b/src/sapphire_collision.c @@ -598,7 +598,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) gCurrentPinballGame->secondaryBall = gCurrentPinballGame->ballStates; modRes = (gCurrentPinballGame->targetBumperHitCounter - 1) % 4; - gMain.spriteGroups[SG_SAPPHIRE_47 + modRes].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_BASE + modRes].active = TRUE; gCurrentPinballGame->splashEffectFrameIndex[modRes] = 0; gCurrentPinballGame->splashEffectFrameTimer[modRes] = 0; gCurrentPinballGame->splashEffectPositionIndex[modRes] = gCurrentPinballGame->targetBumperHitCounter - 1; @@ -622,7 +622,7 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) gCurrentPinballGame->targetBumperHitCounter++; modRes = (gCurrentPinballGame->targetBumperHitCounter -1) % 4; - gMain.spriteGroups[SG_SAPPHIRE_47 + modRes].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_BASE + modRes].active = TRUE; gCurrentPinballGame->splashEffectFrameIndex[modRes] = 0; gCurrentPinballGame->splashEffectFrameTimer[modRes] = 0; gCurrentPinballGame->splashEffectPositionIndex[modRes] = gCurrentPinballGame->targetBumperHitCounter - 1; diff --git a/src/sapphire_pond_and_zigzagoon.c b/src/sapphire_pond_and_zigzagoon.c index 83fffdef..64ac9474 100644 --- a/src/sapphire_pond_and_zigzagoon.c +++ b/src/sapphire_pond_and_zigzagoon.c @@ -35,7 +35,7 @@ void DecrementPelipperTimer(void) void UpdatePelipperPondEntity(void) { s16 i; - struct SpriteGroup *group = &gMain.spriteGroups[SG_SAPPHIRE_60]; + struct SpriteGroup *group = &gMain.spriteGroups[SG_SAPPHIRE_PELIPPER]; struct OamDataSimple *oamSimple; u16 *dst; const u16 *src; @@ -340,7 +340,7 @@ void AnimateWailmerEntity(void) s16 var0; index = (gCurrentPinballGame->globalAnimFrameCounter % 32) / 16; - group = &gMain.spriteGroups[SG_SAPPHIRE_75]; + group = &gMain.spriteGroups[SG_SAPPHIRE_WAILMER]; if (gCurrentPinballGame->catchHoleAnimFrame) index = gCurrentPinballGame->catchHoleAnimFrame; @@ -406,7 +406,7 @@ void UpdateZigzagoonEntity(void) gCurrentPinballGame->sapphireBumperAnimFrame = 0; gCurrentPinballGame->zigzagoonState = 3; gCurrentPinballGame->zigzagoonFxFrame = 0; - gMain.spriteGroups[SG_SAPPHIRE_27].active = TRUE; + gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON_TRAIL_FX].active = TRUE; gCurrentPinballGame->activePortraitType = 22; DmaCopy16(3, gSapphireBoardZigzagoonFx_Gfx, (void *)0x06015800, 0xC00); m4aSongNumStart(SE_UNKNOWN_0xEC); @@ -437,7 +437,7 @@ void UpdateZigzagoonEntity(void) break; case 4: gCurrentPinballGame->activePortraitType = 0; - gMain.spriteGroups[SG_SAPPHIRE_27].active = FALSE; + gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON_TRAIL_FX].active = FALSE; gCurrentPinballGame->zigzagoonState = 0; break; } @@ -452,7 +452,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) const u16 *src; s16 index; - group = &gMain.spriteGroups[SG_SAPPHIRE_26]; + group = &gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON]; if (group->active) { group->baseX = 198 - gCurrentPinballGame->cameraXOffset; @@ -474,7 +474,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) } } - group = &gMain.spriteGroups[SG_SAPPHIRE_27]; + group = &gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON_TRAIL_FX]; if (group->active) { group->baseX = 198 - gCurrentPinballGame->cameraXOffset; @@ -494,7 +494,7 @@ void DrawZigzagoonAndRouletteStopPrompt(void) } } - group = &gMain.spriteGroups[SG_SAPPHIRE_70]; + group = &gMain.spriteGroups[SG_SAPPHIRE_ZIGZAGOON_SPEECH_BUBBLE]; if (group->active) { group->baseX = 206 - gCurrentPinballGame->cameraXOffset; diff --git a/src/sapphire_seedot_egg_shop.c b/src/sapphire_seedot_egg_shop.c index 92ceb39a..2686fd59 100644 --- a/src/sapphire_seedot_egg_shop.c +++ b/src/sapphire_seedot_egg_shop.c @@ -52,7 +52,7 @@ void UpdateSapphireEggHatchAnimation(void) var3 = 0; var1 = 0; var2 = 0; - group = &gMain.spriteGroups[SG_SAPPHIRE_52]; + group = &gMain.spriteGroups[SG_SAPPHIRE_HATCH_EGG]; sp0 = 0; switch (gCurrentPinballGame->eggAnimationPhase) { @@ -167,7 +167,7 @@ void UpdateSapphireEggHatchAnimation(void) gOamBuffer[oamSimple->oamId].y += group->baseY; } - group = &gMain.spriteGroups[SG_SAPPHIRE_51]; + group = &gMain.spriteGroups[SG_SAPPHIRE_HATCH_MACHINE_LOWER_SEGMENT]; if (group->active) { group->baseX = 192 - gCurrentPinballGame->cameraXOffset; @@ -392,7 +392,7 @@ void DrawSapphireSeedotAndBasketSprites(void) s16 index; int var0; - group = &gMain.spriteGroups[SG_SAPPHIRE_64]; + group = &gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_BASKET_BACK]; if (!group->active) return; @@ -408,7 +408,7 @@ void DrawSapphireSeedotAndBasketSprites(void) gOamBuffer[oamSimple->oamId].y = oamSimple->yOffset + group->baseY; } - group = &gMain.spriteGroups[SG_SAPPHIRE_68]; + group = &gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_BASKET_FRONT]; group->baseX = 10 - gCurrentPinballGame->cameraXOffset; group->baseY = 298 - gCurrentPinballGame->cameraYOffset; oamSimple = &group->oam[0]; @@ -417,7 +417,7 @@ void DrawSapphireSeedotAndBasketSprites(void) for (j = 0; j < 3; j++) { - group = &gMain.spriteGroups[SG_SAPPHIRE_65 + j]; + group = &gMain.spriteGroups[SG_SAPPHIRE_SEEDOT_ENTITY_BASE + j]; var0 = gSeedotBaseXPositions[j] - j; group->baseX = var0 - gCurrentPinballGame->cameraXOffset; @@ -545,7 +545,7 @@ void DrawSapphireShopSignSprite(void) struct OamDataSimple *oamSimple; s16 index; - group = &gMain.spriteGroups[SG_SAPPHIRE_69]; + group = &gMain.spriteGroups[SG_SAPPHIRE_MART_SIGN]; if (group->active) { group->baseX = 16 - gCurrentPinballGame->cameraXOffset; @@ -727,7 +727,7 @@ void UpdateSapphireEggMachine(void) for (i = 0; i < 4; i++) { - group = &gMain.spriteGroups[SG_SAPPHIRE_47 + i]; + group = &gMain.spriteGroups[SG_SAPPHIRE_HATCH_MACHINE_LIGHT_SPARK_FX_BASE + i]; if (group->active) { if (gSplashEffectFrameDurations[gCurrentPinballGame->splashEffectFrameIndex[i]][0] > gCurrentPinballGame->splashEffectFrameTimer[i]) From cefc7d20261747734041a06ea1ec5d0c8c7e6f81 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 04:32:28 -0500 Subject: [PATCH 27/33] input array and pika coverage consts --- include/constants/board/main_board.h | 12 +++ include/global.h | 7 +- include/main.h | 2 +- src/all_board_pinball_game_main.c | 30 +++---- src/all_board_portrait_display.c | 2 +- src/all_board_process2.c | 42 +++++----- src/all_board_process6_collision.c | 2 +- src/all_board_process8.c | 3 +- src/groudon_process3.c | 6 +- src/kyogre_process3.c | 14 +++- src/main_board_catch_holes.c | 4 +- src/main_board_center_capture_hole.c | 13 +-- src/main_board_charge_spinner.c | 6 +- src/main_board_intro_mode.c | 4 +- src/main_board_pichu_entity.c | 120 +++++++++++++-------------- src/main_board_to_be_split.c | 3 +- src/rayquaza_process3.c | 6 +- src/ruby_collision.c | 6 +- src/ruby_process3_entities.c | 21 +++-- src/sapphire_collision.c | 6 +- src/sapphire_process3.c | 20 +++-- src/save_and_restore_game.c | 3 +- 22 files changed, 187 insertions(+), 145 deletions(-) diff --git a/include/constants/board/main_board.h b/include/constants/board/main_board.h index 37fa149c..1903da4e 100644 --- a/include/constants/board/main_board.h +++ b/include/constants/board/main_board.h @@ -148,4 +148,16 @@ enum BannerGfxModes{ BANNER_MODE_SHROOMISH_CATCH_BURST = 7, }; +enum outlaneSide{ + OUTLANE_LEFT = 1, + OUTLANE_RIGHT = 2 +}; +//kickbackOccupied + +enum PikaCoverage { + PIKA_LEFT_SIDE = 0, + PIKA_RIGHT_SIDE = 1, + PIKA_BOTH_SIDES = 2 +}; + #endif // GUARD_CONSTANTS_MAIN_BOARD_H \ No newline at end of file diff --git a/include/global.h b/include/global.h index b207baff..00410bc3 100644 --- a/include/global.h +++ b/include/global.h @@ -9,6 +9,7 @@ #include "variables.h" #include "constants/global.h" #include "constants/ereader.h" +#include "constants/pinball_inputs.h" // Prevent cross-jump optimization. #define BLOCK_CROSS_JUMP asm(""); @@ -130,9 +131,9 @@ struct FlipperState struct PinballGame { /*0x000*/ u32 saveDataValid; - /*0x004*/ u8 newButtonActions[5]; // e.g. player pressing the appropriate buttons to trigger the left flipper action, etc. - /*0x009*/ u8 releasedButtonActions[5]; - /*0x00E*/ u8 heldButtonActions[5]; + /*0x004*/ u8 newButtonActions[NUM_PINBALL_INPUTS]; // e.g. player pressing the appropriate buttons to trigger the left flipper action, etc. + /*0x009*/ u8 releasedButtonActions[NUM_PINBALL_INPUTS]; + /*0x00E*/ u8 heldButtonActions[NUM_PINBALL_INPUTS]; /*0x013*/ s8 boardState; // Indexes into gBoardStateInitFuncs/gBoardStateUpdateFuncs dispatch tables (9 states) /*0x014*/ s8 nextBoardState; // Target state set by RequestBoardStateTransition /*0x015*/ s8 prevBoardState; // Previous state saved during dispatcher teardown diff --git a/include/main.h b/include/main.h index 67df156b..c1790069 100644 --- a/include/main.h +++ b/include/main.h @@ -111,7 +111,7 @@ struct Main * An action can be triggered by pressing 2 buttons simultaneously * Each data element holds a mask for the button it looks for. ***/ - /*0x60*/ u16 buttonConfigs[5][2]; + /*0x60*/ u16 buttonConfigs[NUM_PINBALL_INPUTS][2]; // This field must be accessed using the following macro to produce matching code. #define gMain_saveData (*(struct SaveData *)(&gMain.saveData)) diff --git a/src/all_board_pinball_game_main.c b/src/all_board_pinball_game_main.c index 6a82945b..69a1bf3c 100644 --- a/src/all_board_pinball_game_main.c +++ b/src/all_board_pinball_game_main.c @@ -286,7 +286,7 @@ void InitPinballGameState(void) gCurrentPinballGame->chargeIndicatorYOffset = 120; gCurrentPinballGame->fullChargeIndicatorBlinkTimer = 60; DmaCopy16(3, gDxModePikachuObjTiles, (void *)OBJ_VRAM0 + 0x600, 0x180); - gCurrentPinballGame->outLanePikaPosition = 2; + gCurrentPinballGame->outLanePikaPosition = PIKA_BOTH_SIDES; gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; gCurrentPinballGame->ballUpgradeType = BALL_UPGRADE_TYPE_MASTER_BALL; @@ -845,31 +845,31 @@ void UpdateButtonActionsFromJoy(void) { u16 i; - for (i = 0; i < 5; i++) + for (i = 0; i < NUM_PINBALL_INPUTS; i++) { - gCurrentPinballGame->newButtonActions[i] = 0; - gCurrentPinballGame->releasedButtonActions[i] = 0; + gCurrentPinballGame->newButtonActions[i] = FALSE; + gCurrentPinballGame->releasedButtonActions[i] = FALSE; } if (gMain.modeChangeFlags) return; - for (i = 0; i < 5; i++) + for (i = 0; i < NUM_PINBALL_INPUTS; i++) { int buttonConfigKeyMask = (gMain.buttonConfigs[i][0] | gMain.buttonConfigs[i][1]) & KEYS_MASK; if (buttonConfigKeyMask == JOY_HELD(buttonConfigKeyMask)) { - if (gCurrentPinballGame->heldButtonActions[i] == 0) - gCurrentPinballGame->newButtonActions[i] = 1; + if (gCurrentPinballGame->heldButtonActions[i] == FALSE) + gCurrentPinballGame->newButtonActions[i] = TRUE; - gCurrentPinballGame->heldButtonActions[i] = 1; + gCurrentPinballGame->heldButtonActions[i] = TRUE; } else { if (gCurrentPinballGame->heldButtonActions[i]) - gCurrentPinballGame->releasedButtonActions[i] = 1; + gCurrentPinballGame->releasedButtonActions[i] = TRUE; - gCurrentPinballGame->heldButtonActions[i] = 0; + gCurrentPinballGame->heldButtonActions[i] = FALSE; } } } @@ -878,10 +878,10 @@ void ReplayButtonActionsFromRecording(void) { u16 i; - for (i = 0; i < 5; i++) + for (i = 0; i < NUM_PINBALL_INPUTS; i++) { - gCurrentPinballGame->newButtonActions[i] = 0; - gCurrentPinballGame->releasedButtonActions[i] = 0; + gCurrentPinballGame->newButtonActions[i] = FALSE; + gCurrentPinballGame->releasedButtonActions[i] = FALSE; } if (gMain.modeChangeFlags) @@ -889,7 +889,7 @@ void ReplayButtonActionsFromRecording(void) if (gReplayFrameCounter < 60 * 60) { - for (i = 0; i < 5; i++) + for (i = 0; i < NUM_PINBALL_INPUTS; i++) { gCurrentPinballGame->newButtonActions[i] = (gBoardConfig.replayInputData[gReplayFrameCounter].newButtonBits >> i) & 0x1; gCurrentPinballGame->releasedButtonActions[i] = (gBoardConfig.replayInputData[gReplayFrameCounter].releasedButtonBits >> i) & 0x1; @@ -899,6 +899,6 @@ void ReplayButtonActionsFromRecording(void) gReplayFrameCounter++; } - if (gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) gMain.newKeys = A_BUTTON; } \ No newline at end of file diff --git a/src/all_board_portrait_display.c b/src/all_board_portrait_display.c index 1035122d..834be354 100644 --- a/src/all_board_portrait_display.c +++ b/src/all_board_portrait_display.c @@ -135,7 +135,7 @@ void LoadPortraitGraphics(s16 displayMode, s16 picIx) if (gCurrentPinballGame->coins < ptr[3] || ( (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_PICHU_SAVER - && gCurrentPinballGame->outLanePikaPosition == 2) + && gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) || (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_EXTRA_BALL && gCurrentPinballGame->shopExtraBallPreviouslyPurchased) diff --git a/src/all_board_process2.c b/src/all_board_process2.c index e7078dc0..94353a0e 100644 --- a/src/all_board_process2.c +++ b/src/all_board_process2.c @@ -294,23 +294,22 @@ void ProcessTiltInput(void) if (gCurrentPinballGame->ballCatchState == NOT_TRAPPED && gCurrentPinballGame->captureState != MON_CAPTURE_SPECIAL_STATE_CAPTURE_CUTSCENE - && gCurrentPinballGame->kickbackFiring == 0) + && !gCurrentPinballGame->kickbackFiring) { - if (gCurrentPinballGame->newButtonActions[2]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_TILT_LEFT] + && gCurrentPinballGame->boardShakeTimer == 0) { - if (gCurrentPinballGame->boardShakeTimer == 0) + gCurrentPinballGame->boardShakeDirection = 0; + if (gCurrentPinballGame->boardShakeIntensity == 0) { - gCurrentPinballGame->boardShakeDirection = 0; - if (gCurrentPinballGame->boardShakeIntensity == 0) - { - gCurrentPinballGame->boardShakeIntensity = 4; - m4aSongNumStart(SE_TILT_TRIGGERED); - PlayRumble(8); - } + gCurrentPinballGame->boardShakeIntensity = 4; + m4aSongNumStart(SE_TILT_TRIGGERED); + PlayRumble(8); } } - if (gCurrentPinballGame->newButtonActions[3] && gCurrentPinballGame->boardShakeTimer == 0) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_TILT_RIGHT] + && gCurrentPinballGame->boardShakeTimer == 0) { gCurrentPinballGame->boardShakeDirection = 1; if (gCurrentPinballGame->boardShakeIntensity == 0) @@ -321,7 +320,8 @@ void ProcessTiltInput(void) } } - if (gCurrentPinballGame->newButtonActions[4] && gCurrentPinballGame->boardShakeTimer == 0) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_TILT_UP] + && gCurrentPinballGame->boardShakeTimer == 0) { gCurrentPinballGame->boardShakeDirection = 2; if (gCurrentPinballGame->boardShakeIntensity == 0) @@ -421,13 +421,15 @@ void ProcessMainBoardBallDrainAndLaunch(void) struct BallState *ballStates; if (gCurrentPinballGame->boardState != MAIN_BOARD_STATE_BOARD_INTRO - && gCurrentPinballGame->newButtonActions[1] && gCurrentPinballGame->ballInLaunchChute) + && gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER] + && gCurrentPinballGame->ballInLaunchChute) { - gCurrentPinballGame->launcherCharging = 1; + gCurrentPinballGame->launcherCharging = TRUE; gCurrentPinballGame->spoinkEntityState = 1; } - if (gCurrentPinballGame->launcherCharging && gCurrentPinballGame->releasedButtonActions[1]) + if (gCurrentPinballGame->launcherCharging + && gCurrentPinballGame->releasedButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->spoinkEntityState = 3; if (gCurrentPinballGame->ballInLaunchChute) @@ -438,7 +440,7 @@ void ProcessMainBoardBallDrainAndLaunch(void) m4aSongNumStart(SE_UNKNOWN_0xCD); } - gCurrentPinballGame->launcherCharging = 0; + gCurrentPinballGame->launcherCharging = FALSE; } gCurrentPinballGame->ball = &gCurrentPinballGame->ballStates[0]; @@ -469,11 +471,12 @@ void ProcessMainBoardBallDrainAndLaunch(void) m4aMPlayAllStop(); m4aSongNumStart(MUS_END_OF_BALL); ResetBoardStateOnDeath(); - if (gCurrentPinballGame->outLanePikaPosition == 2 && gMain.eReaderBonuses[EREADER_DX_MODE_CARD] == 0) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES + && gMain.eReaderBonuses[EREADER_DX_MODE_CARD] == 0) { gCurrentPinballGame->pichuWalkMode = 2; gCurrentPinballGame->pichuEntranceTimer = 800; - gCurrentPinballGame->outLanePikaPosition = 0; + gCurrentPinballGame->outLanePikaPosition = PIKA_LEFT_SIDE; } } } @@ -543,7 +546,8 @@ void ResetBoardStateOnDeath(void) gCurrentPinballGame->pikaSpinMomentum = 0; gCurrentPinballGame->kickbackAnimFrameTimer = 0; gCurrentPinballGame->kickbackFrameId = 0; - if (gCurrentPinballGame->outLanePikaPosition != 2 || !gMain.eReaderBonuses[EREADER_DX_MODE_CARD]) + if (gCurrentPinballGame->outLanePikaPosition != PIKA_BOTH_SIDES + || !gMain.eReaderBonuses[EREADER_DX_MODE_CARD]) { gCurrentPinballGame->pikaChargeTarget = 0; gCurrentPinballGame->pikaChargeProgress = 0; diff --git a/src/all_board_process6_collision.c b/src/all_board_process6_collision.c index 25edab05..eab852d5 100644 --- a/src/all_board_process6_collision.c +++ b/src/all_board_process6_collision.c @@ -404,7 +404,7 @@ void ComputeWallReflection(u16 arg0, struct Vector16 *arg1, struct Vector16 *arg m4aSongNumStart(SE_WALL_HIT); if (forwardMag > 0x118 - && gCurrentPinballGame->kickbackFiring == 0 + && !gCurrentPinballGame->kickbackFiring && gMain.selectedField < MAIN_FIELD_COUNT) { PlayRumble(6); diff --git a/src/all_board_process8.c b/src/all_board_process8.c index 58566bfb..c7557ac3 100644 --- a/src/all_board_process8.c +++ b/src/all_board_process8.c @@ -22,7 +22,8 @@ void AllBoardProcess_8B_4CEB4(void) gCurrentPinballGame->scoreAdditionAccumulator += (gCurrentPinballGame->ballUpgradeType + 1) * gCurrentPinballGame->scoreAddedInFrame; if (gCurrentPinballGame->scoreCounterAnimationEnabled) { - if (gCurrentPinballGame->newButtonActions[1] || JOY_NEW(A_BUTTON)) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER] + || JOY_NEW(A_BUTTON)) { gCurrentPinballGame->scoreLo += gCurrentPinballGame->scoreAdditionAccumulator; gCurrentPinballGame->scoreAdditionAccumulator = 0; diff --git a/src/groudon_process3.c b/src/groudon_process3.c index 1bae8e17..788140b0 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -1026,7 +1026,8 @@ void UpdateGroudonFieldEntities(void) gCurrentPinballGame->ballGrabShakeTimer--; } - else if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + else if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->ballGrabTimer = gCurrentPinballGame->ballGrabTimer - 30; if (gCurrentPinballGame->ballGrabTimer < 5) @@ -1044,7 +1045,8 @@ void UpdateGroudonFieldEntities(void) else if (gCurrentPinballGame->ballGrabFlashTimer > 40) varSL = 5; } - else if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + else if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->ballGrabFlashTimer = 60; } diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 3b835413..56ed4392 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -889,7 +889,8 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_CRACKED_VULNERABLE; break; case KYOGRE_FREEZE_PHASE_CRACKED_VULNERABLE: - if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->freezeTrapPauseTimer -= 90; if (gCurrentPinballGame->freezeTrapPauseTimer < 0) @@ -908,7 +909,8 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_SPLIT_VULNERABLE; break; case KYOGRE_FREEZE_PHASE_SPLIT_VULNERABLE: - if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->freezeTrapPauseTimer -= 90; if (gCurrentPinballGame->freezeTrapPauseTimer < 0) @@ -927,7 +929,8 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_LAST_HIT_VULNERABLE; break; case KYOGRE_FREEZE_PHASE_LAST_HIT_VULNERABLE: - if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->freezeTrapPauseTimer -= 90; if (gCurrentPinballGame->freezeTrapPauseTimer < 0) @@ -1096,8 +1099,11 @@ void UpdateKyogreFieldEntities(void) break; case KYOGRE_WHIRLPOOL_PHASE_FULL_CAUGHT_BALL: index = ((gCurrentPinballGame->vortexAnimTimer[i] % 40) / 8) + 6; - if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) + { gCurrentPinballGame->vortexAnimTimer[i] += 8; + } var4 = 29 - gCurrentPinballGame->vortexAnimTimer[i]; if (var4 < 10) diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 348ecf96..459a3651 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -100,7 +100,7 @@ void UpdateShopEntryAnimation(s16 arg0) m4aSongNumStart(SE_SHOP_LIST_REVEAL); - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) gCurrentPinballGame->shopPikaSaverMaxed = 1; else gCurrentPinballGame->shopPikaSaverMaxed = 0; @@ -214,7 +214,7 @@ void UpdateShopEntryAnimation(s16 arg0) const u16 *arr = gShopItemData[gCurrentPinballGame->shopSelectedItemId]; if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_PICHU_SAVER - && gCurrentPinballGame->outLanePikaPosition == 2) + && gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) var_r3 = 999; else if (gShopCursorToItemMap[gCurrentPinballGame->shopItemCursor] == PRIZE_EXTRA_BALL && gCurrentPinballGame->shopExtraBallPreviouslyPurchased) diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index 9697f01c..41e9450d 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -89,7 +89,7 @@ void InitRouletteWheel(void) } else if (gCurrentPinballGame->rouletteSlotValues[i] == PRIZE_PICHU_SAVER) { - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) { if (gMain.systemFrameCount & 1) { @@ -132,7 +132,9 @@ void RunRouletteWheel(void) { if (gCurrentPinballGame->rouletteStopRequested == 0) { - if ((gCurrentPinballGame->newButtonActions[1] || JOY_NEW(A_BUTTON)) && gCurrentPinballGame->zigzagoonShockWallActive) + if ( (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER] + || JOY_NEW(A_BUTTON)) + && gCurrentPinballGame->zigzagoonShockWallActive) { gCurrentPinballGame->zigzagoonState = 2; if (gCurrentPinballGame->rouletteSubOffset < 17) @@ -165,7 +167,8 @@ void RunRouletteWheel(void) } } } - else if (gCurrentPinballGame->newButtonActions[1] || JOY_NEW(A_BUTTON)) + else if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER] + || JOY_NEW(A_BUTTON)) { gCurrentPinballGame->rouletteSpinSpeed = (Random() % 200) + 100; if (gMain.selectedField == FIELD_SAPPHIRE) @@ -273,7 +276,7 @@ void GivePrize(void) gCurrentPinballGame->chargeIndicatorYOffset = 120; gCurrentPinballGame->fullChargeIndicatorBlinkTimer = 60; DmaCopy16(3, gPikachuSaverTilesGfx, (void *)0x06010600, 0x180); - gCurrentPinballGame->outLanePikaPosition = 2; + gCurrentPinballGame->outLanePikaPosition = PIKA_BOTH_SIDES; gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; } @@ -293,7 +296,7 @@ void GivePrize(void) gCurrentPinballGame->bannerPreserveBallState = 0; gCurrentPinballGame->pichuWalkMode = 1; gCurrentPinballGame->pichuEntranceTimer = 800; - gCurrentPinballGame->outLanePikaPosition = 0; + gCurrentPinballGame->outLanePikaPosition = PIKA_LEFT_SIDE; gCurrentPinballGame->pikaChargeTarget = 168; gCurrentPinballGame->pikaChargeProgress = 168; gCurrentPinballGame->prevChargeFillValue = 13; diff --git a/src/main_board_charge_spinner.c b/src/main_board_charge_spinner.c index 8e25aacd..7de1c555 100644 --- a/src/main_board_charge_spinner.c +++ b/src/main_board_charge_spinner.c @@ -61,7 +61,8 @@ void UpdatePikachuChargeCounter(void) gCurrentPinballGame->pikaSpinFrameCounter = 0; MPlayStart(&gMPlayInfo_SE3, &se_pika_spinner_clack); gCurrentPinballGame->scoreAddedInFrame = 100; - if (gCurrentPinballGame->chargeFillValue < 12 && gCurrentPinballGame->kickbackFiring == 0) + if (gCurrentPinballGame->chargeFillValue < 12 + && !gCurrentPinballGame->kickbackFiring) { gCurrentPinballGame->fullChargeSlideAnimTimer = 80; gCurrentPinballGame->chargeIndicatorScaleX = 256; @@ -92,7 +93,8 @@ void UpdatePikachuChargeCounter(void) gCurrentPinballGame->pikaSpinFrameCounter = 0; MPlayStart(&gMPlayInfo_SE3, &se_pika_spinner_clack); gCurrentPinballGame->scoreAddedInFrame = 100; - if (gCurrentPinballGame->chargeFillValue < 12 && gCurrentPinballGame->kickbackFiring == 0) + if (gCurrentPinballGame->chargeFillValue < 12 + && !gCurrentPinballGame->kickbackFiring) { gCurrentPinballGame->fullChargeSlideAnimTimer = 80; gCurrentPinballGame->chargeIndicatorScaleX = 256; diff --git a/src/main_board_intro_mode.c b/src/main_board_intro_mode.c index 0ccd575f..92cc9d8d 100644 --- a/src/main_board_intro_mode.c +++ b/src/main_board_intro_mode.c @@ -125,7 +125,7 @@ void UpdateBoardIntroMode(void) else if (gCurrentPinballGame->boardSubState == BOARD_INTRO_SUBSTATE_WAIT_FOR_LAUNCH) { gCurrentPinballGame->rouletteFrameIndex++; - if (gCurrentPinballGame->newButtonActions[1] + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER] && gCurrentPinballGame->boardSubState == BOARD_INTRO_SUBSTATE_WAIT_FOR_LAUNCH) { if (gCurrentPinballGame->rouletteSpinSpeed == 0) @@ -137,7 +137,7 @@ void UpdateBoardIntroMode(void) gCurrentPinballGame->rouletteInitialSpeed = gCurrentPinballGame->rouletteSpinSpeed; gCurrentPinballGame->spoinkEntityState = 1; - gCurrentPinballGame->launcherCharging = 1; + gCurrentPinballGame->launcherCharging = TRUE; gCurrentPinballGame->saverTimeRemaining = 3600; gCurrentPinballGame->rubyPondState = RUBY_POND_STATE_CHINCHOU_COUNTERCLOCKWISE; } diff --git a/src/main_board_pichu_entity.c b/src/main_board_pichu_entity.c index 56c81722..a6865d49 100644 --- a/src/main_board_pichu_entity.c +++ b/src/main_board_pichu_entity.c @@ -2,6 +2,7 @@ #include "m4a.h" #include "main.h" #include "constants/bg_music.h" +#include "constants/board/main_board.h" extern struct SongHeader se_pika_no_kickback; extern struct SongHeader se_pichu_kickback; @@ -32,7 +33,7 @@ void UpdateKickbackLogic(void) if (gCurrentPinballGame->pikaChargeTarget > 167) { gCurrentPinballGame->pikaSaverTileIndex[0] = gPikaSaverAnimFrameTable[(gMain.fieldFrameCount % 160) / 5]; - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) gCurrentPinballGame->pikaSaverTileIndex[1] = gCurrentPinballGame->pikaSaverTileIndex[0] + 6; else gCurrentPinballGame->pikaSaverTileIndex[1] = gCurrentPinballGame->pikaSaverTileIndex[0]; @@ -40,80 +41,76 @@ void UpdateKickbackLogic(void) else { gCurrentPinballGame->pikaSaverTileIndex[0] = (gMain.fieldFrameCount % 50) / 25; - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) gCurrentPinballGame->pikaSaverTileIndex[1] = gCurrentPinballGame->pikaSaverTileIndex[0] + 9; else gCurrentPinballGame->pikaSaverTileIndex[1] = gCurrentPinballGame->pikaSaverTileIndex[0]; } - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) { - gCurrentPinballGame->kickbackOccupied[0] = 1; - gCurrentPinballGame->kickbackOccupied[1] = 1; + gCurrentPinballGame->kickbackOccupied[0] = TRUE; + gCurrentPinballGame->kickbackOccupied[1] = TRUE; } else { - gCurrentPinballGame->kickbackOccupied[0 + gCurrentPinballGame->outLanePikaPosition] = 1; - gCurrentPinballGame->kickbackOccupied[1 - gCurrentPinballGame->outLanePikaPosition] = 0; + gCurrentPinballGame->kickbackOccupied[0 + gCurrentPinballGame->outLanePikaPosition] = TRUE; + gCurrentPinballGame->kickbackOccupied[1 - gCurrentPinballGame->outLanePikaPosition] = FALSE; } if (gCurrentPinballGame->pikaKickbackTimer != 0) { - if (gCurrentPinballGame->pikaKickbackTimer == 120) + if (gCurrentPinballGame->pikaKickbackTimer == 120 + && gCurrentPinballGame->kickbackOccupied[gCurrentPinballGame->outLaneSide - 1]) { - // gCurrentPinballGame->outLaneSide + gCurrentPinballGame->outLanePikaPosition - // Note: this can be && chained off of the previous if, once we have this line deciphered. - if (gCurrentPinballGame->kickbackOccupied[gCurrentPinballGame->outLaneSide - 1] != 0) + if (gCurrentPinballGame->pikaChargeTarget > 167) { - if (gCurrentPinballGame->pikaChargeTarget > 167) - { - gCurrentPinballGame->ballFrozenState = 1; - gCurrentPinballGame->kickbackFiring = 1; - gCurrentPinballGame->kickbackAnimProgress = 120; - gCurrentPinballGame->kickbackAnimDuration = 120; - gCurrentPinballGame->kickbackLaunchTimer = gCurrentPinballGame->kickbackAnimProgress; - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; - gCurrentPinballGame->kickbackAnimFrameTimer = 0; - gCurrentPinballGame->kickbackFrameId = 0; - - if (gCurrentPinballGame->outLanePikaPosition != 2) - { - gCurrentPinballGame->pikaChargeTarget = 0; - gCurrentPinballGame->pikaChargeProgress = 0; - gCurrentPinballGame->prevChargeFillValue = 0; - gCurrentPinballGame->chargeFillValue = 0; - gCurrentPinballGame->chargeIndicatorXOffset = 0; - gCurrentPinballGame->chargeIndicatorYOffset = -4; - gCurrentPinballGame->chargeIndicatorScaleX = 256; - gCurrentPinballGame->chargeIndicatorScaleY = 256; - gCurrentPinballGame->chargeFillAnimTimer = 0; - gCurrentPinballGame->fullChargeSlideAnimTimer = 0; - } - - gCurrentPinballGame->kickbackBallHoverPos = gCurrentPinballGame->ball->positionQ1; - gCurrentPinballGame->scoreAddedInFrame = 30000; + gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->kickbackFiring = TRUE; + gCurrentPinballGame->kickbackAnimProgress = 120; + gCurrentPinballGame->kickbackAnimDuration = 120; + gCurrentPinballGame->kickbackLaunchTimer = gCurrentPinballGame->kickbackAnimProgress; + gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->kickbackAnimFrameTimer = 0; + gCurrentPinballGame->kickbackFrameId = 0; - if (gCurrentPinballGame->bonusPikaSaverCount <= 98) - gCurrentPinballGame->bonusPikaSaverCount++; - } - else + if (gCurrentPinballGame->outLanePikaPosition != PIKA_BOTH_SIDES) { - gCurrentPinballGame->pikaKickbackTimer = 60; - MPlayStart(&gMPlayInfo_SE1, &se_pika_no_kickback); + gCurrentPinballGame->pikaChargeTarget = 0; + gCurrentPinballGame->pikaChargeProgress = 0; + gCurrentPinballGame->prevChargeFillValue = 0; + gCurrentPinballGame->chargeFillValue = 0; + gCurrentPinballGame->chargeIndicatorXOffset = 0; + gCurrentPinballGame->chargeIndicatorYOffset = -4; + gCurrentPinballGame->chargeIndicatorScaleX = 256; + gCurrentPinballGame->chargeIndicatorScaleY = 256; + gCurrentPinballGame->chargeFillAnimTimer = 0; + gCurrentPinballGame->fullChargeSlideAnimTimer = 0; } - outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; - - if (gCurrentPinballGame->outLanePikaPosition == 2) - gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] = (outlaneChuteIx) * 7 + 2; - else - gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] = 2; + gCurrentPinballGame->kickbackBallHoverPos = gCurrentPinballGame->ball->positionQ1; + gCurrentPinballGame->scoreAddedInFrame = 30000; - DmaCopy16(3, gPikaSaverTilesGfx + (gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] * 0x180), 0x06010480 + ((outlaneChuteIx) * 0x180), 0x180); + if (gCurrentPinballGame->bonusPikaSaverCount <= 98) + gCurrentPinballGame->bonusPikaSaverCount++; } + else + { + gCurrentPinballGame->pikaKickbackTimer = 60; + MPlayStart(&gMPlayInfo_SE1, &se_pika_no_kickback); + } + + outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; + + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) + gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] = (outlaneChuteIx) * 7 + 2; + else + gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] = 2; + + DmaCopy16(3, gPikaSaverTilesGfx + (gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] * 0x180), 0x06010480 + ((outlaneChuteIx) * 0x180), 0x180); } - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) gCurrentPinballGame->pikaSaverTileIndex[gCurrentPinballGame->outLaneSide - 1] = (gCurrentPinballGame->outLaneSide - 1) * 7 + 2; else gCurrentPinballGame->pikaSaverTileIndex[gCurrentPinballGame->outLaneSide - 1] = 2; @@ -121,7 +118,7 @@ void UpdateKickbackLogic(void) gCurrentPinballGame->pikaKickbackTimer--; } - if (gCurrentPinballGame->kickbackFiring != 0) + if (gCurrentPinballGame->kickbackFiring) { if (gCurrentPinballGame->kickbackLaunchTimer > 1) { @@ -142,7 +139,7 @@ void UpdateKickbackLogic(void) else { gCurrentPinballGame->activePortraitType = 1; - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) { if (gCurrentPinballGame->outLaneSide == 1) MPlayStart(&gMPlayInfo_SE1, &se_pikachu_kickback); @@ -202,7 +199,7 @@ void UpdateKickbackLogic(void) if (gCurrentPinballGame->kickbackLaunchTimer >= 100) { - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) gCurrentPinballGame->pikaSaverTileIndex[gCurrentPinballGame->outLaneSide - 1] = (gCurrentPinballGame->outLaneSide - 1) * 7 + 2; else gCurrentPinballGame->pikaSaverTileIndex[gCurrentPinballGame->outLaneSide - 1] = 2; @@ -211,7 +208,8 @@ void UpdateKickbackLogic(void) { gMain.fieldSpriteGroups[FIELD_SG_PIKA_KICKBACK_LAUNCH_FX]->active = TRUE; - if (gCurrentPinballGame->outLanePikaPosition == 2 && gCurrentPinballGame->outLaneSide == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES + && gCurrentPinballGame->outLaneSide == OUTLANE_RIGHT) { DmaCopy16(3, gPikaSaverFullCoverageGfx, 0x06015800, 0x2400); } @@ -239,12 +237,12 @@ void UpdateKickbackLogic(void) if (gCurrentPinballGame->kickbackFrameId > 25) { gCurrentPinballGame->kickbackFrameId = 25; - gCurrentPinballGame->kickbackFiring = 0; + gCurrentPinballGame->kickbackFiring = FALSE; gMain.fieldSpriteGroups[FIELD_SG_PIKA_KICKBACK_LAUNCH_FX]->active = FALSE; gCurrentPinballGame->activePortraitType = 0; outlaneChuteIx = gCurrentPinballGame->outLaneSide - 1; - if (gCurrentPinballGame->outLanePikaPosition == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES) gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] = outlaneChuteIx * 9; else gCurrentPinballGame->pikaSaverTileIndex[outlaneChuteIx] = 0; @@ -269,12 +267,12 @@ void UpdateKickbackLogic(void) if (gCurrentPinballGame->kickbackFiring) { spriteGroup->baseY = 380 - gCurrentPinballGame->cameraYOffset; - gCurrentPinballGame->kickbackOccupied[outlaneChuteIx] = 0; + gCurrentPinballGame->kickbackOccupied[outlaneChuteIx] = FALSE; } else { spriteGroup->baseY = 180; - gCurrentPinballGame->kickbackOccupied[outlaneChuteIx] = 1; + gCurrentPinballGame->kickbackOccupied[outlaneChuteIx] = TRUE; } for (j = 0; j < 4; j++) @@ -403,7 +401,7 @@ void PichuArrivalSequence(void) if (gCurrentPinballGame->creatureWaypointIndex == 4) { DmaCopy16(3, gPikachuSaverTilesGfx, (void *)0x06010600, 0x180); - gCurrentPinballGame->outLanePikaPosition = 2; + gCurrentPinballGame->outLanePikaPosition = PIKA_BOTH_SIDES; gMain.fieldSpriteGroups[FIELD_SG_HATCH_MON_ENTITY]->active = FALSE; gCurrentPinballGame->pichuEntranceTimer = 1; m4aSongNumStart(SE_PICHU_IN_POSITION_CHIRP); diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 4c37453f..af54a211 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -760,7 +760,8 @@ void AnimateCoinReward(void) else { if (gCurrentPinballGame->ballCatchState == TRAP_CENTER_HOLE - && (gCurrentPinballGame->newButtonActions[1] || JOY_NEW(A_BUTTON))) + && (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER] + || JOY_NEW(A_BUTTON))) gCurrentPinballGame->coinRewardFastPayout = 1; if (gCurrentPinballGame->coinsAwarded < gCurrentPinballGame->coinRewardAmount) diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 90c15586..831599d7 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -1476,7 +1476,8 @@ void UpdateLightningGrabEntity(void) } else { - if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { gCurrentPinballGame->ballGrabTimer -= 30; if (gCurrentPinballGame->ballGrabTimer < 5) @@ -1497,7 +1498,8 @@ void UpdateLightningGrabEntity(void) } else { - if (gCurrentPinballGame->newButtonActions[0] || gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER] + || gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) gCurrentPinballGame->ballGrabFlashTimer = 60; } diff --git a/src/ruby_collision.c b/src/ruby_collision.c index eb83fdb5..61a24f1c 100644 --- a/src/ruby_collision.c +++ b/src/ruby_collision.c @@ -715,11 +715,11 @@ void ProcessRubyCollisionEvent(s32 arg0, s16* arg1, u16* arg2) return; if (gCurrentPinballGame->ball->positionQ0.x <= 120) - gCurrentPinballGame->outLaneSide = 1; + gCurrentPinballGame->outLaneSide = OUTLANE_LEFT; else - gCurrentPinballGame->outLaneSide = 2; + gCurrentPinballGame->outLaneSide = OUTLANE_RIGHT; - if (gCurrentPinballGame->outLanePikaPosition <= 1) + if (gCurrentPinballGame->outLanePikaPosition < PIKA_BOTH_SIDES) { if (gCurrentPinballGame->outLanePikaPosition != gCurrentPinballGame->outLaneSide - 1) return; diff --git a/src/ruby_process3_entities.c b/src/ruby_process3_entities.c index 5f159901..391d6aac 100644 --- a/src/ruby_process3_entities.c +++ b/src/ruby_process3_entities.c @@ -2,6 +2,7 @@ #include "functions.h" #include "functions_ruby.h" #include "main.h" +#include "constants/board/main_board.h" void UpdateRubyBoardEntityRendering(void) { @@ -104,12 +105,14 @@ void HandleRubyFlipperButtonInput(void) { int tmp; - if (gCurrentPinballGame->newButtonActions[0]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER]) { - if (gCurrentPinballGame->pikaKickbackTimer == 0 && gCurrentPinballGame->outLanePikaPosition != 2 && - gCurrentPinballGame->pichuEntranceTimer == 0 && gCurrentPinballGame->kickbackFiring == 0) + if (gCurrentPinballGame->pikaKickbackTimer == 0 + && gCurrentPinballGame->outLanePikaPosition != PIKA_BOTH_SIDES + && gCurrentPinballGame->pichuEntranceTimer == 0 + && !gCurrentPinballGame->kickbackFiring) { - gCurrentPinballGame->outLanePikaPosition = 0; + gCurrentPinballGame->outLanePikaPosition = PIKA_LEFT_SIDE; } tmp = gCurrentPinballGame->holeIndicators[0]; @@ -124,12 +127,14 @@ void HandleRubyFlipperButtonInput(void) gCurrentPinballGame->ballPowerUpLight[2] = tmp; } - if (gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { - if (gCurrentPinballGame->pikaKickbackTimer == 0 && gCurrentPinballGame->outLanePikaPosition != 2 && - gCurrentPinballGame->pichuEntranceTimer == 0 && gCurrentPinballGame->kickbackFiring == 0) + if (gCurrentPinballGame->pikaKickbackTimer == 0 + && gCurrentPinballGame->outLanePikaPosition != PIKA_BOTH_SIDES + && gCurrentPinballGame->pichuEntranceTimer == 0 + && !gCurrentPinballGame->kickbackFiring) { - gCurrentPinballGame->outLanePikaPosition = 1; + gCurrentPinballGame->outLanePikaPosition = PIKA_RIGHT_SIDE; } tmp = gCurrentPinballGame->holeIndicators[3]; diff --git a/src/sapphire_collision.c b/src/sapphire_collision.c index e8473e61..9c53ad06 100644 --- a/src/sapphire_collision.c +++ b/src/sapphire_collision.c @@ -549,11 +549,11 @@ void ProcessSapphireCollisionEvent(u8 arg0, u16* arg1, u16* arg2) if (gCurrentPinballGame->pikaKickbackTimer == 0) { if (gCurrentPinballGame->ball->positionQ0.x <= 120) - gCurrentPinballGame->outLaneSide = 1; + gCurrentPinballGame->outLaneSide = OUTLANE_LEFT; else - gCurrentPinballGame->outLaneSide = 2; + gCurrentPinballGame->outLaneSide = OUTLANE_RIGHT; - if (gCurrentPinballGame->outLanePikaPosition < 2) + if (gCurrentPinballGame->outLanePikaPosition < PIKA_BOTH_SIDES) { if (gCurrentPinballGame->outLanePikaPosition == gCurrentPinballGame->outLaneSide - 1) gCurrentPinballGame->pikaKickbackTimer = 120; diff --git a/src/sapphire_process3.c b/src/sapphire_process3.c index 3056485e..6d59aef8 100644 --- a/src/sapphire_process3.c +++ b/src/sapphire_process3.c @@ -368,12 +368,14 @@ void HandleSapphireFlipperButtonInput(void) { int tmp; - if (gCurrentPinballGame->newButtonActions[0]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_LEFT_FLIPPER]) { - if (gCurrentPinballGame->pikaKickbackTimer == 0 && gCurrentPinballGame->outLanePikaPosition != 2 && - gCurrentPinballGame->pichuEntranceTimer == 0 && gCurrentPinballGame->kickbackFiring == 0) + if (gCurrentPinballGame->pikaKickbackTimer == 0 + && gCurrentPinballGame->outLanePikaPosition != PIKA_BOTH_SIDES + && gCurrentPinballGame->pichuEntranceTimer == 0 + && !gCurrentPinballGame->kickbackFiring) { - gCurrentPinballGame->outLanePikaPosition = 0; + gCurrentPinballGame->outLanePikaPosition = PIKA_LEFT_SIDE; } tmp = gCurrentPinballGame->holeIndicators[0]; @@ -388,12 +390,14 @@ void HandleSapphireFlipperButtonInput(void) gCurrentPinballGame->ballPowerUpLight[2] = tmp; } - if (gCurrentPinballGame->newButtonActions[1]) + if (gCurrentPinballGame->newButtonActions[PINBALL_INPUT_RIGHT_FLIPPER]) { - if (gCurrentPinballGame->pikaKickbackTimer == 0 && gCurrentPinballGame->outLanePikaPosition != 2 && - gCurrentPinballGame->pichuEntranceTimer == 0 && gCurrentPinballGame->kickbackFiring == 0) + if (gCurrentPinballGame->pikaKickbackTimer == 0 + && gCurrentPinballGame->outLanePikaPosition != PIKA_BOTH_SIDES + && gCurrentPinballGame->pichuEntranceTimer == 0 + && !gCurrentPinballGame->kickbackFiring) { - gCurrentPinballGame->outLanePikaPosition = 1; + gCurrentPinballGame->outLanePikaPosition = PIKA_RIGHT_SIDE; } tmp = gCurrentPinballGame->holeIndicators[3]; diff --git a/src/save_and_restore_game.c b/src/save_and_restore_game.c index fab38dab..f394bc35 100644 --- a/src/save_and_restore_game.c +++ b/src/save_and_restore_game.c @@ -342,7 +342,8 @@ void RestoreFieldSpecificGraphics(void) switch (gCurrentPinballGame->activePortraitType - 1) { case 0: - if (gCurrentPinballGame->outLanePikaPosition == 2 && gCurrentPinballGame->outLaneSide == 2) + if (gCurrentPinballGame->outLanePikaPosition == PIKA_BOTH_SIDES + && gCurrentPinballGame->outLaneSide == OUTLANE_RIGHT) { DmaCopy16(3, gPikaSaverFullCoverageGfx, (void *)0x6015800, 0x2400); } From fc9d2e8f0f76794cdeeb7a40b8f1492edd197a38 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 05:21:30 -0500 Subject: [PATCH 28/33] timerMode --- data/rom_1.s | 2 +- include/constants/board/main_board.h | 3 +-- include/global.h | 8 ++++++- src/all_board_process7.c | 2 +- src/all_board_process8.c | 17 +++++++------- src/bonus_complete_scoring_transition.c | 2 +- src/dusclops_process3.c | 10 ++++----- src/groudon_process3.c | 9 ++++---- src/kecleon_process3.c | 8 ++++--- src/kyogre_process3.c | 11 ++++++---- ...ain_board_catch_normal_and_jirachi_modes.c | 22 ++++++++++--------- src/main_board_center_capture_hole.c | 2 +- src/main_board_evolution_mode.c | 11 +++++----- src/main_board_travel_mode.c | 11 +++++----- src/rayquaza_process3.c | 10 +++++---- src/spheal_process3.c | 6 ++--- 16 files changed, 76 insertions(+), 58 deletions(-) diff --git a/data/rom_1.s b/data/rom_1.s index 54b24bb9..0f78acde 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -982,7 +982,7 @@ gSapphirePainterPalette:: @ 0x081BFCE4 gRubyBoardPalette:: @ 0x081BFEE4 .incbin "baserom.gba", 0x1BFEE4, 0x180 -gDefaultBallPalette:: @ 0x081C0064 +gDefaultTimerPalette:: @ 0x081C0064 .incbin "baserom.gba", 0x1C0064, 0x80 gLocationPalettes:: @ 0x081C00E4 diff --git a/include/constants/board/main_board.h b/include/constants/board/main_board.h index 1903da4e..be085c30 100644 --- a/include/constants/board/main_board.h +++ b/include/constants/board/main_board.h @@ -148,11 +148,10 @@ enum BannerGfxModes{ BANNER_MODE_SHROOMISH_CATCH_BURST = 7, }; -enum outlaneSide{ +enum OutlaneSide{ OUTLANE_LEFT = 1, OUTLANE_RIGHT = 2 }; -//kickbackOccupied enum PikaCoverage { PIKA_LEFT_SIDE = 0, diff --git a/include/global.h b/include/global.h index 00410bc3..0a89a61e 100644 --- a/include/global.h +++ b/include/global.h @@ -83,6 +83,12 @@ #define MODE_CHANGE_BONUS_BANNER 0x80 //2^7 #define MODE_CHANGE_EXPIRED_BONUS_BANNER 0xC0 // 2^6 + 2^7 +#define EVENT_TIMER_MODE_NONE 0 +// Note: Bonus boards start with timer 'paused', and it gets started +// when the ball spawns. (board process 7) +#define EVENT_TIMER_MODE_PAUSED 1 +#define EVENT_TIMER_MODE_RUNNING 2 +#define EVENT_TIMER_MODE_COMPLETED 3 struct BgOffsets { @@ -373,7 +379,7 @@ struct PinballGame /*0x28A*/ s16 catchTargetY; /*0x28C*/ u8 filler28C[0x4]; /*0x290*/ u32 globalAnimFrameCounter; - /*0x294*/ s8 boardModeType; + /*0x294*/ s8 eventTimerType; /*0x295*/ u8 unk295; /*0x296*/ u16 eventTimer; //Timer for events (Only bonus fields or all events?) /*0x298*/ u16 cutsceneTilemapColumn; diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 8cf13b68..95249417 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -353,7 +353,7 @@ void BonusBoardProcess_7B_12BF8() if (gCurrentPinballGame->ballRespawnTimer > 215) { if (gCurrentPinballGame->ballRespawnState == 3) - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; gCurrentPinballGame->ballRespawnState = 0; spriteGroup->active = FALSE; diff --git a/src/all_board_process8.c b/src/all_board_process8.c index c7557ac3..e409d677 100644 --- a/src/all_board_process8.c +++ b/src/all_board_process8.c @@ -4,7 +4,7 @@ #include "constants/bg_music.h" extern const u8 gTimerWarningPalette_Fast[]; -extern const u8 gDefaultBallPalette[]; +extern const u8 gDefaultTimerPalette[]; extern const u8 gTimerWarningPalette_Slow[]; void AllBoardProcess_8A_4CEA8(void) @@ -165,13 +165,14 @@ void ProcessEventTimer(void) s16 sp0[4]; s16 var2; - if (gCurrentPinballGame->boardModeType == 0) + if (gCurrentPinballGame->eventTimerType == EVENT_TIMER_MODE_NONE) return; if (gCurrentPinballGame->eventTimer == 0) return; - if (gCurrentPinballGame->boardModeType == 2 && gMain.modeChangeFlags == MODE_CHANGE_NONE) + if (gCurrentPinballGame->eventTimerType == EVENT_TIMER_MODE_RUNNING + && gMain.modeChangeFlags == MODE_CHANGE_NONE) gCurrentPinballGame->eventTimer--; sp0[0] = gCurrentPinballGame->eventTimer / 3600; @@ -180,7 +181,7 @@ void ProcessEventTimer(void) sp0[2] = var2 / 600; var2 %= 600; sp0[3] = var2 / 60; - if (gCurrentPinballGame->boardModeType == 3) + if (gCurrentPinballGame->eventTimerType == EVENT_TIMER_MODE_COMPLETED) { for (i = 0; i < 4; i++) { @@ -189,7 +190,7 @@ void ProcessEventTimer(void) } DmaCopy16(3, &gBG0TilemapBuffer[0x160], (void *)0x060022C0, 0x80); - gCurrentPinballGame->boardModeType = 0; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = 0; } else @@ -217,7 +218,7 @@ void ProcessEventTimer(void) } else { - DmaCopy16(3, gDefaultBallPalette, (void *)0x05000180, 0x20); + DmaCopy16(3, gDefaultTimerPalette, (void *)0x05000180, 0x20); } if (gCurrentPinballGame->eventTimer == 900) @@ -231,7 +232,7 @@ void ProcessEventTimer(void) } else { - DmaCopy16(3, gDefaultBallPalette, (void *)0x05000180, 0x20); + DmaCopy16(3, gDefaultTimerPalette, (void *)0x05000180, 0x20); } } } @@ -240,7 +241,7 @@ void ResetEventState(void) { s16 i; - gCurrentPinballGame->boardModeType = 0; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = 0; for (i = 0; i < 4; i++) { diff --git a/src/bonus_complete_scoring_transition.c b/src/bonus_complete_scoring_transition.c index a1ccb4a3..be632bad 100644 --- a/src/bonus_complete_scoring_transition.c +++ b/src/bonus_complete_scoring_transition.c @@ -259,7 +259,7 @@ void TransitionFromBonusToMainBoard(void) gMain.isBonusField = 0; gMain.modeChangeFlags = MODE_CHANGE_NONE; gCurrentPinballGame->eventTimer = 0; - gCurrentPinballGame->boardModeType = 0; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; if (gCurrentPinballGame->numCompletedBonusStages > 4) gMain.eReaderBonuses[EREADER_ENCOUNTER_RATE_UP_CARD] = 1; diff --git a/src/dusclops_process3.c b/src/dusclops_process3.c index 941fcf26..663557bb 100644 --- a/src/dusclops_process3.c +++ b/src/dusclops_process3.c @@ -24,7 +24,7 @@ void DuskullBonus_Setup(void) gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState = BONUS_BOARD_SUBSTATE_ACTIVE; gCurrentPinballGame->boardState = DUSCLOPS_BOARD_STATE_0_INTRO; - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + BONUS_DUSKULL_TIME; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballGrabbed = 0; @@ -182,7 +182,7 @@ void DusclopsBoardProcess_3B_33130(void) break; } - if (gCurrentPinballGame->boardModeType) + if (gCurrentPinballGame->eventTimerType) { if (gCurrentPinballGame->eventTimer < 2) { @@ -649,7 +649,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) gCurrentPinballGame->bossAnimLoopCount = 184; gCurrentPinballGame->bossFramesetIndex = DUSCLOPS_FRAME_INTRO_START; tileOffset = 0; - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; break; } @@ -730,7 +730,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) else { gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_DUSCLOPS; - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; } break; @@ -970,7 +970,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) } case DUSCLOPS_ENTITY_STATE_VANISH: { - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; if (gCurrentPinballGame->bossAnimLoopCount == 0) diff --git a/src/groudon_process3.c b/src/groudon_process3.c index 788140b0..fb3199b3 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -46,7 +46,7 @@ void GroudonBoardProcess_3A_3B120(void) else gCurrentPinballGame->legendaryHitsRequired = 15; - gCurrentPinballGame->boardModeType = 0; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 10800; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballRespawnState = 3; @@ -155,7 +155,7 @@ void GroudonBoardProcess_3B_3B49C(void) gCurrentPinballGame->flippersDisabled = 0; if (gCurrentPinballGame->stageTimer == 650) - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; } else { @@ -256,7 +256,8 @@ void GroudonBoardProcess_3B_3B49C(void) RenderGroudonSprites(); AnimateGroudonBackground(); - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 && gMain.modeChangeFlags == MODE_CHANGE_NONE) { m4aMPlayAllStop(); @@ -598,7 +599,7 @@ void UpdateGroudonEntityLogic(void) } break; case GROUDON_ENTITY_STATE_SUFFICIENT_HITS: - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; // Alternating completions lead to escape vs catch // This will happen on the 4th/9th/etc board. ( %5 == 3 completed) diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index 5952c5f0..d9c7e91c 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -59,7 +59,7 @@ void KecleonBoardProcess_3A_35860(void) gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState = BONUS_BOARD_SUBSTATE_ACTIVE; gCurrentPinballGame->boardState = KECLEON_BOARD_STATE_INTRO; - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 120 * 60; // 120 seconds gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballGrabbed = 0; @@ -213,7 +213,9 @@ void KecleonBoardProcess_3B_35AA4(void) RenderKecleonSprites(); UpdateKecleonScopeItem(); UpdateKecleonScopeVision(); - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 && gMain.modeChangeFlags == MODE_CHANGE_NONE) + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 + && gMain.modeChangeFlags == MODE_CHANGE_NONE) { m4aMPlayAllStop(); m4aSongNumStart(MUS_END_OF_BALL3); @@ -636,7 +638,7 @@ void UpdateKecleonEntityLogic(void) } else { - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; gCurrentPinballGame->ballRespawnState = 2; gCurrentPinballGame->ballRespawnTimer = 0; diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 56ed4392..a49fd74d 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -44,7 +44,7 @@ void KyogreBoardProcess_3A_383E4(void) gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState = BONUS_BOARD_SUBSTATE_ACTIVE; gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_INTRO; - gCurrentPinballGame->boardModeType = 0; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 10800; gCurrentPinballGame->timerBonus = 0; if (gCurrentPinballGame->numCompletedBonusStages % 5 == 3) @@ -234,7 +234,10 @@ void KyogreBoardProcess_3B_3869C(void) UpdateKyogreEntityLogic(); RenderKyogreSprites(); AnimateKyogreBackground(); - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 && gMain.modeChangeFlags == MODE_CHANGE_NONE) + + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 + && gMain.modeChangeFlags == MODE_CHANGE_NONE) { m4aMPlayAllStop(); m4aSongNumStart(MUS_END_OF_BALL3); @@ -310,7 +313,7 @@ void UpdateKyogreEntityLogic(void) } if (gCurrentPinballGame->bossFramesetIndex == 32) - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; if (gCurrentPinballGame->bossFramesetIndex == 33) { @@ -487,7 +490,7 @@ void UpdateKyogreEntityLogic(void) gCurrentPinballGame->shockwaveAlreadyHit = 1; break; case KYOGRE_ENTITY_STATE_SUFFICIENT_HITS: - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; if (gCurrentPinballGame->numCompletedBonusStages % 5 == 3) { diff --git a/src/main_board_catch_normal_and_jirachi_modes.c b/src/main_board_catch_normal_and_jirachi_modes.c index c0bd7091..96bf4e24 100644 --- a/src/main_board_catch_normal_and_jirachi_modes.c +++ b/src/main_board_catch_normal_and_jirachi_modes.c @@ -12,7 +12,7 @@ extern u8 gCatchSpritePalettes[]; extern const u8 gCatchMonAppearFx_Gfx[]; extern const u8 gCatchMonAppearFx_Pal[]; -extern const u8 gDefaultBallPalette[]; +extern const u8 gDefaultTimerPalette[]; extern const u8 gJirachiFx_Gfx[][0x480]; extern const u8 gCapturePalette[]; extern const s16 gCatchMonRevealFrameData[8][2]; @@ -65,7 +65,7 @@ void InitCatchEmMode(void) gCurrentPinballGame->boardSubState = CATCH_EM_SUBSTATE_BUILD_WEIGHTS; gCurrentPinballGame->stageTimer = 0; - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + BONUS_CATCH_TIME; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->creatureHitCount = 0; @@ -89,7 +89,7 @@ void InitCatchEmMode(void) } gCurrentPinballGame->catchEmModeStartCount++; - DmaCopy16(3, gDefaultBallPalette, (void *)PLTT + 0x180, 0x20); + DmaCopy16(3, gDefaultTimerPalette, (void *)PLTT + 0x180, 0x20); for (i = 0; i < 6; i++) { @@ -109,7 +109,8 @@ void UpdateCatchEmMode(void) { s16 i; - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 && gCurrentPinballGame->boardSubState < CATCH_EM_SUBSTATE_END_CATCH_HIT_PHASE) { m4aMPlayAllStop(); @@ -179,7 +180,7 @@ void UpdateCatchEmMode(void) } else if (gCurrentPinballGame->modeAnimTimer < 17) { - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; gCurrentPinballGame->boardSubState++; } } @@ -214,7 +215,7 @@ void UpdateCatchEmMode(void) } else if (gCurrentPinballGame->modeAnimTimer == 0) { - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; gCurrentPinballGame->boardSubState++; } } @@ -306,7 +307,7 @@ void InitJirachiBonus(void) { gCurrentPinballGame->boardSubState = JIRACHI_CATCH_SUBSTATE_LOAD_MON_SPRITE; gCurrentPinballGame->stageTimer = 0; - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 1800; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->creatureHitCount = 0; @@ -334,7 +335,7 @@ void InitJirachiBonus(void) gCurrentPinballGame->holeIndicators[1] = gCurrentPinballGame->holeIndicators[0]; gCurrentPinballGame->holeIndicators[2] = gCurrentPinballGame->holeIndicators[0]; gCurrentPinballGame->holeIndicators[3] = gCurrentPinballGame->holeIndicators[0]; - DmaCopy16(3, gDefaultBallPalette, (void *)0x05000180, 0x20); + DmaCopy16(3, gDefaultTimerPalette, (void *)0x05000180, 0x20); } void UpdateJirachiBonus(void) @@ -507,7 +508,7 @@ void UpdateJirachiBonus(void) { gCurrentPinballGame->modeAnimTimer = 40; if (gCurrentPinballGame->stageTimer == 499) - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; } gCurrentPinballGame->stageTimer++; @@ -515,7 +516,8 @@ void UpdateJirachiBonus(void) if (gCurrentPinballGame->creatureHitCooldown) gCurrentPinballGame->creatureHitCooldown--; - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 && gCurrentPinballGame->boardSubState < JIRACHI_CATCH_SUBSTATE_BOARD_STATE_CLEANUP) { m4aMPlayAllStop(); diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index 41e9450d..9f99efc8 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -546,7 +546,7 @@ void RunMonCaptureSequence(void) if (gMain.selectedField < MAIN_FIELD_COUNT && (gCurrentPinballGame->boardState == MAIN_BOARD_STATE_CATCH_EM_MODE || gCurrentPinballGame->boardState == MAIN_BOARD_STATE_JIRACHI_CATCH_MODE)) - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; gCurrentPinballGame->ballFrozenState = 1; diff --git a/src/main_board_evolution_mode.c b/src/main_board_evolution_mode.c index 9d7c1989..116ba92b 100644 --- a/src/main_board_evolution_mode.c +++ b/src/main_board_evolution_mode.c @@ -8,7 +8,7 @@ extern struct SongHeader se_evo_item_appear; extern struct SongHeader se_evo_item_finish_appear; extern struct SongHeader se_evo_item_collected; -extern const u8 gDefaultBallPalette[]; +extern const u8 gDefaultTimerPalette[]; extern const u8 *gEvoItemAppear_GfxList[]; extern const u8 gEvoItemPalettes[][0x20]; extern const s16 gEvoItemAppearFrameThresholds[]; @@ -39,7 +39,7 @@ void InitEvolutionMode(void) { gCurrentPinballGame->boardSubState = EVOLUTION_SUBSTATE_SHUFFLE_EVO_ITEM_PLACEMENTS; gCurrentPinballGame->stageTimer = 0; - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 7200; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->saverTimeRemaining = 3600; @@ -65,7 +65,7 @@ void InitEvolutionMode(void) gCurrentPinballGame->evoItemGfxIndex = 0; } - DmaCopy16(3, gDefaultBallPalette, (void *)0x05000180, 0x20); + DmaCopy16(3, gDefaultTimerPalette, (void *)0x05000180, 0x20); gCurrentPinballGame->evoArrowProgress = 0; gCurrentPinballGame->shopArrowActive = 0; gCurrentPinballGame->catchModeEventTimer = 0; @@ -84,7 +84,8 @@ void UpdateEvolutionMode(void) struct OamDataSimple *oamSimple; s16 index; - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 && gCurrentPinballGame->boardSubState < EVOLUTION_SUBSTATE_END_EVO_PHASE) { m4aMPlayAllStop(); @@ -181,7 +182,7 @@ void UpdateEvolutionMode(void) gCurrentPinballGame->boardSubState++; break; case EVOLUTION_SUBSTATE_REGISTER_CAPTURE: - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; gCurrentPinballGame->preEvoSpecies = gCurrentPinballGame->currentSpecies; RegisterCaptureOrEvolution(1); gCurrentPinballGame->postEvoSpecies = gCurrentPinballGame->currentSpecies; diff --git a/src/main_board_travel_mode.c b/src/main_board_travel_mode.c index c2ff2901..4350d181 100644 --- a/src/main_board_travel_mode.c +++ b/src/main_board_travel_mode.c @@ -4,7 +4,7 @@ #include "constants/bg_music.h" #include "constants/board/ruby_states.h" -extern const u8 gDefaultBallPalette[]; +extern const u8 gDefaultTimerPalette[]; void CleanupTravelModeState(void) { @@ -34,18 +34,19 @@ void InitTravelMode(void) { gCurrentPinballGame->boardSubState = TRAVEL_SUBSTATE_INIT; gCurrentPinballGame->stageTimer = 0; - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 3600; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->saverTimeRemaining = 1800; - DmaCopy16(3, gDefaultBallPalette, (void *)0x05000180, 0x20); + DmaCopy16(3, gDefaultTimerPalette, (void *)0x05000180, 0x20); } void UpdateTravelMode(void) { s16 var0; - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 && gCurrentPinballGame->boardSubState < TRAVEL_SUBSTATE_BOARD_STATE_CLEANUP) { m4aMPlayAllStop(); @@ -126,7 +127,7 @@ void UpdateTravelMode(void) gCurrentPinballGame->boardSubState++; break; case TRAVEL_SUBSTATE_GRAVITY_WELL: - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; gCurrentPinballGame->boardSubState++; gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->portraitCycleFrame = 0; diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 831599d7..9887be74 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -40,7 +40,7 @@ void RayquazaBoardProcess_3A_3E79C(void) else gCurrentPinballGame->legendaryHitsRequired = 15; - gCurrentPinballGame->boardModeType = 0; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 10800; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballRespawnState = 3; @@ -233,7 +233,9 @@ void RayquazaBoardProcess_3B_3EB2C(void) UpdateRayquazaMinionsAndEffects(); UpdateRayquazaEntityLogic(); RenderRayquazaSprites(); - if (gCurrentPinballGame->boardModeType && gCurrentPinballGame->eventTimer < 2 && gMain.modeChangeFlags == MODE_CHANGE_NONE) + if (gCurrentPinballGame->eventTimerType + && gCurrentPinballGame->eventTimer < 2 + && gMain.modeChangeFlags == MODE_CHANGE_NONE) { m4aMPlayAllStop(); m4aSongNumStart(MUS_END_OF_BALL3); @@ -559,7 +561,7 @@ void UpdateRayquazaEntityLogic(void) } break; case RAYQUAZA_ENTITY_STATE_SUFFICIENT_HITS: - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; if (gCurrentPinballGame->numCompletedBonusStages % 10 == 9) { // Catch Rayquaza @@ -1844,7 +1846,7 @@ void UpdateRayquazaIntroSequence(void) gCurrentPinballGame->cameraYAdjust = (gCurrentPinballGame->introFrameCounter - 512) / 2 - 88; if (gCurrentPinballGame->introFrameCounter == 624) - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; if (gCurrentPinballGame->introFrameCounter < 513) gCurrentPinballGame->bgScrollSpeed = gCurrentPinballGame->introFrameCounter / 2; diff --git a/src/spheal_process3.c b/src/spheal_process3.c index b64bda0b..906d3954 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -47,7 +47,7 @@ void SphealBoardProcess_3A_42E48(void) gCurrentPinballGame->stageTimer = 0; gCurrentPinballGame->boardSubState = BONUS_BOARD_SUBSTATE_ACTIVE; gCurrentPinballGame->boardState = SPHEAL_BOARD_STATE_INTRO; - gCurrentPinballGame->boardModeType = 1; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 7200; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballRespawnTimer = 0; @@ -156,7 +156,7 @@ void SphealBoardProcess_3B_43228(void) gCurrentPinballGame->cameraYAdjust = (gCurrentPinballGame->stageTimer / 5) + 0xFFC0; if (gCurrentPinballGame->stageTimer == 325) - gCurrentPinballGame->boardModeType = 2; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; gCurrentPinballGame->stageTimer++; } @@ -170,7 +170,7 @@ void SphealBoardProcess_3B_43228(void) case SPHEAL_BOARD_STATE_ACTIVE_PHASE: if (gCurrentPinballGame->eventTimer == 0) { - gCurrentPinballGame->boardModeType = 3; + gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; if (gCurrentPinballGame->stageTimer == 0) { m4aMPlayAllStop(); From 3401cb60a35182d4a3c8a91f75b237fb8555f60a Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 05:56:01 -0500 Subject: [PATCH 29/33] ball spawn state --- include/global.h | 7 ++++++- src/all_board_banners.c | 8 ++++---- src/all_board_mode_change_and_debug_menu.c | 4 ++-- src/all_board_pinball_game_main.c | 6 +++--- src/all_board_process2.c | 6 +++--- src/all_board_process7.c | 17 +++++++-------- src/dusclops_process3.c | 12 +++++------ src/groudon_process3.c | 15 ++++++++------ src/kecleon_collision.c | 4 ++-- src/kecleon_process3.c | 8 ++++---- src/kyogre_process3.c | 19 +++++++++-------- src/main_board_catch_holes.c | 10 ++++----- src/main_board_center_capture_hole.c | 10 ++++----- src/main_board_pichu_entity.c | 4 ++-- src/rayquaza_process3.c | 22 +++++++++++--------- src/ruby_catch_holes.c | 24 +++++++++++----------- src/ruby_process3_entities_2.c | 4 ++-- src/sapphire_pond_and_zigzagoon.c | 8 ++++---- src/sapphire_process3.c | 16 +++++++-------- src/spheal_collision.c | 2 +- src/spheal_process3.c | 20 +++++++++--------- 21 files changed, 120 insertions(+), 106 deletions(-) diff --git a/include/global.h b/include/global.h index 0a89a61e..5b0f71d5 100644 --- a/include/global.h +++ b/include/global.h @@ -90,6 +90,11 @@ #define EVENT_TIMER_MODE_RUNNING 2 #define EVENT_TIMER_MODE_COMPLETED 3 +#define BALL_SPAWN_STATE_LIVE_BALL 0 +#define BALL_SPAWN_STATE_RESPAWN 1 +#define BALL_SPAWN_STATE_DISABLED 2 +#define BALL_SPAWN_STATE_INITIAL_SPAWN 3 + struct BgOffsets { u16 xOffset; @@ -711,7 +716,7 @@ struct PinballGame /*0x5F3*/ s8 bonusTrapEnabled; /*0x5F4*/ u16 collisionMapScrollY; /*0x5F6*/ s8 ballUpgradeType; - /*0x5F7*/ u8 ballUpgradeTimerFrozen; + /*0x5F7*/ u8 ballUpgradeTimerPaused; /*0x5F8*/ u16 ballUpgradeCounter; /*0x5FA*/ s8 boardEntityActive; /*0x5FB*/ s8 cameraScrollEnabled; diff --git a/src/all_board_banners.c b/src/all_board_banners.c index 8d79f993..a0e0e266 100644 --- a/src/all_board_banners.c +++ b/src/all_board_banners.c @@ -10,7 +10,7 @@ void ProcessBannerCameraTransition(void) { if ((gMain.modeChangeFlags & MODE_CHANGE_BANNER) != 0) { - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->bannerActive) { gCurrentPinballGame->ballFrozenState = 2; @@ -62,7 +62,7 @@ void ProcessBannerCameraTransition(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->ballFrozenState = 0; gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; if (gCurrentPinballGame->bannerPreserveBallState == 0) { @@ -81,7 +81,7 @@ void ProcessBannerCameraTransition(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->ballFrozenState = 0; gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; if (gCurrentPinballGame->bannerPreserveBallState == 0) { @@ -97,7 +97,7 @@ void ProcessBannerCameraTransition(void) gCurrentPinballGame->cameraYAdjust = 0; gCurrentPinballGame->ballFrozenState = 0; gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; if (gCurrentPinballGame->bannerPreserveBallState == 0) { diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index 240da5c3..c2533bcb 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -468,7 +468,7 @@ void BallSaverAnimation(void) gCurrentPinballGame->ballFrozenState = 2; gCurrentPinballGame->boardEntityActive = 1; - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->startButtonDisabled = 1; m4aSongNumStart(SE_BALL_SAVED); } @@ -491,7 +491,7 @@ void BallSaverAnimation(void) else gCurrentPinballGame->ball->oamPriority = 1; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->activePortraitType = 0; gCurrentPinballGame->startButtonDisabled = 0; } diff --git a/src/all_board_pinball_game_main.c b/src/all_board_pinball_game_main.c index 69a1bf3c..673fa2d8 100644 --- a/src/all_board_pinball_game_main.c +++ b/src/all_board_pinball_game_main.c @@ -326,7 +326,7 @@ void SetBallPositionForBonusReturn(void) gCurrentPinballGame->ball->positionQ8.x = gCurrentPinballGame->ball->positionQ0.x << 8; gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; gCurrentPinballGame->ball->scale = 0x80; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->modeAnimTimer = 120; @@ -348,7 +348,7 @@ void SetBallPositionForBonusReturn(void) gCurrentPinballGame->ball->positionQ8.x = gCurrentPinballGame->ball->positionQ0.x << 8; gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; gCurrentPinballGame->ball->scale = 0x80; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->whiscashState = WHISCASH_STATE_INIT_RETURN_FROM_BONUS; @@ -364,7 +364,7 @@ void SetBallPositionForBonusReturn(void) gCurrentPinballGame->ball->positionQ8.x = gCurrentPinballGame->ball->positionQ0.x << 8; gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; gCurrentPinballGame->ball->scale = 0x80; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->pelipperFrameTimer = 0; diff --git a/src/all_board_process2.c b/src/all_board_process2.c index 94353a0e..e7472195 100644 --- a/src/all_board_process2.c +++ b/src/all_board_process2.c @@ -504,8 +504,8 @@ void ProcessBonusBoardBallDrain(void) } else { - gCurrentPinballGame->ball->ballHidden = 1; - gCurrentPinballGame->ballRespawnState = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_RESPAWN; gCurrentPinballGame->ballRespawnTimer = 0; gCurrentPinballGame->ball->positionQ0.x = gBoardConfig.fieldLayout.ballSpawnX; gCurrentPinballGame->ball->positionQ0.y = gBoardConfig.fieldLayout.ballSpawnY; @@ -577,7 +577,7 @@ void ResetBoardStateOnDeath(void) gCurrentPinballGame->ballUpgradeCounter = 0; } - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; DmaCopy16(3, &gBallPalettes[gCurrentPinballGame->ballUpgradeType], (void *)OBJ_PLTT + 0x20, 0x20); gCurrentPinballGame->bonusMultiplier = gCurrentPinballGame->progressLevel; gCurrentPinballGame->progressLevel = 1; diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 95249417..33a6c9f6 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -25,7 +25,7 @@ void MainBoardProcess_7B_12524(void) currentBallState->prevSpinAngle = currentBallState->spinAngle; - if (!gCurrentPinballGame->ballUpgradeTimerFrozen && gCurrentPinballGame->ballUpgradeCounter > 0) + if (!gCurrentPinballGame->ballUpgradeTimerPaused && gCurrentPinballGame->ballUpgradeCounter > 0) { if (--gCurrentPinballGame->ballUpgradeCounter == 0) { @@ -315,7 +315,8 @@ void BonusBoardProcess_7B_12BF8() gOamBuffer[oam->oamId].y = oam->yOffset + spriteGroup->baseY; } - if (gCurrentPinballGame->ballRespawnState == 1 || gCurrentPinballGame->ballRespawnState == 3) + if (gCurrentPinballGame->ballRespawnState == BALL_SPAWN_STATE_RESPAWN + || gCurrentPinballGame->ballRespawnState == BALL_SPAWN_STATE_INITIAL_SPAWN) { if (gCurrentPinballGame->ballRespawnTimer == 0) { @@ -348,14 +349,14 @@ void BonusBoardProcess_7B_12BF8() } if (gCurrentPinballGame->ballRespawnTimer == 186) - primaryBall->ballHidden = 0; + primaryBall->ballHidden = FALSE; if (gCurrentPinballGame->ballRespawnTimer > 215) { - if (gCurrentPinballGame->ballRespawnState == 3) + if (gCurrentPinballGame->ballRespawnState == BALL_SPAWN_STATE_INITIAL_SPAWN) gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_RUNNING; - gCurrentPinballGame->ballRespawnState = 0; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_LIVE_BALL; spriteGroup->active = FALSE; gCurrentPinballGame->ballFrozenState = 0; DmaCopy16(3, &gBallPalettes[gCurrentPinballGame->ballUpgradeType], (void *)PLTT + 0x220, 0x20); @@ -388,11 +389,11 @@ void BonusBoardProcess_7B_12BF8() m4aSongNumStart(SE_UNKNOWN_0xF9); if (gCurrentPinballGame->ballRespawnTimer == 20) - primaryBall->ballHidden = 1; + primaryBall->ballHidden = TRUE; if (gCurrentPinballGame->ballRespawnTimer > 67) { - gCurrentPinballGame->ballRespawnState = 0; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_LIVE_BALL; spriteGroup->active = FALSE; DmaCopy16(3, &gBallPalettes[gCurrentPinballGame->ballUpgradeType], (void *)PLTT + 0x220, 0x20); } @@ -400,7 +401,7 @@ void BonusBoardProcess_7B_12BF8() } else { - if (gCurrentPinballGame->ballUpgradeTimerFrozen == 0 && gCurrentPinballGame->ballUpgradeCounter != 0) + if (!gCurrentPinballGame->ballUpgradeTimerPaused && gCurrentPinballGame->ballUpgradeCounter != 0) { gCurrentPinballGame->ballUpgradeCounter--; if (gCurrentPinballGame->ballUpgradeCounter == 0) diff --git a/src/dusclops_process3.c b/src/dusclops_process3.c index 663557bb..0b5bd107 100644 --- a/src/dusclops_process3.c +++ b/src/dusclops_process3.c @@ -28,8 +28,8 @@ void DuskullBonus_Setup(void) gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + BONUS_DUSKULL_TIME; gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballGrabbed = 0; - gCurrentPinballGame->ballRespawnState = 3; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_INITIAL_SPAWN; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->bonusModeHitCount = 0; gCurrentPinballGame->returnToMainBoardFlag = 0; gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE; @@ -85,7 +85,7 @@ void DusclopsBoardProcess_3B_33130(void) switch (gCurrentPinballGame->boardState) { case DUSCLOPS_BOARD_STATE_0_INTRO: - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->stageTimer < 120) { temp = gCurrentPinballGame->stageTimer / 24; @@ -911,7 +911,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) { gCurrentPinballGame->ball->velocity.x = (gMain.systemFrameCount % 2 * 300) + 65386; gCurrentPinballGame->ball->velocity.y = 300; - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; m4aSongNumStart(SE_DUSCLOPS_BALL_LAUNCH); //Dusclops launch ball PlayRumble(8); } @@ -958,7 +958,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) if (gCurrentPinballGame->captureSequenceFrame == 40) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; } @@ -975,7 +975,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) if (gCurrentPinballGame->bossAnimLoopCount == 0) { - gCurrentPinballGame->ballRespawnState = 2; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_DISABLED; gCurrentPinballGame->ballRespawnTimer = 0; } diff --git a/src/groudon_process3.c b/src/groudon_process3.c index fb3199b3..5f0e8ad8 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -49,9 +49,9 @@ void GroudonBoardProcess_3A_3B120(void) gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 10800; gCurrentPinballGame->timerBonus = 0; - gCurrentPinballGame->ballRespawnState = 3; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_INITIAL_SPAWN; gCurrentPinballGame->ballRespawnTimer = 0; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->returnToMainBoardFlag = 0; gCurrentPinballGame->boardEntityCollisionMode = GROUDON_COLLISION_MODE_ACTIVE; gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; @@ -141,7 +141,7 @@ void GroudonBoardProcess_3B_3B49C(void) switch (gCurrentPinballGame->boardState) { case LEGENDARY_BOARD_STATE_INTRO: - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->stageTimer < 500) { gCurrentPinballGame->cameraYAdjust = -64; @@ -623,7 +623,7 @@ void UpdateGroudonEntityLogic(void) gCurrentPinballGame->bossFramesetIndex = 32; gCurrentPinballGame->boardEntityCollisionMode = GROUDON_COLLISION_MODE_NONE; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->ballRespawnState = 2; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_DISABLED; gCurrentPinballGame->ballRespawnTimer = 0; } @@ -1101,7 +1101,9 @@ void UpdateGroudonFieldEntities(void) if (gCurrentPinballGame->projectileFlightTimer >= 10) { varSL = (gCurrentPinballGame->projectileFlightTimer % 8) / 4 + gCurrentPinballGame->projectileDirection * 2; - if (squaredDistance <= 240 && gCurrentPinballGame->ballRespawnState == 0 && gCurrentPinballGame->ballGrabTimer < 600) + if (squaredDistance <= 240 + && !gCurrentPinballGame->ballRespawnState + && gCurrentPinballGame->ballGrabTimer < 600) { MPlayStart(&gMPlayInfo_SE1, &se_unk_11f); gCurrentPinballGame->projectileFlightTimer = 10; @@ -1650,7 +1652,8 @@ void UpdateGroudonFieldEntities(void) xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; squaredDistance = xx + yy; - if (gCurrentPinballGame->ballRespawnState == 0 && squaredDistance < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) + if (!gCurrentPinballGame->ballRespawnState + && squaredDistance < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) { gCurrentPinballGame->trapAngleQ16 = ArcTan2(-tempVector.x, tempVector.y); gCurrentPinballGame->ball->velocity.x = (Cos(gCurrentPinballGame->trapAngleQ16) * -400) / 20000; diff --git a/src/kecleon_collision.c b/src/kecleon_collision.c index 6bd88b61..b3647c44 100644 --- a/src/kecleon_collision.c +++ b/src/kecleon_collision.c @@ -91,7 +91,7 @@ void CheckKecleonEntityCollision(struct Vector16 *arg0, u16 *arg1, u8 *arg2) if (arrayValue == 0) return; - if (gCurrentPinballGame->ball->ballHidden != 0) + if (gCurrentPinballGame->ball->ballHidden) return; if (gCurrentPinballGame->bossEntityState >= KECLEON_ENTITY_STATE_HIT_WHILE_STANDING) return; @@ -116,7 +116,7 @@ void CheckKecleonEntityCollision(struct Vector16 *arg0, u16 *arg1, u8 *arg2) if (arrayValue == 0) return; - if (gCurrentPinballGame->ball->ballHidden != 0) + if (gCurrentPinballGame->ball->ballHidden) return; if (gCurrentPinballGame->bossEntityState == KECLEON_ENTITY_STATE_RESPOND_TO_HIT) return; diff --git a/src/kecleon_process3.c b/src/kecleon_process3.c index d9c7e91c..5884c881 100644 --- a/src/kecleon_process3.c +++ b/src/kecleon_process3.c @@ -63,9 +63,9 @@ void KecleonBoardProcess_3A_35860(void) gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 120 * 60; // 120 seconds gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballGrabbed = 0; - gCurrentPinballGame->ballRespawnState = 3; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_INITIAL_SPAWN; gCurrentPinballGame->ballRespawnTimer = 0; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->returnToMainBoardFlag = 0; gCurrentPinballGame->kecleonTargetVisible = 1; gCurrentPinballGame->bossEntityState = KECLEON_ENTITY_STATE_SPAWN; @@ -122,7 +122,7 @@ void KecleonBoardProcess_3B_35AA4(void) switch (gCurrentPinballGame->boardState) { case KECLEON_BOARD_STATE_INTRO: - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->stageTimer < 120) { gCurrentPinballGame->cameraYAdjust = (gCurrentPinballGame->stageTimer / 5) + 0xFFE8; @@ -640,7 +640,7 @@ void UpdateKecleonEntityLogic(void) { gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_COMPLETED; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->ballRespawnState = 2; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_DISABLED; gCurrentPinballGame->ballRespawnTimer = 0; gCurrentPinballGame->bossEntityState = KECLEON_ENTITY_STATE_RISE_FROM_DOWN; gCurrentPinballGame->kecleonBoardHitState = 0; diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index a49fd74d..05fe229d 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -56,9 +56,9 @@ void KyogreBoardProcess_3A_383E4(void) gCurrentPinballGame->legendaryFlashState = 0; gCurrentPinballGame->ballGrabbed = 0; gCurrentPinballGame->bossLightFadeInCounter = 0; - gCurrentPinballGame->ballRespawnState = 3; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_INITIAL_SPAWN; gCurrentPinballGame->ballRespawnTimer = 0; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->returnToMainBoardFlag = 0; gCurrentPinballGame->bannerSlideYOffset = 0; gCurrentPinballGame->bossAttackTimer = 0; @@ -119,7 +119,7 @@ void KyogreBoardProcess_3B_3869C(void) switch (gCurrentPinballGame->boardState) { case LEGENDARY_BOARD_STATE_INTRO: - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->stageTimer < 500) { gCurrentPinballGame->cameraYAdjust = -64; @@ -511,7 +511,7 @@ void UpdateKyogreEntityLogic(void) gCurrentPinballGame->bossEntityState = KYOGRE_ENTITY_STATE_PREPARE_LEAVING; gCurrentPinballGame->bossFramesetIndex = 79; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->ballRespawnState = 2; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_DISABLED; gCurrentPinballGame->ballRespawnTimer = 0; } @@ -1070,9 +1070,11 @@ void UpdateKyogreFieldEntities(void) xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; squaredDistance = xx + yy; - if (gCurrentPinballGame->ballGrabbed == 0 && gCurrentPinballGame->ballRespawnState == 0 && - gCurrentPinballGame->bonusModeHitCount < gCurrentPinballGame->legendaryHitsRequired && - gCurrentPinballGame->bossHitFlashTimer == 0 && squaredDistance < 400) + if (gCurrentPinballGame->ballGrabbed == 0 + && !gCurrentPinballGame->ballRespawnState + && gCurrentPinballGame->bonusModeHitCount < gCurrentPinballGame->legendaryHitsRequired + &&gCurrentPinballGame->bossHitFlashTimer == 0 + && squaredDistance < 400) { m4aSongNumStart(SE_UNKNOWN_0x113); PlayRumble(12); @@ -1287,7 +1289,8 @@ void UpdateKyogreFieldEntities(void) squaredDistance = xx + yy; //Check if shockwave close enough to the ball. - if (gCurrentPinballGame->ballRespawnState == 0 && squaredDistance < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) + if (!gCurrentPinballGame->ballRespawnState + && squaredDistance < gShockwaveSplashDistanceThresholds[gCurrentPinballGame->shockwaveAnimTimer]) { gCurrentPinballGame->freezeTrapPhase = KYOGRE_FREEZE_PHASE_ENCLOSE_BALL; gCurrentPinballGame->freezeTrapAnimFrame = 0; diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 459a3651..8a6f01b2 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -780,7 +780,7 @@ void InitCenterTrapMode(void) gMain.fieldSpriteGroups[FIELD_SG_CENTER_HOLE_GRAVITY_FX]->active = FALSE; gCurrentPinballGame->bonusTrapEnabled = 0; gCurrentPinballGame->scoreAddedInFrame = 10000; - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; PlayRumble(8); } @@ -791,7 +791,7 @@ void AnimateCenterTrapSequence(void) gCurrentPinballGame->modeAnimTimer--; if (gCurrentPinballGame->modeAnimTimer > 148) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -823,11 +823,11 @@ void AnimateCenterTrapSequence(void) gCurrentPinballGame->trapAnimState = 2; gCurrentPinballGame->ball->velocity.x = 73; gCurrentPinballGame->ball->velocity.y = 236; - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->boardEntityActive = 0; gCurrentPinballGame->ball->scale = 0x88; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; } else if (gCurrentPinballGame->modeAnimTimer > 12) { @@ -862,7 +862,7 @@ void TransitionToBonusField(void) SaveGameStateSnapshot(0); gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->ball->scale = 0x100; gCurrentPinballGame->trapAnimState = 0; diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index 9f99efc8..85c37776 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -560,7 +560,7 @@ void RunMonCaptureSequence(void) DmaCopy16(3, &gCaptureBallTilesGfx[gCurrentPinballGame->ballUpgradeType << 9], 0x060164C0, 0x80); DmaCopy16(3, &gCaptureBallTilesGfx[((gCurrentPinballGame->ballUpgradeType * 8 + 4) << 6)], 0x06016760, 0x80); - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->captureSequenceFrame == 1) { @@ -750,7 +750,7 @@ void RunMonCaptureSequence(void) if (temp_r0 < 0) { temp_r0 = 0; - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; } { @@ -803,7 +803,7 @@ void RunMonCaptureSequence(void) if (spriteGroup->active) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; spriteGroup->baseX = gCurrentPinballGame->ball->screenPosition.x; spriteGroup->baseY = gCurrentPinballGame->ball->screenPosition.y; temp_r3 = gCaptureShakeOffsets[gCurrentPinballGame->captureSequenceTimer - 17] + 7; @@ -961,7 +961,7 @@ void RunMonCaptureSequence(void) } gMain.fieldSpriteGroups[FIELD_SG_CAPTURE_MON_BALL_FX]->active = FALSE; - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ball->velocity.y = -256; gCurrentPinballGame->ball->velocity.x = 40; gCurrentPinballGame->ball->spinSpeed = 256; @@ -1293,7 +1293,7 @@ void RunMonCaptureSequence(void) break; case 34: - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->ball->oamPriority = 3; gCurrentPinballGame->captureState = MON_CAPTURE_SPECIAL_STATE_INACTIVE; gCurrentPinballGame->captureSequenceFrame = 0; diff --git a/src/main_board_pichu_entity.c b/src/main_board_pichu_entity.c index a6865d49..b88cad23 100644 --- a/src/main_board_pichu_entity.c +++ b/src/main_board_pichu_entity.c @@ -70,7 +70,7 @@ void UpdateKickbackLogic(void) gCurrentPinballGame->kickbackAnimProgress = 120; gCurrentPinballGame->kickbackAnimDuration = 120; gCurrentPinballGame->kickbackLaunchTimer = gCurrentPinballGame->kickbackAnimProgress; - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->kickbackAnimFrameTimer = 0; gCurrentPinballGame->kickbackFrameId = 0; @@ -180,7 +180,7 @@ void UpdateKickbackLogic(void) m4aSongNumStart(SE_KICKBACK_THUNDERWAVE); gCurrentPinballGame->kickbackLaunchTimer = 0; gCurrentPinballGame->ballFrozenState = 0; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->holeIndicators[(gCurrentPinballGame->outLaneSide - 1) * 3] = 1; if (gCurrentPinballGame->allHolesLit == 0 && diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 9887be74..720ca640 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -43,9 +43,9 @@ void RayquazaBoardProcess_3A_3E79C(void) gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_NONE; gCurrentPinballGame->eventTimer = gCurrentPinballGame->timerBonus + 10800; gCurrentPinballGame->timerBonus = 0; - gCurrentPinballGame->ballRespawnState = 3; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_INITIAL_SPAWN; gCurrentPinballGame->ballRespawnTimer = 0; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->cameraYAdjust = -88; gCurrentPinballGame->boardEntityCollisionMode = 1; gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; @@ -138,7 +138,7 @@ void RayquazaBoardProcess_3B_3EB2C(void) switch (gCurrentPinballGame->boardState) { case LEGENDARY_BOARD_STATE_INTRO: - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->introSequencePhase == 1) { gCurrentPinballGame->cameraYAdjust = 0; @@ -581,7 +581,7 @@ void UpdateRayquazaEntityLogic(void) gCurrentPinballGame->bossEntityState = RAYQUAZA_ENTITY_STATE_YELLS; gCurrentPinballGame->bossFramesetIndex = 98; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->ballRespawnState = 2; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_DISABLED; gCurrentPinballGame->ballRespawnTimer = 0; } @@ -1101,7 +1101,8 @@ void UpdateRayquazaMinionsAndEffects(void) PlayRumble(8); if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL - && gCurrentPinballGame->ballRespawnState == 0 && squaredDistance < 200) + && !gCurrentPinballGame->ballRespawnState + && squaredDistance < 200) { gMain.spriteGroups[SG_RAYQUAZA_LIGHTNING_BALL_GRAB_FX].active = TRUE; gCurrentPinballGame->ballGrabTimer = 600; @@ -1273,9 +1274,10 @@ void UpdateRayquazaMinionsAndEffects(void) xx = tempVector.x * tempVector.x; yy = tempVector.y * tempVector.y; squaredDistance = xx + yy; - if (gCurrentPinballGame->ballGrabbed == 0 && gCurrentPinballGame->ballRespawnState == 0 && - gCurrentPinballGame->bonusModeHitCount < gCurrentPinballGame->legendaryHitsRequired && - gCurrentPinballGame->bossHitFlashTimer == 0 && squaredDistance < 300) + if (gCurrentPinballGame->ballGrabbed == 0 + && !gCurrentPinballGame->ballRespawnState + && gCurrentPinballGame->bonusModeHitCount < gCurrentPinballGame->legendaryHitsRequired + && gCurrentPinballGame->bossHitFlashTimer == 0 && squaredDistance < 300) { gCurrentPinballGame->ballGrabTimer = 6; gCurrentPinballGame->ballFrozenState = 1; @@ -1697,7 +1699,7 @@ void RenderWindCloudSprites(void) gMain.spriteGroups[SG_RAYQUAZA_FLYBY_RIGHT_WIND_SPEEDLINES_1B].active = TRUE; if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL - && gCurrentPinballGame->ballRespawnState == 0) + && !gCurrentPinballGame->ballRespawnState) { gCurrentPinballGame->ball->velocity.x += 500; PlayRumble(13); @@ -1728,7 +1730,7 @@ void RenderWindCloudSprites(void) gMain.spriteGroups[SG_RAYQUAZA_FLYBY_LEFT_WIND_SPEEDLINES_1B].active = TRUE; if (gCurrentPinballGame->vortexEntityState[0] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL && gCurrentPinballGame->vortexEntityState[1] < RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL - && gCurrentPinballGame->ballRespawnState == 0) + && !gCurrentPinballGame->ballRespawnState) { gCurrentPinballGame->ball->velocity.x -= 500; PlayRumble(13); diff --git a/src/ruby_catch_holes.c b/src/ruby_catch_holes.c index f0b84e89..2c5a10b7 100644 --- a/src/ruby_catch_holes.c +++ b/src/ruby_catch_holes.c @@ -95,7 +95,7 @@ void AnimateSharpedoCatchSequence(void) gCurrentPinballGame->modeAnimTimer--; if (gCurrentPinballGame->modeAnimTimer > 100) { - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->ball->velocity.x = 0; @@ -128,7 +128,7 @@ void AnimateSharpedoCatchSequence(void) } else { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->catchHoleAnimFrame = 8; } } @@ -179,7 +179,7 @@ void AnimateSharpedoCatchSequence(void) { gCurrentPinballGame->ball->positionQ0.x = 193; gCurrentPinballGame->ball->positionQ0.y = 226; - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->catchHoleAnimFrame = 17; } else if (gCurrentPinballGame->modeAnimTimer > 16) @@ -233,7 +233,7 @@ void AnimateSharpedoCatchSequence(void) gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2; gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; gCurrentPinballGame->ballCatchState = NOT_TRAPPED; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->catchHoleAnimFrame = 0; } } @@ -257,7 +257,7 @@ void InitRubyEggHatchMode(void) gCurrentPinballGame->modeAnimTimer = 120; } - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; } void AnimateRubyEggHatchSequence(void) @@ -266,7 +266,7 @@ void AnimateRubyEggHatchSequence(void) if (modeAnimTimer != 0) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->modeAnimTimer--; @@ -307,7 +307,7 @@ void AnimateRubyEggHatchSequence(void) } else { - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ballCatchState = NOT_TRAPPED; gCurrentPinballGame->ball->positionQ0.x = 0x58; @@ -315,7 +315,7 @@ void AnimateRubyEggHatchSequence(void) gCurrentPinballGame->ball->spinSpeed = 0; gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2; gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; if (gCurrentPinballGame->rubyEggDeliveryState == 2) { @@ -342,7 +342,7 @@ void InitRubyEvolutionShopMode(void) gCurrentPinballGame->scoreAddedInFrame = 500000; gMain.blendControl = 0xCE; gMain.blendBrightness = 0; - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; } void AnimateRubyEvolutionShopSequence(void) @@ -350,7 +350,7 @@ void AnimateRubyEvolutionShopSequence(void) if (gCurrentPinballGame->modeAnimTimer > 0x18) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; @@ -378,7 +378,7 @@ void AnimateRubyEvolutionShopSequence(void) return; } - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->collisionCooldownTimer = 0x3C; @@ -388,7 +388,7 @@ void AnimateRubyEvolutionShopSequence(void) gCurrentPinballGame->ball->positionQ0.y = 0x63; gCurrentPinballGame->ball->spinSpeed = 0; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2; gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; gCurrentPinballGame->ballCatchState = NOT_TRAPPED; diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index d76f2b18..b2b33240 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -374,7 +374,7 @@ void RubyPond_EntityLogic(void) } if (gCurrentPinballGame->whiscashFrameIx == WHISCASH_FRAME_ABSORB_BALL_START+2) - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; break; case WHISCASH_STATE_TO_SPHEAL_BOARD: gCurrentPinballGame->startButtonDisabled = 1; @@ -443,7 +443,7 @@ void RubyPond_EntityLogic(void) if (gCurrentPinballGame->whiscashFrameIx == WHISCASH_FRAME_SPITBALL) { - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ball->spinAngle -= 64; gCurrentPinballGame->ball->positionQ8.x = 0x8500; gCurrentPinballGame->ball->positionQ8.y = 0xC000; diff --git a/src/sapphire_pond_and_zigzagoon.c b/src/sapphire_pond_and_zigzagoon.c index 64ac9474..d2cfb309 100644 --- a/src/sapphire_pond_and_zigzagoon.c +++ b/src/sapphire_pond_and_zigzagoon.c @@ -73,7 +73,7 @@ void UpdatePelipperPondEntity(void) { if (gCurrentPinballGame->pelipperFrameTimer == 0) { - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -91,7 +91,7 @@ void UpdatePelipperPondEntity(void) { gCurrentPinballGame->ball->positionQ0.x = 157; gCurrentPinballGame->ball->positionQ0.y = 134; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; var_sl = 5; } else @@ -229,7 +229,7 @@ void UpdatePelipperPondEntity(void) if (gCurrentPinballGame->pelipperFrameTimer == 13) { - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->pelipperBallDropVelX = 5; gCurrentPinballGame->pelipperBallDropVelY = -25; gCurrentPinballGame->pelipperBallDropPosX = (gCurrentPinballGame->pelipperPosX / 10 + 157) * 10; @@ -258,7 +258,7 @@ void UpdatePelipperPondEntity(void) if (gCurrentPinballGame->ball->positionQ0.y >= 91) { gCurrentPinballGame->ball->positionQ0.y = 91; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->ball->velocity.x = 128; gCurrentPinballGame->ball->velocity.y = 256; diff --git a/src/sapphire_process3.c b/src/sapphire_process3.c index 6d59aef8..7117b8ca 100644 --- a/src/sapphire_process3.c +++ b/src/sapphire_process3.c @@ -188,7 +188,7 @@ void InitSapphireEvolutionShopCatch(void) gCurrentPinballGame->scoreAddedInFrame = 500000; gMain.blendControl = 0xCE; gMain.blendBrightness = 0; - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; } void UpdateSapphireEvolutionShopSequence(void) @@ -197,7 +197,7 @@ void UpdateSapphireEvolutionShopSequence(void) if (gCurrentPinballGame->modeAnimTimer > 0x18) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; @@ -232,7 +232,7 @@ void UpdateSapphireEvolutionShopSequence(void) } else { - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->collisionCooldownTimer = 0x3C; gCurrentPinballGame->ball->velocity.x = 0x60; @@ -240,7 +240,7 @@ void UpdateSapphireEvolutionShopSequence(void) gCurrentPinballGame->ball->positionQ0.x = 0x3C; gCurrentPinballGame->ball->positionQ0.y = 0xB4; gCurrentPinballGame->ball->spinSpeed = 0; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2; gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; gCurrentPinballGame->ballCatchState = NOT_TRAPPED; @@ -273,7 +273,7 @@ void UpdateSapphireWailmerCatchSequence(void) { if (gCurrentPinballGame->modeAnimTimer) { - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; @@ -294,7 +294,7 @@ void UpdateSapphireWailmerCatchSequence(void) } else if (gCurrentPinballGame->modeAnimTimer > 91) { - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->catchHoleAnimFrame = 4; } else if (gCurrentPinballGame->modeAnimTimer > 83) @@ -323,7 +323,7 @@ void UpdateSapphireWailmerCatchSequence(void) } else if (gCurrentPinballGame->modeAnimTimer > 4) { - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->catchHoleAnimFrame = 10; gCurrentPinballGame->ball->positionQ0.x = 0xb5; gCurrentPinballGame->ball->positionQ0.y = 0xc3; @@ -356,7 +356,7 @@ void UpdateSapphireWailmerCatchSequence(void) gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; gCurrentPinballGame->ball->prevPositionQ1 = gCurrentPinballGame->ball->positionQ1; gCurrentPinballGame->ballCatchState = NOT_TRAPPED; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; m4aSongNumStart(SE_WHISCASH_SPIT_BALL); gCurrentPinballGame->cameraScrollTarget = 0; gCurrentPinballGame->cameraScrollEnabled = 1; diff --git a/src/spheal_collision.c b/src/spheal_collision.c index f1d06c61..3b1df8f1 100644 --- a/src/spheal_collision.c +++ b/src/spheal_collision.c @@ -120,7 +120,7 @@ void CheckSphealEntityCollision(struct Vector16 *arg0, u16 *arg1, u8 *arg2) if (lowerReadFromRom == 0) continue; - if (gCurrentPinballGame->ballRespawnState != 0) + if (gCurrentPinballGame->ballRespawnState) continue; arg1[0] = upperReadFromRom; diff --git a/src/spheal_process3.c b/src/spheal_process3.c index 906d3954..5c728403 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -52,8 +52,8 @@ void SphealBoardProcess_3A_42E48(void) gCurrentPinballGame->timerBonus = 0; gCurrentPinballGame->ballRespawnTimer = 0; gCurrentPinballGame->ballGrabbed = 0; - gCurrentPinballGame->ballRespawnState = 0; - gCurrentPinballGame->ball->ballHidden = 1; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_LIVE_BALL; + gCurrentPinballGame->ball->ballHidden = TRUE; gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -69,7 +69,7 @@ void SphealBoardProcess_3A_42E48(void) gCurrentPinballGame->deliveryAnimTimer = 0; gCurrentPinballGame->unk594 = 0; gCurrentPinballGame->unk596 = 0; - gCurrentPinballGame->ballDeliveryActive = 1; + gCurrentPinballGame->ballDeliveryActive = TRUE; // Clear minion info, used for Sealeo. (3rd slot not used on this board) for (i = 0; i < 3; i++) @@ -149,7 +149,7 @@ void SphealBoardProcess_3B_43228(void) switch (gCurrentPinballGame->boardState) { case SPHEAL_BOARD_STATE_INTRO: - gCurrentPinballGame->ballUpgradeTimerFrozen = 1; + gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->stageTimer < 340) { if (gCurrentPinballGame->stageTimer < 321) @@ -176,7 +176,7 @@ void SphealBoardProcess_3B_43228(void) m4aMPlayAllStop(); MPlayStart(&gMPlayInfo_SE1, &se_unk_13b); gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->ballRespawnState = 2; + gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_DISABLED; gCurrentPinballGame->ballRespawnTimer = 0; } @@ -1036,7 +1036,7 @@ void SphealBoard_WhiscashDeliversBall(void) { gCurrentPinballGame->deliveryAnimFrameIndex = 18; gMain.spriteGroups[SG_SPHEAL_WHISCASH_ENTITY].active = FALSE; - gCurrentPinballGame->ballDeliveryActive = 0; + gCurrentPinballGame->ballDeliveryActive = FALSE; } if (gCurrentPinballGame->deliveryAnimFrameIndex == 9) @@ -1059,7 +1059,7 @@ void SphealBoard_WhiscashDeliversBall(void) if (gCurrentPinballGame->deliveryAnimFrameIndex == 8) { m4aSongNumStart(SE_WHISCASH_SPIT_BALL); - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ball->spinAngle -= 0x40; gCurrentPinballGame->ball->positionQ8.x = 0x8F00; gCurrentPinballGame->ball->positionQ8.y = 0xC300; @@ -1128,7 +1128,7 @@ void SphealBoard_PelipperDeliversBall(void) if (gCurrentPinballGame->pelipperFrameTimer == 13) { - gCurrentPinballGame->ball->ballHidden = 0; + gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->pelipperBallDropVelX = -10; gCurrentPinballGame->pelipperBallDropVelY = -25; gCurrentPinballGame->pelipperBallDropPosX = ((gCurrentPinballGame->pelipperPosX / 10) + 157) * 10; @@ -1157,14 +1157,14 @@ void SphealBoard_PelipperDeliversBall(void) if (gCurrentPinballGame->ball->positionQ0.y >= 181) { gCurrentPinballGame->ball->positionQ0.y = 181; - gCurrentPinballGame->ballUpgradeTimerFrozen = 0; + gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->ball->velocity.x = -10; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->boardEntityActive = 0; gCurrentPinballGame->ball->oamPriority = 3; gCurrentPinballGame->boardLayerDepth = 0; - gCurrentPinballGame->ballDeliveryActive = 0; + gCurrentPinballGame->ballDeliveryActive = FALSE; m4aSongNumStart(SE_UNKNOWN_0xE5); PlayRumble(7); } From 7126fb5f3dce383478b6d6bdbc60c883fd2e9b22 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 19:12:24 -0500 Subject: [PATCH 30/33] cameraLocked name, flipper consts --- include/global.h | 8 +++- src/all_board_banners.c | 8 ++-- src/all_board_mode_change_and_debug_menu.c | 4 +- src/all_board_process2.c | 4 +- src/all_board_process4.c | 22 +++++------ src/all_board_process6_collision.c | 46 +++++++++++----------- src/bonus_complete_scoring_transition.c | 2 +- src/groudon_process3.c | 8 ++-- src/kyogre_process3.c | 12 +++--- src/main_board_catch_holes.c | 2 +- src/main_board_launcher_and_cutscenes.c | 2 +- src/main_board_to_be_split.c | 4 +- src/rayquaza_process3.c | 14 +++---- src/ruby_catch_holes.c | 4 +- src/sapphire_process3.c | 4 +- src/save_and_restore_game.c | 2 +- src/spheal_process3.c | 12 +++--- 17 files changed, 81 insertions(+), 77 deletions(-) diff --git a/include/global.h b/include/global.h index 5b0f71d5..af3d764e 100644 --- a/include/global.h +++ b/include/global.h @@ -95,6 +95,10 @@ #define BALL_SPAWN_STATE_DISABLED 2 #define BALL_SPAWN_STATE_INITIAL_SPAWN 3 +#define FLIPPER_LEFT 0 +#define FLIPPER_RIGHT 1 +#define FLIPPER_COUNT 2 + struct BgOffsets { u16 xOffset; @@ -718,7 +722,7 @@ struct PinballGame /*0x5F6*/ s8 ballUpgradeType; /*0x5F7*/ u8 ballUpgradeTimerPaused; /*0x5F8*/ u16 ballUpgradeCounter; - /*0x5FA*/ s8 boardEntityActive; + /*0x5FA*/ s8 cameraLocked; /*0x5FB*/ s8 cameraScrollEnabled; /*0x5FC*/ s16 cameraScrollOffset; /*0x5FE*/ s16 cameraScrollTarget; @@ -886,7 +890,7 @@ struct PinballGame /*0x132C*/struct BallState *ball; /*0x1330*/struct BallState *secondaryBall; /*0x1334*/struct BallState ballStates[2]; - /*0x13BC*/struct FlipperState flipper[2]; + /*0x13BC*/struct FlipperState flipper[FLIPPER_COUNT]; /*0x13D4*/u16 nameRevealDelaysRow2[10]; /*0x13E8*/struct Vector16 nameSlideRow2[10]; } /* size=0x1410 */; diff --git a/src/all_board_banners.c b/src/all_board_banners.c index a0e0e266..2f1d8cdf 100644 --- a/src/all_board_banners.c +++ b/src/all_board_banners.c @@ -14,7 +14,7 @@ void ProcessBannerCameraTransition(void) if (gCurrentPinballGame->bannerActive) { gCurrentPinballGame->ballFrozenState = 2; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; if (gCurrentPinballGame->bannerDelayTimer != 0) { gCurrentPinballGame->bannerDelayTimer--; @@ -66,7 +66,7 @@ void ProcessBannerCameraTransition(void) if (gCurrentPinballGame->bannerPreserveBallState == 0) { - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } } @@ -85,7 +85,7 @@ void ProcessBannerCameraTransition(void) if (gCurrentPinballGame->bannerPreserveBallState == 0) { - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } } @@ -101,7 +101,7 @@ void ProcessBannerCameraTransition(void) if (gCurrentPinballGame->bannerPreserveBallState == 0) { - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } } } diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index c2533bcb..6a2098a6 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -403,7 +403,7 @@ void BallSaverAnimation(void) gMain.spriteGroups[SG_BALL_SAVE_LATI_ARM].active = FALSE; if (gMain.animationTimer == 32) { - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; m4aSongNumStart(SE_SAVER_PLUNGER_DROP); PlayRumble(6); } @@ -467,7 +467,7 @@ void BallSaverAnimation(void) } gCurrentPinballGame->ballFrozenState = 2; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->startButtonDisabled = 1; m4aSongNumStart(SE_BALL_SAVED); diff --git a/src/all_board_process2.c b/src/all_board_process2.c index e7472195..0b5a7d1a 100644 --- a/src/all_board_process2.c +++ b/src/all_board_process2.c @@ -140,7 +140,7 @@ void MainBoardProcess_2B_4D960(void) } var4 += var2; - if (gCurrentPinballGame->boardEntityActive == 0) + if (!gCurrentPinballGame->cameraLocked) { gCurrentPinballGame->cameraYQ8 = var4; gCurrentPinballGame->cameraBaseY = var4 / 0x100; @@ -229,7 +229,7 @@ void BonusBoardProcess_2B_4DBFC(void) } var4 += var2; - if (gCurrentPinballGame->boardEntityActive == 0) + if (!gCurrentPinballGame->cameraLocked) { gCurrentPinballGame->cameraYQ8 = var4; gCurrentPinballGame->cameraBaseY = var4 / 0x100; diff --git a/src/all_board_process4.c b/src/all_board_process4.c index b40160ad..b5e1999e 100644 --- a/src/all_board_process4.c +++ b/src/all_board_process4.c @@ -18,7 +18,7 @@ void DetermineFlipperBallSide(struct Vector16 arg0) struct FlipperLineSegment *line; struct Vector16 point1, point2; - line = &gFlipperLineGeometry[gCurrentPinballGame->flipper[0].position]; + line = &gFlipperLineGeometry[gCurrentPinballGame->flipper[FLIPPER_LEFT].position]; point1.x = line->x1 + 0x53; point1.y = line->y1 + gBoardConfig.fieldLayout.flipperBaseY; @@ -28,9 +28,9 @@ void DetermineFlipperBallSide(struct Vector16 arg0) check = (point2.y - point1.y) * (arg0.x - point1.x) * 30 / (point2.x - point1.x) + (point1.y - arg0.y) * 30; if (check >= 0) - gCurrentPinballGame->flipper[0].ballSide = 1; + gCurrentPinballGame->flipper[FLIPPER_LEFT].ballSide = 1; else - gCurrentPinballGame->flipper[0].ballSide = -1; + gCurrentPinballGame->flipper[FLIPPER_LEFT].ballSide = -1; line = &gFlipperLineGeometry[gCurrentPinballGame->flipper[1].position]; @@ -43,9 +43,9 @@ void DetermineFlipperBallSide(struct Vector16 arg0) check = (point2.y - point1.y) * (arg0.x - point1.x) * 30 / (point2.x - point1.x) + (point1.y - arg0.y) * 30; if (check >= 0) - gCurrentPinballGame->flipper[1].ballSide = 1; + gCurrentPinballGame->flipper[FLIPPER_RIGHT].ballSide = 1; else - gCurrentPinballGame->flipper[1].ballSide = -1; + gCurrentPinballGame->flipper[FLIPPER_RIGHT].ballSide = -1; } void MainBoardProcess_4B_19490(void) @@ -55,7 +55,7 @@ void MainBoardProcess_4B_19490(void) if ((gMain.modeChangeFlags & MODE_CHANGE_BANNER) == 0) UpdateMainBoardFlipperPhysics(); - for (i = 0; i < 2; i++) + for (i = 0; i < FLIPPER_COUNT; i++) { struct SpriteGroup *spriteGroup; @@ -89,7 +89,7 @@ void UpdateMainBoardFlipperPhysics(void) DetermineFlipperBallSide(gCurrentPinballGame->ball->positionQ0); - for (i = 0; i < 2; i++) + for (i = 0; i < FLIPPER_COUNT; i++) { s16 dir; struct FlipperState *flipper; @@ -151,7 +151,7 @@ void UpdateMainBoardFlipperPhysics(void) } flipper->movementDirection = flipper->movementDirection * dir; if (flipper->movementDirection <= 0) - flipper->bounceApplied = 0; + flipper->bounceApplied = FALSE; flipper->movementDirection = dir; } } @@ -166,7 +166,7 @@ void BonusBoardProcess_4B_19734(void) UpdateBonusBoardFlipperPhysics(); gMain.modeChangeFlags = gMain.modeChangeFlags; } - for (i = 0; i < 2; i++) + for (i = 0; i < FLIPPER_COUNT; i++) { struct SpriteGroup *spriteGroup; @@ -204,7 +204,7 @@ void UpdateBonusBoardFlipperPhysics(void) DetermineFlipperBallSide(gCurrentPinballGame->ball->positionQ0); - for (i = 0; i < 2; i++) + for (i = 0; i < FLIPPER_COUNT; i++) { s16 dir; struct FlipperState *flipper; @@ -269,7 +269,7 @@ void UpdateBonusBoardFlipperPhysics(void) } flipper->movementDirection = flipper->movementDirection * dir; if (flipper->movementDirection <= 0) - flipper->bounceApplied = 0; + flipper->bounceApplied = FALSE; flipper->movementDirection = dir; } } diff --git a/src/all_board_process6_collision.c b/src/all_board_process6_collision.c index eab852d5..eb2f8b69 100644 --- a/src/all_board_process6_collision.c +++ b/src/all_board_process6_collision.c @@ -79,17 +79,17 @@ void AllBoardProcess_6B_1333C() ApplyTiltEffectOnCollision(&var0, &var1, r7); var0.x -= (gBoardConfig.fieldLayout.leftFlipperOriginX * 2); var0.y -= (gBoardConfig.fieldLayout.flipperOriginY * 2); - if (gCurrentPinballGame->flipper[0].bounceApplied == 0) + if (!gCurrentPinballGame->flipper[FLIPPER_LEFT].bounceApplied) { ComputeWallReflection(r7, &gCurrentPinballGame->ball->velocity, &var2); - gCurrentPinballGame->flipper[0].bounceApplied = 1; + gCurrentPinballGame->flipper[FLIPPER_LEFT].bounceApplied = TRUE; } else { var2.x = gCurrentPinballGame->ball->velocity.x; var2.y = gCurrentPinballGame->ball->velocity.y; } - ComputeFlipperBounce(&var0, &var2, 0); + ComputeFlipperBounce(&var0, &var2, FLIPPER_LEFT); gCurrentPinballGame->ball->velocity.x = var2.x + var1.x; gCurrentPinballGame->ball->velocity.y = var2.y + var1.y; if (gCurrentPinballGame->collisionResponseType == 5) @@ -111,10 +111,10 @@ void AllBoardProcess_6B_1333C() ApplyTiltEffectOnCollision(&var0, &var1, r7); var0.x -= (gBoardConfig.fieldLayout.rightFlipperOriginX * 2); var0.y -= (gBoardConfig.fieldLayout.flipperOriginY * 2); - if (gCurrentPinballGame->flipper[1].bounceApplied == 0) + if (!gCurrentPinballGame->flipper[FLIPPER_RIGHT].bounceApplied) { ComputeWallReflection(r7, &gCurrentPinballGame->ball->velocity, &var2); - gCurrentPinballGame->flipper[1].bounceApplied = 1; + gCurrentPinballGame->flipper[FLIPPER_RIGHT].bounceApplied = TRUE; } else { @@ -123,7 +123,7 @@ void AllBoardProcess_6B_1333C() } var0.x = 0x5f - var0.x; var2.x = -var2.x; - ComputeFlipperBounce(&var0, &var2, 1); + ComputeFlipperBounce(&var0, &var2, FLIPPER_RIGHT); var2.x = -var2.x; gCurrentPinballGame->ball->velocity.x = var2.x + var1.x; gCurrentPinballGame->ball->velocity.y = var2.y + var1.y; @@ -262,7 +262,7 @@ void ApplyTiltEffectOnCollision(struct Vector16 *arg0, struct Vector16 *arg1, u1 } } -void ComputeFlipperBounce(struct Vector16* arg0, struct Vector16* arg1, s16 arg2) +void ComputeFlipperBounce(struct Vector16* arg0, struct Vector16* arg1, s16 flipperIx) { struct Vector16 r7; u16 r4; @@ -277,14 +277,14 @@ void ComputeFlipperBounce(struct Vector16* arg0, struct Vector16* arg1, s16 arg2 for (;;) { - sp12 = gCurrentPinballGame->flipper[arg2].position - gCurrentPinballGame->flipper[arg2].prevPosition; + sp12 = gCurrentPinballGame->flipper[flipperIx].position - gCurrentPinballGame->flipper[flipperIx].prevPosition; - if ((sp12 *= gCurrentPinballGame->flipper[arg2].ballSide) > 0) + if ((sp12 *= gCurrentPinballGame->flipper[flipperIx].ballSide) > 0) { - if (gCurrentPinballGame->flipper[arg2].collisionFrameIndex < 7) - r4 = gFlipperCollisionAngles[gCurrentPinballGame->flipper[arg2].collisionMapFrame - 1][0] + 0x4000; + if (gCurrentPinballGame->flipper[flipperIx].collisionFrameIndex < 7) + r4 = gFlipperCollisionAngles[gCurrentPinballGame->flipper[flipperIx].collisionMapFrame - 1][0] + 0x4000; else - r4 = gFlipperCollisionAngles[gCurrentPinballGame->flipper[arg2].collisionMapFrame + 1][1] + -0x4000; // This changes compilation, apparently + r4 = gFlipperCollisionAngles[gCurrentPinballGame->flipper[flipperIx].collisionMapFrame + 1][1] + -0x4000; // This changes compilation, apparently } else { @@ -298,7 +298,7 @@ void ComputeFlipperBounce(struct Vector16* arg0, struct Vector16* arg1, s16 arg2 yy = r7.y * r7.y; temp = xx + yy - 0x240000; temp = Sqrt(temp * 4) / 2; - ComputeFlipperLaunchVelocity(temp, arg2, &sp4, r4); + ComputeFlipperLaunchVelocity(temp, flipperIx, &sp4, r4); if (sp4.x > 0x1C2) sp4.x = 0x1C2; @@ -316,7 +316,7 @@ void ComputeFlipperBounce(struct Vector16* arg0, struct Vector16* arg1, s16 arg2 for (i = gCurrentPinballGame->gravityStrengthIndex; i < 4; i++) { - if (LookupFlipperCollisionMap(*arg0, i + 1, &sp0, arg2)) + if (LookupFlipperCollisionMap(*arg0, i + 1, &sp0, flipperIx)) { flag = TRUE; break; @@ -893,7 +893,7 @@ void ProcessBonusTrapPhysics(void) } } -u16 LookupFlipperCollisionMap(struct Vector16 r0, s16 r1, u16 *r2, s16 r3) { +u16 LookupFlipperCollisionMap(struct Vector16 r0, s16 r1, u16 *r2, s16 flipperIx) { struct FlipperState* flipper; u16 res; int new_var; @@ -902,14 +902,14 @@ u16 LookupFlipperCollisionMap(struct Vector16 r0, s16 r1, u16 *r2, s16 r3) { res = 0; ix = (r0.y * 96) + r0.x; - flipper = &gCurrentPinballGame->flipper[r3]; + flipper = &gCurrentPinballGame->flipper[flipperIx]; flipper->collisionMapFrame = gFlipperCollisionFrameMapping[r1 + (flipper->collisionFrameIndex * 5)]; if (0xF & (&gBoardConfig.flipperCollisionData[flipper->collisionMapFrame * 0x2400])[ix]) { *r2 = 0xFFF0 & (&gBoardConfig.flipperCollisionData[flipper->collisionMapFrame * 0x2400])[ix]; - if (r3 == 1) + if (flipperIx == FLIPPER_RIGHT) { new_var = 0x8000; *r2 = new_var - (*r2); @@ -920,13 +920,13 @@ u16 LookupFlipperCollisionMap(struct Vector16 r0, s16 r1, u16 *r2, s16 r3) { return res; } -void ComputeFlipperLaunchVelocity(s32 arg0, s16 arg1, struct Vector16* arg2, u16 arg3) +void ComputeFlipperLaunchVelocity(s32 arg0, s16 flipperIx, struct Vector16* arg2, u16 arg3) { u16 angle; - angle = gCurrentPinballGame->flipper[arg1].collisionMapFrame; + angle = gCurrentPinballGame->flipper[flipperIx].collisionMapFrame; - if (gCurrentPinballGame->flipper[arg1].ballSide > 0) + if (gCurrentPinballGame->flipper[flipperIx].ballSide > 0) { if (gCurrentPinballGame->flipperLaunchPending == 0) { @@ -935,7 +935,7 @@ void ComputeFlipperLaunchVelocity(s32 arg0, s16 arg1, struct Vector16* arg2, u16 s16 temp_r2; s16 temp_r5; - temp_r2 = gCurrentPinballGame->flipper[arg1].collisionMapFrame; + temp_r2 = gCurrentPinballGame->flipper[flipperIx].collisionMapFrame; temp_r5 = (temp_r2 - 2) * 25; arg0 -= temp_r5; @@ -952,7 +952,7 @@ void ComputeFlipperLaunchVelocity(s32 arg0, s16 arg1, struct Vector16* arg2, u16 scale = ((arg0 -2600) * 348 / 5400) + 406; } - if (arg1) + if (flipperIx != FLIPPER_LEFT) var0 = 0x8000 - var0; angle = (gCurrentPinballGame->ball->velocity.x * -0x600) / 0x80 + @@ -964,7 +964,7 @@ void ComputeFlipperLaunchVelocity(s32 arg0, s16 arg1, struct Vector16* arg2, u16 gCurrentPinballGame->flipperLaunchPending = 1; - if (arg1) + if (flipperIx) arg2->x = -gCurrentPinballGame->flipperLaunchVelocity.x; else arg2->x = gCurrentPinballGame->flipperLaunchVelocity.x; diff --git a/src/bonus_complete_scoring_transition.c b/src/bonus_complete_scoring_transition.c index be632bad..d7b289a3 100644 --- a/src/bonus_complete_scoring_transition.c +++ b/src/bonus_complete_scoring_transition.c @@ -267,7 +267,7 @@ void TransitionFromBonusToMainBoard(void) gCurrentPinballGame->prevBoardState = 3; gCurrentPinballGame->boardState = MAIN_BOARD_STATE_DEFAULT; gCurrentPinballGame->boardTransitionPhase = BOARD_STATE_DISPATCHER_STATE_INIT; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; gCurrentPinballGame->cameraYAdjust = 0; LoadPortraitGraphics(PORTRAIT_STATE_CURRENT_LOCATION, PORTRAIT_MAIN_SLOT); diff --git a/src/groudon_process3.c b/src/groudon_process3.c index 5f0e8ad8..121ba99a 100644 --- a/src/groudon_process3.c +++ b/src/groudon_process3.c @@ -178,7 +178,7 @@ void GroudonBoardProcess_3B_3B49C(void) DmaCopy16(3, gGroudonBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; } break; case LEGENDARY_BOARD_STATE_SUCCESS_SCORING: @@ -210,7 +210,7 @@ void GroudonBoardProcess_3B_3B49C(void) gCurrentPinballGame->numCompletedBonusStages++; } - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; @@ -247,7 +247,7 @@ void GroudonBoardProcess_3B_3B49C(void) case LEGENDARY_BOARD_STATE_SCORE_COUNTING_FINISHED: ProcessBonusBannerAndScoring(); gCurrentPinballGame->returnToMainBoardFlag = 1; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; } @@ -267,7 +267,7 @@ void GroudonBoardProcess_3B_3B49C(void) if (gCurrentPinballGame->returnToMainBoardFlag) { - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; FadeToMainBoard(); } diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 05fe229d..5e9b9b2d 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -158,7 +158,7 @@ void KyogreBoardProcess_3B_3869C(void) DmaCopy16(3, gKyogreBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; } break; case LEGENDARY_BOARD_STATE_SUCCESS_SCORING: @@ -190,7 +190,7 @@ void KyogreBoardProcess_3B_3869C(void) gCurrentPinballGame->numCompletedBonusStages++; } - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; @@ -227,7 +227,7 @@ void KyogreBoardProcess_3B_3869C(void) case LEGENDARY_BOARD_STATE_SCORE_COUNTING_FINISHED: ProcessBonusBannerAndScoring(); gCurrentPinballGame->returnToMainBoardFlag = 1; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; } UpdateKyogreFieldEntities(); @@ -246,7 +246,7 @@ void KyogreBoardProcess_3B_3869C(void) if (gCurrentPinballGame->returnToMainBoardFlag) { - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; FadeToMainBoard(); } @@ -1081,7 +1081,7 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->vortexEntityState[i] = KYOGRE_WHIRLPOOL_PHASE_FULL_CAUGHT_BALL; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; tempVector2.x = gCurrentPinballGame->vortexScreenPosition[i].x / 10 + 120; tempVector2.y = gCurrentPinballGame->vortexScreenPosition[i].y / 10 + 144; tempVector.x = (tempVector2.x << 8) - gCurrentPinballGame->ball->positionQ8.x; @@ -1161,7 +1161,7 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->ball->velocity.y = 300; gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->vortexEntityState[i] = KYOGRE_WHIRLPOOL_PHASE_INIT; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } break; case KYOGRE_WHIRLPOOL_PHASE_SHRUNK: diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 8a6f01b2..db71f61a 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -825,7 +825,7 @@ void AnimateCenterTrapSequence(void) gCurrentPinballGame->ball->velocity.y = 236; gCurrentPinballGame->ball->ballHidden = FALSE; gCurrentPinballGame->ballFrozenState = 0; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; gCurrentPinballGame->ball->scale = 0x88; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; } diff --git a/src/main_board_launcher_and_cutscenes.c b/src/main_board_launcher_and_cutscenes.c index 7c7e056e..5e848b95 100644 --- a/src/main_board_launcher_and_cutscenes.c +++ b/src/main_board_launcher_and_cutscenes.c @@ -315,7 +315,7 @@ void RunEvolutionCutscene(void) m4aMPlayAllStop(); DmaCopy16(3, (void *)0x05000200, gCurrentPinballGame->pauseObjPalette, 0x200); gCurrentPinballGame->creatureOamPriority = 0; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } if (gCurrentPinballGame->stageTimer == 10) diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index af54a211..52d654fb 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -1495,7 +1495,7 @@ void UpdateHatchCave(void) gCurrentPinballGame->ball->positionQ1.x = gCurrentPinballGame->ball->positionQ0.x * 2; gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; m4aSongNumStart(SE_UNKNOWN_0xB9); - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } if (gCurrentPinballGame->eggCaveExitDelayTimer) @@ -1518,7 +1518,7 @@ void UpdateHatchCave(void) gCurrentPinballGame->ball->positionQ1.y = gCurrentPinballGame->ball->positionQ0.y * 2; gCurrentPinballGame->ball->positionQ8.x = gCurrentPinballGame->ball->positionQ0.x << 8; gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; } } diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 720ca640..51fb6cbc 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -156,7 +156,7 @@ void RayquazaBoardProcess_3B_3EB2C(void) DmaCopy16(3, gRayquazaBonusClear_Gfx, (void *)0x06015800, 0x2000); gCurrentPinballGame->bannerSlideYOffset = 136; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; case LEGENDARY_BOARD_STATE_SUCCESS_SCORING: ProcessBonusBannerAndScoring(); @@ -187,7 +187,7 @@ void RayquazaBoardProcess_3B_3EB2C(void) gCurrentPinballGame->numCompletedBonusStages++; } - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; case LEGENDARY_BOARD_STATE_CATCH_BANNER: gCurrentPinballGame->boardState = LEGENDARY_BOARD_STATE_CATCH_SCORING; @@ -225,7 +225,7 @@ void RayquazaBoardProcess_3B_3EB2C(void) case LEGENDARY_BOARD_STATE_SCORE_COUNTING_FINISHED: ProcessBonusBannerAndScoring(); gCurrentPinballGame->returnToMainBoardFlag = 1; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; } @@ -244,7 +244,7 @@ void RayquazaBoardProcess_3B_3EB2C(void) if (gCurrentPinballGame->returnToMainBoardFlag) { - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; FadeToMainBoard(); } @@ -648,7 +648,7 @@ void UpdateRayquazaEntityLogic(void) gCurrentPinballGame->bossPositionY = -1200; gCurrentPinballGame->introSequencePhase = 2; gCurrentPinballGame->introFrameCounter = 0; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; gMain.modeChangeFlags = MODE_CHANGE_BONUS_BANNER; gMain.spriteGroups[SG_RAYQUAZA_FLYING_SPARKLE].active = TRUE; gCurrentPinballGame->minionLogicPosition[0].x = 0; @@ -1283,7 +1283,7 @@ void UpdateRayquazaMinionsAndEffects(void) gCurrentPinballGame->ballFrozenState = 1; gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->vortexEntityState[i] = RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; tempVector2.x = gCurrentPinballGame->vortexScreenPosition[i].x / 10 + 16; tempVector2.y = gCurrentPinballGame->vortexScreenPosition[i].y / 10 + 32; @@ -1372,7 +1372,7 @@ void UpdateRayquazaMinionsAndEffects(void) gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->vortexEntityState[i] = RAYQUAZA_WHIRLWIND_STATE_INIT; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; PlayRumble(8); } diff --git a/src/ruby_catch_holes.c b/src/ruby_catch_holes.c index 2c5a10b7..817c25d6 100644 --- a/src/ruby_catch_holes.c +++ b/src/ruby_catch_holes.c @@ -104,7 +104,7 @@ void AnimateSharpedoCatchSequence(void) if (gCurrentPinballGame->modeAnimTimer > 108) { - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; if (gCurrentPinballGame->modeAnimTimer > 110) { @@ -187,7 +187,7 @@ void AnimateSharpedoCatchSequence(void) gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->cameraScrollTarget = 0; gCurrentPinballGame->cameraScrollEnabled = 1; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; gCurrentPinballGame->ball->spinSpeed = 0; gCurrentPinballGame->ball->velocity.x = 0xFF56; gCurrentPinballGame->ball->velocity.y = 220; diff --git a/src/sapphire_process3.c b/src/sapphire_process3.c index 7117b8ca..4386b02e 100644 --- a/src/sapphire_process3.c +++ b/src/sapphire_process3.c @@ -281,7 +281,7 @@ void UpdateSapphireWailmerCatchSequence(void) gCurrentPinballGame->ball->spinSpeed = 0; if (gCurrentPinballGame->modeAnimTimer > 97) { - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; gCurrentPinballGame->catchHoleAnimFrame = 2; gCurrentPinballGame->ball->positionQ0.x = 0xb5; gCurrentPinballGame->ball->positionQ0.y = 0xc3; @@ -360,7 +360,7 @@ void UpdateSapphireWailmerCatchSequence(void) m4aSongNumStart(SE_WHISCASH_SPIT_BALL); gCurrentPinballGame->cameraScrollTarget = 0; gCurrentPinballGame->cameraScrollEnabled = 1; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; } } diff --git a/src/save_and_restore_game.c b/src/save_and_restore_game.c index f394bc35..111bae00 100644 --- a/src/save_and_restore_game.c +++ b/src/save_and_restore_game.c @@ -479,7 +479,7 @@ void RestoreMainFieldDynamicGraphics(void) LoadCatchSpriteGraphics(); LoadMonFieldSpriteGraphics(); - for (i = 0; i <= 1; i++) + for (i = 0; i < FLIPPER_COUNT; i++) { var0 = gCurrentPinballGame->flipper[i].position / 2; DmaCopy16(3, gFlipperTileGraphics[var0], ((i * 0x200) + 0x06010000), 0x200); diff --git a/src/spheal_process3.c b/src/spheal_process3.c index 5c728403..ac750331 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -212,7 +212,7 @@ void SphealBoardProcess_3B_43228(void) gMain.spriteGroups[SG_SPHEAL_END_SCORE_TOTAL].active = TRUE; DmaCopy16(3, gSphealResultsScreenGfx, (void *)0x06015800, 0x800); gCurrentPinballGame->bannerSlideYOffset = -126; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; } break; case SPHEAL_BOARD_STATE_SCORE_DISPLAY: @@ -243,7 +243,7 @@ void SphealBoardProcess_3B_43228(void) gCurrentPinballGame->boardState = SPHEAL_BOARD_STATE_SCORE_DISPLAY_CLEANUP; } - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; case SPHEAL_BOARD_STATE_SCORE_DISPLAY_CLEANUP: UpdateSphealResultsScreen(); @@ -262,7 +262,7 @@ void SphealBoardProcess_3B_43228(void) case SPHEAL_BOARD_STATE_PREPARE_RETURN: UpdateSphealResultsScreen(); gCurrentPinballGame->returnToMainBoardFlag = 1; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; break; } @@ -272,7 +272,7 @@ void SphealBoardProcess_3B_43228(void) AnimateSphealBackground(); if (gCurrentPinballGame->returnToMainBoardFlag) { - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; FadeToMainBoard(); } @@ -1106,7 +1106,7 @@ void SphealBoard_PelipperDeliversBall(void) gCurrentPinballGame->pelipperState = 8; gCurrentPinballGame->deliveryAnimFrameIndex = 13; gMain.spriteGroups[SG_SPHEAL_PELIPPER_ENTITY].active = TRUE; - gCurrentPinballGame->boardEntityActive = 1; + gCurrentPinballGame->cameraLocked = TRUE; } } else @@ -1161,7 +1161,7 @@ void SphealBoard_PelipperDeliversBall(void) gCurrentPinballGame->ballFrozenState = 0; gCurrentPinballGame->ball->velocity.x = -10; gCurrentPinballGame->ball->velocity.y = 0; - gCurrentPinballGame->boardEntityActive = 0; + gCurrentPinballGame->cameraLocked = FALSE; gCurrentPinballGame->ball->oamPriority = 3; gCurrentPinballGame->boardLayerDepth = 0; gCurrentPinballGame->ballDeliveryActive = FALSE; From 2c28099393c6918dea27c2e819e193ea8988f003 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 19:38:12 -0500 Subject: [PATCH 31/33] ball physics state name --- include/global.h | 6 ++++- src/all_board_banners.c | 8 +++--- src/all_board_mode_change_and_debug_menu.c | 4 +-- src/all_board_pinball_game_main.c | 30 +++++++++++----------- src/all_board_process2.c | 4 +-- src/all_board_process5.c | 7 ++--- src/all_board_process7.c | 6 ++--- src/dusclops_collision.c | 2 +- src/dusclops_process3.c | 2 +- src/groudon_collision.c | 2 +- src/kyogre_collision.c | 2 +- src/kyogre_process3.c | 4 +-- src/main_board_catch_holes.c | 12 ++++----- src/main_board_center_capture_hole.c | 6 ++--- src/main_board_pichu_entity.c | 4 +-- src/main_board_to_be_split.c | 2 +- src/rayquaza_collision.c | 2 +- src/rayquaza_process3.c | 4 +-- src/ruby_catch_holes.c | 12 ++++----- src/ruby_collision.c | 2 +- src/ruby_process3_entities_2.c | 2 +- src/sapphire_pond_and_zigzagoon.c | 6 ++--- src/sapphire_process3.c | 8 +++--- src/spheal_process3.c | 14 +++++----- 24 files changed, 78 insertions(+), 73 deletions(-) diff --git a/include/global.h b/include/global.h index af3d764e..dfc741ac 100644 --- a/include/global.h +++ b/include/global.h @@ -95,6 +95,10 @@ #define BALL_SPAWN_STATE_DISABLED 2 #define BALL_SPAWN_STATE_INITIAL_SPAWN 3 +#define BALL_PHYSICS_NORMAL 0 +#define BALL_PHYSICS_MANUAL 1 +#define BALL_PHYSICS_FROZEN 2 + #define FLIPPER_LEFT 0 #define FLIPPER_RIGHT 1 #define FLIPPER_COUNT 2 @@ -160,7 +164,7 @@ struct PinballGame /*0x01C*/ bool8 scoreCounterAnimationEnabled; /*0x01D*/ u8 fadeSubState; /*0x01E*/ u8 gravityStrengthIndex; - /*0x01F*/ u8 ballFrozenState; + /*0x01F*/ u8 ballPhysicsState; /*0x020*/ u8 ballInLaunchChute; /*0x021*/ u8 launcherCharging; /*0x022*/ s8 collisionResponseType; diff --git a/src/all_board_banners.c b/src/all_board_banners.c index 2f1d8cdf..cb552552 100644 --- a/src/all_board_banners.c +++ b/src/all_board_banners.c @@ -13,7 +13,7 @@ void ProcessBannerCameraTransition(void) gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; if (gCurrentPinballGame->bannerActive) { - gCurrentPinballGame->ballFrozenState = 2; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_FROZEN; gCurrentPinballGame->cameraLocked = TRUE; if (gCurrentPinballGame->bannerDelayTimer != 0) { @@ -60,7 +60,7 @@ void ProcessBannerCameraTransition(void) if (gCurrentPinballGame->cameraYScrollSpeed == 0 || gCurrentPinballGame->cameraYAdjust == 0) { gCurrentPinballGame->cameraYAdjust = 0; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; @@ -79,7 +79,7 @@ void ProcessBannerCameraTransition(void) } gCurrentPinballGame->cameraYAdjust = 0; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; @@ -95,7 +95,7 @@ void ProcessBannerCameraTransition(void) if (gCurrentPinballGame->cameraYAdjust >= 0) { gCurrentPinballGame->cameraYAdjust = 0; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; diff --git a/src/all_board_mode_change_and_debug_menu.c b/src/all_board_mode_change_and_debug_menu.c index 6a2098a6..224556b1 100644 --- a/src/all_board_mode_change_and_debug_menu.c +++ b/src/all_board_mode_change_and_debug_menu.c @@ -466,7 +466,7 @@ void BallSaverAnimation(void) DmaCopy16(3, gBonusStagePal_Dark, (void *)0x050003C0, 0x20); } - gCurrentPinballGame->ballFrozenState = 2; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_FROZEN; gCurrentPinballGame->cameraLocked = TRUE; gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; gCurrentPinballGame->startButtonDisabled = 1; @@ -483,7 +483,7 @@ void BallSaverAnimation(void) gMain.modeChangeFlags &= ~MODE_CHANGE_BALL_SAVER; gCurrentPinballGame->collisionCooldownTimer = 60; InitBallState(0); - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; SetBoardCollisionConfig(0); gCurrentPinballGame->boardCollisionConfigChanged = 0; if (gMain.selectedField == FIELD_RUBY) diff --git a/src/all_board_pinball_game_main.c b/src/all_board_pinball_game_main.c index 673fa2d8..3700db57 100644 --- a/src/all_board_pinball_game_main.c +++ b/src/all_board_pinball_game_main.c @@ -327,7 +327,7 @@ void SetBallPositionForBonusReturn(void) gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; gCurrentPinballGame->ball->scale = 0x80; gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->modeAnimTimer = 120; gCurrentPinballGame->ballCatchState = TRAP_CENTER_HOLE; @@ -349,7 +349,7 @@ void SetBallPositionForBonusReturn(void) gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; gCurrentPinballGame->ball->scale = 0x80; gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->whiscashState = WHISCASH_STATE_INIT_RETURN_FROM_BONUS; gCurrentPinballGame->cameraBaseX = 0; @@ -365,7 +365,7 @@ void SetBallPositionForBonusReturn(void) gCurrentPinballGame->ball->positionQ8.y = gCurrentPinballGame->ball->positionQ0.y << 8; gCurrentPinballGame->ball->scale = 0x80; gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->pelipperFrameTimer = 0; gCurrentPinballGame->pelipperState = 7; @@ -550,7 +550,7 @@ void MainGameFrameUpdate(void) CurrentBoardProcPairs_020028D8[4].updateFunc(); if (gMain.modeChangeFlags) { - if (!gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) { for (i = 0; i < 4; i++) { @@ -563,9 +563,9 @@ void MainGameFrameUpdate(void) { gMain.fieldFrameCount++; gCurrentPinballGame->globalAnimFrameCounter++; - if (gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_NORMAL) { - if (gCurrentPinballGame->ballFrozenState != 2) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_FROZEN) { for (i = 0; i < 4; i++) { @@ -606,7 +606,7 @@ void IdleGameFrameUpdate(void) CurrentBoardProcPairs_020028D8[4].updateFunc(); if (gMain.modeChangeFlags) { - if (!gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) { for (i = 0; i < 4; i++) { @@ -619,9 +619,9 @@ void IdleGameFrameUpdate(void) { gMain.fieldFrameCount++; gCurrentPinballGame->globalAnimFrameCounter++; - if (gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_NORMAL) { - if (gCurrentPinballGame->ballFrozenState != 2) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_FROZEN) { for (i = 0; i < 4; i++) { @@ -675,7 +675,7 @@ void BonusFieldFrameUpdate(void) CurrentBoardProcPairs_020028D8[4].updateFunc(); if (gMain.modeChangeFlags & ~MODE_CHANGE_EXPIRED_BONUS) { - if (!gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) { for (i = 0; i < 4; i++) { @@ -690,9 +690,9 @@ void BonusFieldFrameUpdate(void) { gMain.fieldFrameCount++; gCurrentPinballGame->globalAnimFrameCounter++; - if (gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_NORMAL) { - if (gCurrentPinballGame->ballFrozenState == 2) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_FROZEN) { gCurrentPinballGame->activeBallIndex = 0; gCurrentPinballGame->ball = &gCurrentPinballGame->ballStates[0]; @@ -739,7 +739,7 @@ void IdleBonusFieldFrameUpdate(void) CurrentBoardProcPairs_020028D8[4].updateFunc(); if (gMain.modeChangeFlags & ~MODE_CHANGE_EXPIRED_BONUS) { - if (!gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) { for (i = 0; i < 4; i++) { @@ -754,9 +754,9 @@ void IdleBonusFieldFrameUpdate(void) { gMain.fieldFrameCount++; gCurrentPinballGame->globalAnimFrameCounter++; - if (gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_NORMAL) { - if (gCurrentPinballGame->ballFrozenState == 2) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_FROZEN) { gCurrentPinballGame->activeBallIndex = 0; gCurrentPinballGame->ball = &gCurrentPinballGame->ballStates[0]; diff --git a/src/all_board_process2.c b/src/all_board_process2.c index 0b5a7d1a..97fbe9df 100644 --- a/src/all_board_process2.c +++ b/src/all_board_process2.c @@ -115,7 +115,7 @@ void MainBoardProcess_2B_4D960(void) } } - if (gCurrentPinballGame->ballFrozenState == 0) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) var0 = (gCurrentPinballGame->secondaryBall->velocity.y * 40) + 0x1000; gCurrentPinballGame->cameraLookAhead += (var0 - gCurrentPinballGame->cameraLookAhead) / 10; @@ -204,7 +204,7 @@ void BonusBoardProcess_2B_4DBFC(void) } } - if (gCurrentPinballGame->ballFrozenState == 0) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) var0 = gCurrentPinballGame->secondaryBall->velocity.y * 40 + 0x1000; gCurrentPinballGame->cameraLookAhead += (var0 - gCurrentPinballGame->cameraLookAhead) / 10; diff --git a/src/all_board_process5.c b/src/all_board_process5.c index 46488787..3efd54dd 100644 --- a/src/all_board_process5.c +++ b/src/all_board_process5.c @@ -93,7 +93,7 @@ void MainBoardProcess_5B_11C98(void) { u16 angle; - if (!gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) { // Gravity is applied at different strengths, depending on fast the ball is // currently moving downwards. @@ -123,7 +123,7 @@ void MainBoardProcess_5B_11C98(void) { u16 angle; - if (!gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL) { // Gravity is applied at different strengths, depending on fast the ball is // currently moving downwards. @@ -174,7 +174,8 @@ void BonusBoardProcess_5B_11F88(void) currentBall->prevPositionQ8 = currentBall->positionQ8; if (gCurrentPinballGame->captureState != MON_CAPTURE_SPECIAL_STATE_CAPTURE_CUTSCENE) { - if (!gCurrentPinballGame->ballFrozenState && !gCurrentPinballGame->ballGrabbed) + if (gCurrentPinballGame->ballPhysicsState == BALL_PHYSICS_NORMAL + && !gCurrentPinballGame->ballGrabbed) { // Gravity is applied at different strengths, depending on fast the ball is // currently moving downwards. diff --git a/src/all_board_process7.c b/src/all_board_process7.c index 33a6c9f6..f28f491c 100644 --- a/src/all_board_process7.c +++ b/src/all_board_process7.c @@ -320,7 +320,7 @@ void BonusBoardProcess_7B_12BF8() { if (gCurrentPinballGame->ballRespawnTimer == 0) { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; primaryBall->velocity.x = 0; primaryBall->velocity.y = 0; primaryBall->spinSpeed = 0; @@ -358,7 +358,7 @@ void BonusBoardProcess_7B_12BF8() gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_LIVE_BALL; spriteGroup->active = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; DmaCopy16(3, &gBallPalettes[gCurrentPinballGame->ballUpgradeType], (void *)PLTT + 0x220, 0x20); } } @@ -366,7 +366,7 @@ void BonusBoardProcess_7B_12BF8() { if (gCurrentPinballGame->ballRespawnTimer == 0) { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; primaryBall->velocity.x = 0; primaryBall->velocity.y = 0; primaryBall->spinSpeed = 0; diff --git a/src/dusclops_collision.c b/src/dusclops_collision.c index f4aad7bc..55ebb94a 100644 --- a/src/dusclops_collision.c +++ b/src/dusclops_collision.c @@ -208,7 +208,7 @@ void CheckDusclopsAbsorbZoneHit(u8 arg0, u16 *arg1, u16 *arg2) break; case 4: gCurrentPinballGame->bossEntityState = DUSCLOPS_ENTITY_STATE_HIT_ABSORB_ZONE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE; break; case 5: diff --git a/src/dusclops_process3.c b/src/dusclops_process3.c index 0b5bd107..9ec45196 100644 --- a/src/dusclops_process3.c +++ b/src/dusclops_process3.c @@ -917,7 +917,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void) } if (gCurrentPinballGame->bossFramesetIndex == DUSCLOPS_FRAME_ABSOLB_LAUNCH) - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; if (gCurrentPinballGame->bossFramesetIndex > DUSCLOPS_FRAME_ABSOLB_LAUNCH) { diff --git a/src/groudon_collision.c b/src/groudon_collision.c index e7574bb1..6885de34 100644 --- a/src/groudon_collision.c +++ b/src/groudon_collision.c @@ -186,7 +186,7 @@ void ProcessGroudonCollisionEvent(u8 arg0, u16 *arg1, u16 *arg2) break; case 4: gCurrentPinballGame->bossEntityState = GROUDON_ENTITY_STATE_SUFFICIENT_HITS; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; break; case 5: case 6: diff --git a/src/kyogre_collision.c b/src/kyogre_collision.c index 95fe8e17..b9381d83 100644 --- a/src/kyogre_collision.c +++ b/src/kyogre_collision.c @@ -181,7 +181,7 @@ void ProcessKyogreCollisionEvent(u8 arg0, u16 *arg1, u16 *arg2) break; case 4: gCurrentPinballGame->bossEntityState = KYOGRE_ENTITY_STATE_SHOCKWAVE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; break; case 5: case 6: diff --git a/src/kyogre_process3.c b/src/kyogre_process3.c index 5e9b9b2d..72a8639a 100644 --- a/src/kyogre_process3.c +++ b/src/kyogre_process3.c @@ -1078,7 +1078,7 @@ void UpdateKyogreFieldEntities(void) { m4aSongNumStart(SE_UNKNOWN_0x113); PlayRumble(12); - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->vortexEntityState[i] = KYOGRE_WHIRLPOOL_PHASE_FULL_CAUGHT_BALL; gCurrentPinballGame->cameraLocked = TRUE; @@ -1159,7 +1159,7 @@ void UpdateKyogreFieldEntities(void) gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->ball->velocity.x = -150 + (gMain.systemFrameCount % 2) * 300; gCurrentPinballGame->ball->velocity.y = 300; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->vortexEntityState[i] = KYOGRE_WHIRLPOOL_PHASE_INIT; gCurrentPinballGame->cameraLocked = FALSE; } diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index db71f61a..0f19fba7 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -792,7 +792,7 @@ void AnimateCenterTrapSequence(void) if (gCurrentPinballGame->modeAnimTimer > 148) { gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->positionQ0.x = 119; @@ -804,17 +804,17 @@ void AnimateCenterTrapSequence(void) } else if (gCurrentPinballGame->modeAnimTimer == 148) { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->trapAnimState = 0; } else if (gCurrentPinballGame->modeAnimTimer > 36) { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->trapAnimState = 0; } else if (gCurrentPinballGame->modeAnimTimer > 24) { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->trapAnimState = 1; } else if (gCurrentPinballGame->modeAnimTimer == 24) @@ -824,7 +824,7 @@ void AnimateCenterTrapSequence(void) gCurrentPinballGame->ball->velocity.x = 73; gCurrentPinballGame->ball->velocity.y = 236; gCurrentPinballGame->ball->ballHidden = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->cameraLocked = FALSE; gCurrentPinballGame->ball->scale = 0x88; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; @@ -863,7 +863,7 @@ void TransitionToBonusField(void) gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->ballHidden = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->ball->scale = 0x100; gCurrentPinballGame->trapAnimState = 0; gCurrentPinballGame->ballCatchState = NOT_TRAPPED; diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index 85c37776..a0643159 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -548,7 +548,7 @@ void RunMonCaptureSequence(void) || gCurrentPinballGame->boardState == MAIN_BOARD_STATE_JIRACHI_CATCH_MODE)) gCurrentPinballGame->eventTimerType = EVENT_TIMER_MODE_PAUSED; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.x = (gCurrentPinballGame->ball->velocity.x * 4) / 5; gCurrentPinballGame->ball->velocity.y = (gCurrentPinballGame->ball->velocity.y * 4) / 5; @@ -1301,7 +1301,7 @@ void RunMonCaptureSequence(void) if (gMain.selectedField < MAIN_FIELD_COUNT) { - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->ball->velocity.y = -10; gCurrentPinballGame->ball->velocity.x = 20; @@ -1342,7 +1342,7 @@ void RunMonCaptureSequence(void) } else { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->portraitDisplayState = PORTRAIT_DISPLAY_MODE_BANNER; diff --git a/src/main_board_pichu_entity.c b/src/main_board_pichu_entity.c index b88cad23..f9c4ddb6 100644 --- a/src/main_board_pichu_entity.c +++ b/src/main_board_pichu_entity.c @@ -65,7 +65,7 @@ void UpdateKickbackLogic(void) { if (gCurrentPinballGame->pikaChargeTarget > 167) { - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->kickbackFiring = TRUE; gCurrentPinballGame->kickbackAnimProgress = 120; gCurrentPinballGame->kickbackAnimDuration = 120; @@ -179,7 +179,7 @@ void UpdateKickbackLogic(void) gCurrentPinballGame->ball->velocity.y = -300; m4aSongNumStart(SE_KICKBACK_THUNDERWAVE); gCurrentPinballGame->kickbackLaunchTimer = 0; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; gCurrentPinballGame->holeIndicators[(gCurrentPinballGame->outLaneSide - 1) * 3] = 1; diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 52d654fb..28ba46a7 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -1485,7 +1485,7 @@ void UpdateHatchCave(void) { if (gCurrentPinballGame->eggCaveExitDelayTimer == 30) { - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->collisionCooldownTimer = 60; gCurrentPinballGame->ball->velocity.x = 20; gCurrentPinballGame->ball->velocity.y = 200; diff --git a/src/rayquaza_collision.c b/src/rayquaza_collision.c index 3b0d8f37..1283accf 100644 --- a/src/rayquaza_collision.c +++ b/src/rayquaza_collision.c @@ -136,7 +136,7 @@ void ProcessRayquazaCollisionEvent(u8 arg0, u16 *arg1, u16 *arg2) break; case 4: gCurrentPinballGame->bossEntityState = RAYQUAZA_ENTITY_STATE_LIGHTNING_ATTACK; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; break; case 5: case 6: diff --git a/src/rayquaza_process3.c b/src/rayquaza_process3.c index 51fb6cbc..9507db0b 100644 --- a/src/rayquaza_process3.c +++ b/src/rayquaza_process3.c @@ -1280,7 +1280,7 @@ void UpdateRayquazaMinionsAndEffects(void) && gCurrentPinballGame->bossHitFlashTimer == 0 && squaredDistance < 300) { gCurrentPinballGame->ballGrabTimer = 6; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->vortexEntityState[i] = RAYQUAZA_WHIRLWIND_STATE_FULL_CAUGHT_BALL; gCurrentPinballGame->cameraLocked = TRUE; @@ -1368,7 +1368,7 @@ void UpdateRayquazaMinionsAndEffects(void) { gCurrentPinballGame->ballWhirlwindLiftY = 0; gCurrentPinballGame->ball->velocity.y = -((gCurrentPinballGame->ballWhirlwindFallAcceleration * 0x80) / 10) / 2; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->vortexAnimTimer[i] = 0; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->vortexEntityState[i] = RAYQUAZA_WHIRLWIND_STATE_INIT; diff --git a/src/ruby_catch_holes.c b/src/ruby_catch_holes.c index 817c25d6..f3bcba29 100644 --- a/src/ruby_catch_holes.c +++ b/src/ruby_catch_holes.c @@ -96,7 +96,7 @@ void AnimateSharpedoCatchSequence(void) if (gCurrentPinballGame->modeAnimTimer > 100) { gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -184,7 +184,7 @@ void AnimateSharpedoCatchSequence(void) } else if (gCurrentPinballGame->modeAnimTimer > 16) { - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->cameraScrollTarget = 0; gCurrentPinballGame->cameraScrollEnabled = 1; gCurrentPinballGame->cameraLocked = FALSE; @@ -267,7 +267,7 @@ void AnimateRubyEggHatchSequence(void) if (modeAnimTimer != 0) { gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; @@ -325,7 +325,7 @@ void AnimateRubyEggHatchSequence(void) } else { - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->collisionCooldownTimer = 0x3C; gCurrentPinballGame->ball->velocity.x = 0x14; gCurrentPinballGame->ball->velocity.y = 0xC8; @@ -351,7 +351,7 @@ void AnimateRubyEvolutionShopSequence(void) if (gCurrentPinballGame->modeAnimTimer > 0x18) { gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -379,7 +379,7 @@ void AnimateRubyEvolutionShopSequence(void) } gCurrentPinballGame->ball->ballHidden = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->collisionCooldownTimer = 0x3C; gCurrentPinballGame->ball->velocity.x = 0x60; diff --git a/src/ruby_collision.c b/src/ruby_collision.c index 61a24f1c..b4dc080f 100644 --- a/src/ruby_collision.c +++ b/src/ruby_collision.c @@ -94,7 +94,7 @@ s16 CollisionCheck_Ruby(struct Vector16 *arg0, u16* arg1) { break; case 4: gCurrentPinballGame->whiscashState = WHISCASH_STATE_ABSORB_ZONE_HIT; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; some_enum = 0; break; } diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index b2b33240..eacdaa37 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -452,7 +452,7 @@ void RubyPond_EntityLogic(void) } if (gCurrentPinballGame->whiscashFrameIx == WHISCASH_FRAME_SPITBALL+2) - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; break; case WHISCASH_STATE_HIT: gCurrentPinballGame->whiscashFrameIx = WHISCASH_FRAME_HIT; diff --git a/src/sapphire_pond_and_zigzagoon.c b/src/sapphire_pond_and_zigzagoon.c index d2cfb309..0508aa02 100644 --- a/src/sapphire_pond_and_zigzagoon.c +++ b/src/sapphire_pond_and_zigzagoon.c @@ -74,7 +74,7 @@ void UpdatePelipperPondEntity(void) if (gCurrentPinballGame->pelipperFrameTimer == 0) { gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->spinSpeed = 0; @@ -237,7 +237,7 @@ void UpdatePelipperPondEntity(void) gCurrentPinballGame->ball->oamPriority = 1; } - if (gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_NORMAL) { if (gCurrentPinballGame->pelipperFrameTimer < 13) { @@ -259,7 +259,7 @@ void UpdatePelipperPondEntity(void) { gCurrentPinballGame->ball->positionQ0.y = 91; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->ball->velocity.x = 128; gCurrentPinballGame->ball->velocity.y = 256; gCurrentPinballGame->ball->oamPriority = 3; diff --git a/src/sapphire_process3.c b/src/sapphire_process3.c index 4386b02e..89531634 100644 --- a/src/sapphire_process3.c +++ b/src/sapphire_process3.c @@ -198,7 +198,7 @@ void UpdateSapphireEvolutionShopSequence(void) if (gCurrentPinballGame->modeAnimTimer > 0x18) { gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -233,7 +233,7 @@ void UpdateSapphireEvolutionShopSequence(void) else { gCurrentPinballGame->ball->ballHidden = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->collisionCooldownTimer = 0x3C; gCurrentPinballGame->ball->velocity.x = 0x60; gCurrentPinballGame->ball->velocity.y = 0xC0; @@ -274,7 +274,7 @@ void UpdateSapphireWailmerCatchSequence(void) if (gCurrentPinballGame->modeAnimTimer) { gCurrentPinballGame->ballUpgradeTimerPaused = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->modeAnimTimer--; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; @@ -343,7 +343,7 @@ void UpdateSapphireWailmerCatchSequence(void) else { gCurrentPinballGame->catchHoleAnimFrame = 0; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->collisionCooldownTimer = 60; gCurrentPinballGame->ball->spinSpeed = 0; gCurrentPinballGame->ball->velocity.x = -0x66; diff --git a/src/spheal_process3.c b/src/spheal_process3.c index ac750331..3d643050 100644 --- a/src/spheal_process3.c +++ b/src/spheal_process3.c @@ -54,7 +54,7 @@ void SphealBoardProcess_3A_42E48(void) gCurrentPinballGame->ballGrabbed = 0; gCurrentPinballGame->ballRespawnState = BALL_SPAWN_STATE_LIVE_BALL; gCurrentPinballGame->ball->ballHidden = TRUE; - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.x = 0; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->spinSpeed = 0; @@ -1068,7 +1068,7 @@ void SphealBoard_WhiscashDeliversBall(void) } if (gCurrentPinballGame->deliveryAnimFrameIndex == 10) - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; } } @@ -1136,7 +1136,7 @@ void SphealBoard_PelipperDeliversBall(void) gCurrentPinballGame->ball->oamPriority = 1; } - if (gCurrentPinballGame->ballFrozenState) + if (gCurrentPinballGame->ballPhysicsState != BALL_PHYSICS_NORMAL) { if (gCurrentPinballGame->pelipperFrameTimer < 13) { @@ -1158,7 +1158,7 @@ void SphealBoard_PelipperDeliversBall(void) { gCurrentPinballGame->ball->positionQ0.y = 181; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->ball->velocity.x = -10; gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->cameraLocked = FALSE; @@ -1221,7 +1221,7 @@ void UpdateSealeoKnockdownPhysics(void) if (i == 2) { // Ball - gCurrentPinballGame->ballFrozenState = 1; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_MANUAL; gCurrentPinballGame->ball->velocity.x += 5 - targetSealeoIx * 10; } @@ -1391,7 +1391,7 @@ void UpdateSealeoKnockdownPhysics(void) { gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->velocity.x = 5 - targetSealeoIx * 10; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->knockdownPhase[i] = SPHEAL_KNOCKDOWN_PHASE_WAITING; } } @@ -1451,7 +1451,7 @@ void UpdateSealeoKnockdownPhysics(void) { gCurrentPinballGame->ball->velocity.y = 0; gCurrentPinballGame->ball->velocity.x = 5 - targetSealeoIx * 10; - gCurrentPinballGame->ballFrozenState = 0; + gCurrentPinballGame->ballPhysicsState = BALL_PHYSICS_NORMAL; gCurrentPinballGame->knockdownPhase[i] = SPHEAL_KNOCKDOWN_PHASE_WAITING; } } From 74587c4bbdaf387441758853ac7500ecc10987d1 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 20:56:47 -0500 Subject: [PATCH 32/33] banner hold lock camera --- include/functions.h | 3 ++- include/global.h | 2 +- include/main.h | 2 +- src/all_board_banners.c | 16 ++++++++-------- src/data/species.h | 3 +++ src/main_board_bumpers.c | 2 +- src/main_board_catch_holes.c | 2 +- src/main_board_catch_normal_and_jirachi_modes.c | 8 ++++---- src/main_board_center_capture_hole.c | 2 +- src/main_board_to_be_split.c | 2 +- src/ruby_process3_entities_2.c | 6 +++--- src/ruby_trigger_targets.c | 2 +- src/sapphire_seedot_egg_shop.c | 6 +++--- 13 files changed, 30 insertions(+), 26 deletions(-) diff --git a/include/functions.h b/include/functions.h index f8f5c459..66029abf 100644 --- a/include/functions.h +++ b/include/functions.h @@ -324,7 +324,7 @@ extern void IntroScene2_InitVars(void); // asm/options.s -//extern ? Options_Main(); +extern void Options_Main(); //extern ? Options_LoadGraphics(); extern void Options_InitStates(void); //extern ? Options_HandleInput(); @@ -407,6 +407,7 @@ extern void ProcessRayquazaCollisionEvent(u8, u16*, u16*); extern s16 CollisionCheck_Spheal(struct Vector16*, u16*); extern void CheckSphealEntityCollision(struct Vector16*, u16*, u8*); extern void ProcessSphealCollisionEvent(u8, u16*, u16*); +extern void PinballGameMain(); extern void IdlePinballGameMain(); extern void PinballGameIdle0_19048(void);//gMain.subState = 0 extern void PinballGameIdle1_19190(void);//gMain.subState = 1 diff --git a/include/global.h b/include/global.h index dfc741ac..2ad9bb34 100644 --- a/include/global.h +++ b/include/global.h @@ -238,7 +238,7 @@ struct PinballGame /*0x0F6*/ s16 bannerSlidePosition; /*0x0F8*/ s16 bannerSlideVelocity; /*0x0FA*/ s8 bannerActive; - /*0x0FB*/ s8 bannerPreserveBallState; + /*0x0FB*/ s8 holdCameraLockAfterBanner; /*0x0FC*/ s16 bonusSummarySlideY; /*0x0FE*/ s16 ballSaverSlideY; /*0x100*/ s32 ballSaverPosX; diff --git a/include/main.h b/include/main.h index c1790069..3621293b 100644 --- a/include/main.h +++ b/include/main.h @@ -7,6 +7,7 @@ #include "constants/pinball_inputs.h" #include "constants/species.h" #include "constants/sprite_groups.h" +#include "functions.h" struct HighScoreEntry { @@ -178,5 +179,4 @@ void DisableVBlankInterrupts(void); void MainLoopIter(void); void DefaultMainCallback(void); - #endif // GUARD_MAIN_H diff --git a/src/all_board_banners.c b/src/all_board_banners.c index cb552552..6410a294 100644 --- a/src/all_board_banners.c +++ b/src/all_board_banners.c @@ -64,7 +64,7 @@ void ProcessBannerCameraTransition(void) gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; - if (gCurrentPinballGame->bannerPreserveBallState == 0) + if (!gCurrentPinballGame->holdCameraLockAfterBanner) { gCurrentPinballGame->cameraLocked = FALSE; } @@ -83,7 +83,7 @@ void ProcessBannerCameraTransition(void) gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; - if (gCurrentPinballGame->bannerPreserveBallState == 0) + if (!gCurrentPinballGame->holdCameraLockAfterBanner) { gCurrentPinballGame->cameraLocked = FALSE; } @@ -99,7 +99,7 @@ void ProcessBannerCameraTransition(void) gMain.modeChangeFlags &= ~MODE_CHANGE_BANNER; gCurrentPinballGame->ballUpgradeTimerPaused = FALSE; - if (gCurrentPinballGame->bannerPreserveBallState == 0) + if (!gCurrentPinballGame->holdCameraLockAfterBanner) { gCurrentPinballGame->cameraLocked = FALSE; } @@ -112,12 +112,12 @@ void ProcessBannerCameraTransition(void) void RenderBannerSlideAnimation(void) { s16 i; - s16 sp00; + s16 bannerTypeIx; struct SpriteGroup *spriteGroup; struct OamDataSimple *simple; u32 frameCount; - sp00 = gCurrentPinballGame->bannerGfxIndex - 1; + bannerTypeIx = gCurrentPinballGame->bannerGfxIndex - 1; spriteGroup = gMain.fieldSpriteGroups[FIELD_SG_MAIN_MODE_START_BANNER]; frameCount = ((gMain.systemFrameCount & 7) / 4); @@ -320,9 +320,9 @@ void RenderBannerSlideAnimation(void) u16 *dst; simple = &spriteGroup->oam[i]; dst = (u16 *)&gOamBuffer[simple->oamId]; - *dst++ = gModeBannerOamAttributes[sp00][i * 3 + 0]; - *dst++ = gModeBannerOamAttributes[sp00][i * 3 + 1]; - *dst++ = gModeBannerOamAttributes[sp00][i * 3 + 2]; + *dst++ = gModeBannerOamAttributes[bannerTypeIx][i * 3 + 0]; + *dst++ = gModeBannerOamAttributes[bannerTypeIx][i * 3 + 1]; + *dst++ = gModeBannerOamAttributes[bannerTypeIx][i * 3 + 2]; gOamBuffer[simple->oamId].x = gOamBuffer[simple->oamId].x + spriteGroup->baseX; gOamBuffer[simple->oamId].y = gOamBuffer[simple->oamId].y + spriteGroup->baseY; diff --git a/src/data/species.h b/src/data/species.h index e3d604f5..c45bb1d6 100644 --- a/src/data/species.h +++ b/src/data/species.h @@ -1,3 +1,6 @@ +#include "constants/species.h" +#include "types.h" + const struct PokemonSpecies gSpeciesInfo[NUM_SPECIES] = { [SPECIES_TREECKO] = { .speciesIdRS = 277, diff --git a/src/main_board_bumpers.c b/src/main_board_bumpers.c index 26ea0248..e5687910 100644 --- a/src/main_board_bumpers.c +++ b/src/main_board_bumpers.c @@ -362,7 +362,7 @@ void HandleRubyBumperHit(void) gCurrentPinballGame->cameraYScrollSpeed = 4; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_SHROOMISH_CATCH_BURST; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; diff --git a/src/main_board_catch_holes.c b/src/main_board_catch_holes.c index 0f19fba7..6fdf44b7 100644 --- a/src/main_board_catch_holes.c +++ b/src/main_board_catch_holes.c @@ -370,7 +370,7 @@ void UpdateShopEntryAnimation(s16 arg0) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_EVOLUTION; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = 0xF63C; //-2500 gCurrentPinballGame->bannerSlideTimer = 50; diff --git a/src/main_board_catch_normal_and_jirachi_modes.c b/src/main_board_catch_normal_and_jirachi_modes.c index 96bf4e24..cb08e6e7 100644 --- a/src/main_board_catch_normal_and_jirachi_modes.c +++ b/src/main_board_catch_normal_and_jirachi_modes.c @@ -165,7 +165,7 @@ void UpdateCatchEmMode(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CATCH_EM; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 1; + gCurrentPinballGame->holdCameraLockAfterBanner = TRUE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; @@ -200,7 +200,7 @@ void UpdateCatchEmMode(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CATCH_EM; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 1; + gCurrentPinballGame->holdCameraLockAfterBanner = TRUE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; @@ -373,7 +373,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_JIRACHI; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 1; + gCurrentPinballGame->holdCameraLockAfterBanner = TRUE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; @@ -407,7 +407,7 @@ void UpdateJirachiBonus(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_JIRACHI; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 1; + gCurrentPinballGame->holdCameraLockAfterBanner = TRUE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; diff --git a/src/main_board_center_capture_hole.c b/src/main_board_center_capture_hole.c index a0643159..3261d118 100644 --- a/src/main_board_center_capture_hole.c +++ b/src/main_board_center_capture_hole.c @@ -293,7 +293,7 @@ void GivePrize(void) gCurrentPinballGame->cameraYScrollSpeed = 2; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->pichuWalkMode = 1; gCurrentPinballGame->pichuEntranceTimer = 800; gCurrentPinballGame->outLanePikaPosition = PIKA_LEFT_SIDE; diff --git a/src/main_board_to_be_split.c b/src/main_board_to_be_split.c index 28ba46a7..f0f388d4 100644 --- a/src/main_board_to_be_split.c +++ b/src/main_board_to_be_split.c @@ -1469,7 +1469,7 @@ void UpdateHatchCave(void) gCurrentPinballGame->cameraYScrollSpeed = 2; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->eggCaveLiftTimer = 48; } diff --git a/src/ruby_process3_entities_2.c b/src/ruby_process3_entities_2.c index eacdaa37..75bceb4f 100644 --- a/src/ruby_process3_entities_2.c +++ b/src/ruby_process3_entities_2.c @@ -200,7 +200,7 @@ void AnimateRubyShopDoor(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; m4aSongNumStart(SE_UNKNOWN_0xBD); } @@ -756,7 +756,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->cameraYScrollSpeed = 4; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_LOTAD_CATCH_BURST; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; @@ -774,7 +774,7 @@ void RubyPondTriBumperHandleHitAndDraw(void) gCurrentPinballGame->cameraYScrollSpeed = 4; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_CHINCHOU_CATCH_BURST; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->bannerDisplayDuration = 80; gCurrentPinballGame->bannerSlidePosition = -2500; gCurrentPinballGame->bannerSlideTimer = 50; diff --git a/src/ruby_trigger_targets.c b/src/ruby_trigger_targets.c index 033fd5b5..ca49eea1 100644 --- a/src/ruby_trigger_targets.c +++ b/src/ruby_trigger_targets.c @@ -476,7 +476,7 @@ void DrawRubySideBumperSprites(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_TRAVEL; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->bannerDisplayDuration = 120; gCurrentPinballGame->bannerSlidePosition = 0; gCurrentPinballGame->bannerSlideTimer = 50; diff --git a/src/sapphire_seedot_egg_shop.c b/src/sapphire_seedot_egg_shop.c index 2686fd59..f67749c9 100644 --- a/src/sapphire_seedot_egg_shop.c +++ b/src/sapphire_seedot_egg_shop.c @@ -334,7 +334,7 @@ void UpdateSapphireSeedotCollection(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_TRAVEL; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->bannerDisplayDuration = 120; gCurrentPinballGame->bannerSlidePosition = 0; gCurrentPinballGame->bannerSlideTimer = 50; @@ -592,7 +592,7 @@ void UpdateSapphireEggMachine(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->sapphireHatchMachineState = 1; gCurrentPinballGame->holeAnimFrameCounter = 0; m4aMPlayStop(&gMPlayInfo_BGM); @@ -681,7 +681,7 @@ void UpdateSapphireEggMachine(void) gCurrentPinballGame->cameraYScrollSpeed = 0; gCurrentPinballGame->bannerGfxIndex = BANNER_MODE_NONE; gCurrentPinballGame->bannerActive = TRUE; - gCurrentPinballGame->bannerPreserveBallState = 0; + gCurrentPinballGame->holdCameraLockAfterBanner = FALSE; gCurrentPinballGame->sapphireHatchMachineState = 5; gCurrentPinballGame->holeAnimFrameCounter = 0; gCurrentPinballGame->sapphireHatchMachineFrameIx = 10; From 0a6e9eda4e67a6020183299d464608c238d29917 Mon Sep 17 00:00:00 2001 From: Retnuhytnuob Date: Sat, 30 May 2026 23:26:27 -0500 Subject: [PATCH 33/33] update side naming var; more generic --- include/global.h | 12 ++++++++---- src/all_board_process4.c | 18 +++++++++--------- src/all_board_process6_collision.c | 16 ++++++++-------- src/save_and_restore_game.c | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/include/global.h b/include/global.h index 2ad9bb34..49eacc1e 100644 --- a/include/global.h +++ b/include/global.h @@ -99,9 +99,13 @@ #define BALL_PHYSICS_MANUAL 1 #define BALL_PHYSICS_FROZEN 2 -#define FLIPPER_LEFT 0 -#define FLIPPER_RIGHT 1 -#define FLIPPER_COUNT 2 +#define SIDE_IX_LEFT 0 +#define SIDE_IX_RIGHT 1 +#define SIDE_COUNT 2 + +#define SIDE_COLLISION_NONE 0 +#define SIDE_COLLISION_LEFT 1 +#define SIDE_COLLISION_RIGHT 2 struct BgOffsets { @@ -894,7 +898,7 @@ struct PinballGame /*0x132C*/struct BallState *ball; /*0x1330*/struct BallState *secondaryBall; /*0x1334*/struct BallState ballStates[2]; - /*0x13BC*/struct FlipperState flipper[FLIPPER_COUNT]; + /*0x13BC*/struct FlipperState flipper[SIDE_COUNT]; /*0x13D4*/u16 nameRevealDelaysRow2[10]; /*0x13E8*/struct Vector16 nameSlideRow2[10]; } /* size=0x1410 */; diff --git a/src/all_board_process4.c b/src/all_board_process4.c index b5e1999e..da5f3705 100644 --- a/src/all_board_process4.c +++ b/src/all_board_process4.c @@ -18,7 +18,7 @@ void DetermineFlipperBallSide(struct Vector16 arg0) struct FlipperLineSegment *line; struct Vector16 point1, point2; - line = &gFlipperLineGeometry[gCurrentPinballGame->flipper[FLIPPER_LEFT].position]; + line = &gFlipperLineGeometry[gCurrentPinballGame->flipper[SIDE_IX_LEFT].position]; point1.x = line->x1 + 0x53; point1.y = line->y1 + gBoardConfig.fieldLayout.flipperBaseY; @@ -28,9 +28,9 @@ void DetermineFlipperBallSide(struct Vector16 arg0) check = (point2.y - point1.y) * (arg0.x - point1.x) * 30 / (point2.x - point1.x) + (point1.y - arg0.y) * 30; if (check >= 0) - gCurrentPinballGame->flipper[FLIPPER_LEFT].ballSide = 1; + gCurrentPinballGame->flipper[SIDE_IX_LEFT].ballSide = 1; else - gCurrentPinballGame->flipper[FLIPPER_LEFT].ballSide = -1; + gCurrentPinballGame->flipper[SIDE_IX_LEFT].ballSide = -1; line = &gFlipperLineGeometry[gCurrentPinballGame->flipper[1].position]; @@ -43,9 +43,9 @@ void DetermineFlipperBallSide(struct Vector16 arg0) check = (point2.y - point1.y) * (arg0.x - point1.x) * 30 / (point2.x - point1.x) + (point1.y - arg0.y) * 30; if (check >= 0) - gCurrentPinballGame->flipper[FLIPPER_RIGHT].ballSide = 1; + gCurrentPinballGame->flipper[SIDE_IX_RIGHT].ballSide = 1; else - gCurrentPinballGame->flipper[FLIPPER_RIGHT].ballSide = -1; + gCurrentPinballGame->flipper[SIDE_IX_RIGHT].ballSide = -1; } void MainBoardProcess_4B_19490(void) @@ -55,7 +55,7 @@ void MainBoardProcess_4B_19490(void) if ((gMain.modeChangeFlags & MODE_CHANGE_BANNER) == 0) UpdateMainBoardFlipperPhysics(); - for (i = 0; i < FLIPPER_COUNT; i++) + for (i = 0; i < SIDE_COUNT; i++) { struct SpriteGroup *spriteGroup; @@ -89,7 +89,7 @@ void UpdateMainBoardFlipperPhysics(void) DetermineFlipperBallSide(gCurrentPinballGame->ball->positionQ0); - for (i = 0; i < FLIPPER_COUNT; i++) + for (i = 0; i < SIDE_COUNT; i++) { s16 dir; struct FlipperState *flipper; @@ -166,7 +166,7 @@ void BonusBoardProcess_4B_19734(void) UpdateBonusBoardFlipperPhysics(); gMain.modeChangeFlags = gMain.modeChangeFlags; } - for (i = 0; i < FLIPPER_COUNT; i++) + for (i = 0; i < SIDE_COUNT; i++) { struct SpriteGroup *spriteGroup; @@ -204,7 +204,7 @@ void UpdateBonusBoardFlipperPhysics(void) DetermineFlipperBallSide(gCurrentPinballGame->ball->positionQ0); - for (i = 0; i < FLIPPER_COUNT; i++) + for (i = 0; i < SIDE_COUNT; i++) { s16 dir; struct FlipperState *flipper; diff --git a/src/all_board_process6_collision.c b/src/all_board_process6_collision.c index eb2f8b69..b3924d09 100644 --- a/src/all_board_process6_collision.c +++ b/src/all_board_process6_collision.c @@ -79,17 +79,17 @@ void AllBoardProcess_6B_1333C() ApplyTiltEffectOnCollision(&var0, &var1, r7); var0.x -= (gBoardConfig.fieldLayout.leftFlipperOriginX * 2); var0.y -= (gBoardConfig.fieldLayout.flipperOriginY * 2); - if (!gCurrentPinballGame->flipper[FLIPPER_LEFT].bounceApplied) + if (!gCurrentPinballGame->flipper[SIDE_IX_LEFT].bounceApplied) { ComputeWallReflection(r7, &gCurrentPinballGame->ball->velocity, &var2); - gCurrentPinballGame->flipper[FLIPPER_LEFT].bounceApplied = TRUE; + gCurrentPinballGame->flipper[SIDE_IX_LEFT].bounceApplied = TRUE; } else { var2.x = gCurrentPinballGame->ball->velocity.x; var2.y = gCurrentPinballGame->ball->velocity.y; } - ComputeFlipperBounce(&var0, &var2, FLIPPER_LEFT); + ComputeFlipperBounce(&var0, &var2, SIDE_IX_LEFT); gCurrentPinballGame->ball->velocity.x = var2.x + var1.x; gCurrentPinballGame->ball->velocity.y = var2.y + var1.y; if (gCurrentPinballGame->collisionResponseType == 5) @@ -111,10 +111,10 @@ void AllBoardProcess_6B_1333C() ApplyTiltEffectOnCollision(&var0, &var1, r7); var0.x -= (gBoardConfig.fieldLayout.rightFlipperOriginX * 2); var0.y -= (gBoardConfig.fieldLayout.flipperOriginY * 2); - if (!gCurrentPinballGame->flipper[FLIPPER_RIGHT].bounceApplied) + if (!gCurrentPinballGame->flipper[SIDE_IX_RIGHT].bounceApplied) { ComputeWallReflection(r7, &gCurrentPinballGame->ball->velocity, &var2); - gCurrentPinballGame->flipper[FLIPPER_RIGHT].bounceApplied = TRUE; + gCurrentPinballGame->flipper[SIDE_IX_RIGHT].bounceApplied = TRUE; } else { @@ -123,7 +123,7 @@ void AllBoardProcess_6B_1333C() } var0.x = 0x5f - var0.x; var2.x = -var2.x; - ComputeFlipperBounce(&var0, &var2, FLIPPER_RIGHT); + ComputeFlipperBounce(&var0, &var2, SIDE_IX_RIGHT); var2.x = -var2.x; gCurrentPinballGame->ball->velocity.x = var2.x + var1.x; gCurrentPinballGame->ball->velocity.y = var2.y + var1.y; @@ -909,7 +909,7 @@ u16 LookupFlipperCollisionMap(struct Vector16 r0, s16 r1, u16 *r2, s16 flipperIx if (0xF & (&gBoardConfig.flipperCollisionData[flipper->collisionMapFrame * 0x2400])[ix]) { *r2 = 0xFFF0 & (&gBoardConfig.flipperCollisionData[flipper->collisionMapFrame * 0x2400])[ix]; - if (flipperIx == FLIPPER_RIGHT) + if (flipperIx == SIDE_IX_RIGHT) { new_var = 0x8000; *r2 = new_var - (*r2); @@ -952,7 +952,7 @@ void ComputeFlipperLaunchVelocity(s32 arg0, s16 flipperIx, struct Vector16* arg2 scale = ((arg0 -2600) * 348 / 5400) + 406; } - if (flipperIx != FLIPPER_LEFT) + if (flipperIx != SIDE_IX_LEFT) var0 = 0x8000 - var0; angle = (gCurrentPinballGame->ball->velocity.x * -0x600) / 0x80 + diff --git a/src/save_and_restore_game.c b/src/save_and_restore_game.c index 111bae00..f613cba3 100644 --- a/src/save_and_restore_game.c +++ b/src/save_and_restore_game.c @@ -479,7 +479,7 @@ void RestoreMainFieldDynamicGraphics(void) LoadCatchSpriteGraphics(); LoadMonFieldSpriteGraphics(); - for (i = 0; i < FLIPPER_COUNT; i++) + for (i = 0; i < SIDE_COUNT; i++) { var0 = gCurrentPinballGame->flipper[i].position / 2; DmaCopy16(3, gFlipperTileGraphics[var0], ((i * 0x200) + 0x06010000), 0x200);