diff options
Diffstat (limited to 'data')
261 files changed, 54 insertions, 572 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index d6b9de0c1..d8f681686 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1355,7 +1355,7 @@ BattleScript_SleepTalkUsingMove:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledmove TRUE BattleScript_EffectDestinyBond:: attackcanceler @@ -2400,7 +2400,7 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledmove TRUE BattleScript_EffectIngrain:: attackcanceler @@ -2969,7 +2969,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText - jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText + jumpifbattletype BATTLE_TYPE_TRAINER_HILL, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd BattleScript_LocalBattleLostPrintWhiteOut:: @@ -4261,7 +4261,7 @@ BattleScript_IgnoresWhileAsleep:: BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS waitmessage 0x40 - jumptorandomattack FALSE + jumptocalledmove FALSE BattleScript_MoveUsedLoafingAround:: jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 diff --git a/data/slot_machine.s b/data/slot_machine.s index 0896d6348..4a354d71c 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -2,526 +2,8 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 - -gUnknown_085A7424:: @ 85A7424 - .4byte 0x1F8 - .4byte 0x11C5 - .4byte 0x21D6 - .4byte 0x11E7 - -gUnknown_085A7434:: @ 85A7434 - window_template 0, 2, 15, 0x1B, 4, 15, 0x194 - null_window_template - -gUnknown_085A7444:: @ 85A7444 - window_template 0, 1, 3, 20, 13, 13, 1 - -gUnknown_085A744C:: @ 85A744C - .byte 3, 1, 2, 0 - -gUnknown_083ECAAC:: @ 85A7450 - .4byte sub_8101D5C - .4byte sub_8101D8C - .4byte sub_8101DB0 - .4byte sub_8101DF4 - .4byte sub_8101E10 - .4byte sub_8101E3C - .4byte sub_8101F44 - .4byte sub_8101F60 - .4byte sub_8101F88 - .4byte sub_8101FA4 - .4byte sub_8102008 - .4byte sub_8102034 - .4byte sub_8102058 - .4byte sub_8102090 - .4byte sub_81020C8 - .4byte sub_81021E0 - .4byte sub_81021FC - .4byte sub_8102264 - .4byte sub_81022A0 - .4byte sub_81022CC - .4byte sub_81022F0 - .4byte sub_8102318 - .4byte sub_8102344 - .4byte sub_810239C - .4byte sub_81023B8 - .4byte sub_81023E0_ - .4byte sub_81023FC - .4byte sub_8102424 - .4byte sub_8102460 - -gUnknown_085A74C4:: @ 85A74C4 - .4byte sub_812BB34 - .4byte sub_812BB68 - .4byte sub_812BC20 - -gUnknown_085A74D0:: @ 85A74D0 - .4byte sub_812BF64 - .4byte sub_812BF68 - .4byte sub_812BF88 - .4byte sub_812C01C - .4byte sub_812C0E0 - -gUnknown_085A74E4:: @ 85A74E4 - .4byte sub_812C138 - .4byte sub_812C3A0 - .4byte sub_812C4BC - -gUnknown_085A74F0:: @ 85A74F0 - .4byte sub_812C5DC - .4byte sub_812C628 - .4byte sub_812C8FC - -gUnknown_085A74FC:: @ 85A74FC - .2byte 2, 4, 4, 4, 8, 0 - -gUnknown_085A7508:: @ 85A7508 - .4byte sub_812C238 - .4byte sub_812C290 - .4byte sub_812C290 - -gUnknown_085A7514:: @ 85A7514 - .4byte sub_812C3C8 - .4byte sub_812C3C8 - .4byte sub_812C414 - -gUnknown_085A7520:: @ 85A7520 - .4byte sub_812C500 - .4byte sub_812C500 - .4byte sub_812C55C - -gUnknown_085A752C:: @ 85A752C - .4byte sub_812C64C - .4byte j5_08111E84 - .4byte sub_812C74C - -gUnknown_085A7538:: @ 85A7538 - .4byte sub_812C920 - .4byte sub_812CA08 - .4byte sub_812CB80 - -gUnknown_085A7544:: @ 85A7544 - .4byte sub_812CDA4 - .4byte sub_812CDD8 - .4byte sub_812CDF4 - -gUnknown_085A7550:: @ 85A7550 - .2byte 5, 10, 15, 0 - -gUnknown_085A7558:: @ 85A7558 - .4byte nullsub_50 - .4byte sub_812D264 - .4byte sub_812D28C - .4byte sub_812D30C - -gUnknown_085A7568:: @ 85A7568 - .2byte 0x9E - -gUnknown_085A756A:: @ 85A756A - .2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F - -gUnknown_085A7574:: @ 85A7574 - .4byte sub_812D51C - .4byte sub_812D594 - .4byte sub_812D60C - .4byte sub_812D63C - .4byte sub_812D6EC - .4byte sub_812D740 - .4byte sub_812D774 - .4byte sub_812D7E4 - .4byte sub_812D870 - .4byte sub_812D920 - .4byte sub_812D950 - .4byte sub_812D9A4 - .4byte sub_812DA20 - .4byte sub_812DA6C - .4byte sub_812DA90 - .4byte sub_812DB04 - .4byte sub_812DB8C - .4byte sub_812D950 - .4byte sub_812DBBC - -gUnknown_085A75C0:: @ 85A75C0 - .byte 1, 1, 2, 2 - -gUnknown_085A75C4:: @ 85A75C4 - .2byte 0x40, 0x30, 0x18, 8 - -gUnknown_085A75CC:: @ 85A75CC - .2byte 10, 8, 6, 4 - -gUnknown_085A75D4:: @ 85A75D4 - .4byte sub_812DD04 - .4byte sub_812DD28 - .4byte sub_812DD48 - .4byte sub_812DD28 - .4byte sub_812DD78 - .4byte sub_812DD28 - .4byte sub_812DDC4 - .4byte sub_812DD28 - .4byte sub_812DE14 - .4byte sub_812DD28 - .4byte sub_812DE30 - .4byte sub_812DD28 - .4byte sub_812DE48 - .4byte sub_812DD28 - .4byte sub_812DE7C - -gUnknown_085A7610:: @ 85A7610 - .4byte nullsub_51 - -gUnknown_085A7614:: @ 85A7614 - .2byte 16 - -gUnknown_085A7616:: @ 85A7616 - .2byte 0, 0x40, 0x80, 0xC0 - -gUnknown_085A761E:: @ 85A761E - .2byte 4, -4, 4, -4 - -gUnknown_085A7626:: @ 85A7626 - .2byte 4, 4, -4, -4 - -gUnknown_085A762E:: @ 85A762E - .2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0 - -gUnknown_085A763E:: @ 85A763E - .2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0 - -gUnknown_085A764E:: @ 85A764E - .2byte 16, 12, 16, 0, 0, 4, 8, 8 - -gUnknown_085A765E:: @ 85A765E - .2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18 - -gUnknown_085A766E:: @ 85A766E - .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 - -gUnknown_085A76AD:: @ 85A76AD - .byte 1, 0, 5, 4, 3, 2, 0 - -gUnknown_083ECCF8:: @ 85A76B4 - .2byte 0, 6, 0, 10, 0, 2 - -gUnknown_083ECD04:: @ 85A76C0 - .byte 1, 1, 12 - .byte 1, 1, 14 - .byte 2, 2, 14 - .byte 2, 2, 14 - .byte 2, 3, 16 - .byte 3, 3, 16 - -gUnknown_083ECD16:: @ 85A76D2 - .byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32 - .byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23 - .byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E - -gUnknown_083ECD28:: @ 85A76E4 - .byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19 - .byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16 - .byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28 - .byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF - .byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28 - -gUnknown_083ECD46:: @ 85A7702 - .byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5 - .byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5 - .byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28 - .byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64 - .byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64 - .byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6 - -gUnknown_083ECDAC:: @ 85A7768 - .byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05 - .byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06 - .byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23 - .byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32 - .byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C - -gUnknown_083ECE12:: @ 85A77CE - .2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100 - -gUnknown_083ECE1C:: @ 85A77D8 - .byte 10, 0, 5, 0 - .byte 10, 0, 10, 0 - .byte 10, 0, 15, 0 - .byte 10, 0, 25, 0 - .byte 10, 0, 35, 0 - -gUnknown_083ECE30:: @ 85A77EC - .byte 0, 0 - .byte 5, 0 - .byte 10, 0 - .byte 15, 0 - .byte 20, 0 - -gUnknown_083ECE3A:: @ 85A77F6 - .byte 6, 4, 3, 2, 5, 0, 0, 0 - -gUnknown_083ECE42:: @ 85A77FE - .byte 0x80, 0 - .byte 0x20, 0 - .byte 0x40, 0 - -gUnknown_083ECE48:: @ 85A7804 - .byte 16, 0 - .byte 8, 0 - .byte 4, 0 - .byte 2, 0 - .byte 1, 0 - -sSym2Match:: @ 85A780E - .byte 7, 8, 4, 3, 0, 5, 2, 0 - -sSlotMatchFlags:: @ 85A7816 - .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 - -sSlotPayouts:: @ 85A7828 - .2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C - -gUnknown_085A783A:: @ 85A783A - .2byte 0xD0, 0x38 - .2byte 0xB8, 0 - .2byte 0xC8, 8 - .2byte 0xD8, 0x10 - .2byte 0xE8, 0x18 - .2byte 0xD0, 0x48 - .2byte 0xD0, 8 - .2byte 0xD0, 0x40 - .2byte 0xD0, 0x38 - .2byte 0xC0, 0x58 - .2byte 0xE0, 0x58 - .2byte 0xC0, 0x78 - .2byte 0xE0, 0x78 - .2byte 0x90, 0x38 - .2byte 0x110, 0x58 - .2byte 0xA8, 0x70 - .2byte 0xD0, 0x54 - .2byte 0xD0, 0x70 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0xBC, 0x34 - .2byte 0xD0, 0x34 - .2byte 0xE4, 0x34 - .2byte 0xB8, 0x48 - .2byte 0xC4, 0x48 - .2byte 0xD0, 0x48 - .2byte 0xDC, 0x48 - .2byte 0xE8, 0x48 - .2byte 0x00, 0x00 - .2byte 0 - - -gUnknown_085A78C8:: @ 85A78C8 - .4byte sub_812F078 - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F36C - .4byte sub_812F3B4 - .4byte sub_812F2CC - .4byte sub_812F078 - .4byte sub_812F078 - .4byte sub_812F080 - .4byte sub_812F104 - .4byte sub_812F11C - .4byte sub_812F134 - .4byte sub_812F150 - .4byte sub_812F1B8 - .4byte sub_812F21C - .4byte sub_812F078 - .4byte sub_812F470 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F514 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F5E0 - .4byte sub_812F648 - -gUnknown_085A7954:: @ 85A7954 - .byte 0x19 - .byte 0x22 - .2byte 0 - .byte 0x2 - .byte 0 - .2byte 0 - .byte 0x9 - .byte 0x10 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A7964:: @ 85A7964 - .byte 0xA - .byte 0x1 - .2byte 0 - .byte 0xB - .byte 2 - .2byte 0 - .byte 0xC - .byte 0x3 - .2byte 0 - .byte 0xD - .byte 4 - .2byte 0 - .byte 0x5 - .byte 5 - .2byte 0 - .byte 0x8 - .byte 0x6 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A7980:: @ 85A7980 - .byte 0x3 - .byte 0x7 - .2byte 0 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A798C:: @ 85A798C - .byte 0x4 - .byte 0x8 - .2byte 0 - .byte 0x6 - .byte 0x9 - .2byte 0 - .byte 0x6 - .byte 0xA - .2byte 1 - .byte 0x6 - .byte 0xB - .2byte 2 - .byte 0x6 - .byte 0xC - .2byte 3 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A79A4:: @ 85A79A4 - .byte 0 - .byte 0xD - .2byte 0 - .byte 1 - .byte 0xE - .2byte 0 - .byte 0x7 - .byte 0xF - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A79B4:: @ 85A79B4 - .byte 0x13 - .byte 0x1A - .2byte 0 - .byte 0x14 - .byte 0x1B - .2byte 1 - .byte 0x15 - .byte 0x1C - .2byte 2 - .byte 0xE - .byte 0x1D - .2byte 3 - .byte 0xF - .byte 0x1E - .2byte 4 - .byte 0x10 - .byte 0x1F - .2byte 5 - .byte 0x11 - .byte 0x20 - .2byte 6 - .byte 0x12 - .byte 0x21 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 - -gUnknown_085A79DC:: @ 85A79DC - .byte 0x16 - .byte 0x12 - .2byte 0 - .byte 0x17 - .byte 0x13 - .2byte 1 - .byte 0x18 - .byte 0x14 - .2byte 2 - .byte 0xE - .byte 0x15 - .2byte 3 - .byte 0xF - .byte 0x16 - .2byte 4 - .byte 0x10 - .byte 0x17 - .2byte 5 - .byte 0x11 - .byte 0x18 - .2byte 6 - .byte 0x12 - .byte 0x19 - .2byte 7 - .byte 0x8 - .byte 0x11 - .2byte 0 - .byte 0xFF - .byte 0 - .2byte 0 -gUnknown_085A7A04:: @ 85A7A04 - .4byte gUnknown_085A7954 - .4byte gUnknown_085A7964 - .4byte gUnknown_085A7980 - .4byte gUnknown_085A798C - .4byte gUnknown_085A79A4 - .4byte gUnknown_085A79DC - .4byte gUnknown_085A79B4 - -gUnknown_085A7A20:: @ 85A7A20 - .4byte sub_812F7C0 - .4byte sub_812F784 - .4byte sub_812F794 - .4byte nullsub_101 - .4byte nullsub_101 - .4byte sub_812F794 - .4byte sub_812F794 +.align 2 gUnknown_085A7A3C:: @ 85A7A3C .2byte 0 @@ -820,50 +302,50 @@ gUnknown_085A7C8C:: @ 85A7C8C gUnknown_085A7CDC:: @ 85A7CDC .4byte gUnknown_085A7C8C -gUnknown_085A7CE0:: @ 85A7CE0 - spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154 +gSpriteTemplate_83ED414:: @ 85A7CE0 + spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18 -gUnknown_085A7CF8:: @ 85A7CF8 - spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8 +gSpriteTemplate_83ED42C:: @ 85A7CF8 + spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C -gUnknown_085A7D10:: @ 85A7D10 +gSpriteTemplate_83ED444:: @ 85A7D10 spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D28:: @ 85A7D28 - spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424 +gSpriteTemplate_83ED45C:: @ 85A7D28 + spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170 -gUnknown_085A7D40:: @ 85A7D40 +gSpriteTemplate_83ED474:: @ 85A7D40 spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D58:: @ 85A7D58 +gSpriteTemplate_83ED48C:: @ 85A7D58 spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D70:: @ 85A7D70 +gSpriteTemplate_83ED4A4:: @ 85A7D70 spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7D88:: @ 85A7D88 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4 +gSpriteTemplate_83ED4BC:: @ 85A7D88 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C -gUnknown_085A7DA0:: @ 85A7DA0 +gSpriteTemplate_83ED4D4:: @ 85A7DA0 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7DB8:: @ 85A7DB8 +gSpriteTemplate_83ED4EC:: @ 85A7DB8 spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7DD0:: @ 85A7DD0 - spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8 +gSpriteTemplate_83ED504:: @ 85A7DD0 + spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C -gUnknown_085A7DE8:: @ 85A7DE8 - spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48 +gSpriteTemplate_83ED51C:: @ 85A7DE8 + spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784 -gUnknown_085A7E00:: @ 85A7E00 - spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64 +gSpriteTemplate_83ED534:: @ 85A7E00 + spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894 -gUnknown_085A7E18:: @ 85A7E18 - spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20 +gSpriteTemplate_83ED54C:: @ 85A7E18 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C -gUnknown_085A7E30:: @ 85A7E30 - spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14 +gSpriteTemplate_83ED564:: @ 85A7E30 + spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38 gUnknown_085A7E48:: @ 85A7E48 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy @@ -907,8 +389,8 @@ gUnknown_085A7F68:: @ 85A7F68 gUnknown_085A7F80:: @ 85A7F80 spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_085A7F98:: @ 85A7F98 - spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54 +gSpriteTemplate_83ED6CC:: @ 85A7F98 + spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70 gUnknown_085A7FB0:: @ 85A7FB0 subsprite -64, -64, 3, 0, 64x64 @@ -916,7 +398,7 @@ gUnknown_085A7FB0:: @ 85A7FB0 subsprite -64, 0, 3, 0, 64x64 subsprite 0, 0, 3, 0, 64x64 -gUnknown_085A7FC0:: @ 85A7FC0 +gSubspriteTables_83ED704:: @ 85A7FC0 .4byte 4, gUnknown_085A7FB0 gUnknown_085A7FC8:: @ 85A7FC8 @@ -927,7 +409,7 @@ gUnknown_085A7FC8:: @ 85A7FC8 subsprite -32, 4, 1, 16, 32x8 subsprite 0, 4, 1, 20, 32x8 -gUnknown_085A7FE0:: @ 85A7FE0 +gSubspriteTables_83ED73C:: @ 85A7FE0 .4byte 6, gUnknown_085A7FC8 gUnknown_085A7FE8:: @ 85A7FE8 @@ -935,7 +417,7 @@ gUnknown_085A7FE8:: @ 85A7FE8 subsprite -32, 12, 1, 32, 32x8 subsprite 0, 12, 1, 36, 32x8 -gUnknown_085A7FF4:: @ 85A7FF4 +gSubspriteTables_83ED75C:: @ 85A7FF4 .4byte 3, gUnknown_085A7FE8 gUnknown_085A7FFC:: @ 85A7FFC @@ -945,7 +427,7 @@ gUnknown_085A7FFC:: @ 85A7FFC subsprite -32, 16, 1, 40, 32x8 subsprite 0, 16, 1, 44, 32x8 -gUnknown_085A8010:: @ 85A8010 +gSubspriteTables_83ED78C:: @ 85A8010 .4byte 5, gUnknown_085A7FFC gUnknown_085A8018:: @ 85A8018 @@ -954,7 +436,7 @@ gUnknown_085A8018:: @ 85A8018 subsprite -32, 0, 1, 8, 32x8 subsprite 0, 0, 1, 12, 32x8 -gUnknown_085A8028:: @ 85A8028 +gSubspriteTables_83ED7B4:: @ 85A8028 .4byte 4, gUnknown_085A8018 gUnknown_085A8030:: @ 85A8030 @@ -962,7 +444,7 @@ gUnknown_085A8030:: @ 85A8030 subsprite -8, -4, 1, 0, 16x8 subsprite -8, 4, 1, 0, 16x8 -gUnknown_085A803C:: @ 85A803C +gSubspriteTables_83ED7D4:: @ 85A803C .4byte 3, gUnknown_085A8030 gUnknown_085A8044:: @ 85A8044 @@ -1173,7 +655,7 @@ gUnknown_085A8244:: @ 85A8244 gUnknown_085A825C:: @ 85A825C .4byte 6, gUnknown_085A8244 -gUnknown_085A8264:: @ 85A8264 +gUnknown_083EDB5C:: @ 85A8264 .4byte gUnknown_085A7E48 .4byte gUnknown_085A7E60 .4byte gUnknown_085A7E78 @@ -1201,7 +683,7 @@ gUnknown_085A8264:: @ 85A8264 .4byte gUnknown_085A7F08 .4byte gDummySpriteTemplate -gUnknown_085A82CC:: @ 85A82CC +gUnknown_083EDBC4:: @ 85A82CC .4byte gUnknown_085A8058 .4byte gUnknown_085A8070 .4byte gUnknown_085A8088 @@ -1230,7 +712,7 @@ gUnknown_085A82CC:: @ 85A82CC .4byte NULL .align 2 -gUnknown_085A8334:: @ 85A8334 +sSlotMachineSpriteSheets:: @ 85A8334 obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000 obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001 obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002 @@ -1252,7 +734,7 @@ gUnknown_085A8334:: @ 85A8334 .align 2 .byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0 -gUnknown_085A83E4:: @ 85A83E4 +gUnknown_083EDCDC:: @ 85A83E4 .4byte gUnknown_08DD19F8 @ might be a palette idk .byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1 @@ -1272,29 +754,29 @@ gUnknown_085A8402:: @ 85A8402 gUnknown_085A8404:: @ 85A8404 .byte 0xBF, 0x4A, 0, 0 -gUnknown_085A8408:: @ 85A8408 +gUnknown_083EDD08:: @ 85A8408 .4byte gUnknown_085A83FC .4byte gUnknown_085A83FE .4byte gUnknown_085A8400 .4byte gUnknown_085A8402 .4byte gUnknown_085A8404 -gUnknown_085A841C:: @ 85A841C +gUnknown_083EDD1C:: @ 85A841C .4byte gSlotMachineMenu_Pal + 0x94 .4byte gSlotMachineMenu_Pal + 0x96 .4byte gSlotMachineMenu_Pal + 0x98 .4byte gSlotMachineMenu_Pal + 0x9A .4byte gSlotMachineMenu_Pal + 0x9C -gUnknown_085A8430:: @ 85A8430 +gUnknown_083EDD30:: @ 85A8430 .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D -gUnknown_085A8435:: @ 85A8435 +gUnknown_083EDD35:: @ 85A8435 .byte 0, 0 .byte 1, 2 .byte 3, 4 -gUnknown_085A843B:: @ 85A843B +gUnknown_083EDD3B:: @ 85A843B .byte 1, 2, 2 gUnknown_085A843E:: @ 85A843E @@ -1307,12 +789,12 @@ gUnknown_085A847E:: @ 85A847E .incbin "graphics/slot_machine/85A847E.gbapal" .align 2 -gUnknown_085A84A0:: @ 85A84A0 +gUnknown_083EDDA0:: @ 85A84A0 .4byte gUnknown_085A843E .4byte gUnknown_085A845E .4byte gUnknown_085A847E -gUnknown_085A84AC:: @ 85A84AC +gUnknown_083EDDAC:: @ 85A84AC .4byte gSlotMachineMenu_Pal + 0x20 gUnknown_085A84B0:: @ 85A84B0 @@ -1324,20 +806,20 @@ gUnknown_085A84D0:: @ 85A84D0 gUnknown_085A84F0:: @ 85A84F0 .incbin "graphics/slot_machine/85A84F0.gbapal" -gUnknown_085A8510:: @ 85A8510 +gUnknown_083EDE10:: @ 85A8510 .4byte gUnknown_085A84B0 .4byte gUnknown_085A84D0 .4byte gUnknown_085A84F0 .4byte gUnknown_08DCF230 -gUnknown_085A8520:: @ 85A8520 +gUnknown_083EDE20:: @ 85A8520 .4byte gUnknown_08DCF230 -gUnknown_085A8524:: @ 85A8524 +gPalette_83EDE24:: @ 85A8524 .incbin "graphics/slot_machine/85A8524.bin" .align 2 -gUnknown_085A8544:: @ 85A8544 +gSlotMachineSpritePalettes:: @ 85A8544 obj_pal gUnknown_08DCF170, 0 obj_pal gUnknown_08DCF190, 1 obj_pal gUnknown_08DCF1B0, 2 @@ -1348,10 +830,10 @@ gUnknown_085A8544:: @ 85A8544 obj_pal gUnknown_08DCF1F0, 7 null_obj_pal -gUnknown_085A858C:: @ 85A858C +sReelTimeGfx:: @ 85A858C .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" -gUnknown_085A96E0:: @ 85A96E0 +sReelTimeWindowTilemap:: @ 85A96E0 @if anyone knows what this tilemap is please do share .incbin "graphics/slot_machine/85A96E0.bin" diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/0.png Binary files differindex 004eccc67..1d98f3621 100644 --- a/data/tilesets/primary/building/anim/0.png +++ b/data/tilesets/primary/building/anim/0.png diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/1.png Binary files differindex e28281dea..6798473b7 100644 --- a/data/tilesets/primary/building/anim/1.png +++ b/data/tilesets/primary/building/anim/1.png diff --git a/data/tilesets/primary/building/tiles.png b/data/tilesets/primary/building/tiles.png Binary files differindex 506bb7400..bd6c0f921 100644 --- a/data/tilesets/primary/building/tiles.png +++ b/data/tilesets/primary/building/tiles.png diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/0/0.png Binary files differindex d535d920e..1254a7655 100644 --- a/data/tilesets/primary/general/anim/0/0.png +++ b/data/tilesets/primary/general/anim/0/0.png diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/0/1.png Binary files differindex 74f93ecce..50bd949f2 100644 --- a/data/tilesets/primary/general/anim/0/1.png +++ b/data/tilesets/primary/general/anim/0/1.png diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/0/2.png Binary files differindex fb0bfe89f..5d8192c9d 100644 --- a/data/tilesets/primary/general/anim/0/2.png +++ b/data/tilesets/primary/general/anim/0/2.png diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/1/0.png Binary files differindex a7bb2e631..d3f2ea0da 100644 --- a/data/tilesets/primary/general/anim/1/0.png +++ b/data/tilesets/primary/general/anim/1/0.png diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/1/1.png Binary files differindex c215f1683..86b0ff176 100644 --- a/data/tilesets/primary/general/anim/1/1.png +++ b/data/tilesets/primary/general/anim/1/1.png diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/1/2.png Binary files differindex f8e0ee273..d2302180e 100644 --- a/data/tilesets/primary/general/anim/1/2.png +++ b/data/tilesets/primary/general/anim/1/2.png diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/1/3.png Binary files differindex 6c6ce3611..f757f8253 100644 --- a/data/tilesets/primary/general/anim/1/3.png +++ b/data/tilesets/primary/general/anim/1/3.png diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/1/4.png Binary files differindex cc1f9576c..950b88585 100644 --- a/data/tilesets/primary/general/anim/1/4.png +++ b/data/tilesets/primary/general/anim/1/4.png diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/1/5.png Binary files differindex 3c0c57a86..4de7d4225 100644 --- a/data/tilesets/primary/general/anim/1/5.png +++ b/data/tilesets/primary/general/anim/1/5.png diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/1/6.png Binary files differindex be5ecacaa..73c1cabdd 100644 --- a/data/tilesets/primary/general/anim/1/6.png +++ b/data/tilesets/primary/general/anim/1/6.png diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/1/7.png Binary files differindex 85bc7561a..827fd8b74 100644 --- a/data/tilesets/primary/general/anim/1/7.png +++ b/data/tilesets/primary/general/anim/1/7.png diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/2/0.png Binary files differindex 6f9f0c309..80c99c473 100644 --- a/data/tilesets/primary/general/anim/2/0.png +++ b/data/tilesets/primary/general/anim/2/0.png diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/2/1.png Binary files differindex bef1f3023..52051f056 100644 --- a/data/tilesets/primary/general/anim/2/1.png +++ b/data/tilesets/primary/general/anim/2/1.png diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/2/2.png Binary files differindex b5d7a9ee9..39c6e2f87 100644 --- a/data/tilesets/primary/general/anim/2/2.png +++ b/data/tilesets/primary/general/anim/2/2.png diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/2/3.png Binary files differindex 42a953a83..abb5ff362 100644 --- a/data/tilesets/primary/general/anim/2/3.png +++ b/data/tilesets/primary/general/anim/2/3.png diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/2/4.png Binary files differindex 112b20077..a7bde9837 100644 --- a/data/tilesets/primary/general/anim/2/4.png +++ b/data/tilesets/primary/general/anim/2/4.png diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/2/5.png Binary files differindex 7f58c0b94..05f88d81e 100644 --- a/data/tilesets/primary/general/anim/2/5.png +++ b/data/tilesets/primary/general/anim/2/5.png diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/2/6.png Binary files differindex 784a543b4..01f9c203d 100644 --- a/data/tilesets/primary/general/anim/2/6.png +++ b/data/tilesets/primary/general/anim/2/6.png diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/3/0.png Binary files differindex 2f8bb49b6..e307d81aa 100644 --- a/data/tilesets/primary/general/anim/3/0.png +++ b/data/tilesets/primary/general/anim/3/0.png diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/3/1.png Binary files differindex 5a2744a66..df6aaf3bc 100644 --- a/data/tilesets/primary/general/anim/3/1.png +++ b/data/tilesets/primary/general/anim/3/1.png diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/3/2.png Binary files differindex 0ddf1cda7..560f89d06 100644 --- a/data/tilesets/primary/general/anim/3/2.png +++ b/data/tilesets/primary/general/anim/3/2.png diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/3/3.png Binary files differindex f3fee8470..a8db289ae 100644 --- a/data/tilesets/primary/general/anim/3/3.png +++ b/data/tilesets/primary/general/anim/3/3.png diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/4/0.png Binary files differindex 90dc0bc02..ba160b633 100644 --- a/data/tilesets/primary/general/anim/4/0.png +++ b/data/tilesets/primary/general/anim/4/0.png diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/4/1.png Binary files differindex 4459a94e5..48274c9a0 100644 --- a/data/tilesets/primary/general/anim/4/1.png +++ b/data/tilesets/primary/general/anim/4/1.png diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/4/2.png Binary files differindex 389875c31..9e1f98c1b 100644 --- a/data/tilesets/primary/general/anim/4/2.png +++ b/data/tilesets/primary/general/anim/4/2.png diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/4/3.png Binary files differindex ac8936cce..c5b446f65 100644 --- a/data/tilesets/primary/general/anim/4/3.png +++ b/data/tilesets/primary/general/anim/4/3.png diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png Binary files differindex 121e835a2..17426ab80 100644 --- a/data/tilesets/primary/general/tiles.png +++ b/data/tilesets/primary/general/tiles.png diff --git a/data/tilesets/primary/secret_base/tiles.png b/data/tilesets/primary/secret_base/tiles.png Binary files differindex 9dee014ea..e19d61a9d 100644 --- a/data/tilesets/primary/secret_base/tiles.png +++ b/data/tilesets/primary/secret_base/tiles.png diff --git a/data/tilesets/primary/secret_base/unknown_tiles.png b/data/tilesets/primary/secret_base/unknown_tiles.png Binary files differindex 3ca4d9e87..2511e18b0 100644 --- a/data/tilesets/primary/secret_base/unknown_tiles.png +++ b/data/tilesets/primary/secret_base/unknown_tiles.png diff --git a/data/tilesets/secondary/battle_arena/tiles.png b/data/tilesets/secondary/battle_arena/tiles.png Binary files differindex 7414666df..c0592a0b4 100644 --- a/data/tilesets/secondary/battle_arena/tiles.png +++ b/data/tilesets/secondary/battle_arena/tiles.png diff --git a/data/tilesets/secondary/battle_dome/tiles.png b/data/tilesets/secondary/battle_dome/tiles.png Binary files differindex be3708bfd..04ebc0e75 100644 --- a/data/tilesets/secondary/battle_dome/tiles.png +++ b/data/tilesets/secondary/battle_dome/tiles.png diff --git a/data/tilesets/secondary/battle_factory/tiles.png b/data/tilesets/secondary/battle_factory/tiles.png Binary files differindex 4d9463b20..381cddabf 100644 --- a/data/tilesets/secondary/battle_factory/tiles.png +++ b/data/tilesets/secondary/battle_factory/tiles.png diff --git a/data/tilesets/secondary/battle_frontier/tiles.png b/data/tilesets/secondary/battle_frontier/tiles.png Binary files differindex 1b14ce555..0b39cbc02 100644 --- a/data/tilesets/secondary/battle_frontier/tiles.png +++ b/data/tilesets/secondary/battle_frontier/tiles.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png Binary files differindex 8a9905198..98f1a9283 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png Binary files differindex 836986b12..d0254e9ee 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png Binary files differindex 660d3080f..1be9641b8 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png Binary files differindex 7fe571b4a..7a536f24c 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png Binary files differindex da34656d1..59ac5b7e9 100644 --- a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png +++ b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png Binary files differindex 8a9905198..98f1a9283 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png Binary files differindex 836986b12..d0254e9ee 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png Binary files differindex 660d3080f..1be9641b8 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png Binary files differindex 7fe571b4a..7a536f24c 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png Binary files differindex 03704bfd0..277abe7f8 100644 --- a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png +++ b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png diff --git a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png Binary files differindex 1c1f700c0..9e82b5fe2 100644 --- a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png +++ b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png diff --git a/data/tilesets/secondary/battle_palace/tiles.png b/data/tilesets/secondary/battle_palace/tiles.png Binary files differindex 4e11e3596..1137db188 100644 --- a/data/tilesets/secondary/battle_palace/tiles.png +++ b/data/tilesets/secondary/battle_palace/tiles.png diff --git a/data/tilesets/secondary/battle_pike/tiles.png b/data/tilesets/secondary/battle_pike/tiles.png Binary files differindex fc11f1d1a..7750506d8 100644 --- a/data/tilesets/secondary/battle_pike/tiles.png +++ b/data/tilesets/secondary/battle_pike/tiles.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/0/0.png Binary files differindex c0fb59c0e..04bb8ad84 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/0/0.png +++ b/data/tilesets/secondary/battle_pyramid/anim/0/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/0/1.png Binary files differindex 29c019209..e292686f9 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/0/1.png +++ b/data/tilesets/secondary/battle_pyramid/anim/0/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/0/2.png Binary files differindex 7c463d9c3..fa24db001 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/0/2.png +++ b/data/tilesets/secondary/battle_pyramid/anim/0/2.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/1/0.png Binary files differindex 2a0921dea..c135df824 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/1/0.png +++ b/data/tilesets/secondary/battle_pyramid/anim/1/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/1/1.png Binary files differindex 3474d081f..2588bdac0 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/1/1.png +++ b/data/tilesets/secondary/battle_pyramid/anim/1/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/1/2.png Binary files differindex b9f1c4423..fbbf67d2f 100644 --- a/data/tilesets/secondary/battle_pyramid/anim/1/2.png +++ b/data/tilesets/secondary/battle_pyramid/anim/1/2.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/3.png b/data/tilesets/secondary/battle_pyramid/anim/1/3.png Binary files differdeleted file mode 100644 index 8ad81b1e1..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/3.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/4.png b/data/tilesets/secondary/battle_pyramid/anim/1/4.png Binary files differdeleted file mode 100644 index bea921d90..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/4.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/5.png b/data/tilesets/secondary/battle_pyramid/anim/1/5.png Binary files differdeleted file mode 100644 index bea921d90..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/5.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/6.png b/data/tilesets/secondary/battle_pyramid/anim/1/6.png Binary files differdeleted file mode 100644 index 16652df19..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/6.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/7.png b/data/tilesets/secondary/battle_pyramid/anim/1/7.png Binary files differdeleted file mode 100644 index 8ea7a49e6..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/7.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/8.png b/data/tilesets/secondary/battle_pyramid/anim/1/8.png Binary files differdeleted file mode 100644 index 2895d3319..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/8.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/9.png b/data/tilesets/secondary/battle_pyramid/anim/1/9.png Binary files differdeleted file mode 100644 index 63c22acf2..000000000 --- a/data/tilesets/secondary/battle_pyramid/anim/1/9.png +++ /dev/null diff --git a/data/tilesets/secondary/battle_pyramid/tiles.png b/data/tilesets/secondary/battle_pyramid/tiles.png Binary files differindex d9609f3dd..d6784b06a 100644 --- a/data/tilesets/secondary/battle_pyramid/tiles.png +++ b/data/tilesets/secondary/battle_pyramid/tiles.png diff --git a/data/tilesets/secondary/battle_tent/tiles.png b/data/tilesets/secondary/battle_tent/tiles.png Binary files differindex 35e5c4b65..c9f646906 100644 --- a/data/tilesets/secondary/battle_tent/tiles.png +++ b/data/tilesets/secondary/battle_tent/tiles.png diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/0.png Binary files differindex 069509b27..127ed4e47 100644 --- a/data/tilesets/secondary/bike_shop/anim/0.png +++ b/data/tilesets/secondary/bike_shop/anim/0.png diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/1.png Binary files differindex 4123bb0bf..71f12a746 100644 --- a/data/tilesets/secondary/bike_shop/anim/1.png +++ b/data/tilesets/secondary/bike_shop/anim/1.png diff --git a/data/tilesets/secondary/bike_shop/anim/2.png b/data/tilesets/secondary/bike_shop/anim/2.png Binary files differdeleted file mode 100644 index 7c463d9c3..000000000 --- a/data/tilesets/secondary/bike_shop/anim/2.png +++ /dev/null diff --git a/data/tilesets/secondary/bike_shop/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png Binary files differindex e068538f5..f4f48fca3 100644 --- a/data/tilesets/secondary/bike_shop/tiles.png +++ b/data/tilesets/secondary/bike_shop/tiles.png diff --git a/data/tilesets/secondary/brendans_mays_house/tiles.png b/data/tilesets/secondary/brendans_mays_house/tiles.png Binary files differindex 6d6a5f047..f54e2ae15 100644 --- a/data/tilesets/secondary/brendans_mays_house/tiles.png +++ b/data/tilesets/secondary/brendans_mays_house/tiles.png diff --git a/data/tilesets/secondary/cable_club/tiles.png b/data/tilesets/secondary/cable_club/tiles.png Binary files differindex c5ad4cfac..7d2378a06 100644 --- a/data/tilesets/secondary/cable_club/tiles.png +++ b/data/tilesets/secondary/cable_club/tiles.png diff --git a/data/tilesets/secondary/cable_club/unknown_tiles.png b/data/tilesets/secondary/cable_club/unknown_tiles.png Binary files differindex 84e79f720..46e0916f3 100644 --- a/data/tilesets/secondary/cable_club/unknown_tiles.png +++ b/data/tilesets/secondary/cable_club/unknown_tiles.png diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/0.png Binary files differindex 67f294ffe..e98a161eb 100644 --- a/data/tilesets/secondary/cave/anim/0.png +++ b/data/tilesets/secondary/cave/anim/0.png diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/1.png Binary files differindex 9c92be807..12ffcd12c 100644 --- a/data/tilesets/secondary/cave/anim/1.png +++ b/data/tilesets/secondary/cave/anim/1.png diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/2.png Binary files differindex 78ea00e04..c5be89c00 100644 --- a/data/tilesets/secondary/cave/anim/2.png +++ b/data/tilesets/secondary/cave/anim/2.png diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/3.png Binary files differindex 7edd52eaa..635a81154 100644 --- a/data/tilesets/secondary/cave/anim/3.png +++ b/data/tilesets/secondary/cave/anim/3.png diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/unused/0.png Binary files differindex 44564e67a..cea6ece85 100644 --- a/data/tilesets/secondary/cave/anim/unused/0.png +++ b/data/tilesets/secondary/cave/anim/unused/0.png diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/unused/1.png Binary files differindex 47e7e17ee..01d8a300a 100644 --- a/data/tilesets/secondary/cave/anim/unused/1.png +++ b/data/tilesets/secondary/cave/anim/unused/1.png diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/unused/2.png Binary files differindex d1447cde2..ba13bda8c 100644 --- a/data/tilesets/secondary/cave/anim/unused/2.png +++ b/data/tilesets/secondary/cave/anim/unused/2.png diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/unused/3.png Binary files differindex 8ad81b1e1..117f04aa4 100644 --- a/data/tilesets/secondary/cave/anim/unused/3.png +++ b/data/tilesets/secondary/cave/anim/unused/3.png diff --git a/data/tilesets/secondary/cave/tiles.png b/data/tilesets/secondary/cave/tiles.png Binary files differindex e8c98dd71..cd9a83701 100644 --- a/data/tilesets/secondary/cave/tiles.png +++ b/data/tilesets/secondary/cave/tiles.png diff --git a/data/tilesets/secondary/contest/tiles.png b/data/tilesets/secondary/contest/tiles.png Binary files differindex 710654f5f..f9a1b5cd9 100644 --- a/data/tilesets/secondary/contest/tiles.png +++ b/data/tilesets/secondary/contest/tiles.png diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/0.png Binary files differindex adf42975f..f80971c45 100644 --- a/data/tilesets/secondary/dewford/anim/0.png +++ b/data/tilesets/secondary/dewford/anim/0.png diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/1.png Binary files differindex 6e7c23a18..b98d9cafb 100644 --- a/data/tilesets/secondary/dewford/anim/1.png +++ b/data/tilesets/secondary/dewford/anim/1.png diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/2.png Binary files differindex 86075ffb0..6f88f493f 100644 --- a/data/tilesets/secondary/dewford/anim/2.png +++ b/data/tilesets/secondary/dewford/anim/2.png diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/3.png Binary files differindex 6e3c57621..b95b4bc9e 100644 --- a/data/tilesets/secondary/dewford/anim/3.png +++ b/data/tilesets/secondary/dewford/anim/3.png diff --git a/data/tilesets/secondary/dewford/tiles.png b/data/tilesets/secondary/dewford/tiles.png Binary files differindex 1cf4c165c..33e61b435 100644 --- a/data/tilesets/secondary/dewford/tiles.png +++ b/data/tilesets/secondary/dewford/tiles.png diff --git a/data/tilesets/secondary/dewford_gym/tiles.png b/data/tilesets/secondary/dewford_gym/tiles.png Binary files differindex 7d923b505..2aa68bb2a 100644 --- a/data/tilesets/secondary/dewford_gym/tiles.png +++ b/data/tilesets/secondary/dewford_gym/tiles.png diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/0/0.png Binary files differindex 806d26e57..108a2099b 100644 --- a/data/tilesets/secondary/elite_four/anim/0/0.png +++ b/data/tilesets/secondary/elite_four/anim/0/0.png diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/0/1.png Binary files differindex 2a8e6a31c..64b23f061 100644 --- a/data/tilesets/secondary/elite_four/anim/0/1.png +++ b/data/tilesets/secondary/elite_four/anim/0/1.png diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/0/2.png Binary files differindex c4e6161a6..0d9f603fc 100644 --- a/data/tilesets/secondary/elite_four/anim/0/2.png +++ b/data/tilesets/secondary/elite_four/anim/0/2.png diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/0/3.png Binary files differindex 2a8e6a31c..64b23f061 100644 --- a/data/tilesets/secondary/elite_four/anim/0/3.png +++ b/data/tilesets/secondary/elite_four/anim/0/3.png diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/1/0.png Binary files differindex 7822d1896..6e508308b 100644 --- a/data/tilesets/secondary/elite_four/anim/1/0.png +++ b/data/tilesets/secondary/elite_four/anim/1/0.png diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/1/1.png Binary files differindex 66d60e90b..794f26195 100644 --- a/data/tilesets/secondary/elite_four/anim/1/1.png +++ b/data/tilesets/secondary/elite_four/anim/1/1.png diff --git a/data/tilesets/secondary/elite_four/anim/1/2.png b/data/tilesets/secondary/elite_four/anim/1/2.png Binary files differdeleted file mode 100644 index 09fb59fbf..000000000 --- a/data/tilesets/secondary/elite_four/anim/1/2.png +++ /dev/null diff --git a/data/tilesets/secondary/elite_four/anim/1/3.png b/data/tilesets/secondary/elite_four/anim/1/3.png Binary files differdeleted file mode 100644 index 0c7c05034..000000000 --- a/data/tilesets/secondary/elite_four/anim/1/3.png +++ /dev/null diff --git a/data/tilesets/secondary/elite_four/anim/1/4.png b/data/tilesets/secondary/elite_four/anim/1/4.png Binary files differdeleted file mode 100644 index 317db1714..000000000 --- a/data/tilesets/secondary/elite_four/anim/1/4.png +++ /dev/null diff --git a/data/tilesets/secondary/elite_four/anim/1/5.png b/data/tilesets/secondary/elite_four/anim/1/5.png Binary files differdeleted file mode 100644 index d0cbfeb57..000000000 --- a/data/tilesets/secondary/elite_four/anim/1/5.png +++ /dev/null diff --git a/data/tilesets/secondary/elite_four/anim/1/6.png b/data/tilesets/secondary/elite_four/anim/1/6.png Binary files differdeleted file mode 100644 index 4b35ededd..000000000 --- a/data/tilesets/secondary/elite_four/anim/1/6.png +++ /dev/null diff --git a/data/tilesets/secondary/elite_four/anim/1/7.png b/data/tilesets/secondary/elite_four/anim/1/7.png Binary files differdeleted file mode 100644 index dfe698edb..000000000 --- a/data/tilesets/secondary/elite_four/anim/1/7.png +++ /dev/null diff --git a/data/tilesets/secondary/elite_four/tiles.png b/data/tilesets/secondary/elite_four/tiles.png Binary files differindex d16b2db03..751f5d8cd 100644 --- a/data/tilesets/secondary/elite_four/tiles.png +++ b/data/tilesets/secondary/elite_four/tiles.png diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/0.png Binary files differindex 7536d08ad..ac03df40b 100644 --- a/data/tilesets/secondary/ever_grande/anim/0.png +++ b/data/tilesets/secondary/ever_grande/anim/0.png diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/1.png Binary files differindex 7536d08ad..ac03df40b 100644 --- a/data/tilesets/secondary/ever_grande/anim/1.png +++ b/data/tilesets/secondary/ever_grande/anim/1.png diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/2.png Binary files differindex f0835aa3b..4f8baa2a3 100644 --- a/data/tilesets/secondary/ever_grande/anim/2.png +++ b/data/tilesets/secondary/ever_grande/anim/2.png diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/3.png Binary files differindex c07cbbd17..f120dee16 100644 --- a/data/tilesets/secondary/ever_grande/anim/3.png +++ b/data/tilesets/secondary/ever_grande/anim/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/4.png Binary files differindex 7536d08ad..ac03df40b 100644 --- a/data/tilesets/secondary/ever_grande/anim/4.png +++ b/data/tilesets/secondary/ever_grande/anim/4.png diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/5.png Binary files differindex 7536d08ad..ac03df40b 100644 --- a/data/tilesets/secondary/ever_grande/anim/5.png +++ b/data/tilesets/secondary/ever_grande/anim/5.png diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/6.png Binary files differindex 9b5030306..d7cfd4529 100644 --- a/data/tilesets/secondary/ever_grande/anim/6.png +++ b/data/tilesets/secondary/ever_grande/anim/6.png diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/7.png Binary files differindex 9b5030306..d7cfd4529 100644 --- a/data/tilesets/secondary/ever_grande/anim/7.png +++ b/data/tilesets/secondary/ever_grande/anim/7.png diff --git a/data/tilesets/secondary/ever_grande/tiles.png b/data/tilesets/secondary/ever_grande/tiles.png Binary files differindex 943a3f8f4..a8ff3a742 100644 --- a/data/tilesets/secondary/ever_grande/tiles.png +++ b/data/tilesets/secondary/ever_grande/tiles.png diff --git a/data/tilesets/secondary/facility/tiles.png b/data/tilesets/secondary/facility/tiles.png Binary files differindex f99c24150..7f48c6a99 100644 --- a/data/tilesets/secondary/facility/tiles.png +++ b/data/tilesets/secondary/facility/tiles.png diff --git a/data/tilesets/secondary/fallarbor/tiles.png b/data/tilesets/secondary/fallarbor/tiles.png Binary files differindex 21ab321ef..3582d1d03 100644 --- a/data/tilesets/secondary/fallarbor/tiles.png +++ b/data/tilesets/secondary/fallarbor/tiles.png diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png Binary files differindex 78cb1c1ae..9cd688c5e 100644 --- a/data/tilesets/secondary/fortree/tiles.png +++ b/data/tilesets/secondary/fortree/tiles.png diff --git a/data/tilesets/secondary/fortree_gym/tiles.png b/data/tilesets/secondary/fortree_gym/tiles.png Binary files differindex 932b5c06a..aa10752cd 100644 --- a/data/tilesets/secondary/fortree_gym/tiles.png +++ b/data/tilesets/secondary/fortree_gym/tiles.png diff --git a/data/tilesets/secondary/generic_building/tiles.png b/data/tilesets/secondary/generic_building/tiles.png Binary files differindex 6f681f837..4a79b0f04 100644 --- a/data/tilesets/secondary/generic_building/tiles.png +++ b/data/tilesets/secondary/generic_building/tiles.png diff --git a/data/tilesets/secondary/inside_of_truck/tiles.png b/data/tilesets/secondary/inside_of_truck/tiles.png Binary files differindex 65a82e888..59a24b705 100644 --- a/data/tilesets/secondary/inside_of_truck/tiles.png +++ b/data/tilesets/secondary/inside_of_truck/tiles.png diff --git a/data/tilesets/secondary/inside_ship/tiles.png b/data/tilesets/secondary/inside_ship/tiles.png Binary files differindex 77142a755..5ddbe2859 100644 --- a/data/tilesets/secondary/inside_ship/tiles.png +++ b/data/tilesets/secondary/inside_ship/tiles.png diff --git a/data/tilesets/secondary/island_harbor/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png Binary files differindex 82e419e72..12ec2b1df 100644 --- a/data/tilesets/secondary/island_harbor/tiles.png +++ b/data/tilesets/secondary/island_harbor/tiles.png diff --git a/data/tilesets/secondary/lab/tiles.png b/data/tilesets/secondary/lab/tiles.png Binary files differindex 6a213d960..cd401d24a 100644 --- a/data/tilesets/secondary/lab/tiles.png +++ b/data/tilesets/secondary/lab/tiles.png diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/0.png Binary files differindex 303855f71..434041fbd 100644 --- a/data/tilesets/secondary/lavaridge/anim/0.png +++ b/data/tilesets/secondary/lavaridge/anim/0.png diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/1.png Binary files differindex 7cdee79e2..ebc028ed4 100644 --- a/data/tilesets/secondary/lavaridge/anim/1.png +++ b/data/tilesets/secondary/lavaridge/anim/1.png diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/2.png Binary files differindex b5810b806..aee227f05 100644 --- a/data/tilesets/secondary/lavaridge/anim/2.png +++ b/data/tilesets/secondary/lavaridge/anim/2.png diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/3.png Binary files differindex caf7b5698..99149ae62 100644 --- a/data/tilesets/secondary/lavaridge/anim/3.png +++ b/data/tilesets/secondary/lavaridge/anim/3.png diff --git a/data/tilesets/secondary/lavaridge/tiles.png b/data/tilesets/secondary/lavaridge/tiles.png Binary files differindex 896c43194..2f6898a0f 100644 --- a/data/tilesets/secondary/lavaridge/tiles.png +++ b/data/tilesets/secondary/lavaridge/tiles.png diff --git a/data/tilesets/secondary/lavaridge_gym/tiles.png b/data/tilesets/secondary/lavaridge_gym/tiles.png Binary files differindex 8734cc3bf..f5c25c6bb 100644 --- a/data/tilesets/secondary/lavaridge_gym/tiles.png +++ b/data/tilesets/secondary/lavaridge_gym/tiles.png diff --git a/data/tilesets/secondary/lilycove/tiles.png b/data/tilesets/secondary/lilycove/tiles.png Binary files differindex b77f3d379..44111c448 100644 --- a/data/tilesets/secondary/lilycove/tiles.png +++ b/data/tilesets/secondary/lilycove/tiles.png diff --git a/data/tilesets/secondary/lilycove_museum/tiles.png b/data/tilesets/secondary/lilycove_museum/tiles.png Binary files differindex 5bcc0ecfe..d0f0cf036 100644 --- a/data/tilesets/secondary/lilycove_museum/tiles.png +++ b/data/tilesets/secondary/lilycove_museum/tiles.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/0/a/0.png Binary files differindex 88b028b52..b20c5470e 100644 --- a/data/tilesets/secondary/mauville/anim/0/a/0.png +++ b/data/tilesets/secondary/mauville/anim/0/a/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/0/a/1.png Binary files differindex ce4010db2..0587295fc 100644 --- a/data/tilesets/secondary/mauville/anim/0/a/1.png +++ b/data/tilesets/secondary/mauville/anim/0/a/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/0/a/2.png Binary files differindex 5ea20f6db..af0dd4ffe 100644 --- a/data/tilesets/secondary/mauville/anim/0/a/2.png +++ b/data/tilesets/secondary/mauville/anim/0/a/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/0/a/3.png Binary files differindex fdf4d30bf..bc132f2ef 100644 --- a/data/tilesets/secondary/mauville/anim/0/a/3.png +++ b/data/tilesets/secondary/mauville/anim/0/a/3.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/4.png b/data/tilesets/secondary/mauville/anim/0/a/4.png Binary files differdeleted file mode 100644 index c8097808c..000000000 --- a/data/tilesets/secondary/mauville/anim/0/a/4.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/a/5.png b/data/tilesets/secondary/mauville/anim/0/a/5.png Binary files differdeleted file mode 100644 index 88b028b52..000000000 --- a/data/tilesets/secondary/mauville/anim/0/a/5.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/a/6.png b/data/tilesets/secondary/mauville/anim/0/a/6.png Binary files differdeleted file mode 100644 index ce4010db2..000000000 --- a/data/tilesets/secondary/mauville/anim/0/a/6.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/a/7.png b/data/tilesets/secondary/mauville/anim/0/a/7.png Binary files differdeleted file mode 100644 index 5ea20f6db..000000000 --- a/data/tilesets/secondary/mauville/anim/0/a/7.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/a/8.png b/data/tilesets/secondary/mauville/anim/0/a/8.png Binary files differdeleted file mode 100644 index fdf4d30bf..000000000 --- a/data/tilesets/secondary/mauville/anim/0/a/8.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/a/9.png b/data/tilesets/secondary/mauville/anim/0/a/9.png Binary files differdeleted file mode 100644 index c8097808c..000000000 --- a/data/tilesets/secondary/mauville/anim/0/a/9.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/0/b/0.png Binary files differindex 88b028b52..b20c5470e 100644 --- a/data/tilesets/secondary/mauville/anim/0/b/0.png +++ b/data/tilesets/secondary/mauville/anim/0/b/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/0/b/1.png Binary files differindex ce4010db2..0587295fc 100644 --- a/data/tilesets/secondary/mauville/anim/0/b/1.png +++ b/data/tilesets/secondary/mauville/anim/0/b/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/0/b/2.png Binary files differindex 5ea20f6db..af0dd4ffe 100644 --- a/data/tilesets/secondary/mauville/anim/0/b/2.png +++ b/data/tilesets/secondary/mauville/anim/0/b/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/0/b/3.png Binary files differindex fdf4d30bf..bc132f2ef 100644 --- a/data/tilesets/secondary/mauville/anim/0/b/3.png +++ b/data/tilesets/secondary/mauville/anim/0/b/3.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/4.png b/data/tilesets/secondary/mauville/anim/0/b/4.png Binary files differdeleted file mode 100644 index 91f368cf8..000000000 --- a/data/tilesets/secondary/mauville/anim/0/b/4.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/b/5.png b/data/tilesets/secondary/mauville/anim/0/b/5.png Binary files differdeleted file mode 100644 index 91f368cf8..000000000 --- a/data/tilesets/secondary/mauville/anim/0/b/5.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/b/6.png b/data/tilesets/secondary/mauville/anim/0/b/6.png Binary files differdeleted file mode 100644 index 91f368cf8..000000000 --- a/data/tilesets/secondary/mauville/anim/0/b/6.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/0/b/7.png b/data/tilesets/secondary/mauville/anim/0/b/7.png Binary files differdeleted file mode 100644 index 91f368cf8..000000000 --- a/data/tilesets/secondary/mauville/anim/0/b/7.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/a/0.png b/data/tilesets/secondary/mauville/anim/1/a/0.png Binary files differdeleted file mode 100644 index 88b028b52..000000000 --- a/data/tilesets/secondary/mauville/anim/1/a/0.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/1/a/1.png Binary files differindex c8097808c..911b980a3 100644 --- a/data/tilesets/secondary/mauville/anim/1/a/1.png +++ b/data/tilesets/secondary/mauville/anim/1/a/1.png diff --git a/data/tilesets/secondary/mauville/anim/1/a/2.png b/data/tilesets/secondary/mauville/anim/1/a/2.png Binary files differdeleted file mode 100644 index 5ea20f6db..000000000 --- a/data/tilesets/secondary/mauville/anim/1/a/2.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/a/3.png b/data/tilesets/secondary/mauville/anim/1/a/3.png Binary files differdeleted file mode 100644 index fdf4d30bf..000000000 --- a/data/tilesets/secondary/mauville/anim/1/a/3.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/0.png b/data/tilesets/secondary/mauville/anim/1/b/0.png Binary files differdeleted file mode 100644 index 88b028b52..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/0.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/1/b/1.png Binary files differindex c8097808c..911b980a3 100644 --- a/data/tilesets/secondary/mauville/anim/1/b/1.png +++ b/data/tilesets/secondary/mauville/anim/1/b/1.png diff --git a/data/tilesets/secondary/mauville/anim/1/b/2.png b/data/tilesets/secondary/mauville/anim/1/b/2.png Binary files differdeleted file mode 100644 index 5ea20f6db..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/2.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/3.png b/data/tilesets/secondary/mauville/anim/1/b/3.png Binary files differdeleted file mode 100644 index fdf4d30bf..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/3.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/4.png b/data/tilesets/secondary/mauville/anim/1/b/4.png Binary files differdeleted file mode 100644 index 44564e67a..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/4.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/5.png b/data/tilesets/secondary/mauville/anim/1/b/5.png Binary files differdeleted file mode 100644 index 47e7e17ee..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/5.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/6.png b/data/tilesets/secondary/mauville/anim/1/b/6.png Binary files differdeleted file mode 100644 index d1447cde2..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/6.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/anim/1/b/7.png b/data/tilesets/secondary/mauville/anim/1/b/7.png Binary files differdeleted file mode 100644 index 8ad81b1e1..000000000 --- a/data/tilesets/secondary/mauville/anim/1/b/7.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png Binary files differindex e4ce0d4f8..208a052c5 100644 --- a/data/tilesets/secondary/mauville/tiles.png +++ b/data/tilesets/secondary/mauville/tiles.png diff --git a/data/tilesets/secondary/mauville_game_corner/tiles.png b/data/tilesets/secondary/mauville_game_corner/tiles.png Binary files differindex 3f7f565c9..50e341fde 100644 --- a/data/tilesets/secondary/mauville_game_corner/tiles.png +++ b/data/tilesets/secondary/mauville_game_corner/tiles.png diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/0.png Binary files differindex 090fe6a1a..ebf603978 100644 --- a/data/tilesets/secondary/mauville_gym/anim/0.png +++ b/data/tilesets/secondary/mauville_gym/anim/0.png diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/1.png Binary files differindex 48f325890..34072707f 100644 --- a/data/tilesets/secondary/mauville_gym/anim/1.png +++ b/data/tilesets/secondary/mauville_gym/anim/1.png diff --git a/data/tilesets/secondary/mauville_gym/anim/2.png b/data/tilesets/secondary/mauville_gym/anim/2.png Binary files differdeleted file mode 100644 index 16652df19..000000000 --- a/data/tilesets/secondary/mauville_gym/anim/2.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville_gym/anim/3.png b/data/tilesets/secondary/mauville_gym/anim/3.png Binary files differdeleted file mode 100644 index 8ea7a49e6..000000000 --- a/data/tilesets/secondary/mauville_gym/anim/3.png +++ /dev/null diff --git a/data/tilesets/secondary/mauville_gym/tiles.png b/data/tilesets/secondary/mauville_gym/tiles.png Binary files differindex 5606bb101..04c2f9394 100644 --- a/data/tilesets/secondary/mauville_gym/tiles.png +++ b/data/tilesets/secondary/mauville_gym/tiles.png diff --git a/data/tilesets/secondary/meteor_falls/tiles.png b/data/tilesets/secondary/meteor_falls/tiles.png Binary files differindex 9c7532805..9d47866bd 100644 --- a/data/tilesets/secondary/meteor_falls/tiles.png +++ b/data/tilesets/secondary/meteor_falls/tiles.png diff --git a/data/tilesets/secondary/mirage_tower/tiles.png b/data/tilesets/secondary/mirage_tower/tiles.png Binary files differindex fd2904ca1..0d7ee0d68 100644 --- a/data/tilesets/secondary/mirage_tower/tiles.png +++ b/data/tilesets/secondary/mirage_tower/tiles.png diff --git a/data/tilesets/secondary/mossdeep/tiles.png b/data/tilesets/secondary/mossdeep/tiles.png Binary files differindex 818406b23..cc4591f88 100644 --- a/data/tilesets/secondary/mossdeep/tiles.png +++ b/data/tilesets/secondary/mossdeep/tiles.png diff --git a/data/tilesets/secondary/mossdeep_game_corner/tiles.png b/data/tilesets/secondary/mossdeep_game_corner/tiles.png Binary files differindex f09edf436..cfe709805 100644 --- a/data/tilesets/secondary/mossdeep_game_corner/tiles.png +++ b/data/tilesets/secondary/mossdeep_game_corner/tiles.png diff --git a/data/tilesets/secondary/mossdeep_gym/tiles.png b/data/tilesets/secondary/mossdeep_gym/tiles.png Binary files differindex 36a0873a4..357774a42 100644 --- a/data/tilesets/secondary/mossdeep_gym/tiles.png +++ b/data/tilesets/secondary/mossdeep_gym/tiles.png diff --git a/data/tilesets/secondary/mystery_events_house/tiles.png b/data/tilesets/secondary/mystery_events_house/tiles.png Binary files differindex 5afa07fcf..778ca7865 100644 --- a/data/tilesets/secondary/mystery_events_house/tiles.png +++ b/data/tilesets/secondary/mystery_events_house/tiles.png diff --git a/data/tilesets/secondary/navel_rock/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png Binary files differindex ffbc04584..288e50b44 100644 --- a/data/tilesets/secondary/navel_rock/tiles.png +++ b/data/tilesets/secondary/navel_rock/tiles.png diff --git a/data/tilesets/secondary/oceanic_museum/tiles.png b/data/tilesets/secondary/oceanic_museum/tiles.png Binary files differindex a074d4a05..bda540d6b 100644 --- a/data/tilesets/secondary/oceanic_museum/tiles.png +++ b/data/tilesets/secondary/oceanic_museum/tiles.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/0/0.png Binary files differindex e7bcfd743..316eb500e 100644 --- a/data/tilesets/secondary/pacifidlog/anim/0/0.png +++ b/data/tilesets/secondary/pacifidlog/anim/0/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/0/1.png Binary files differindex dde024f6e..ee9d4316e 100644 --- a/data/tilesets/secondary/pacifidlog/anim/0/1.png +++ b/data/tilesets/secondary/pacifidlog/anim/0/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/0/2.png Binary files differindex 1a4cea24d..221a71585 100644 --- a/data/tilesets/secondary/pacifidlog/anim/0/2.png +++ b/data/tilesets/secondary/pacifidlog/anim/0/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/1/0.png Binary files differindex beb8ee82d..6d432eb25 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/0.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/1/1.png Binary files differindex 594655120..7588b8a72 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/1.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/1/2.png Binary files differindex 747306d5c..2a11e5065 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/2.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/1/3.png Binary files differindex 20e0a7cdd..be4089ff4 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/3.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/3.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/1/4.png Binary files differindex 7b74ee349..4c16111de 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/4.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/4.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/1/5.png Binary files differindex b135bdfbe..93bbc6375 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/5.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/5.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/1/6.png Binary files differindex 4eae151e6..b08f5a0d9 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/6.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/6.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/1/7.png Binary files differindex f1863fdd5..1a5f0ae5c 100644 --- a/data/tilesets/secondary/pacifidlog/anim/1/7.png +++ b/data/tilesets/secondary/pacifidlog/anim/1/7.png diff --git a/data/tilesets/secondary/pacifidlog/tiles.png b/data/tilesets/secondary/pacifidlog/tiles.png Binary files differindex 94fe6d96b..9fe620e1e 100644 --- a/data/tilesets/secondary/pacifidlog/tiles.png +++ b/data/tilesets/secondary/pacifidlog/tiles.png diff --git a/data/tilesets/secondary/petalburg/tiles.png b/data/tilesets/secondary/petalburg/tiles.png Binary files differindex dd0e23ca4..00d6d94a4 100644 --- a/data/tilesets/secondary/petalburg/tiles.png +++ b/data/tilesets/secondary/petalburg/tiles.png diff --git a/data/tilesets/secondary/petalburg_gym/tiles.png b/data/tilesets/secondary/petalburg_gym/tiles.png Binary files differindex cb7c40e5a..87cd3c556 100644 --- a/data/tilesets/secondary/petalburg_gym/tiles.png +++ b/data/tilesets/secondary/petalburg_gym/tiles.png diff --git a/data/tilesets/secondary/pokemon_center/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png Binary files differindex 673746c5a..c54b078d4 100644 --- a/data/tilesets/secondary/pokemon_center/tiles.png +++ b/data/tilesets/secondary/pokemon_center/tiles.png diff --git a/data/tilesets/secondary/pokemon_day_care/tiles.png b/data/tilesets/secondary/pokemon_day_care/tiles.png Binary files differindex 76cd9ab96..a45206efc 100644 --- a/data/tilesets/secondary/pokemon_day_care/tiles.png +++ b/data/tilesets/secondary/pokemon_day_care/tiles.png diff --git a/data/tilesets/secondary/pokemon_fan_club/tiles.png b/data/tilesets/secondary/pokemon_fan_club/tiles.png Binary files differindex 62dd0f03f..fa42a5ef1 100644 --- a/data/tilesets/secondary/pokemon_fan_club/tiles.png +++ b/data/tilesets/secondary/pokemon_fan_club/tiles.png diff --git a/data/tilesets/secondary/pokemon_school/tiles.png b/data/tilesets/secondary/pokemon_school/tiles.png Binary files differindex 20e3f32c8..8ea0e8fbd 100644 --- a/data/tilesets/secondary/pokemon_school/tiles.png +++ b/data/tilesets/secondary/pokemon_school/tiles.png diff --git a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png Binary files differindex f10306e7a..daf4e05b4 100644 --- a/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png +++ b/data/tilesets/secondary/pretty_petal_flower_shop/tiles.png diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/0/0.png Binary files differindex 358745e4b..af00b97c7 100644 --- a/data/tilesets/secondary/rustboro/anim/0/0.png +++ b/data/tilesets/secondary/rustboro/anim/0/0.png diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/0/1.png Binary files differindex f5a095b15..20b1ef630 100644 --- a/data/tilesets/secondary/rustboro/anim/0/1.png +++ b/data/tilesets/secondary/rustboro/anim/0/1.png diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/0/2.png Binary files differindex 91f368cf8..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/2.png +++ b/data/tilesets/secondary/rustboro/anim/0/2.png diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/0/3.png Binary files differindex 91f368cf8..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/3.png +++ b/data/tilesets/secondary/rustboro/anim/0/3.png diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/0/4.png Binary files differindex 91f368cf8..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/4.png +++ b/data/tilesets/secondary/rustboro/anim/0/4.png diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/0/5.png Binary files differindex 91f368cf8..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/5.png +++ b/data/tilesets/secondary/rustboro/anim/0/5.png diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/0/6.png Binary files differindex 91f368cf8..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/6.png +++ b/data/tilesets/secondary/rustboro/anim/0/6.png diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/0/7.png Binary files differindex 91f368cf8..44c4b2cdc 100644 --- a/data/tilesets/secondary/rustboro/anim/0/7.png +++ b/data/tilesets/secondary/rustboro/anim/0/7.png diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/1/0.png Binary files differindex 75bd2f8a4..07471595b 100644 --- a/data/tilesets/secondary/rustboro/anim/1/0.png +++ b/data/tilesets/secondary/rustboro/anim/1/0.png diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/1/1.png Binary files differindex 9f8b3a02f..408f2b03a 100644 --- a/data/tilesets/secondary/rustboro/anim/1/1.png +++ b/data/tilesets/secondary/rustboro/anim/1/1.png diff --git a/data/tilesets/secondary/rustboro/anim/1/2.png b/data/tilesets/secondary/rustboro/anim/1/2.png Binary files differdeleted file mode 100644 index 86075ffb0..000000000 --- a/data/tilesets/secondary/rustboro/anim/1/2.png +++ /dev/null diff --git a/data/tilesets/secondary/rustboro/anim/1/3.png b/data/tilesets/secondary/rustboro/anim/1/3.png Binary files differdeleted file mode 100644 index 6e3c57621..000000000 --- a/data/tilesets/secondary/rustboro/anim/1/3.png +++ /dev/null diff --git a/data/tilesets/secondary/rustboro/tiles.png b/data/tilesets/secondary/rustboro/tiles.png Binary files differindex fbfc72d46..c3a3bfbab 100644 --- a/data/tilesets/secondary/rustboro/tiles.png +++ b/data/tilesets/secondary/rustboro/tiles.png diff --git a/data/tilesets/secondary/rustboro_gym/tiles.png b/data/tilesets/secondary/rustboro_gym/tiles.png Binary files differindex d4ebc14a1..82ba1c51c 100644 --- a/data/tilesets/secondary/rustboro_gym/tiles.png +++ b/data/tilesets/secondary/rustboro_gym/tiles.png diff --git a/data/tilesets/secondary/rusturf_tunnel/tiles.png b/data/tilesets/secondary/rusturf_tunnel/tiles.png Binary files differindex 913935f77..8d6d13c05 100644 --- a/data/tilesets/secondary/rusturf_tunnel/tiles.png +++ b/data/tilesets/secondary/rusturf_tunnel/tiles.png diff --git a/data/tilesets/secondary/seashore_house/tiles.png b/data/tilesets/secondary/seashore_house/tiles.png Binary files differindex ea48f5006..14100fa06 100644 --- a/data/tilesets/secondary/seashore_house/tiles.png +++ b/data/tilesets/secondary/seashore_house/tiles.png diff --git a/data/tilesets/secondary/secret_base/blue_cave/tiles.png b/data/tilesets/secondary/secret_base/blue_cave/tiles.png Binary files differindex 9d820463b..ed7126297 100644 --- a/data/tilesets/secondary/secret_base/blue_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/blue_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png Binary files differindex 1e42fed54..ed7126297 100644 --- a/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png +++ b/data/tilesets/secondary/secret_base/blue_cave/unused_tiles.png diff --git a/data/tilesets/secondary/secret_base/brown_cave/tiles.png b/data/tilesets/secondary/secret_base/brown_cave/tiles.png Binary files differindex a1c8bfe72..7beb706d9 100644 --- a/data/tilesets/secondary/secret_base/brown_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/brown_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png Binary files differindex dfd187d51..7beb706d9 100644 --- a/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png +++ b/data/tilesets/secondary/secret_base/brown_cave/unused_tiles.png diff --git a/data/tilesets/secondary/secret_base/red_cave/tiles.png b/data/tilesets/secondary/secret_base/red_cave/tiles.png Binary files differindex 2652f6bbf..5146810e1 100644 --- a/data/tilesets/secondary/secret_base/red_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/red_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png Binary files differindex 5cfebd309..5146810e1 100644 --- a/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png +++ b/data/tilesets/secondary/secret_base/red_cave/unused_tiles.png diff --git a/data/tilesets/secondary/secret_base/shrub/tiles.png b/data/tilesets/secondary/secret_base/shrub/tiles.png Binary files differindex 692141b04..a64727c6e 100644 --- a/data/tilesets/secondary/secret_base/shrub/tiles.png +++ b/data/tilesets/secondary/secret_base/shrub/tiles.png diff --git a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png Binary files differindex 461d620ae..a64727c6e 100644 --- a/data/tilesets/secondary/secret_base/shrub/unused_tiles.png +++ b/data/tilesets/secondary/secret_base/shrub/unused_tiles.png diff --git a/data/tilesets/secondary/secret_base/tree/tiles.png b/data/tilesets/secondary/secret_base/tree/tiles.png Binary files differindex 94887cc1f..f07999cb0 100644 --- a/data/tilesets/secondary/secret_base/tree/tiles.png +++ b/data/tilesets/secondary/secret_base/tree/tiles.png diff --git a/data/tilesets/secondary/secret_base/tree/unused_tiles.png b/data/tilesets/secondary/secret_base/tree/unused_tiles.png Binary files differindex 567cf7800..f07999cb0 100644 --- a/data/tilesets/secondary/secret_base/tree/unused_tiles.png +++ b/data/tilesets/secondary/secret_base/tree/unused_tiles.png diff --git a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png Binary files differindex b171b5ec6..d4535523b 100644 --- a/data/tilesets/secondary/secret_base/yellow_cave/tiles.png +++ b/data/tilesets/secondary/secret_base/yellow_cave/tiles.png diff --git a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png Binary files differindex f825201cc..d4535523b 100644 --- a/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png +++ b/data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.png diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png Binary files differindex f253a2e53..5911ee42c 100644 --- a/data/tilesets/secondary/shop/tiles.png +++ b/data/tilesets/secondary/shop/tiles.png diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/0.png Binary files differindex ef62c4143..28bf60f26 100644 --- a/data/tilesets/secondary/slateport/anim/0.png +++ b/data/tilesets/secondary/slateport/anim/0.png diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/1.png Binary files differindex 9b926bdfc..31d22f697 100644 --- a/data/tilesets/secondary/slateport/anim/1.png +++ b/data/tilesets/secondary/slateport/anim/1.png diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/2.png Binary files differindex c5974f105..83b0e3940 100644 --- a/data/tilesets/secondary/slateport/anim/2.png +++ b/data/tilesets/secondary/slateport/anim/2.png diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/3.png Binary files differindex 9b926bdfc..31d22f697 100644 --- a/data/tilesets/secondary/slateport/anim/3.png +++ b/data/tilesets/secondary/slateport/anim/3.png diff --git a/data/tilesets/secondary/slateport/tiles.png b/data/tilesets/secondary/slateport/tiles.png Binary files differindex d8661b99a..ff7588d2d 100644 --- a/data/tilesets/secondary/slateport/tiles.png +++ b/data/tilesets/secondary/slateport/tiles.png diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/0.png Binary files differindex 63f97ad47..6ae032652 100644 --- a/data/tilesets/secondary/sootopolis/anim/0.png +++ b/data/tilesets/secondary/sootopolis/anim/0.png diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/1.png Binary files differindex aa14ec04a..5bf8f7a98 100644 --- a/data/tilesets/secondary/sootopolis/anim/1.png +++ b/data/tilesets/secondary/sootopolis/anim/1.png diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/2.png Binary files differindex 09fb59fbf..85598e145 100644 --- a/data/tilesets/secondary/sootopolis/anim/2.png +++ b/data/tilesets/secondary/sootopolis/anim/2.png diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/3.png Binary files differindex 0c7c05034..c7aad10c7 100644 --- a/data/tilesets/secondary/sootopolis/anim/3.png +++ b/data/tilesets/secondary/sootopolis/anim/3.png diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/4.png Binary files differindex 317db1714..ec446b9db 100644 --- a/data/tilesets/secondary/sootopolis/anim/4.png +++ b/data/tilesets/secondary/sootopolis/anim/4.png diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/5.png Binary files differindex d0cbfeb57..cbe1769c0 100644 --- a/data/tilesets/secondary/sootopolis/anim/5.png +++ b/data/tilesets/secondary/sootopolis/anim/5.png diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/6.png Binary files differindex 4b35ededd..690c5fd8e 100644 --- a/data/tilesets/secondary/sootopolis/anim/6.png +++ b/data/tilesets/secondary/sootopolis/anim/6.png diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/7.png Binary files differindex dfe698edb..e4026a02f 100644 --- a/data/tilesets/secondary/sootopolis/anim/7.png +++ b/data/tilesets/secondary/sootopolis/anim/7.png diff --git a/data/tilesets/secondary/sootopolis/tiles.png b/data/tilesets/secondary/sootopolis/tiles.png Binary files differindex 92df774ae..d27c817f0 100644 --- a/data/tilesets/secondary/sootopolis/tiles.png +++ b/data/tilesets/secondary/sootopolis/tiles.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png Binary files differindex f0ec1ac00..180b5522e 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/0/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png Binary files differindex 4fefe4598..af3ab12d2 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/0/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png Binary files differindex f603b3046..8481c0cde 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/0/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png b/data/tilesets/secondary/sootopolis_gym/anim/0/3.png Binary files differdeleted file mode 100644 index 2a8e6a31c..000000000 --- a/data/tilesets/secondary/sootopolis_gym/anim/0/3.png +++ /dev/null diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png Binary files differindex e0f807ef4..dc6cf500e 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/1/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png Binary files differindex 08413b63c..93dd79753 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/1/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png Binary files differindex 6681b5e96..30961482c 100644 --- a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png +++ b/data/tilesets/secondary/sootopolis_gym/anim/1/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/tiles.png b/data/tilesets/secondary/sootopolis_gym/tiles.png Binary files differindex 4f6b25769..de097c92c 100644 --- a/data/tilesets/secondary/sootopolis_gym/tiles.png +++ b/data/tilesets/secondary/sootopolis_gym/tiles.png diff --git a/data/tilesets/secondary/trainer_hill/tiles.png b/data/tilesets/secondary/trainer_hill/tiles.png Binary files differindex 78d292513..bfc0a3d9a 100644 --- a/data/tilesets/secondary/trainer_hill/tiles.png +++ b/data/tilesets/secondary/trainer_hill/tiles.png diff --git a/data/tilesets/secondary/trick_house_puzzle/tiles.png b/data/tilesets/secondary/trick_house_puzzle/tiles.png Binary files differindex 5ef1bf9ca..c31e0c0d7 100644 --- a/data/tilesets/secondary/trick_house_puzzle/tiles.png +++ b/data/tilesets/secondary/trick_house_puzzle/tiles.png diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/0.png Binary files differindex 7609cc82a..fab28e54f 100644 --- a/data/tilesets/secondary/underwater/anim/0.png +++ b/data/tilesets/secondary/underwater/anim/0.png diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/1.png Binary files differindex 64cddd371..869bc6060 100644 --- a/data/tilesets/secondary/underwater/anim/1.png +++ b/data/tilesets/secondary/underwater/anim/1.png diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/2.png Binary files differindex ff6ff8437..64e4b267d 100644 --- a/data/tilesets/secondary/underwater/anim/2.png +++ b/data/tilesets/secondary/underwater/anim/2.png diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/3.png Binary files differindex 2863c2261..0c1392011 100644 --- a/data/tilesets/secondary/underwater/anim/3.png +++ b/data/tilesets/secondary/underwater/anim/3.png diff --git a/data/tilesets/secondary/underwater/tiles.png b/data/tilesets/secondary/underwater/tiles.png Binary files differindex 5af21f353..811b0cae4 100644 --- a/data/tilesets/secondary/underwater/tiles.png +++ b/data/tilesets/secondary/underwater/tiles.png diff --git a/data/tilesets/secondary/union_room/tiles.png b/data/tilesets/secondary/union_room/tiles.png Binary files differindex b38ffe9e5..f5ab3a9cb 100644 --- a/data/tilesets/secondary/union_room/tiles.png +++ b/data/tilesets/secondary/union_room/tiles.png diff --git a/data/tilesets/secondary/unused_1/0.png b/data/tilesets/secondary/unused_1/0.png Binary files differindex bea921d90..ab462ba21 100644 --- a/data/tilesets/secondary/unused_1/0.png +++ b/data/tilesets/secondary/unused_1/0.png diff --git a/data/tilesets/secondary/unused_1/1.png b/data/tilesets/secondary/unused_1/1.png Binary files differindex bea921d90..ab462ba21 100644 --- a/data/tilesets/secondary/unused_1/1.png +++ b/data/tilesets/secondary/unused_1/1.png diff --git a/data/tilesets/secondary/unused_1/2.png b/data/tilesets/secondary/unused_1/2.png Binary files differindex 16652df19..703e0109a 100644 --- a/data/tilesets/secondary/unused_1/2.png +++ b/data/tilesets/secondary/unused_1/2.png diff --git a/data/tilesets/secondary/unused_1/3.png b/data/tilesets/secondary/unused_1/3.png Binary files differindex 8ea7a49e6..50d5068d7 100644 --- a/data/tilesets/secondary/unused_1/3.png +++ b/data/tilesets/secondary/unused_1/3.png diff --git a/data/tilesets/secondary/unused_1/tiles.png b/data/tilesets/secondary/unused_1/tiles.png Binary files differindex 3ae8bce42..9347405d4 100644 --- a/data/tilesets/secondary/unused_1/tiles.png +++ b/data/tilesets/secondary/unused_1/tiles.png diff --git a/data/tilesets/secondary/unused_2/0.png b/data/tilesets/secondary/unused_2/0.png Binary files differindex 2895d3319..2887a970d 100644 --- a/data/tilesets/secondary/unused_2/0.png +++ b/data/tilesets/secondary/unused_2/0.png diff --git a/data/tilesets/secondary/unused_2/1.png b/data/tilesets/secondary/unused_2/1.png Binary files differindex 63c22acf2..2eb2b90f1 100644 --- a/data/tilesets/secondary/unused_2/1.png +++ b/data/tilesets/secondary/unused_2/1.png diff --git a/data/tilesets/secondary/unused_2/2.png b/data/tilesets/secondary/unused_2/2.png Binary files differdeleted file mode 100644 index d1447cde2..000000000 --- a/data/tilesets/secondary/unused_2/2.png +++ /dev/null diff --git a/data/tilesets/secondary/unused_2/3.png b/data/tilesets/secondary/unused_2/3.png Binary files differdeleted file mode 100644 index 8ad81b1e1..000000000 --- a/data/tilesets/secondary/unused_2/3.png +++ /dev/null diff --git a/data/tilesets/secondary/unused_2/tiles.png b/data/tilesets/secondary/unused_2/tiles.png Binary files differindex 2ab3b63d6..d734e826d 100644 --- a/data/tilesets/secondary/unused_2/tiles.png +++ b/data/tilesets/secondary/unused_2/tiles.png |
