Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

src/battle_anim_mons.c

@@ -965,7 +965,7 @@ void ToggleBg3Mode(bool8 largeScreenSize)
     }
 }
 
-void TradeMenuBouncePartySprites(struct Sprite *sprite)
+void Trade_MoveSelectedMonToTarget(struct Sprite *sprite)
 {
     sprite->data[1] = sprite->x;
     sprite->data[3] = sprite->y;

src/battle_controller_oak_old_man.c

@@ -98,63 +98,63 @@ static void Task_StartSendOutAnim(u8 taskId);
 
 static void (*const sOakOldManBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 {
-    OakOldManHandleGetMonData,
-    OakOldManHandleGetRawMonData,
-    OakOldManHandleSetMonData,
-    OakOldManHandleSetRawMonData,
-    OakOldManHandleLoadMonSprite,
-    OakOldManHandleSwitchInAnim,
-    OakOldManHandleReturnMonToBall,
-    OakOldManHandleDrawTrainerPic,
-    OakOldManHandleTrainerSlide,
-    OakOldManHandleTrainerSlideBack,
-    OakOldManHandleFaintAnimation,
-    OakOldManHandlePaletteFade,
-    OakOldManHandleSuccessBallThrowAnim,
-    OakOldManHandleBallThrowAnim,
-    OakOldManHandlePause,
-    OakOldManHandleMoveAnimation,
-    OakOldManHandlePrintString,
-    OakOldManHandlePrintSelectionString,
-    OakOldManHandleChooseAction,
-    OakOldManHandleUnknownYesNoBox,
-    OakOldManHandleChooseMove,
-    OakOldManHandleChooseItem,
-    OakOldManHandleChoosePokemon,
-    OakOldManHandleCmd23,
-    OakOldManHandleHealthBarUpdate,
-    OakOldManHandleExpUpdate,
-    OakOldManHandleStatusIconUpdate,
-    OakOldManHandleStatusAnimation,
-    OakOldManHandleStatusXor,
-    OakOldManHandleDataTransfer,
-    OakOldManHandleDMA3Transfer,
-    OakOldManHandlePlayBGM,
-    OakOldManHandleCmd32,
-    OakOldManHandleTwoReturnValues,
-    OakOldManHandleChosenMonReturnValue,
-    OakOldManHandleOneReturnValue,
-    OakOldManHandleOneReturnValue_Duplicate,
-    OakOldManHandleCmd37,
-    OakOldManHandleCmd38,
-    OakOldManHandleCmd39,
-    OakOldManHandleCmd40,
-    OakOldManHandleHitAnimation,
-    OakOldManHandleCmd42,
-    OakOldManHandlePlaySE,
-    OakOldManHandlePlayFanfare,
-    OakOldManHandleFaintingCry,
-    OakOldManHandleIntroSlide,
-    OakOldManHandleIntroTrainerBallThrow,
-    OakOldManHandleDrawPartyStatusSummary,
-    OakOldManHandleHidePartyStatusSummary,
-    OakOldManHandleEndBounceEffect,
-    OakOldManHandleSpriteInvisibility,
-    OakOldManHandleBattleAnimation,
-    OakOldManHandleLinkStandbyMsg,
-    OakOldManHandleResetActionMoveSelection,
-    OakOldManHandleCmd55,
-    OakOldManCmdEnd,
+    [CONTROLLER_GETMONDATA]               = OakOldManHandleGetMonData,
+    [CONTROLLER_GETRAWMONDATA]            = OakOldManHandleGetRawMonData,
+    [CONTROLLER_SETMONDATA]               = OakOldManHandleSetMonData,
+    [CONTROLLER_SETRAWMONDATA]            = OakOldManHandleSetRawMonData,
+    [CONTROLLER_LOADMONSPRITE]            = OakOldManHandleLoadMonSprite,
+    [CONTROLLER_SWITCHINANIM]             = OakOldManHandleSwitchInAnim,
+    [CONTROLLER_RETURNMONTOBALL]          = OakOldManHandleReturnMonToBall,
+    [CONTROLLER_DRAWTRAINERPIC]           = OakOldManHandleDrawTrainerPic,
+    [CONTROLLER_TRAINERSLIDE]             = OakOldManHandleTrainerSlide,
+    [CONTROLLER_TRAINERSLIDEBACK]         = OakOldManHandleTrainerSlideBack,
+    [CONTROLLER_FAINTANIMATION]           = OakOldManHandleFaintAnimation,
+    [CONTROLLER_PALETTEFADE]              = OakOldManHandlePaletteFade,
+    [CONTROLLER_SUCCESSBALLTHROWANIM]     = OakOldManHandleSuccessBallThrowAnim,
+    [CONTROLLER_BALLTHROWANIM]            = OakOldManHandleBallThrowAnim,
+    [CONTROLLER_PAUSE]                    = OakOldManHandlePause,
+    [CONTROLLER_MOVEANIMATION]            = OakOldManHandleMoveAnimation,
+    [CONTROLLER_PRINTSTRING]              = OakOldManHandlePrintString,
+    [CONTROLLER_PRINTSTRINGPLAYERONLY]    = OakOldManHandlePrintSelectionString,
+    [CONTROLLER_CHOOSEACTION]             = OakOldManHandleChooseAction,
+    [CONTROLLER_UNKNOWNYESNOBOX]          = OakOldManHandleUnknownYesNoBox,
+    [CONTROLLER_CHOOSEMOVE]               = OakOldManHandleChooseMove,
+    [CONTROLLER_OPENBAG]                  = OakOldManHandleChooseItem,
+    [CONTROLLER_CHOOSEPOKEMON]            = OakOldManHandleChoosePokemon,
+    [CONTROLLER_23]                       = OakOldManHandleCmd23,
+    [CONTROLLER_HEALTHBARUPDATE]          = OakOldManHandleHealthBarUpdate,
+    [CONTROLLER_EXPUPDATE]                = OakOldManHandleExpUpdate,
+    [CONTROLLER_STATUSICONUPDATE]         = OakOldManHandleStatusIconUpdate,
+    [CONTROLLER_STATUSANIMATION]          = OakOldManHandleStatusAnimation,
+    [CONTROLLER_STATUSXOR]                = OakOldManHandleStatusXor,
+    [CONTROLLER_DATATRANSFER]             = OakOldManHandleDataTransfer,
+    [CONTROLLER_DMA3TRANSFER]             = OakOldManHandleDMA3Transfer,
+    [CONTROLLER_PLAYBGM]                  = OakOldManHandlePlayBGM,
+    [CONTROLLER_32]                       = OakOldManHandleCmd32,
+    [CONTROLLER_TWORETURNVALUES]          = OakOldManHandleTwoReturnValues,
+    [CONTROLLER_CHOSENMONRETURNVALUE]     = OakOldManHandleChosenMonReturnValue,
+    [CONTROLLER_ONERETURNVALUE]           = OakOldManHandleOneReturnValue,
+    [CONTROLLER_ONERETURNVALUE_DUPLICATE] = OakOldManHandleOneReturnValue_Duplicate,
+    [CONTROLLER_CLEARUNKVAR]              = OakOldManHandleCmd37,
+    [CONTROLLER_SETUNKVAR]                = OakOldManHandleCmd38,
+    [CONTROLLER_CLEARUNKFLAG]             = OakOldManHandleCmd39,
+    [CONTROLLER_TOGGLEUNKFLAG]            = OakOldManHandleCmd40,
+    [CONTROLLER_HITANIMATION]             = OakOldManHandleHitAnimation,
+    [CONTROLLER_CANTSWITCH]               = OakOldManHandleCmd42,
+    [CONTROLLER_PLAYSE]                   = OakOldManHandlePlaySE,
+    [CONTROLLER_PLAYFANFARE]              = OakOldManHandlePlayFanfare,
+    [CONTROLLER_FAINTINGCRY]              = OakOldManHandleFaintingCry,
+    [CONTROLLER_INTROSLIDE]               = OakOldManHandleIntroSlide,
+    [CONTROLLER_INTROTRAINERBALLTHROW]    = OakOldManHandleIntroTrainerBallThrow,
+    [CONTROLLER_DRAWPARTYSTATUSSUMMARY]   = OakOldManHandleDrawPartyStatusSummary,
+    [CONTROLLER_HIDEPARTYSTATUSSUMMARY]   = OakOldManHandleHidePartyStatusSummary,
+    [CONTROLLER_ENDBOUNCE]                = OakOldManHandleEndBounceEffect,
+    [CONTROLLER_SPRITEINVISIBILITY]       = OakOldManHandleSpriteInvisibility,
+    [CONTROLLER_BATTLEANIMATION]          = OakOldManHandleBattleAnimation,
+    [CONTROLLER_LINKSTANDBYMSG]           = OakOldManHandleLinkStandbyMsg,
+    [CONTROLLER_RESETACTIONMOVESELECTION] = OakOldManHandleResetActionMoveSelection,
+    [CONTROLLER_ENDLINKBATTLE]            = OakOldManHandleCmd55,
+    [CONTROLLER_TERMINATOR_NOP]           = OakOldManCmdEnd,
 };
 
 static void OakOldManDummy(void)

src/battle_controller_opponent.c

@@ -92,63 +92,63 @@ static void EndDrawPartyStatusSummary(void);
 
 static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 {
-    OpponentHandleGetMonData,
-    OpponentHandleGetRawMonData,
-    OpponentHandleSetMonData,
-    OpponentHandleSetRawMonData,
-    OpponentHandleLoadMonSprite,
-    OpponentHandleSwitchInAnim,
-    OpponentHandleReturnMonToBall,
-    OpponentHandleDrawTrainerPic,
-    OpponentHandleTrainerSlide,
-    OpponentHandleTrainerSlideBack,
-    OpponentHandleFaintAnimation,
-    OpponentHandlePaletteFade,
-    OpponentHandleSuccessBallThrowAnim,
-    OpponentHandleBallThrowAnim,
-    OpponentHandlePause,
-    OpponentHandleMoveAnimation,
-    OpponentHandlePrintString,
-    OpponentHandlePrintSelectionString,
-    OpponentHandleChooseAction,
-    OpponentHandleUnknownYesNoBox,
-    OpponentHandleChooseMove,
-    OpponentHandleChooseItem,
-    OpponentHandleChoosePokemon,
-    OpponentHandleCmd23,
-    OpponentHandleHealthBarUpdate,
-    OpponentHandleExpUpdate,
-    OpponentHandleStatusIconUpdate,
-    OpponentHandleStatusAnimation,
-    OpponentHandleStatusXor,
-    OpponentHandleDataTransfer,
-    OpponentHandleDMA3Transfer,
-    OpponentHandlePlayBGM,
-    OpponentHandleCmd32,
-    OpponentHandleTwoReturnValues,
-    OpponentHandleChosenMonReturnValue,
-    OpponentHandleOneReturnValue,
-    OpponentHandleOneReturnValue_Duplicate,
-    OpponentHandleCmd37,
-    OpponentHandleCmd38,
-    OpponentHandleCmd39,
-    OpponentHandleCmd40,
-    OpponentHandleHitAnimation,
-    OpponentHandleCmd42,
-    OpponentHandlePlaySE,
-    OpponentHandlePlayFanfare,
-    OpponentHandleFaintingCry,
-    OpponentHandleIntroSlide,
-    OpponentHandleIntroTrainerBallThrow,
-    OpponentHandleDrawPartyStatusSummary,
-    OpponentHandleHidePartyStatusSummary,
-    OpponentHandleEndBounceEffect,
-    OpponentHandleSpriteInvisibility,
-    OpponentHandleBattleAnimation,
-    OpponentHandleLinkStandbyMsg,
-    OpponentHandleResetActionMoveSelection,
-    OpponentHandleCmd55,
-    OpponentCmdEnd
+    [CONTROLLER_GETMONDATA]               = OpponentHandleGetMonData,
+    [CONTROLLER_GETRAWMONDATA]            = OpponentHandleGetRawMonData,
+    [CONTROLLER_SETMONDATA]               = OpponentHandleSetMonData,
+    [CONTROLLER_SETRAWMONDATA]            = OpponentHandleSetRawMonData,
+    [CONTROLLER_LOADMONSPRITE]            = OpponentHandleLoadMonSprite,
+    [CONTROLLER_SWITCHINANIM]             = OpponentHandleSwitchInAnim,
+    [CONTROLLER_RETURNMONTOBALL]          = OpponentHandleReturnMonToBall,
+    [CONTROLLER_DRAWTRAINERPIC]           = OpponentHandleDrawTrainerPic,
+    [CONTROLLER_TRAINERSLIDE]             = OpponentHandleTrainerSlide,
+    [CONTROLLER_TRAINERSLIDEBACK]         = OpponentHandleTrainerSlideBack,
+    [CONTROLLER_FAINTANIMATION]           = OpponentHandleFaintAnimation,
+    [CONTROLLER_PALETTEFADE]              = OpponentHandlePaletteFade,
+    [CONTROLLER_SUCCESSBALLTHROWANIM]     = OpponentHandleSuccessBallThrowAnim,
+    [CONTROLLER_BALLTHROWANIM]            = OpponentHandleBallThrowAnim,
+    [CONTROLLER_PAUSE]                    = OpponentHandlePause,
+    [CONTROLLER_MOVEANIMATION]            = OpponentHandleMoveAnimation,
+    [CONTROLLER_PRINTSTRING]              = OpponentHandlePrintString,
+    [CONTROLLER_PRINTSTRINGPLAYERONLY]    = OpponentHandlePrintSelectionString,
+    [CONTROLLER_CHOOSEACTION]             = OpponentHandleChooseAction,
+    [CONTROLLER_UNKNOWNYESNOBOX]          = OpponentHandleUnknownYesNoBox,
+    [CONTROLLER_CHOOSEMOVE]               = OpponentHandleChooseMove,
+    [CONTROLLER_OPENBAG]                  = OpponentHandleChooseItem,
+    [CONTROLLER_CHOOSEPOKEMON]            = OpponentHandleChoosePokemon,
+    [CONTROLLER_23]                       = OpponentHandleCmd23,
+    [CONTROLLER_HEALTHBARUPDATE]          = OpponentHandleHealthBarUpdate,
+    [CONTROLLER_EXPUPDATE]                = OpponentHandleExpUpdate,
+    [CONTROLLER_STATUSICONUPDATE]         = OpponentHandleStatusIconUpdate,
+    [CONTROLLER_STATUSANIMATION]          = OpponentHandleStatusAnimation,
+    [CONTROLLER_STATUSXOR]                = OpponentHandleStatusXor,
+    [CONTROLLER_DATATRANSFER]             = OpponentHandleDataTransfer,
+    [CONTROLLER_DMA3TRANSFER]             = OpponentHandleDMA3Transfer,
+    [CONTROLLER_PLAYBGM]                  = OpponentHandlePlayBGM,
+    [CONTROLLER_32]                       = OpponentHandleCmd32,
+    [CONTROLLER_TWORETURNVALUES]          = OpponentHandleTwoReturnValues,
+    [CONTROLLER_CHOSENMONRETURNVALUE]     = OpponentHandleChosenMonReturnValue,
+    [CONTROLLER_ONERETURNVALUE]           = OpponentHandleOneReturnValue,
+    [CONTROLLER_ONERETURNVALUE_DUPLICATE] = OpponentHandleOneReturnValue_Duplicate,
+    [CONTROLLER_CLEARUNKVAR]              = OpponentHandleCmd37,
+    [CONTROLLER_SETUNKVAR]                = OpponentHandleCmd38,
+    [CONTROLLER_CLEARUNKFLAG]             = OpponentHandleCmd39,
+    [CONTROLLER_TOGGLEUNKFLAG]            = OpponentHandleCmd40,
+    [CONTROLLER_HITANIMATION]             = OpponentHandleHitAnimation,
+    [CONTROLLER_CANTSWITCH]               = OpponentHandleCmd42,
+    [CONTROLLER_PLAYSE]                   = OpponentHandlePlaySE,
+    [CONTROLLER_PLAYFANFARE]              = OpponentHandlePlayFanfare,
+    [CONTROLLER_FAINTINGCRY]              = OpponentHandleFaintingCry,
+    [CONTROLLER_INTROSLIDE]               = OpponentHandleIntroSlide,
+    [CONTROLLER_INTROTRAINERBALLTHROW]    = OpponentHandleIntroTrainerBallThrow,
+    [CONTROLLER_DRAWPARTYSTATUSSUMMARY]   = OpponentHandleDrawPartyStatusSummary,
+    [CONTROLLER_HIDEPARTYSTATUSSUMMARY]   = OpponentHandleHidePartyStatusSummary,
+    [CONTROLLER_ENDBOUNCE]                = OpponentHandleEndBounceEffect,
+    [CONTROLLER_SPRITEINVISIBILITY]       = OpponentHandleSpriteInvisibility,
+    [CONTROLLER_BATTLEANIMATION]          = OpponentHandleBattleAnimation,
+    [CONTROLLER_LINKSTANDBYMSG]           = OpponentHandleLinkStandbyMsg,
+    [CONTROLLER_RESETACTIONMOVESELECTION] = OpponentHandleResetActionMoveSelection,
+    [CONTROLLER_ENDLINKBATTLE]            = OpponentHandleCmd55,
+    [CONTROLLER_TERMINATOR_NOP]           = OpponentCmdEnd
 };
 
 // unknown unused data

src/battle_controller_player.c

@@ -109,63 +109,63 @@ static void EndDrawPartyStatusSummary(void);
 
 static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 {
-    PlayerHandleGetMonData,
-    PlayerHandleGetRawMonData,
-    PlayerHandleSetMonData,
-    PlayerHandleSetRawMonData,
-    PlayerHandleLoadMonSprite,
-    PlayerHandleSwitchInAnim,
-    PlayerHandleReturnMonToBall,
-    PlayerHandleDrawTrainerPic,
-    PlayerHandleTrainerSlide,
-    PlayerHandleTrainerSlideBack,
-    PlayerHandleFaintAnimation,
-    PlayerHandlePaletteFade,
-    PlayerHandleSuccessBallThrowAnim,
-    PlayerHandleBallThrowAnim,
-    PlayerHandlePause,
-    PlayerHandleMoveAnimation,
-    PlayerHandlePrintString,
-    PlayerHandlePrintSelectionString,
-    PlayerHandleChooseAction,
-    PlayerHandleUnknownYesNoBox,
-    PlayerHandleChooseMove,
-    PlayerHandleChooseItem,
-    PlayerHandleChoosePokemon,
-    PlayerHandleCmd23,
-    PlayerHandleHealthBarUpdate,
-    PlayerHandleExpUpdate,
-    PlayerHandleStatusIconUpdate,
-    PlayerHandleStatusAnimation,
-    PlayerHandleStatusXor,
-    PlayerHandleDataTransfer,
-    PlayerHandleDMA3Transfer,
-    PlayerHandlePlayBGM,
-    PlayerHandleCmd32,
-    PlayerHandleTwoReturnValues,
-    PlayerHandleChosenMonReturnValue,
-    PlayerHandleOneReturnValue,
-    PlayerHandleOneReturnValue_Duplicate,
-    PlayerHandleCmd37,
-    PlayerHandleCmd38,
-    PlayerHandleCmd39,
-    PlayerHandleCmd40,
-    PlayerHandleHitAnimation,
-    PlayerHandleCmd42,
-    PlayerHandlePlaySE,
-    PlayerHandlePlayFanfare,
-    PlayerHandleFaintingCry,
-    PlayerHandleIntroSlide,
-    PlayerHandleIntroTrainerBallThrow,
-    PlayerHandleDrawPartyStatusSummary,
-    PlayerHandleHidePartyStatusSummary,
-    PlayerHandleEndBounceEffect,
-    PlayerHandleSpriteInvisibility,
-    PlayerHandleBattleAnimation,
-    PlayerHandleLinkStandbyMsg,
-    PlayerHandleResetActionMoveSelection,
-    PlayerHandleCmd55,
-    PlayerCmdEnd,
+    [CONTROLLER_GETMONDATA]               = PlayerHandleGetMonData,
+    [CONTROLLER_GETRAWMONDATA]            = PlayerHandleGetRawMonData,
+    [CONTROLLER_SETMONDATA]               = PlayerHandleSetMonData,
+    [CONTROLLER_SETRAWMONDATA]            = PlayerHandleSetRawMonData,
+    [CONTROLLER_LOADMONSPRITE]            = PlayerHandleLoadMonSprite,
+    [CONTROLLER_SWITCHINANIM]             = PlayerHandleSwitchInAnim,
+    [CONTROLLER_RETURNMONTOBALL]          = PlayerHandleReturnMonToBall,
+    [CONTROLLER_DRAWTRAINERPIC]           = PlayerHandleDrawTrainerPic,
+    [CONTROLLER_TRAINERSLIDE]             = PlayerHandleTrainerSlide,
+    [CONTROLLER_TRAINERSLIDEBACK]         = PlayerHandleTrainerSlideBack,
+    [CONTROLLER_FAINTANIMATION]           = PlayerHandleFaintAnimation,
+    [CONTROLLER_PALETTEFADE]              = PlayerHandlePaletteFade,
+    [CONTROLLER_SUCCESSBALLTHROWANIM]     = PlayerHandleSuccessBallThrowAnim,
+    [CONTROLLER_BALLTHROWANIM]            = PlayerHandleBallThrowAnim,
+    [CONTROLLER_PAUSE]                    = PlayerHandlePause,
+    [CONTROLLER_MOVEANIMATION]            = PlayerHandleMoveAnimation,
+    [CONTROLLER_PRINTSTRING]              = PlayerHandlePrintString,
+    [CONTROLLER_PRINTSTRINGPLAYERONLY]    = PlayerHandlePrintSelectionString,
+    [CONTROLLER_CHOOSEACTION]             = PlayerHandleChooseAction,
+    [CONTROLLER_UNKNOWNYESNOBOX]          = PlayerHandleUnknownYesNoBox,
+    [CONTROLLER_CHOOSEMOVE]               = PlayerHandleChooseMove,
+    [CONTROLLER_OPENBAG]                  = PlayerHandleChooseItem,
+    [CONTROLLER_CHOOSEPOKEMON]            = PlayerHandleChoosePokemon,
+    [CONTROLLER_23]                       = PlayerHandleCmd23,
+    [CONTROLLER_HEALTHBARUPDATE]          = PlayerHandleHealthBarUpdate,
+    [CONTROLLER_EXPUPDATE]                = PlayerHandleExpUpdate,
+    [CONTROLLER_STATUSICONUPDATE]         = PlayerHandleStatusIconUpdate,
+    [CONTROLLER_STATUSANIMATION]          = PlayerHandleStatusAnimation,
+    [CONTROLLER_STATUSXOR]                = PlayerHandleStatusXor,
+    [CONTROLLER_DATATRANSFER]             = PlayerHandleDataTransfer,
+    [CONTROLLER_DMA3TRANSFER]             = PlayerHandleDMA3Transfer,
+    [CONTROLLER_PLAYBGM]                  = PlayerHandlePlayBGM,
+    [CONTROLLER_32]                       = PlayerHandleCmd32,
+    [CONTROLLER_TWORETURNVALUES]          = PlayerHandleTwoReturnValues,
+    [CONTROLLER_CHOSENMONRETURNVALUE]     = PlayerHandleChosenMonReturnValue,
+    [CONTROLLER_ONERETURNVALUE]           = PlayerHandleOneReturnValue,
+    [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PlayerHandleOneReturnValue_Duplicate,
+    [CONTROLLER_CLEARUNKVAR]              = PlayerHandleCmd37,
+    [CONTROLLER_SETUNKVAR]                = PlayerHandleCmd38,
+    [CONTROLLER_CLEARUNKFLAG]             = PlayerHandleCmd39,
+    [CONTROLLER_TOGGLEUNKFLAG]            = PlayerHandleCmd40,
+    [CONTROLLER_HITANIMATION]             = PlayerHandleHitAnimation,
+    [CONTROLLER_CANTSWITCH]               = PlayerHandleCmd42,
+    [CONTROLLER_PLAYSE]                   = PlayerHandlePlaySE,
+    [CONTROLLER_PLAYFANFARE]              = PlayerHandlePlayFanfare,
+    [CONTROLLER_FAINTINGCRY]              = PlayerHandleFaintingCry,
+    [CONTROLLER_INTROSLIDE]               = PlayerHandleIntroSlide,
+    [CONTROLLER_INTROTRAINERBALLTHROW]    = PlayerHandleIntroTrainerBallThrow,
+    [CONTROLLER_DRAWPARTYSTATUSSUMMARY]   = PlayerHandleDrawPartyStatusSummary,
+    [CONTROLLER_HIDEPARTYSTATUSSUMMARY]   = PlayerHandleHidePartyStatusSummary,
+    [CONTROLLER_ENDBOUNCE]                = PlayerHandleEndBounceEffect,
+    [CONTROLLER_SPRITEINVISIBILITY]       = PlayerHandleSpriteInvisibility,
+    [CONTROLLER_BATTLEANIMATION]          = PlayerHandleBattleAnimation,
+    [CONTROLLER_LINKSTANDBYMSG]           = PlayerHandleLinkStandbyMsg,
+    [CONTROLLER_RESETACTIONMOVESELECTION] = PlayerHandleResetActionMoveSelection,
+    [CONTROLLER_ENDLINKBATTLE]            = PlayerHandleCmd55,
+    [CONTROLLER_TERMINATOR_NOP]           = PlayerCmdEnd,
 };
 
 static const u8 sTargetIdentities[] = { B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT };

src/battle_controller_pokedude.c

@@ -34,7 +34,7 @@ struct PokedudeBattlePartyInfo
     u8 side;
     u8 level;
     u16 species;
-    u16 moves[4];
+    u16 moves[MAX_MON_MOVES];
     u8 nature;
     u8 gender;
 };
@@ -121,65 +121,65 @@ static void Task_StartSendOutAnim(u8 taskId);
 static const u8 *GetPokedudeText(void);
 
 static void (*const sPokedudeBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
-    {
-        PokedudeHandleGetMonData,
-        PokedudeHandleGetRawMonData,
-        PokedudeHandleSetMonData,
-        PokedudeHandleSetRawMonData,
-        PokedudeHandleLoadMonSprite,
-        PokedudeHandleSwitchInAnim,
-        PokedudeHandleReturnMonToBall,
-        PokedudeHandleDrawTrainerPic,
-        PokedudeHandleTrainerSlide,
-        PokedudeHandleTrainerSlideBack,
-        PokedudeHandleFaintAnimation,
-        PokedudeHandlePaletteFade,
-        PokedudeHandleSuccessBallThrowAnim,
-        PokedudeHandleBallThrowAnim,
-        PokedudeHandlePause,
-        PokedudeHandleMoveAnimation,
-        PokedudeHandlePrintString,
-        PokedudeHandlePrintSelectionString,
-        PokedudeHandleChooseAction,
-        PokedudeHandleUnknownYesNoBox,
-        PokedudeHandleChooseMove,
-        PokedudeHandleChooseItem,
-        PokedudeHandleChoosePokemon,
-        PokedudeHandleCmd23,
-        PokedudeHandleHealthBarUpdate,
-        PokedudeHandleExpUpdate,
-        PokedudeHandleStatusIconUpdate,
-        PokedudeHandleStatusAnimation,
-        PokedudeHandleStatusXor,
-        PokedudeHandleDataTransfer,
-        PokedudeHandleDMA3Transfer,
-        PokedudeHandlePlayBGM,
-        PokedudeHandleCmd32,
-        PokedudeHandleTwoReturnValues,
-        PokedudeHandleChosenMonReturnValue,
-        PokedudeHandleOneReturnValue,
-        PokedudeHandleOneReturnValue_Duplicate,
-        PokedudeHandleCmd37,
-        PokedudeHandleCmd38,
-        PokedudeHandleCmd39,
-        PokedudeHandleCmd40,
-        PokedudeHandleHitAnimation,
-        PokedudeHandleCmd42,
-        PokedudeHandlePlaySE,
-        PokedudeHandlePlayFanfare,
-        PokedudeHandleFaintingCry,
-        PokedudeHandleIntroSlide,
-        PokedudeHandleIntroTrainerBallThrow,
-        PokedudeHandleDrawPartyStatusSummary,
-        PokedudeHandleHidePartyStatusSummary,
-        PokedudeHandleEndBounceEffect,
-        PokedudeHandleSpriteInvisibility,
-        PokedudeHandleBattleAnimation,
-        PokedudeHandleLinkStandbyMsg,
-        PokedudeHandleResetActionMoveSelection,
-        PokedudeHandleCmd55,
-        PokedudeCmdEnd,
-    };
+{
+    [CONTROLLER_GETMONDATA]               = PokedudeHandleGetMonData,
+    [CONTROLLER_GETRAWMONDATA]            = PokedudeHandleGetRawMonData,
+    [CONTROLLER_SETMONDATA]               = PokedudeHandleSetMonData,
+    [CONTROLLER_SETRAWMONDATA]            = PokedudeHandleSetRawMonData,
+    [CONTROLLER_LOADMONSPRITE]            = PokedudeHandleLoadMonSprite,
+    [CONTROLLER_SWITCHINANIM]             = PokedudeHandleSwitchInAnim,
+    [CONTROLLER_RETURNMONTOBALL]          = PokedudeHandleReturnMonToBall,
+    [CONTROLLER_DRAWTRAINERPIC]           = PokedudeHandleDrawTrainerPic,
+    [CONTROLLER_TRAINERSLIDE]             = PokedudeHandleTrainerSlide,
+    [CONTROLLER_TRAINERSLIDEBACK]         = PokedudeHandleTrainerSlideBack,
+    [CONTROLLER_FAINTANIMATION]           = PokedudeHandleFaintAnimation,
+    [CONTROLLER_PALETTEFADE]              = PokedudeHandlePaletteFade,
+    [CONTROLLER_SUCCESSBALLTHROWANIM]     = PokedudeHandleSuccessBallThrowAnim,
+    [CONTROLLER_BALLTHROWANIM]            = PokedudeHandleBallThrowAnim,
+    [CONTROLLER_PAUSE]                    = PokedudeHandlePause,
+    [CONTROLLER_MOVEANIMATION]            = PokedudeHandleMoveAnimation,
+    [CONTROLLER_PRINTSTRING]              = PokedudeHandlePrintString,
+    [CONTROLLER_PRINTSTRINGPLAYERONLY]    = PokedudeHandlePrintSelectionString,
+    [CONTROLLER_CHOOSEACTION]             = PokedudeHandleChooseAction,
+    [CONTROLLER_UNKNOWNYESNOBOX]          = PokedudeHandleUnknownYesNoBox,
+    [CONTROLLER_CHOOSEMOVE]               = PokedudeHandleChooseMove,
+    [CONTROLLER_OPENBAG]                  = PokedudeHandleChooseItem,
+    [CONTROLLER_CHOOSEPOKEMON]            = PokedudeHandleChoosePokemon,
+    [CONTROLLER_23]                       = PokedudeHandleCmd23,
+    [CONTROLLER_HEALTHBARUPDATE]          = PokedudeHandleHealthBarUpdate,
+    [CONTROLLER_EXPUPDATE]                = PokedudeHandleExpUpdate,
+    [CONTROLLER_STATUSICONUPDATE]         = PokedudeHandleStatusIconUpdate,
+    [CONTROLLER_STATUSANIMATION]          = PokedudeHandleStatusAnimation,
+    [CONTROLLER_STATUSXOR]                = PokedudeHandleStatusXor,
+    [CONTROLLER_DATATRANSFER]             = PokedudeHandleDataTransfer,
+    [CONTROLLER_DMA3TRANSFER]             = PokedudeHandleDMA3Transfer,
+    [CONTROLLER_PLAYBGM]                  = PokedudeHandlePlayBGM,
+    [CONTROLLER_32]                       = PokedudeHandleCmd32,
+    [CONTROLLER_TWORETURNVALUES]          = PokedudeHandleTwoReturnValues,
+    [CONTROLLER_CHOSENMONRETURNVALUE]     = PokedudeHandleChosenMonReturnValue,
+    [CONTROLLER_ONERETURNVALUE]           = PokedudeHandleOneReturnValue,
+    [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PokedudeHandleOneReturnValue_Duplicate,
+    [CONTROLLER_CLEARUNKVAR]              = PokedudeHandleCmd37,
+    [CONTROLLER_SETUNKVAR]                = PokedudeHandleCmd38,
+    [CONTROLLER_CLEARUNKFLAG]             = PokedudeHandleCmd39,
+    [CONTROLLER_TOGGLEUNKFLAG]            = PokedudeHandleCmd40,
+    [CONTROLLER_HITANIMATION]             = PokedudeHandleHitAnimation,
+    [CONTROLLER_CANTSWITCH]               = PokedudeHandleCmd42,
+    [CONTROLLER_PLAYSE]                   = PokedudeHandlePlaySE,
+    [CONTROLLER_PLAYFANFARE]              = PokedudeHandlePlayFanfare,
+    [CONTROLLER_FAINTINGCRY]              = PokedudeHandleFaintingCry,
+    [CONTROLLER_INTROSLIDE]               = PokedudeHandleIntroSlide,
+    [CONTROLLER_INTROTRAINERBALLTHROW]    = PokedudeHandleIntroTrainerBallThrow,
+    [CONTROLLER_DRAWPARTYSTATUSSUMMARY]   = PokedudeHandleDrawPartyStatusSummary,
+    [CONTROLLER_HIDEPARTYSTATUSSUMMARY]   = PokedudeHandleHidePartyStatusSummary,
+    [CONTROLLER_ENDBOUNCE]                = PokedudeHandleEndBounceEffect,
+    [CONTROLLER_SPRITEINVISIBILITY]       = PokedudeHandleSpriteInvisibility,
+    [CONTROLLER_BATTLEANIMATION]          = PokedudeHandleBattleAnimation,
+    [CONTROLLER_LINKSTANDBYMSG]           = PokedudeHandleLinkStandbyMsg,
+    [CONTROLLER_RESETACTIONMOVESELECTION] = PokedudeHandleResetActionMoveSelection,
+    [CONTROLLER_ENDLINKBATTLE]            = PokedudeHandleCmd55,
+    [CONTROLLER_TERMINATOR_NOP]           = PokedudeCmdEnd,
+};
 
 // unknown unused data
 static const u8 sUnused[] = { 0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58 };

src/battle_controller_safari.c

@@ -79,63 +79,63 @@ static void CompleteWhenChosePokeblock(void);
 
 static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
 {
-    SafariHandleGetMonData,
-    SafariHandleGetRawMonData,
-    SafariHandleSetMonData,
-    SafariHandleSetRawMonData,
-    SafariHandleLoadMonSprite,
-    SafariHandleSwitchInAnim,
-    SafariHandleReturnMonToBall,
-    SafariHandleDrawTrainerPic,
-    SafariHandleTrainerSlide,
-    SafariHandleTrainerSlideBack,
-    SafariHandleFaintAnimation,
-    SafariHandlePaletteFade,
-    SafariHandleSuccessBallThrowAnim,
-    SafariHandleBallThrowAnim,
-    SafariHandlePause,
-    SafariHandleMoveAnimation,
-    SafariHandlePrintString,
-    SafariHandlePrintSelectionString,
-    SafariHandleChooseAction,
-    SafariHandleUnknownYesNoBox,
-    SafariHandleChooseMove,
-    SafariHandleChooseItem,
-    SafariHandleChoosePokemon,
-    SafariHandleCmd23,
-    SafariHandleHealthBarUpdate,
-    SafariHandleExpUpdate,
-    SafariHandleStatusIconUpdate,
-    SafariHandleStatusAnimation,
-    SafariHandleStatusXor,
-    SafariHandleDataTransfer,
-    SafariHandleDMA3Transfer,
-    SafariHandlePlayBGM,
-    SafariHandleCmd32,
-    SafariHandleTwoReturnValues,
-    SafariHandleChosenMonReturnValue,
-    SafariHandleOneReturnValue,
-    SafariHandleOneReturnValue_Duplicate,
-    SafariHandleCmd37,
-    SafariHandleCmd38,
-    SafariHandleCmd39,
-    SafariHandleCmd40,
-    SafariHandleHitAnimation,
-    SafariHandleCmd42,
-    SafariHandlePlaySE,
-    SafariHandlePlayFanfareOrBGM,
-    SafariHandleFaintingCry,
-    SafariHandleIntroSlide,
-    SafariHandleIntroTrainerBallThrow,
-    SafariHandleDrawPartyStatusSummary,
-    SafariHandleHidePartyStatusSummary,
-    SafariHandleEndBounceEffect,
-    SafariHandleSpriteInvisibility,
-    SafariHandleBattleAnimation,
-    SafariHandleLinkStandbyMsg,
-    SafariHandleResetActionMoveSelection,
-    SafariHandleCmd55,
-    SafariCmdEnd,
+    [CONTROLLER_GETMONDATA]               = SafariHandleGetMonData,
+    [CONTROLLER_GETRAWMONDATA]            = SafariHandleGetRawMonData,
+    [CONTROLLER_SETMONDATA]               = SafariHandleSetMonData,
+    [CONTROLLER_SETRAWMONDATA]            = SafariHandleSetRawMonData,
+    [CONTROLLER_LOADMONSPRITE]            = SafariHandleLoadMonSprite,
+    [CONTROLLER_SWITCHINANIM]             = SafariHandleSwitchInAnim,
+    [CONTROLLER_RETURNMONTOBALL]          = SafariHandleReturnMonToBall,
+    [CONTROLLER_DRAWTRAINERPIC]           = SafariHandleDrawTrainerPic,
+    [CONTROLLER_TRAINERSLIDE]             = SafariHandleTrainerSlide,
+    [CONTROLLER_TRAINERSLIDEBACK]         = SafariHandleTrainerSlideBack,
+    [CONTROLLER_FAINTANIMATION]           = SafariHandleFaintAnimation,
+    [CONTROLLER_PALETTEFADE]              = SafariHandlePaletteFade,
+    [CONTROLLER_SUCCESSBALLTHROWANIM]     = SafariHandleSuccessBallThrowAnim,
+    [CONTROLLER_BALLTHROWANIM]            = SafariHandleBallThrowAnim,
+    [CONTROLLER_PAUSE]                    = SafariHandlePause,
+    [CONTROLLER_MOVEANIMATION]            = SafariHandleMoveAnimation,
+    [CONTROLLER_PRINTSTRING]              = SafariHandlePrintString,
+    [CONTROLLER_PRINTSTRINGPLAYERONLY]    = SafariHandlePrintSelectionString,
+    [CONTROLLER_CHOOSEACTION]             = SafariHandleChooseAction,
+    [CONTROLLER_UNKNOWNYESNOBOX]          = SafariHandleUnknownYesNoBox,
+    [CONTROLLER_CHOOSEMOVE]               = SafariHandleChooseMove,
+    [CONTROLLER_OPENBAG]                  = SafariHandleChooseItem,
+    [CONTROLLER_CHOOSEPOKEMON]            = SafariHandleChoosePokemon,
+    [CONTROLLER_23]                       = SafariHandleCmd23,
+    [CONTROLLER_HEALTHBARUPDATE]          = SafariHandleHealthBarUpdate,
+    [CONTROLLER_EXPUPDATE]                = SafariHandleExpUpdate,
+    [CONTROLLER_STATUSICONUPDATE]         = SafariHandleStatusIconUpdate,
+    [CONTROLLER_STATUSANIMATION]          = SafariHandleStatusAnimation,
+    [CONTROLLER_STATUSXOR]                = SafariHandleStatusXor,
+    [CONTROLLER_DATATRANSFER]             = SafariHandleDataTransfer,
+    [CONTROLLER_DMA3TRANSFER]             = SafariHandleDMA3Transfer,
+    [CONTROLLER_PLAYBGM]                  = SafariHandlePlayBGM,
+    [CONTROLLER_32]                       = SafariHandleCmd32,
+    [CONTROLLER_TWORETURNVALUES]          = SafariHandleTwoReturnValues,
+    [CONTROLLER_CHOSENMONRETURNVALUE]     = SafariHandleChosenMonReturnValue,
+    [CONTROLLER_ONERETURNVALUE]           = SafariHandleOneReturnValue,
+    [CONTROLLER_ONERETURNVALUE_DUPLICATE] = SafariHandleOneReturnValue_Duplicate,
+    [CONTROLLER_CLEARUNKVAR]              = SafariHandleCmd37,
+    [CONTROLLER_SETUNKVAR]                = SafariHandleCmd38,
+    [CONTROLLER_CLEARUNKFLAG]             = SafariHandleCmd39,
+    [CONTROLLER_TOGGLEUNKFLAG]            = SafariHandleCmd40,
+    [CONTROLLER_HITANIMATION]             = SafariHandleHitAnimation,
+    [CONTROLLER_CANTSWITCH]               = SafariHandleCmd42,
+    [CONTROLLER_PLAYSE]                   = SafariHandlePlaySE,
+    [CONTROLLER_PLAYFANFARE]              = SafariHandlePlayFanfareOrBGM,
+    [CONTROLLER_FAINTINGCRY]              = SafariHandleFaintingCry,
+    [CONTROLLER_INTROSLIDE]               = SafariHandleIntroSlide,
+    [CONTROLLER_INTROTRAINERBALLTHROW]    = SafariHandleIntroTrainerBallThrow,
+    [CONTROLLER_DRAWPARTYSTATUSSUMMARY]   = SafariHandleDrawPartyStatusSummary,
+    [CONTROLLER_HIDEPARTYSTATUSSUMMARY]   = SafariHandleHidePartyStatusSummary,
+    [CONTROLLER_ENDBOUNCE]                = SafariHandleEndBounceEffect,
+    [CONTROLLER_SPRITEINVISIBILITY]       = SafariHandleSpriteInvisibility,
+    [CONTROLLER_BATTLEANIMATION]          = SafariHandleBattleAnimation,
+    [CONTROLLER_LINKSTANDBYMSG]           = SafariHandleLinkStandbyMsg,
+    [CONTROLLER_RESETACTIONMOVESELECTION] = SafariHandleResetActionMoveSelection,
+    [CONTROLLER_ENDLINKBATTLE]            = SafariHandleCmd55,
+    [CONTROLLER_TERMINATOR_NOP]           = SafariCmdEnd,
 };
 
 // not used

src/battle_setup.c

@@ -497,7 +497,7 @@ u8 BattleSetup_GetTerrainId(void)
             return BATTLE_TERRAIN_WATER;
         return BATTLE_TERRAIN_PLAIN;
     }
-    if (MetatileBehavior_IsDeepSemiDeepOrSplashingWater(tileBehavior))
+    if (MetatileBehavior_IsDeepWaterTerrain(tileBehavior))
         return BATTLE_TERRAIN_WATER;
     if (MetatileBehavior_IsSurfable(tileBehavior))
         return BATTLE_TERRAIN_POND;

src/berry_crush.c

@@ -3274,7 +3274,7 @@ static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame * game)
     u8 i = 0;
     u8 *crusherGfx;
 
-    LZ77UnCompWram(gBerryCrush_Crusher_Tilemap, gDecompressionBuffer);
+    LZ77UnCompWram(gBerryCrush_TextWindows_Tilemap, gDecompressionBuffer);
     for (crusherGfx = gDecompressionBuffer; i < game->playerCount; ++i)
     {
         CopyToBgTilemapBufferRect(

src/data/text/move_names.h

@@ -1,357 +1,357 @@
-const u8 gMoveNames[][13] = {
-    _("-$$$$$$"),
-    _("POUND"),
-    _("KARATE CHOP"),
-    _("DOUBLESLAP"),
-    _("COMET PUNCH"),
-    _("MEGA PUNCH"),
-    _("PAY DAY"),
-    _("FIRE PUNCH"),
-    _("ICE PUNCH"),
-    _("THUNDERPUNCH"),
-    _("SCRATCH"),
-    _("VICEGRIP"),
-    _("GUILLOTINE"),
-    _("RAZOR WIND"),
-    _("SWORDS DANCE"),
-    _("CUT"),
-    _("GUST"),
-    _("WING ATTACK"),
-    _("WHIRLWIND"),
-    _("FLY"),
-    _("BIND"),
-    _("SLAM"),
-    _("VINE WHIP"),
-    _("STOMP"),
-    _("DOUBLE KICK"),
-    _("MEGA KICK"),
-    _("JUMP KICK"),
-    _("ROLLING KICK"),
-    _("SAND-ATTACK"),
-    _("HEADBUTT"),
-    _("HORN ATTACK"),
-    _("FURY ATTACK"),
-    _("HORN DRILL"),
-    _("TACKLE"),
-    _("BODY SLAM"),
-    _("WRAP"),
-    _("TAKE DOWN"),
-    _("THRASH"),
-    _("DOUBLE-EDGE"),
-    _("TAIL WHIP"),
-    _("POISON STING"),
-    _("TWINEEDLE"),
-    _("PIN MISSILE"),
-    _("LEER"),
-    _("BITE"),
-    _("GROWL"),
-    _("ROAR"),
-    _("SING"),
-    _("SUPERSONIC"),
-    _("SONICBOOM"),
-    _("DISABLE"),
-    _("ACID"),
-    _("EMBER"),
-    _("FLAMETHROWER"),
-    _("MIST"),
-    _("WATER GUN"),
-    _("HYDRO PUMP"),
-    _("SURF"),
-    _("ICE BEAM"),
-    _("BLIZZARD"),
-    _("PSYBEAM"),
-    _("BUBBLEBEAM"),
-    _("AURORA BEAM"),
-    _("HYPER BEAM"),
-    _("PECK"),
-    _("DRILL PECK"),
-    _("SUBMISSION"),
-    _("LOW KICK"),
-    _("COUNTER"),
-    _("SEISMIC TOSS"),
-    _("STRENGTH"),
-    _("ABSORB"),
-    _("MEGA DRAIN"),
-    _("LEECH SEED"),
-    _("GROWTH"),
-    _("RAZOR LEAF"),
-    _("SOLARBEAM"),
-    _("POISONPOWDER"),
-    _("STUN SPORE"),
-    _("SLEEP POWDER"),
-    _("PETAL DANCE"),
-    _("STRING SHOT"),
-    _("DRAGON RAGE"),
-    _("FIRE SPIN"),
-    _("THUNDERSHOCK"),
-    _("THUNDERBOLT"),
-    _("THUNDER WAVE"),
-    _("THUNDER"),
-    _("ROCK THROW"),
-    _("EARTHQUAKE"),
-    _("FISSURE"),
-    _("DIG"),
-    _("TOXIC"),
-    _("CONFUSION"),
-    _("PSYCHIC"),
-    _("HYPNOSIS"),
-    _("MEDITATE"),
-    _("AGILITY"),
-    _("QUICK ATTACK"),
-    _("RAGE"),
-    _("TELEPORT"),
-    _("NIGHT SHADE"),
-    _("MIMIC"),
-    _("SCREECH"),
-    _("DOUBLE TEAM"),
-    _("RECOVER"),
-    _("HARDEN"),
-    _("MINIMIZE"),
-    _("SMOKESCREEN"),
-    _("CONFUSE RAY"),
-    _("WITHDRAW"),
-    _("DEFENSE CURL"),
-    _("BARRIER"),
-    _("LIGHT SCREEN"),
-    _("HAZE"),
-    _("REFLECT"),
-    _("FOCUS ENERGY"),
-    _("BIDE"),
-    _("METRONOME"),
-    _("MIRROR MOVE"),
-    _("SELFDESTRUCT"),
-    _("EGG BOMB"),
-    _("LICK"),
-    _("SMOG"),
-    _("SLUDGE"),
-    _("BONE CLUB"),
-    _("FIRE BLAST"),
-    _("WATERFALL"),
-    _("CLAMP"),
-    _("SWIFT"),
-    _("SKULL BASH"),
-    _("SPIKE CANNON"),
-    _("CONSTRICT"),
-    _("AMNESIA"),
-    _("KINESIS"),
-    _("SOFTBOILED"),
-    _("HI JUMP KICK"),
-    _("GLARE"),
-    _("DREAM EATER"),
-    _("POISON GAS"),
-    _("BARRAGE"),
-    _("LEECH LIFE"),
-    _("LOVELY KISS"),
-    _("SKY ATTACK"),
-    _("TRANSFORM"),
-    _("BUBBLE"),
-    _("DIZZY PUNCH"),
-    _("SPORE"),
-    _("FLASH"),
-    _("PSYWAVE"),
-    _("SPLASH"),
-    _("ACID ARMOR"),
-    _("CRABHAMMER"),
-    _("EXPLOSION"),
-    _("FURY SWIPES"),
-    _("BONEMERANG"),
-    _("REST"),
-    _("ROCK SLIDE"),
-    _("HYPER FANG"),
-    _("SHARPEN"),
-    _("CONVERSION"),
-    _("TRI ATTACK"),
-    _("SUPER FANG"),
-    _("SLASH"),
-    _("SUBSTITUTE"),
-    _("STRUGGLE"),
-    _("SKETCH"),
-    _("TRIPLE KICK"),
-    _("THIEF"),
-    _("SPIDER WEB"),
-    _("MIND READER"),
-    _("NIGHTMARE"),
-    _("FLAME WHEEL"),
-    _("SNORE"),
-    _("CURSE"),
-    _("FLAIL"),
-    _("CONVERSION 2"),
-    _("AEROBLAST"),
-    _("COTTON SPORE"),
-    _("REVERSAL"),
-    _("SPITE"),
-    _("POWDER SNOW"),
-    _("PROTECT"),
-    _("MACH PUNCH"),
-    _("SCARY FACE"),
-    _("FAINT ATTACK"),
-    _("SWEET KISS"),
-    _("BELLY DRUM"),
-    _("SLUDGE BOMB"),
-    _("MUD-SLAP"),
-    _("OCTAZOOKA"),
-    _("SPIKES"),
-    _("ZAP CANNON"),
-    _("FORESIGHT"),
-    _("DESTINY BOND"),
-    _("PERISH SONG"),
-    _("ICY WIND"),
-    _("DETECT"),
-    _("BONE RUSH"),
-    _("LOCK-ON"),
-    _("OUTRAGE"),
-    _("SANDSTORM"),
-    _("GIGA DRAIN"),
-    _("ENDURE"),
-    _("CHARM"),
-    _("ROLLOUT"),
-    _("FALSE SWIPE"),
-    _("SWAGGER"),
-    _("MILK DRINK"),
-    _("SPARK"),
-    _("FURY CUTTER"),
-    _("STEEL WING"),
-    _("MEAN LOOK"),
-    _("ATTRACT"),
-    _("SLEEP TALK"),
-    _("HEAL BELL"),
-    _("RETURN"),
-    _("PRESENT"),
-    _("FRUSTRATION"),
-    _("SAFEGUARD"),
-    _("PAIN SPLIT"),
-    _("SACRED FIRE"),
-    _("MAGNITUDE"),
-    _("DYNAMICPUNCH"),
-    _("MEGAHORN"),
-    _("DRAGONBREATH"),
-    _("BATON PASS"),
-    _("ENCORE"),
-    _("PURSUIT"),
-    _("RAPID SPIN"),
-    _("SWEET SCENT"),
-    _("IRON TAIL"),
-    _("METAL CLAW"),
-    _("VITAL THROW"),
-    _("MORNING SUN"),
-    _("SYNTHESIS"),
-    _("MOONLIGHT"),
-    _("HIDDEN POWER"),
-    _("CROSS CHOP"),
-    _("TWISTER"),
-    _("RAIN DANCE"),
-    _("SUNNY DAY"),
-    _("CRUNCH"),
-    _("MIRROR COAT"),
-    _("PSYCH UP"),
-    _("EXTREMESPEED"),
-    _("ANCIENTPOWER"),
-    _("SHADOW BALL"),
-    _("FUTURE SIGHT"),
-    _("ROCK SMASH"),
-    _("WHIRLPOOL"),
-    _("BEAT UP"),
-    _("FAKE OUT"),
-    _("UPROAR"),
-    _("STOCKPILE"),
-    _("SPIT UP"),
-    _("SWALLOW"),
-    _("HEAT WAVE"),
-    _("HAIL"),
-    _("TORMENT"),
-    _("FLATTER"),
-    _("WILL-O-WISP"),
-    _("MEMENTO"),
-    _("FACADE"),
-    _("FOCUS PUNCH"),
-    _("SMELLINGSALT"),
-    _("FOLLOW ME"),
-    _("NATURE POWER"),
-    _("CHARGE"),
-    _("TAUNT"),
-    _("HELPING HAND"),
-    _("TRICK"),
-    _("ROLE PLAY"),
-    _("WISH"),
-    _("ASSIST"),
-    _("INGRAIN"),
-    _("SUPERPOWER"),
-    _("MAGIC COAT"),
-    _("RECYCLE"),
-    _("REVENGE"),
-    _("BRICK BREAK"),
-    _("YAWN"),
-    _("KNOCK OFF"),
-    _("ENDEAVOR"),
-    _("ERUPTION"),
-    _("SKILL SWAP"),
-    _("IMPRISON"),
-    _("REFRESH"),
-    _("GRUDGE"),
-    _("SNATCH"),
-    _("SECRET POWER"),
-    _("DIVE"),
-    _("ARM THRUST"),
-    _("CAMOUFLAGE"),
-    _("TAIL GLOW"),
-    _("LUSTER PURGE"),
-    _("MIST BALL"),
-    _("FEATHERDANCE"),
-    _("TEETER DANCE"),
-    _("BLAZE KICK"),
-    _("MUD SPORT"),
-    _("ICE BALL"),
-    _("NEEDLE ARM"),
-    _("SLACK OFF"),
-    _("HYPER VOICE"),
-    _("POISON FANG"),
-    _("CRUSH CLAW"),
-    _("BLAST BURN"),
-    _("HYDRO CANNON"),
-    _("METEOR MASH"),
-    _("ASTONISH"),
-    _("WEATHER BALL"),
-    _("AROMATHERAPY"),
-    _("FAKE TEARS"),
-    _("AIR CUTTER"),
-    _("OVERHEAT"),
-    _("ODOR SLEUTH"),
-    _("ROCK TOMB"),
-    _("SILVER WIND"),
-    _("METAL SOUND"),
-    _("GRASSWHISTLE"),
-    _("TICKLE"),
-    _("COSMIC POWER"),
-    _("WATER SPOUT"),
-    _("SIGNAL BEAM"),
-    _("SHADOW PUNCH"),
-    _("EXTRASENSORY"),
-    _("SKY UPPERCUT"),
-    _("SAND TOMB"),
-    _("SHEER COLD"),
-    _("MUDDY WATER"),
-    _("BULLET SEED"),
-    _("AERIAL ACE"),
-    _("ICICLE SPEAR"),
-    _("IRON DEFENSE"),
-    _("BLOCK"),
-    _("HOWL"),
-    _("DRAGON CLAW"),
-    _("FRENZY PLANT"),
-    _("BULK UP"),
-    _("BOUNCE"),
-    _("MUD SHOT"),
-    _("POISON TAIL"),
-    _("COVET"),
-    _("VOLT TACKLE"),
-    _("MAGICAL LEAF"),
-    _("WATER SPORT"),
-    _("CALM MIND"),
-    _("LEAF BLADE"),
-    _("DRAGON DANCE"),
-    _("ROCK BLAST"),
-    _("SHOCK WAVE"),
-    _("WATER PULSE"),
-    _("DOOM DESIRE"),
-    _("PSYCHO BOOST")
+const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] = {
+    [MOVE_NONE]          = _("-$$$$$$"),
+    [MOVE_POUND]         = _("POUND"),
+    [MOVE_KARATE_CHOP]   = _("KARATE CHOP"),
+    [MOVE_DOUBLE_SLAP]   = _("DOUBLESLAP"),
+    [MOVE_COMET_PUNCH]   = _("COMET PUNCH"),
+    [MOVE_MEGA_PUNCH]    = _("MEGA PUNCH"),
+    [MOVE_PAY_DAY]       = _("PAY DAY"),
+    [MOVE_FIRE_PUNCH]    = _("FIRE PUNCH"),
+    [MOVE_ICE_PUNCH]     = _("ICE PUNCH"),
+    [MOVE_THUNDER_PUNCH] = _("THUNDERPUNCH"),
+    [MOVE_SCRATCH]       = _("SCRATCH"),
+    [MOVE_VICE_GRIP]     = _("VICEGRIP"),
+    [MOVE_GUILLOTINE]    = _("GUILLOTINE"),
+    [MOVE_RAZOR_WIND]    = _("RAZOR WIND"),
+    [MOVE_SWORDS_DANCE]  = _("SWORDS DANCE"),
+    [MOVE_CUT]           = _("CUT"),
+    [MOVE_GUST]          = _("GUST"),
+    [MOVE_WING_ATTACK]   = _("WING ATTACK"),
+    [MOVE_WHIRLWIND]     = _("WHIRLWIND"),
+    [MOVE_FLY]           = _("FLY"),
+    [MOVE_BIND]          = _("BIND"),
+    [MOVE_SLAM]          = _("SLAM"),
+    [MOVE_VINE_WHIP]     = _("VINE WHIP"),
+    [MOVE_STOMP]         = _("STOMP"),
+    [MOVE_DOUBLE_KICK]   = _("DOUBLE KICK"),
+    [MOVE_MEGA_KICK]     = _("MEGA KICK"),
+    [MOVE_JUMP_KICK]     = _("JUMP KICK"),
+    [MOVE_ROLLING_KICK]  = _("ROLLING KICK"),
+    [MOVE_SAND_ATTACK]   = _("SAND-ATTACK"),
+    [MOVE_HEADBUTT]      = _("HEADBUTT"),
+    [MOVE_HORN_ATTACK]   = _("HORN ATTACK"),
+    [MOVE_FURY_ATTACK]   = _("FURY ATTACK"),
+    [MOVE_HORN_DRILL]    = _("HORN DRILL"),
+    [MOVE_TACKLE]        = _("TACKLE"),
+    [MOVE_BODY_SLAM]     = _("BODY SLAM"),
+    [MOVE_WRAP]          = _("WRAP"),
+    [MOVE_TAKE_DOWN]     = _("TAKE DOWN"),
+    [MOVE_THRASH]        = _("THRASH"),
+    [MOVE_DOUBLE_EDGE]   = _("DOUBLE-EDGE"),
+    [MOVE_TAIL_WHIP]     = _("TAIL WHIP"),
+    [MOVE_POISON_STING]  = _("POISON STING"),
+    [MOVE_TWINEEDLE]     = _("TWINEEDLE"),
+    [MOVE_PIN_MISSILE]   = _("PIN MISSILE"),
+    [MOVE_LEER]          = _("LEER"),
+    [MOVE_BITE]          = _("BITE"),
+    [MOVE_GROWL]         = _("GROWL"),
+    [MOVE_ROAR]          = _("ROAR"),
+    [MOVE_SING]          = _("SING"),
+    [MOVE_SUPERSONIC]    = _("SUPERSONIC"),
+    [MOVE_SONIC_BOOM]    = _("SONICBOOM"),
+    [MOVE_DISABLE]       = _("DISABLE"),
+    [MOVE_ACID]          = _("ACID"),
+    [MOVE_EMBER]         = _("EMBER"),
+    [MOVE_FLAMETHROWER]  = _("FLAMETHROWER"),
+    [MOVE_MIST]          = _("MIST"),
+    [MOVE_WATER_GUN]     = _("WATER GUN"),
+    [MOVE_HYDRO_PUMP]    = _("HYDRO PUMP"),
+    [MOVE_SURF]          = _("SURF"),
+    [MOVE_ICE_BEAM]      = _("ICE BEAM"),
+    [MOVE_BLIZZARD]      = _("BLIZZARD"),
+    [MOVE_PSYBEAM]       = _("PSYBEAM"),
+    [MOVE_BUBBLE_BEAM]   = _("BUBBLEBEAM"),
+    [MOVE_AURORA_BEAM]   = _("AURORA BEAM"),
+    [MOVE_HYPER_BEAM]    = _("HYPER BEAM"),
+    [MOVE_PECK]          = _("PECK"),
+    [MOVE_DRILL_PECK]    = _("DRILL PECK"),
+    [MOVE_SUBMISSION]    = _("SUBMISSION"),
+    [MOVE_LOW_KICK]      = _("LOW KICK"),
+    [MOVE_COUNTER]       = _("COUNTER"),
+    [MOVE_SEISMIC_TOSS]  = _("SEISMIC TOSS"),
+    [MOVE_STRENGTH]      = _("STRENGTH"),
+    [MOVE_ABSORB]        = _("ABSORB"),
+    [MOVE_MEGA_DRAIN]    = _("MEGA DRAIN"),
+    [MOVE_LEECH_SEED]    = _("LEECH SEED"),
+    [MOVE_GROWTH]        = _("GROWTH"),
+    [MOVE_RAZOR_LEAF]    = _("RAZOR LEAF"),
+    [MOVE_SOLAR_BEAM]    = _("SOLARBEAM"),
+    [MOVE_POISON_POWDER] = _("POISONPOWDER"),
+    [MOVE_STUN_SPORE]    = _("STUN SPORE"),
+    [MOVE_SLEEP_POWDER]  = _("SLEEP POWDER"),
+    [MOVE_PETAL_DANCE]   = _("PETAL DANCE"),
+    [MOVE_STRING_SHOT]   = _("STRING SHOT"),
+    [MOVE_DRAGON_RAGE]   = _("DRAGON RAGE"),
+    [MOVE_FIRE_SPIN]     = _("FIRE SPIN"),
+    [MOVE_THUNDER_SHOCK] = _("THUNDERSHOCK"),
+    [MOVE_THUNDERBOLT]   = _("THUNDERBOLT"),
+    [MOVE_THUNDER_WAVE]  = _("THUNDER WAVE"),
+    [MOVE_THUNDER]       = _("THUNDER"),
+    [MOVE_ROCK_THROW]    = _("ROCK THROW"),
+    [MOVE_EARTHQUAKE]    = _("EARTHQUAKE"),
+    [MOVE_FISSURE]       = _("FISSURE"),
+    [MOVE_DIG]           = _("DIG"),
+    [MOVE_TOXIC]         = _("TOXIC"),
+    [MOVE_CONFUSION]     = _("CONFUSION"),
+    [MOVE_PSYCHIC]       = _("PSYCHIC"),
+    [MOVE_HYPNOSIS]      = _("HYPNOSIS"),
+    [MOVE_MEDITATE]      = _("MEDITATE"),
+    [MOVE_AGILITY]       = _("AGILITY"),
+    [MOVE_QUICK_ATTACK]  = _("QUICK ATTACK"),
+    [MOVE_RAGE]          = _("RAGE"),
+    [MOVE_TELEPORT]      = _("TELEPORT"),
+    [MOVE_NIGHT_SHADE]   = _("NIGHT SHADE"),
+    [MOVE_MIMIC]         = _("MIMIC"),
+    [MOVE_SCREECH]       = _("SCREECH"),
+    [MOVE_DOUBLE_TEAM]   = _("DOUBLE TEAM"),
+    [MOVE_RECOVER]       = _("RECOVER"),
+    [MOVE_HARDEN]        = _("HARDEN"),
+    [MOVE_MINIMIZE]      = _("MINIMIZE"),
+    [MOVE_SMOKESCREEN]   = _("SMOKESCREEN"),
+    [MOVE_CONFUSE_RAY]   = _("CONFUSE RAY"),
+    [MOVE_WITHDRAW]      = _("WITHDRAW"),
+    [MOVE_DEFENSE_CURL]  = _("DEFENSE CURL"),
+    [MOVE_BARRIER]       = _("BARRIER"),
+    [MOVE_LIGHT_SCREEN]  = _("LIGHT SCREEN"),
+    [MOVE_HAZE]          = _("HAZE"),
+    [MOVE_REFLECT]       = _("REFLECT"),
+    [MOVE_FOCUS_ENERGY]  = _("FOCUS ENERGY"),
+    [MOVE_BIDE]          = _("BIDE"),
+    [MOVE_METRONOME]     = _("METRONOME"),
+    [MOVE_MIRROR_MOVE]   = _("MIRROR MOVE"),
+    [MOVE_SELF_DESTRUCT] = _("SELFDESTRUCT"),
+    [MOVE_EGG_BOMB]      = _("EGG BOMB"),
+    [MOVE_LICK]          = _("LICK"),
+    [MOVE_SMOG]          = _("SMOG"),
+    [MOVE_SLUDGE]        = _("SLUDGE"),
+    [MOVE_BONE_CLUB]     = _("BONE CLUB"),
+    [MOVE_FIRE_BLAST]    = _("FIRE BLAST"),
+    [MOVE_WATERFALL]     = _("WATERFALL"),
+    [MOVE_CLAMP]         = _("CLAMP"),
+    [MOVE_SWIFT]         = _("SWIFT"),
+    [MOVE_SKULL_BASH]    = _("SKULL BASH"),
+    [MOVE_SPIKE_CANNON]  = _("SPIKE CANNON"),
+    [MOVE_CONSTRICT]     = _("CONSTRICT"),
+    [MOVE_AMNESIA]       = _("AMNESIA"),
+    [MOVE_KINESIS]       = _("KINESIS"),
+    [MOVE_SOFT_BOILED]   = _("SOFTBOILED"),
+    [MOVE_HI_JUMP_KICK]  = _("HI JUMP KICK"),
+    [MOVE_GLARE]         = _("GLARE"),
+    [MOVE_DREAM_EATER]   = _("DREAM EATER"),
+    [MOVE_POISON_GAS]    = _("POISON GAS"),
+    [MOVE_BARRAGE]       = _("BARRAGE"),
+    [MOVE_LEECH_LIFE]    = _("LEECH LIFE"),
+    [MOVE_LOVELY_KISS]   = _("LOVELY KISS"),
+    [MOVE_SKY_ATTACK]    = _("SKY ATTACK"),
+    [MOVE_TRANSFORM]     = _("TRANSFORM"),
+    [MOVE_BUBBLE]        = _("BUBBLE"),
+    [MOVE_DIZZY_PUNCH]   = _("DIZZY PUNCH"),
+    [MOVE_SPORE]         = _("SPORE"),
+    [MOVE_FLASH]         = _("FLASH"),
+    [MOVE_PSYWAVE]       = _("PSYWAVE"),
+    [MOVE_SPLASH]        = _("SPLASH"),
+    [MOVE_ACID_ARMOR]    = _("ACID ARMOR"),
+    [MOVE_CRABHAMMER]    = _("CRABHAMMER"),
+    [MOVE_EXPLOSION]     = _("EXPLOSION"),
+    [MOVE_FURY_SWIPES]   = _("FURY SWIPES"),
+    [MOVE_BONEMERANG]    = _("BONEMERANG"),
+    [MOVE_REST]          = _("REST"),
+    [MOVE_ROCK_SLIDE]    = _("ROCK SLIDE"),
+    [MOVE_HYPER_FANG]    = _("HYPER FANG"),
+    [MOVE_SHARPEN]       = _("SHARPEN"),
+    [MOVE_CONVERSION]    = _("CONVERSION"),
+    [MOVE_TRI_ATTACK]    = _("TRI ATTACK"),
+    [MOVE_SUPER_FANG]    = _("SUPER FANG"),
+    [MOVE_SLASH]         = _("SLASH"),
+    [MOVE_SUBSTITUTE]    = _("SUBSTITUTE"),
+    [MOVE_STRUGGLE]      = _("STRUGGLE"),
+    [MOVE_SKETCH]        = _("SKETCH"),
+    [MOVE_TRIPLE_KICK]   = _("TRIPLE KICK"),
+    [MOVE_THIEF]         = _("THIEF"),
+    [MOVE_SPIDER_WEB]    = _("SPIDER WEB"),
+    [MOVE_MIND_READER]   = _("MIND READER"),
+    [MOVE_NIGHTMARE]     = _("NIGHTMARE"),
+    [MOVE_FLAME_WHEEL]   = _("FLAME WHEEL"),
+    [MOVE_SNORE]         = _("SNORE"),
+    [MOVE_CURSE]         = _("CURSE"),
+    [MOVE_FLAIL]         = _("FLAIL"),
+    [MOVE_CONVERSION_2]  = _("CONVERSION 2"),
+    [MOVE_AEROBLAST]     = _("AEROBLAST"),
+    [MOVE_COTTON_SPORE]  = _("COTTON SPORE"),
+    [MOVE_REVERSAL]      = _("REVERSAL"),
+    [MOVE_SPITE]         = _("SPITE"),
+    [MOVE_POWDER_SNOW]   = _("POWDER SNOW"),
+    [MOVE_PROTECT]       = _("PROTECT"),
+    [MOVE_MACH_PUNCH]    = _("MACH PUNCH"),
+    [MOVE_SCARY_FACE]    = _("SCARY FACE"),
+    [MOVE_FAINT_ATTACK]  = _("FAINT ATTACK"),
+    [MOVE_SWEET_KISS]    = _("SWEET KISS"),
+    [MOVE_BELLY_DRUM]    = _("BELLY DRUM"),
+    [MOVE_SLUDGE_BOMB]   = _("SLUDGE BOMB"),
+    [MOVE_MUD_SLAP]      = _("MUD-SLAP"),
+    [MOVE_OCTAZOOKA]     = _("OCTAZOOKA"),
+    [MOVE_SPIKES]        = _("SPIKES"),
+    [MOVE_ZAP_CANNON]    = _("ZAP CANNON"),
+    [MOVE_FORESIGHT]     = _("FORESIGHT"),
+    [MOVE_DESTINY_BOND]  = _("DESTINY BOND"),
+    [MOVE_PERISH_SONG]   = _("PERISH SONG"),
+    [MOVE_ICY_WIND]      = _("ICY WIND"),
+    [MOVE_DETECT]        = _("DETECT"),
+    [MOVE_BONE_RUSH]     = _("BONE RUSH"),
+    [MOVE_LOCK_ON]       = _("LOCK-ON"),
+    [MOVE_OUTRAGE]       = _("OUTRAGE"),
+    [MOVE_SANDSTORM]     = _("SANDSTORM"),
+    [MOVE_GIGA_DRAIN]    = _("GIGA DRAIN"),
+    [MOVE_ENDURE]        = _("ENDURE"),
+    [MOVE_CHARM]         = _("CHARM"),
+    [MOVE_ROLLOUT]       = _("ROLLOUT"),
+    [MOVE_FALSE_SWIPE]   = _("FALSE SWIPE"),
+    [MOVE_SWAGGER]       = _("SWAGGER"),
+    [MOVE_MILK_DRINK]    = _("MILK DRINK"),
+    [MOVE_SPARK]         = _("SPARK"),
+    [MOVE_FURY_CUTTER]   = _("FURY CUTTER"),
+    [MOVE_STEEL_WING]    = _("STEEL WING"),
+    [MOVE_MEAN_LOOK]     = _("MEAN LOOK"),
+    [MOVE_ATTRACT]       = _("ATTRACT"),
+    [MOVE_SLEEP_TALK]    = _("SLEEP TALK"),
+    [MOVE_HEAL_BELL]     = _("HEAL BELL"),
+    [MOVE_RETURN]        = _("RETURN"),
+    [MOVE_PRESENT]       = _("PRESENT"),
+    [MOVE_FRUSTRATION]   = _("FRUSTRATION"),
+    [MOVE_SAFEGUARD]     = _("SAFEGUARD"),
+    [MOVE_PAIN_SPLIT]    = _("PAIN SPLIT"),
+    [MOVE_SACRED_FIRE]   = _("SACRED FIRE"),
+    [MOVE_MAGNITUDE]     = _("MAGNITUDE"),
+    [MOVE_DYNAMIC_PUNCH] = _("DYNAMICPUNCH"),
+    [MOVE_MEGAHORN]      = _("MEGAHORN"),
+    [MOVE_DRAGON_BREATH] = _("DRAGONBREATH"),
+    [MOVE_BATON_PASS]    = _("BATON PASS"),
+    [MOVE_ENCORE]        = _("ENCORE"),
+    [MOVE_PURSUIT]       = _("PURSUIT"),
+    [MOVE_RAPID_SPIN]    = _("RAPID SPIN"),
+    [MOVE_SWEET_SCENT]   = _("SWEET SCENT"),
+    [MOVE_IRON_TAIL]     = _("IRON TAIL"),
+    [MOVE_METAL_CLAW]    = _("METAL CLAW"),
+    [MOVE_VITAL_THROW]   = _("VITAL THROW"),
+    [MOVE_MORNING_SUN]   = _("MORNING SUN"),
+    [MOVE_SYNTHESIS]     = _("SYNTHESIS"),
+    [MOVE_MOONLIGHT]     = _("MOONLIGHT"),
+    [MOVE_HIDDEN_POWER]  = _("HIDDEN POWER"),
+    [MOVE_CROSS_CHOP]    = _("CROSS CHOP"),
+    [MOVE_TWISTER]       = _("TWISTER"),
+    [MOVE_RAIN_DANCE]    = _("RAIN DANCE"),
+    [MOVE_SUNNY_DAY]     = _("SUNNY DAY"),
+    [MOVE_CRUNCH]        = _("CRUNCH"),
+    [MOVE_MIRROR_COAT]   = _("MIRROR COAT"),
+    [MOVE_PSYCH_UP]      = _("PSYCH UP"),
+    [MOVE_EXTREME_SPEED] = _("EXTREMESPEED"),
+    [MOVE_ANCIENT_POWER] = _("ANCIENTPOWER"),
+    [MOVE_SHADOW_BALL]   = _("SHADOW BALL"),
+    [MOVE_FUTURE_SIGHT]  = _("FUTURE SIGHT"),
+    [MOVE_ROCK_SMASH]    = _("ROCK SMASH"),
+    [MOVE_WHIRLPOOL]     = _("WHIRLPOOL"),
+    [MOVE_BEAT_UP]       = _("BEAT UP"),
+    [MOVE_FAKE_OUT]      = _("FAKE OUT"),
+    [MOVE_UPROAR]        = _("UPROAR"),
+    [MOVE_STOCKPILE]     = _("STOCKPILE"),
+    [MOVE_SPIT_UP]       = _("SPIT UP"),
+    [MOVE_SWALLOW]       = _("SWALLOW"),
+    [MOVE_HEAT_WAVE]     = _("HEAT WAVE"),
+    [MOVE_HAIL]          = _("HAIL"),
+    [MOVE_TORMENT]       = _("TORMENT"),
+    [MOVE_FLATTER]       = _("FLATTER"),
+    [MOVE_WILL_O_WISP]   = _("WILL-O-WISP"),
+    [MOVE_MEMENTO]       = _("MEMENTO"),
+    [MOVE_FACADE]        = _("FACADE"),
+    [MOVE_FOCUS_PUNCH]   = _("FOCUS PUNCH"),
+    [MOVE_SMELLING_SALT] = _("SMELLINGSALT"),
+    [MOVE_FOLLOW_ME]     = _("FOLLOW ME"),
+    [MOVE_NATURE_POWER]  = _("NATURE POWER"),
+    [MOVE_CHARGE]        = _("CHARGE"),
+    [MOVE_TAUNT]         = _("TAUNT"),
+    [MOVE_HELPING_HAND]  = _("HELPING HAND"),
+    [MOVE_TRICK]         = _("TRICK"),
+    [MOVE_ROLE_PLAY]     = _("ROLE PLAY"),
+    [MOVE_WISH]          = _("WISH"),
+    [MOVE_ASSIST]        = _("ASSIST"),
+    [MOVE_INGRAIN]       = _("INGRAIN"),
+    [MOVE_SUPERPOWER]    = _("SUPERPOWER"),
+    [MOVE_MAGIC_COAT]    = _("MAGIC COAT"),
+    [MOVE_RECYCLE]       = _("RECYCLE"),
+    [MOVE_REVENGE]       = _("REVENGE"),
+    [MOVE_BRICK_BREAK]   = _("BRICK BREAK"),
+    [MOVE_YAWN]          = _("YAWN"),
+    [MOVE_KNOCK_OFF]     = _("KNOCK OFF"),
+    [MOVE_ENDEAVOR]      = _("ENDEAVOR"),
+    [MOVE_ERUPTION]      = _("ERUPTION"),
+    [MOVE_SKILL_SWAP]    = _("SKILL SWAP"),
+    [MOVE_IMPRISON]      = _("IMPRISON"),
+    [MOVE_REFRESH]       = _("REFRESH"),
+    [MOVE_GRUDGE]        = _("GRUDGE"),
+    [MOVE_SNATCH]        = _("SNATCH"),
+    [MOVE_SECRET_POWER]  = _("SECRET POWER"),
+    [MOVE_DIVE]          = _("DIVE"),
+    [MOVE_ARM_THRUST]    = _("ARM THRUST"),
+    [MOVE_CAMOUFLAGE]    = _("CAMOUFLAGE"),
+    [MOVE_TAIL_GLOW]     = _("TAIL GLOW"),
+    [MOVE_LUSTER_PURGE]  = _("LUSTER PURGE"),
+    [MOVE_MIST_BALL]     = _("MIST BALL"),
+    [MOVE_FEATHER_DANCE] = _("FEATHERDANCE"),
+    [MOVE_TEETER_DANCE]  = _("TEETER DANCE"),
+    [MOVE_BLAZE_KICK]    = _("BLAZE KICK"),
+    [MOVE_MUD_SPORT]     = _("MUD SPORT"),
+    [MOVE_ICE_BALL]      = _("ICE BALL"),
+    [MOVE_NEEDLE_ARM]    = _("NEEDLE ARM"),
+    [MOVE_SLACK_OFF]     = _("SLACK OFF"),
+    [MOVE_HYPER_VOICE]   = _("HYPER VOICE"),
+    [MOVE_POISON_FANG]   = _("POISON FANG"),
+    [MOVE_CRUSH_CLAW]    = _("CRUSH CLAW"),
+    [MOVE_BLAST_BURN]    = _("BLAST BURN"),
+    [MOVE_HYDRO_CANNON]  = _("HYDRO CANNON"),
+    [MOVE_METEOR_MASH]   = _("METEOR MASH"),
+    [MOVE_ASTONISH]      = _("ASTONISH"),
+    [MOVE_WEATHER_BALL]  = _("WEATHER BALL"),
+    [MOVE_AROMATHERAPY]  = _("AROMATHERAPY"),
+    [MOVE_FAKE_TEARS]    = _("FAKE TEARS"),
+    [MOVE_AIR_CUTTER]    = _("AIR CUTTER"),
+    [MOVE_OVERHEAT]      = _("OVERHEAT"),
+    [MOVE_ODOR_SLEUTH]   = _("ODOR SLEUTH"),
+    [MOVE_ROCK_TOMB]     = _("ROCK TOMB"),
+    [MOVE_SILVER_WIND]   = _("SILVER WIND"),
+    [MOVE_METAL_SOUND]   = _("METAL SOUND"),
+    [MOVE_GRASS_WHISTLE] = _("GRASSWHISTLE"),
+    [MOVE_TICKLE]        = _("TICKLE"),
+    [MOVE_COSMIC_POWER]  = _("COSMIC POWER"),
+    [MOVE_WATER_SPOUT]   = _("WATER SPOUT"),
+    [MOVE_SIGNAL_BEAM]   = _("SIGNAL BEAM"),
+    [MOVE_SHADOW_PUNCH]  = _("SHADOW PUNCH"),
+    [MOVE_EXTRASENSORY]  = _("EXTRASENSORY"),
+    [MOVE_SKY_UPPERCUT]  = _("SKY UPPERCUT"),
+    [MOVE_SAND_TOMB]     = _("SAND TOMB"),
+    [MOVE_SHEER_COLD]    = _("SHEER COLD"),
+    [MOVE_MUDDY_WATER]   = _("MUDDY WATER"),
+    [MOVE_BULLET_SEED]   = _("BULLET SEED"),
+    [MOVE_AERIAL_ACE]    = _("AERIAL ACE"),
+    [MOVE_ICICLE_SPEAR]  = _("ICICLE SPEAR"),
+    [MOVE_IRON_DEFENSE]  = _("IRON DEFENSE"),
+    [MOVE_BLOCK]         = _("BLOCK"),
+    [MOVE_HOWL]          = _("HOWL"),
+    [MOVE_DRAGON_CLAW]   = _("DRAGON CLAW"),
+    [MOVE_FRENZY_PLANT]  = _("FRENZY PLANT"),
+    [MOVE_BULK_UP]       = _("BULK UP"),
+    [MOVE_BOUNCE]        = _("BOUNCE"),
+    [MOVE_MUD_SHOT]      = _("MUD SHOT"),
+    [MOVE_POISON_TAIL]   = _("POISON TAIL"),
+    [MOVE_COVET]         = _("COVET"),
+    [MOVE_VOLT_TACKLE]   = _("VOLT TACKLE"),
+    [MOVE_MAGICAL_LEAF]  = _("MAGICAL LEAF"),
+    [MOVE_WATER_SPORT]   = _("WATER SPORT"),
+    [MOVE_CALM_MIND]     = _("CALM MIND"),
+    [MOVE_LEAF_BLADE]    = _("LEAF BLADE"),
+    [MOVE_DRAGON_DANCE]  = _("DRAGON DANCE"),
+    [MOVE_ROCK_BLAST]    = _("ROCK BLAST"),
+    [MOVE_SHOCK_WAVE]    = _("SHOCK WAVE"),
+    [MOVE_WATER_PULSE]   = _("WATER PULSE"),
+    [MOVE_DOOM_DESIRE]   = _("DOOM DESIRE"),
+    [MOVE_PSYCHO_BOOST]  = _("PSYCHO BOOST")
 };

src/data/tilesets/graphics.h

@@ -922,9 +922,11 @@ const u16 gTilesetPalettes_SeaCottage[][16] =
 	INCBIN_U16("data/tilesets/secondary/sea_cottage/palettes/15.gbapal"),
 };
 
-const u32 gTilesetTiles_SilphCo[] = INCBIN_U32("data/tilesets/secondary/condominiums/tiles.4bpp.lz");
+// Shared by SilphCo
+const u32 gTilesetTiles_Condominiums[] = INCBIN_U32("data/tilesets/secondary/condominiums/tiles.4bpp.lz");
 
-const u16 gTilesetPalettes_SilphCo[][16] =
+// Shared by SilphCo
+const u16 gTilesetPalettes_Condominiums[][16] =
 {
 	INCBIN_U16("data/tilesets/secondary/condominiums/palettes/00.gbapal"),
 	INCBIN_U16("data/tilesets/secondary/condominiums/palettes/01.gbapal"),

src/data/tilesets/headers.h

@@ -497,8 +497,8 @@ const struct Tileset gTileset_SilphCo =
 {
     .isCompressed = TRUE,
     .isSecondary = TRUE,
-    .tiles = gTilesetTiles_SilphCo,
-    .palettes = gTilesetPalettes_SilphCo,
+    .tiles = gTilesetTiles_Condominiums,
+    .palettes = gTilesetPalettes_Condominiums,
     .metatiles = gMetatiles_SilphCo,
     .metatileAttributes = gMetatileAttributes_SilphCo,
     .callback = InitTilesetAnim_SilphCo,
@@ -585,8 +585,8 @@ const struct Tileset gTileset_Condominiums =
 {
     .isCompressed = TRUE,
     .isSecondary = TRUE,
-    .tiles = gTilesetTiles_SilphCo,
-    .palettes = gTilesetPalettes_SilphCo,
+    .tiles = gTilesetTiles_Condominiums,
+    .palettes = gTilesetPalettes_Condominiums,
     .metatiles = gMetatiles_Condominiums,
     .metatileAttributes = gMetatileAttributes_Condominiums,
     .callback = NULL,

src/field_control_avatar.c

@@ -600,7 +600,7 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
 
 static const u8 *GetInteractedWaterScript(struct MapPosition *unused1, u8 metatileBehavior, u8 direction)
 {
-    if (MetatileBehavior_IsSemiDeepWater(metatileBehavior) == TRUE &&PartyHasMonWithSurf() == TRUE)
+    if (MetatileBehavior_IsFastWater(metatileBehavior) == TRUE && PartyHasMonWithSurf() == TRUE)
         return EventScript_CurrentTooFast;
     if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
         return EventScript_UseSurf;

src/field_door.c

@@ -251,7 +251,11 @@ static const struct DoorGraphics sDoorGraphics[] = {
     {METATILE_CeruleanCity_Door,                           DOOR_SOUND_NORMAL,  0, sDoorAnimTiles_Cerulean, sDoorAnimPalettes_Cerulean},
     {METATILE_LavenderTown_Door,                           DOOR_SOUND_NORMAL,  0, sDoorAnimTiles_Lavender, sDoorAnimPalettes_Lavender},
     {METATILE_VermilionCity_Door,                          DOOR_SOUND_NORMAL,  0, sDoorAnimTiles_Vermilion, sDoorAnimPalettes_Vermilion},
-    {METATILE_VermilionCity_PokemonFanClubDoor,            DOOR_SOUND_NORMAL,  0, sDoorAnimTiles_PokemonFanClub, sDoorAnimPalettes_PokemonFanClub},
+/*  Below was presumably intended for the door to the Pokemon Fan Club. The metatile is surrounded by metatiles for the fan club building.
+    Its animation tiles are similar to the Vermilion door above, and the building on the map uses that metatile instead. The unused tiles
+    have the pokeball above the door in view, but on the map the pokeball above the door is too high to be in view.
+    The metatile below was subsequently re-used for the warp to enter the SS Anne from the harbor, which has no door. */
+    {METATILE_VermilionCity_SSAnneWarp,                    DOOR_SOUND_NORMAL,  0, sDoorAnimTiles_PokemonFanClub, sDoorAnimPalettes_PokemonFanClub},
     {METATILE_CeladonCity_DeptStoreDoor,                   DOOR_SOUND_SLIDING, 0, sDoorAnimTiles_DeptStore, sDoorAnimPalettes_DeptStore},
     {METATILE_FuchsiaCity_Door,                            DOOR_SOUND_NORMAL,  0, sDoorAnimTiles_Fuchsia, sDoorAnimPalettes_Fuchsia},
     {METATILE_FuchsiaCity_SafariZoneDoor,                  DOOR_SOUND_SLIDING, 0, sDoorAnimTiles_SafariZone, sDoorAnimPalettes_SafariZone},

src/graphics.c

@@ -1121,16 +1121,16 @@ const u32 gBerryPouchSpritePalette[] = INCBIN_U32("graphics/berry_pouch/berry_po
 const u8 gBerryPouchBg1Tilemap[] = INCBIN_U8("graphics/berry_pouch/background.bin.lz");
 
 const u32 gBuyMenuFrame_Gfx[] = INCBIN_U32("graphics/shop_menu/shop_menu.4bpp.lz");
-const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap.bin");
-const u32 gBuyMenuFrame_TmHmTilemap[] = INCBIN_U32("graphics/shop_menu/shop_tm_hm_tilemap.bin");
+const u32 gBuyMenuFrame_Tilemap[] = INCBIN_U32("graphics/shop_menu/shop_tilemap.bin.lz");
+const u32 gBuyMenuFrame_TmHmTilemap[] = INCBIN_U32("graphics/shop_menu/shop_tm_hm_tilemap.bin.lz");
 const u32 gBuyMenuFrame_Pal[] = INCBIN_U32("graphics/shop_menu/shop_menu.gbapal.lz");
 
 const u32 gUnknown_8E861A8[] = INCBIN_U32("graphics/unknown/unknown_E861A8.bin.lz");
 
-const u8 gUnknown_8E86240[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz");
-const u8 gUnknown_8E86BE8[] = INCBIN_U8("graphics/teachy_tv/bg1_tilemap.bin.lz");
-const u8 gUnknown_8E86D6C[] = INCBIN_U8("graphics/teachy_tv/bg2_tilemap.bin.lz");
-const u32 gUnknown_8E86F98[] = INCBIN_U32("graphics/teachy_tv/palettes.gbapal.lz");
+const u8 gTeachyTv_Gfx[] = INCBIN_U8("graphics/teachy_tv/tiles.4bpp.lz");
+const u8 gTeachyTvScreen_Tilemap[] = INCBIN_U8("graphics/teachy_tv/screen.bin.lz");
+const u8 gTeachyTvTitle_Tilemap[] = INCBIN_U8("graphics/teachy_tv/title.bin.lz");
+const u32 gTeachyTv_Pal[] = INCBIN_U32("graphics/teachy_tv/tiles.gbapal.lz");
 
 const u32 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz");
 
@@ -1237,11 +1237,11 @@ const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/misc/markings2.gbapal");
 const u16 gMonMarkingsMenu_Gfx[] = INCBIN_U16("graphics/misc/markings2.4bpp");
 
 const u16 gTradeMenu_Pal[] = INCBIN_U16("graphics/trade/menu.gbapal");
-const u16 gTradeButtons_Pal[] = INCBIN_U16("graphics/trade/unknown_DDB444.gbapal");
+const u16 gTradeCursor_Pal[] = INCBIN_U16("graphics/trade/cursor.gbapal");
 const u16 gTradeMenu_Gfx[] = INCBIN_U16("graphics/trade/menu.4bpp");
-const u16 gTradeButtons_Gfx[] = INCBIN_U16("graphics/trade/buttons.4bpp");
-const u16 gUnknown_8E9E9DC[] = INCBIN_U16("graphics/unused/unused_DDCEE4.bin");
-const u16 gUnknown_8E9E9FC[] = INCBIN_U16("graphics/trade/unknown_DDCF04.bin");
+const u16 gTradeCursor_Gfx[] = INCBIN_U16("graphics/trade/cursor.4bpp");
+const u16 gTradeUnused_Tilemap[] = INCBIN_U16("graphics/trade/unused.bin");
+const u16 gTradeMenu_Tilemap[] = INCBIN_U16("graphics/trade/menu.bin");
 const u16 gTradeMenuMonBox_Tilemap[] = INCBIN_U16("graphics/trade/menu_mon_box.bin");
 
 const u16 gFameCheckerBgPals[] = INCBIN_U16("graphics/fame_checker/bg.gbapal");
@@ -1392,7 +1392,6 @@ const u32 gTradeGba_Gfx[] = INCBIN_U32("graphics/link/gba.4bpp");
 
 const u16 gUnknown_8EAFE80[] = INCBIN_U16("graphics/interface/blank2.gbapal");
 
-const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/berry_crush.gbapal");
-const u16 gUnknown_8EAFF60[] = INCBIN_U16("graphics/unknown/unknown_EAFF60.gbapal");
-const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/berry_crush.4bpp.lz");
-const u32 gBerryCrush_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/data_EB0ADC.bin.lz");
+const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.gbapal");
+const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/crusher.4bpp.lz");
+const u32 gBerryCrush_TextWindows_Tilemap[] = INCBIN_U32("graphics/berry_crush/text_windows.bin.lz");

src/link.c

@@ -764,7 +764,7 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int minPlayers, int maxPlayers)
             {
                 if (gLinkPlayers[0].linkType == LINKTYPE_TRADE_SETUP)
                 {
-                    switch (Trade_CalcLinkPlayerCompatibilityParam())
+                    switch (GetGameProgressForLinkTrade())
                     {
                     case TRADE_BOTH_PLAYERS_READY:
                         sPlayerDataExchangeStatus = EXCHANGE_COMPLETE;

src/link_rfu_3.c

@@ -667,7 +667,7 @@ void InitHostRfuGameData(struct RfuGameData *data, u8 activity, bool32 startedAc
     data->compatibility.hasNews = FALSE;
     data->compatibility.hasCard = FALSE;
     data->compatibility.unknown = FALSE;
-    data->compatibility.isChampion = FlagGet(FLAG_SYS_CAN_LINK_WITH_RS);
+    data->compatibility.canLinkNationally = FlagGet(FLAG_SYS_CAN_LINK_WITH_RS);
     data->compatibility.hasNationalDex = IsNationalPokedexEnabled();
     data->compatibility.gameClear = FlagGet(FLAG_SYS_GAME_CLEAR);
 }

src/map_preview_screen.c

@@ -17,67 +17,67 @@ static EWRAM_DATA bool8 sAllocedBg0TilemapBuffer = FALSE;
 
 static void Task_RunMapPreviewScreenForest(u8 taskId);
 
-static const u8 sViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest/pal.gbapal");
+static const u8 sViridianForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/viridian_forest/tiles.gbapal");
 static const u8 sViridianForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/viridian_forest/tiles.4bpp.lz");
 static const u8 sViridianForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/viridian_forest/tilemap.bin.lz");
-static const u8 sRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel/pal.gbapal");
+static const u8 sRockTunnelMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rock_tunnel/tiles.gbapal");
 static const u8 sRockTunnelMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rock_tunnel/tiles.4bpp.lz");
 static const u8 sRockTunnelMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rock_tunnel/tilemap.bin.lz");
-static const u8 sRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout/pal.gbapal");
+static const u8 sRocketHideoutMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_hideout/tiles.gbapal");
 static const u8 sRocketHideoutMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_hideout/tiles.4bpp.lz");
 static const u8 sRocketHideoutMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_hideout/tilemap.bin.lz");
-static const u8 sPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant/pal.gbapal");
+static const u8 sPowerPlantMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/power_plant/tiles.gbapal");
 static const u8 sPowerPlantMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/power_plant/tiles.4bpp.lz");
 static const u8 sPowerPlantMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/power_plant/tilemap.bin.lz");
-static const u8 sPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/pal.gbapal");
+static const u8 sPokemonMansionMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/tiles.gbapal");
 static const u8 sPokemonMansionMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/tiles.4bpp.lz");
 static const u8 sPokemonMansionMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_mansion/tilemap.bin.lz");
-static const u8 sPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower/pal.gbapal");
+static const u8 sPokemonTowerMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/pokemon_tower/tiles.gbapal");
 static const u8 sPokemonTowerMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/pokemon_tower/tiles.4bpp.lz");
 static const u8 sPokemonTowerMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/pokemon_tower/tilemap.bin.lz");
-static const u8 sSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co/pal.gbapal");
+static const u8 sSilphCoMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/silph_co/tiles.gbapal");
 static const u8 sSilphCoMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/silph_co/tiles.4bpp.lz");
 static const u8 sSilphCoMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/silph_co/tilemap.bin.lz");
-static const u8 sMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon/pal.gbapal");
+static const u8 sMtMoonMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_moon/tiles.gbapal");
 static const u8 sMtMoonMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_moon/tiles.4bpp.lz");
 static const u8 sMtMoonMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_moon/tilemap.bin.lz");
-static const u8 sSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands/pal.gbapal");
+static const u8 sSeafoamIslandsMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/seafoam_islands/tiles.gbapal");
 static const u8 sSeafoamIslandsMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/seafoam_islands/tiles.4bpp.lz");
 static const u8 sSeafoamIslandsMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/seafoam_islands/tilemap.bin.lz");
-static const u8 sRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/pal.gbapal");
+static const u8 sRocketWarehouseMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/tiles.gbapal");
 static const u8 sRocketWarehouseMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/tiles.4bpp.lz");
 static const u8 sRocketWarehouseMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/rocket_warehouse/tilemap.bin.lz");
-static const u8 sVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/victory_road/pal.gbapal");
+static const u8 sVictoryRoadMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/victory_road/tiles.gbapal");
 static const u8 sVictoryRoadMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/victory_road/tiles.4bpp.lz");
 static const u8 sVictoryRoadMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/victory_road/tilemap.bin.lz");
-static const u8 sMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember/pal.gbapal");
+static const u8 sMtEmberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/mt_ember/tiles.gbapal");
 static const u8 sMtEmberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/mt_ember/tiles.4bpp.lz");
 static const u8 sMtEmberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/mt_ember/tilemap.bin.lz");
-static const u8 sSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/safari_zone/pal.gbapal");
+static const u8 sSafariZoneMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/safari_zone/tiles.gbapal");
 static const u8 sSafariZoneMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/safari_zone/tiles.4bpp.lz");
 static const u8 sSafariZoneMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/safari_zone/tilemap.bin.lz");
-static const u8 sMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber/pal.gbapal");
+static const u8 sMoneanChamberMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/monean_chamber/tiles.gbapal");
 static const u8 sMoneanChamberMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/monean_chamber/tiles.4bpp.lz");
 static const u8 sMoneanChamberMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/monean_chamber/tilemap.bin.lz");
-static const u8 sDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole/pal.gbapal");
+static const u8 sDottedHoleMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/dotted_hole/tiles.gbapal");
 static const u8 sDottedHoleMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/dotted_hole/tiles.4bpp.lz");
 static const u8 sDottedHoleMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/dotted_hole/tilemap.bin.lz");
-static const u8 sCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave/pal.gbapal");
+static const u8 sCeruleanCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/cerulean_cave/tiles.gbapal");
 static const u8 sCeruleanCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/cerulean_cave/tiles.4bpp.lz");
 static const u8 sCeruleanCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/cerulean_cave/tilemap.bin.lz");
-static const u8 sDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave/pal.gbapal");
+static const u8 sDiglettsCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/digletts_cave/tiles.gbapal");
 static const u8 sDiglettsCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/digletts_cave/tiles.4bpp.lz");
 static const u8 sDiglettsCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/digletts_cave/tilemap.bin.lz");
-static const u8 sLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave/pal.gbapal");
+static const u8 sLostCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/lost_cave/tiles.gbapal");
 static const u8 sLostCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/lost_cave/tiles.4bpp.lz");
 static const u8 sLostCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/lost_cave/tilemap.bin.lz");
-static const u8 sBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest/pal.gbapal");
+static const u8 sBerryForestMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/berry_forest/tiles.gbapal");
 static const u8 sBerryForestMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/berry_forest/tiles.4bpp.lz");
 static const u8 sBerryForestMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/berry_forest/tilemap.bin.lz");
-static const u8 sIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave/pal.gbapal");
+static const u8 sIcefallCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/icefall_cave/tiles.gbapal");
 static const u8 sIcefallCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/icefall_cave/tiles.4bpp.lz");
 static const u8 sIcefallCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/icefall_cave/tilemap.bin.lz");
-static const u8 sAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave/pal.gbapal");
+static const u8 sAlteringCaveMapPreviewPalette[] = INCBIN_U8("graphics/map_preview/altering_cave/tiles.gbapal");
 static const u8 sAlteringCaveMapPreviewTiles[] = INCBIN_U8("graphics/map_preview/altering_cave/tiles.4bpp.lz");
 static const u8 sAlteringCaveMapPreviewTilemap[] = INCBIN_U8("graphics/map_preview/altering_cave/tilemap.bin.lz");
 

src/menu.c

@@ -469,7 +469,7 @@ void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 line
     CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
-void UnionRoomAndTradeMenuPrintOptions(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
+void PrintMenuTable(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
 {
     u8 left = GetMenuCursorDimensionByFont(fontId, 0);
 

src/metatile_behavior.c

@@ -4,7 +4,7 @@
 
 static const bool8 sBehaviorSurfable[NUM_METATILE_BEHAVIORS] = {
     [MB_POND_WATER]         = TRUE,
-    [MB_SEMI_DEEP_WATER]    = TRUE,
+    [MB_FAST_WATER]         = TRUE,
     [MB_DEEP_WATER]         = TRUE,
     [MB_WATERFALL]          = TRUE,
     [MB_OCEAN_WATER]        = TRUE,
@@ -209,9 +209,10 @@ bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior)
+// Water that's too fast to surf on
+bool8 MetatileBehavior_IsFastWater(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_SEMI_DEEP_WATER)
+    if (metatileBehavior == MB_FAST_WATER)
         return TRUE;
     else
         return FALSE;
@@ -476,7 +477,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior)
 
 bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior)
 {
-    if (metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER)
+    if (metatileBehavior >= MB_FAST_WATER && metatileBehavior <= MB_DEEP_WATER)
         return TRUE;
     else
         return FALSE;
@@ -514,9 +515,9 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior)
+bool8 MetatileBehavior_IsDeepWaterTerrain(u8 metatileBehavior)
 {
-    if ((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER)
+    if ((metatileBehavior >= MB_FAST_WATER && metatileBehavior <= MB_DEEP_WATER)
       || metatileBehavior == MB_OCEAN_WATER)
         return TRUE;
     else

src/party_menu.c

@@ -4063,7 +4063,7 @@ static bool8 SetUpFieldMove_Surf(void)
     s16 x, y;
     
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
-    if (MetatileBehavior_IsSemiDeepWater(MapGridGetMetatileBehaviorAt(x, y)) != TRUE
+    if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) != TRUE
      && PartyHasMonWithSurf() == TRUE
      && IsPlayerFacingSurfableFishableWater() == TRUE)
     {
@@ -4085,7 +4085,7 @@ static void DisplayCantUseSurfMessage(void)
     else
     {
         GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
-        if (MetatileBehavior_IsSemiDeepWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
+        if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
             DisplayPartyMenuStdMessage(PARTY_MSG_CURRENT_TOO_FAST);
         else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE17))
               && ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE17))

src/pokemon.c

@@ -5780,7 +5780,7 @@ bool32 IsHMMove2(u16 move)
     return FALSE;
 }
 
-bool8 IsPokeSpriteNotFlipped(u16 species)
+bool8 IsMonSpriteNotFlipped(u16 species)
 {
     return gBaseStats[species].noFlip;
 }

src/pokemon_special_anim_scene.c

@@ -153,31 +153,31 @@ static const struct OamData sOamData_MonSprite = {
 };
 
 
-static const union AffineAnimCmd gUnknown_84599E0[] = {
+static const union AffineAnimCmd sAffineAnim_Zoom_0[] = {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gUnknown_84599F0[] = {
+static const union AffineAnimCmd sAffineAnim_Zoom_1[] = {
     AFFINEANIMCMD_FRAME(0x155, 0x155, 0, 0),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gUnknown_8459A00[] = {
+static const union AffineAnimCmd sAffineAnim_Zoom_2[] = {
     AFFINEANIMCMD_FRAME(0x1AA, 0x1AA, 0, 0),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd gUnknown_8459A10[] = {
+static const union AffineAnimCmd sAffineAnim_Zoom_3[] = {
     AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0),
     AFFINEANIMCMD_END
 };
 
 static const union AffineAnimCmd *const sAffineAnimTable_Zoom[] = {
-    gUnknown_84599E0,
-    gUnknown_84599F0,
-    gUnknown_8459A00,
-    gUnknown_8459A10
+    sAffineAnim_Zoom_0,
+    sAffineAnim_Zoom_1,
+    sAffineAnim_Zoom_2,
+    sAffineAnim_Zoom_3
 };
 
 static const struct SpriteTemplate sSpriteTemplate_MonSprite = {
@@ -236,13 +236,13 @@ static const struct OamData sOamData_LevelUpVertical = {
     .paletteNum = 0
 };
 
-static const union AnimCmd gUnknown_8459AC0[] = {
+static const union AnimCmd sAnim_LevelUpVertical[] = {
     ANIMCMD_FRAME(0, 3),
     ANIMCMD_END
 };
 
 static const union AnimCmd *const sAnimTable_LevelUpVertical[] = {
-    gUnknown_8459AC0
+    sAnim_LevelUpVertical
 };
 
 static const struct SpriteTemplate sSpriteTemplate_LevelUpVertical = {
@@ -295,22 +295,22 @@ static const struct OamData sOamData_UseItem_OutwardSpiralDots = {
     .paletteNum = 0
 };
 
-static const union AnimCmd gUnknown_8459B0C[] = {
+static const union AnimCmd sAnim_UseItem_OutwardSpiralDots_0[] = {
     ANIMCMD_FRAME(0, 16),
     ANIMCMD_FRAME(1,  8),
     ANIMCMD_FRAME(2,  4),
     ANIMCMD_END
 };
 
-static const union AnimCmd gUnknown_8459B1C[] = {
+static const union AnimCmd sAnim_UseItem_OutwardSpiralDots_1[] = {
     ANIMCMD_FRAME(1, 4),
     ANIMCMD_FRAME(0, 4),
     ANIMCMD_END
 };
 
 static const union AnimCmd *const sAnimTable_UseItem_OutwardSpiralDots[] = {
-    gUnknown_8459B0C,
-    gUnknown_8459B1C
+    sAnim_UseItem_OutwardSpiralDots_0,
+    sAnim_UseItem_OutwardSpiralDots_1
 };
 
 static const struct SpriteTemplate sSpriteTemplate_UseItem_OutwardSpiralDots = {

src/pokemon_storage_system_graphics.c

@@ -76,117 +76,69 @@ static const union AffineAnimCmd *const sAffineAnims_ReleaseMon[] = {
     [RELEASE_ANIM_COME_BACK] = sAffineAnim_ReleaseMon_ComeBack,
 };
 
-static const u16 sWallpaperPalettes_Forest[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/forest/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/forest/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Forest[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/forest/tiles.gbapal");
 static const u32 sWallpaperTiles_Forest[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/forest/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Forest[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/forest/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_City[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/city/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/city/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_City[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/city/tiles.gbapal");
 static const u32 sWallpaperTiles_City[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/city/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_City[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/city/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Desert[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/desert/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/desert/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Desert[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/desert/tiles.gbapal");
 static const u32 sWallpaperTiles_Desert[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/desert/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Desert[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/desert/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Savanna[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/savanna/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/savanna/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Savanna[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/savanna/tiles.gbapal");
 static const u32 sWallpaperTiles_Savanna[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/savanna/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Savanna[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/savanna/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Crag[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/crag/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/crag/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Crag[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/crag/tiles.gbapal");
 static const u32 sWallpaperTiles_Crag[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/crag/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Crag[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/crag/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Volcano[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/volcano/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/volcano/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Volcano[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/volcano/tiles.gbapal");
 static const u32 sWallpaperTiles_Volcano[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/volcano/tiles.4bpp.lz");
 static const u8 sUnusedSpace1[4] = {};
 static const u32 sWallpaperTilemap_Volcano[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/volcano/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Snow[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/snow/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/snow/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Snow[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/snow/tiles.gbapal");
 static const u32 sWallpaperTiles_Snow[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/snow/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Snow[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/snow/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Cave[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/cave/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/cave/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Cave[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/cave/tiles.gbapal");
 static const u32 sWallpaperTiles_Cave[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/cave/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Cave[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/cave/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Beach[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/beach/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/beach/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Beach[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/beach/tiles.gbapal");
 static const u32 sWallpaperTiles_Beach[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/beach/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Beach[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/beach/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Seafloor[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/seafloor/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/seafloor/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Seafloor[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/seafloor/tiles.gbapal");
 static const u32 sWallpaperTiles_Seafloor[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/seafloor/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Seafloor[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/seafloor/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_River[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/river/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/river/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_River[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/river/tiles.gbapal");
 static const u32 sWallpaperTiles_River[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/river/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_River[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/river/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Sky[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/sky/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/sky/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Sky[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/sky/tiles.gbapal");
 static const u32 sWallpaperTiles_Sky[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/sky/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Sky[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/sky/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Stars[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/stars/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/stars/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Stars[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/stars/tiles.gbapal");
 static const u8 sUnusedSpace2[32] = {};
 static const u32 sWallpaperTiles_Stars[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/stars/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Stars[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/stars/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Pokecenter[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/pokecenter/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/pokecenter/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Pokecenter[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/pokecenter/tiles.gbapal");
 static const u32 sWallpaperTiles_Pokecenter[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pokecenter/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Pokecenter[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pokecenter/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Tiles[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/tiles/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/tiles/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Tiles[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/tiles/tiles.gbapal");
 static const u32 sWallpaperTiles_Tiles[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/tiles/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Tiles[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/tiles/tilemap.bin.lz");
 
-static const u16 sWallpaperPalettes_Simple[][16] = {
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/simple/title.gbapal"),
-    INCBIN_U16("graphics/pokemon_storage/wallpapers/simple/box.gbapal"),
-};
+static const u16 sWallpaperPalettes_Simple[][16] = INCBIN_U16("graphics/pokemon_storage/wallpapers/simple/tiles.gbapal");
 static const u32 sWallpaperTiles_Simple[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/simple/tiles.4bpp.lz");
 static const u32 sWallpaperTilemap_Simple[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/simple/tilemap.bin.lz");
 

src/pokemon_summary_screen.c

@@ -2510,7 +2510,7 @@ static void PrintSkillsPage(void)
 }
 
 #define GetMoveNamePrinterYpos(x) ((x) * 28 + 5)
-#define GetMovePpPinterYpos(x) ((x) * 28 + 16)
+#define GetMovePpPrinterYpos(x) ((x) * 28 + 16)
 
 static void PrintMovesPage(void)
 {
@@ -2567,14 +2567,14 @@ static void PokeSum_PrintMoveName(u8 i)
           colorIdx = 1;
     }
 
-    AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW,
+    AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 36, GetMovePpPrinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW,
         gText_PokeSum_PP);
-    AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]);
+    AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPrinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]);
 
     if (sMonSummaryScreen->moveIds[i] != MOVE_NONE)
     {
-        AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash);
-        AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]);
+        AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 58, GetMovePpPrinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash);
+        AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPrinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]);
     }
 }
 
@@ -4035,7 +4035,7 @@ static void PokeSum_CreateMonPicSprite(void)
 
     FreeSpriteOamMatrix(&gSprites[spriteId]);
 
-    if (!IsPokeSpriteNotFlipped(species))
+    if (!IsMonSpriteNotFlipped(species))
         gSprites[spriteId].hFlip = TRUE;
     else
         gSprites[spriteId].hFlip = FALSE;
@@ -4162,7 +4162,7 @@ static void PokeSum_CreateMonIconSprite(void)
             sMonSummaryScreen->monIconSpriteId = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 1);
     }
 
-    if (!IsPokeSpriteNotFlipped(species))
+    if (!IsMonSpriteNotFlipped(species))
         gSprites[sMonSummaryScreen->monIconSpriteId].hFlip = TRUE;
     else
         gSprites[sMonSummaryScreen->monIconSpriteId].hFlip = FALSE;

src/region_map.c

@@ -406,7 +406,7 @@ static const u32 sPlayerIcon_Red[] = INCBIN_U32("graphics/region_map/player_icon
 static const u32 sPlayerIcon_Leaf[] = INCBIN_U32("graphics/region_map/player_icon_leaf.4bpp.lz");
 static const u32 sRegionMap_Gfx[] = INCBIN_U32("graphics/region_map/region_map.4bpp.lz");
 static const u32 sMapEdge_Gfx[] = INCBIN_U32("graphics/region_map/map_edge.4bpp.lz");
-static const u32 sSwitchMapMenu_Gfx[] = INCBIN_U32("graphics/region_map/switch_map_menu.bin.lz");
+static const u32 sSwitchMapMenu_Gfx[] = INCBIN_U32("graphics/region_map/switch_map_menu.4bpp.lz");
 static const u32 sKanto_Tilemap[] = INCBIN_U32("graphics/region_map/kanto.bin.lz");
 static const u32 sSevii123_Tilemap[] = INCBIN_U32("graphics/region_map/sevii_123.bin.lz");
 static const u32 sSevii45_Tilemap[] = INCBIN_U32("graphics/region_map/sevii_45.bin.lz");

src/teachy_tv.c

@@ -40,10 +40,10 @@ struct TeachyTvCtrlBlk
 struct TeachyTvBuf
 {
     MainCallback savedCallback;
-    u16 buffer1[0x800];
-    u16 buffer2[0x800];
-    u16 buffer3[0x800];
-    u16 buffer4[0x800];
+    u16 screenTilemap[BG_SCREEN_SIZE];
+    u16 buffer2[BG_SCREEN_SIZE];
+    u16 buffer3[BG_SCREEN_SIZE];
+    u16 titleTilemap[BG_SCREEN_SIZE];
     u8 grassAnimCounterLo;
     u8 grassAnimCounterHi;
     u8 grassAnimDisabled;
@@ -508,7 +508,7 @@ static void TeachyTvSetupBg(void)
     ResetAllBgsCoordinatesAndBgCntRegs();
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sBgTemplates, 4);
-    SetBgTilemapBuffer(1, sResources->buffer1);
+    SetBgTilemapBuffer(1, sResources->screenTilemap);
     SetBgTilemapBuffer(2, sResources->buffer2);
     SetBgTilemapBuffer(3, sResources->buffer3);
     SetGpuReg(REG_OFFSET_DISPCNT, 0x3040);
@@ -527,10 +527,10 @@ static void TeachyTvLoadGraphic(void)
 {
     u16 src = RGB_BLACK;
     ResetTempTileDataBuffers();
-    DecompressAndCopyTileDataToVram(1, gUnknown_8E86240, 0, 0, 0);
-    LZDecompressWram(gUnknown_8E86BE8, sResources->buffer1);
-    LZDecompressWram(gUnknown_8E86D6C, sResources->buffer4);
-    LoadCompressedPalette(gUnknown_8E86F98, 0, 0x80);
+    DecompressAndCopyTileDataToVram(1, gTeachyTv_Gfx, 0, 0, 0);
+    LZDecompressWram(gTeachyTvScreen_Tilemap, sResources->screenTilemap);
+    LZDecompressWram(gTeachyTvTitle_Tilemap, sResources->titleTilemap);
+    LoadCompressedPalette(gTeachyTv_Pal, 0, 0x80);
     LoadPalette(&src, 0, sizeof(src));
     LoadSpritePalette(&gSpritePalette_GeneralFieldEffect1);
     TeachyTvLoadBg3Map(sResources->buffer3);
@@ -758,7 +758,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId)
     TeachyTvBg2AnimController();
     if (++data[2] > 63)
     {
-        CopyToBgTilemapBufferRect_ChangePalette(2, sResources->buffer4, 0, 0, 0x20, 0x20, 0x11);
+        CopyToBgTilemapBufferRect_ChangePalette(2, sResources->titleTilemap, 0, 0, 0x20, 0x20, 0x11);
         TeachyTvSetSpriteCoordsAndSwitchFrame(data[1], 8, 0x38, 7);
         ScheduleBgCopyTilemapToVram(2);
         data[2] = 0;

src/union_room.c

@@ -1176,7 +1176,7 @@ static u32 IsTryingToTradeAcrossVersionTooSoon(struct WirelessLink_Group * data,
     {
         if (!(gSaveBlock2Ptr->specialSaveWarpFlags & CHAMPION_SAVEWARP))
             return UR_TRADE_PLAYER_NOT_READY;
-        else if (partner->rfu.data.compatibility.isChampion)
+        else if (partner->rfu.data.compatibility.canLinkNationally)
             return UR_TRADE_READY;
     }
     else

src/union_room_chat_display.c

@@ -1195,7 +1195,7 @@ static void PrintKeyboardSwapTextsOnWin3(void)
 {
     FillWindowPixelBuffer(3, PIXEL_FILL(1));
     DrawTextBorderOuter(3, 1, 13);
-    UnionRoomAndTradeMenuPrintOptions(3, FONT_NORMAL, 14, 5, sKeyboardSwapTexts);
+    PrintMenuTable(3, FONT_NORMAL, 14, 5, sKeyboardSwapTexts);
     Menu_InitCursor(3, FONT_NORMAL, 0, 0, 14, 5, GetCurrentKeyboardPage());
     PutWindowTilemap(3);
 }