ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR 2023-02-01 14:59:45 -05:00
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.md
View File

@ -9,7 +9,7 @@ If you run into trouble, ask for help on Discord or IRC (see [README.md](README.
## Windows
Windows has instructions for building with three possible terminals, providing 3 different options in case the user stumbles upon unexpected errors.
- [Windows 10 (WSL1)](#windows-10-wsl1) (**Fastest, highly recommended**, Windows 10 only)
- [Windows 10/11 (WSL1)](#windows-1011-wsl1) (**Fastest, highly recommended**, Windows 10 and 11 only)
- [Windows (msys2)](#windows-msys2) (Second fastest)
- [Windows (Cygwin)](#windows-cygwin) (Slowest)
@ -26,7 +26,7 @@ All of the Windows instructions assume that the default drive is C:\\. If this d
**A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions.
## Windows 10 (WSL1)
## Windows 10/11 (WSL1)
WSL1 is the preferred terminal to build **pokeemerald**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
- If WSL (Debian or Ubuntu) is **not installed**, then go to [Installing WSL1](#Installing-WSL1).
- Otherwise, if WSL is installed, but it **hasn't previously been set up for another decompilation project**, then go to [Setting up WSL1](#Setting-up-WSL1).

84
data/battle_anim_scripts.s
View File

@ -1458,11 +1458,11 @@ FuryCutterStrongest:
Move_SELF_DESTRUCT:
loadspritegfx ANIM_TAG_EXPLOSION
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, RGB_RED
createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 6, 0, 38, 1
call SelfDestructExplode
call SelfDestructExplode
waitforvisualfinish
@ -1624,11 +1624,11 @@ RisingWaterHitEffect:
Move_EXPLOSION:
loadspritegfx ANIM_TAG_EXPLOSION
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8
createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 8, 0, 40, 1
call Explosion1
call Explosion1
waitforvisualfinish
@ -1657,12 +1657,12 @@ Explosion1:
Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE
createvisualtask AnimTask_DefenseCurlDeformMon, 5
waitforvisualfinish
createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
waitforvisualfinish
end
@ -3920,22 +3920,22 @@ Move_LUSTER_PURGE:
waitforvisualfinish
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23)
waitforvisualfinish
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
@ -4360,7 +4360,7 @@ Move_AERIAL_ACE:
Move_IRON_DEFENSE:
loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0
waitforvisualfinish
end
@ -4373,7 +4373,7 @@ Move_BLOCK:
Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask AnimTask_DeepInhale, 2, 0
createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
delay 12
call RoarEffect
createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3
@ -4572,7 +4572,7 @@ Move_SHOCK_WAVE:
Move_HARDEN:
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish
end
@ -5645,7 +5645,7 @@ HydroPumpBeams:
createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, -16
delay 1
return
HydroPumpHitSplats :
HydroPumpHitSplats:
createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 15, ANIM_TARGET, 1
createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, -15, ANIM_TARGET, 1
return
@ -7219,7 +7219,7 @@ Move_STEEL_WING:
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
@ -7245,7 +7245,7 @@ Move_STEEL_WING:
Move_IRON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@ -7255,7 +7255,7 @@ Move_IRON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
clearmonbg ANIM_TARGET
blendoff
waitforvisualfinish
@ -7275,7 +7275,7 @@ Move_POISON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
clearmonbg ANIM_TARGET
blendoff
call PoisonBubblesEffect
@ -7285,7 +7285,7 @@ Move_POISON_TAIL:
Move_METAL_CLAW:
loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
delay 2
@ -7947,16 +7947,16 @@ Move_PERISH_SONG:
panse SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 0, 16, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 0
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 0
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 0
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 0
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, FALSE
delay 100
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 16, 0, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 1
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, TRUE
waitforvisualfinish
end
@ -8102,7 +8102,7 @@ Move_ENCORE:
loadspritegfx ANIM_TAG_SPOTLIGHT
loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0
createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE
waitforvisualfinish
createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8
createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9
@ -8113,7 +8113,7 @@ Move_ENCORE:
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1
createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE
waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 2
end
@ -8364,7 +8364,7 @@ Move_HYPER_BEAM:
delay 30
createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call HyperBeamOrbs
call HyperBeamOrbs
call HyperBeamOrbs
@ -8408,7 +8408,7 @@ Move_FLATTER:
loadspritegfx ANIM_TAG_CONFETTI
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0
createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE
waitforvisualfinish
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0
@ -8439,7 +8439,7 @@ Move_FLATTER:
delay 5
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1
createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE
waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 2
end
@ -9680,10 +9680,10 @@ Move_TWISTER:
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
delay 4
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3

6
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -411,7 +411,13 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
special LoadPlayerParty
closemessage
delay 2
@ The command tower_save ultimately calls TrySavingData(SAVE_LINK), which writes data in SaveBlock1 and SaveBlock2
@ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save,
@ which they can opt out of. As a result the player can save their party and quit without having saved the PC.
@ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing).
.ifndef BUGFIX
tower_save 0
.endif
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed

2
data/specials.inc
View File

@ -258,7 +258,7 @@ gSpecials::
def_special CallSlateportTentFunction
def_special ChoosePartyForBattleFrontier
def_special ValidateEReaderTrainer
def_special GetBestBattleTowerStreak
def_special GetBattleTowerSinglesStreak
def_special ReducePlayerPartyToSelectedMons
def_special BedroomPC
def_special PlayerPC

2
gflib/sprite.c
View File

@ -1615,7 +1615,7 @@ void LoadSpritePalettes(const struct SpritePalette *palettes)
void DoLoadSpritePalette(const u16 *src, u16 paletteOffset)
{
LoadPalette(src, paletteOffset + 0x100, 32);
LoadPalette(src, OBJ_PLTT_OFFSET + paletteOffset, PLTT_SIZE_4BPP);
}
u8 AllocSpritePalette(u16 tag)

BIN
graphics/battle_frontier/tourney_info_card.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
graphics/battle_interface/ball_caught_indicator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 B

After

Width:  |  Height:  |  Size: 158 B

BIN
graphics/battle_interface/status.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 531 B

BIN
graphics/battle_interface/status2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 531 B

BIN
graphics/battle_interface/status3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 530 B

BIN
graphics/battle_interface/status4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 530 B

BIN
graphics/battle_interface/status_brn.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 176 B

BIN
graphics/battle_interface/status_frz.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 177 B

BIN
graphics/battle_interface/status_par.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 176 B

BIN
graphics/battle_interface/status_psn.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 176 B

BIN
graphics/battle_interface/status_slp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 176 B

147
graphics/berry_crush/crusher.pal
View File

@ -1,147 +0,0 @@
JASC-PAL
0100
144
98 172 180
255 213 156
255 197 139
255 164 106
238 131 82
222 123 74
213 98 49
197 82 41
156 213 189
123 180 156
222 156 255
172 123 222
255 0 255
255 0 255
230 230 255
65 74 90
156 148 172
255 213 156
255 197 139
255 164 106
238 131 82
222 123 74
213 98 49
197 82 41
255 238 0
230 189 0
180 180 180
139 139 139
255 0 255
255 0 255
230 230 255
65 74 90
156 148 172
255 213 156
255 197 139
255 164 106
238 131 82
222 123 74
213 98 49
197 82 41
197 213 246
255 255 255
238 238 246
205 205 213
255 0 255
255 0 255
230 230 255
65 74 90
255 180 255
164 172 172
98 106 115
123 131 139
139 148 156
148 222 164
156 189 222
197 213 246
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
139 123 74
74 131 189
65 74 90
0 0 0
148 222 164
164 230 172
180 238 189
197 246 205
213 255 222
238 255 238
255 255 255
65 180 238
255 255 255
0 197 57
255 255 255
246 213 0
255 0 255
246 238 205
139 123 74
255 164 106
164 172 172
98 106 115
123 131 139
139 148 156
115 156 189
156 189 222
197 213 246
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
139 123 74
74 131 189
65 74 90
0 0 0
148 222 164
164 230 172
180 238 189
197 246 205
213 255 222
238 255 238
255 255 255
189 65 255
255 255 255
123 123 123
255 0 255
246 238 205
139 123 74
180 189 189
255 255 255
0 0 255
164 172 172
98 106 115
123 131 139
139 148 156
115 156 189
156 189 222
148 222 164
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
139 123 74
74 131 189
65 74 90
98 172 180
41 41 57
213 213 222
205 205 205
238 238 238
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/berry_crush/crusher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

67
graphics/cable_car/bg.pal
View File

@ -1,67 +0,0 @@
JASC-PAL
0100
64
0 0 0
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
255 230 139
238 205 123
222 189 115
205 172 106
189 156 98
180 139 90
230 106 189
230 106 189
230 106 189
0 0 0
189 255 148
156 222 98
131 197 74
106 164 49
82 115 24
57 82 0
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
0 0 0
213 238 255
189 230 255
164 222 255
139 213 255
115 205 255
98 205 255
197 205 222
189 189 197
180 164 164
156 131 131
131 90 90
123 65 65
230 106 189
230 106 189
230 106 189
0 0 0
197 205 246
172 189 238
156 172 238
131 156 230
115 139 230
98 123 230
65 74 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/cable_car/bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
graphics/contest/interface.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

259
graphics/contest/interface_audience.pal
View File

@ -1,259 +0,0 @@
JASC-PAL
0100
256
0 0 0
255 255 255
230 230 230
197 197 197
148 148 148
74 65 82
0 255 0
0 255 0
65 74 123
139 123 131
82 82 197
189 82 74
131 74 98
74 74 131
131 139 222
106 164 164
0 0 0
115 123 156
90 65 57
148 197 106
123 98 65
131 123 49
222 189 148
164 131 106
115 164 82
164 148 57
90 106 139
180 172 82
82 139 49
255 230 189
222 131 41
246 246 222
205 148 115
255 106 115
255 57 57
156 0 0
164 222 255
106 148 255
49 82 255
255 255 115
246 222 65
230 106 0
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
0 0 0
255 255 115
246 222 90
238 189 65
238 164 41
230 131 16
230 106 0
255 41 0
255 148 82
255 255 164
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
0 0 0
255 131 106
197 24 16
164 222 255
106 148 255
49 82 255
255 197 255
255 139 255
213 0 139
148 255 164
65 205 57
246 222 65
230 106 0
255 255 255
65 74 106
65 74 106
197 255 255
246 246 90
205 205 65
255 255 180
180 180 24
74 65 82
255 255 255
156 156 156
255 156 156
0 0 0
255 255 255
255 148 148
255 123 98
255 0 0
148 148 148
0 0 0
197 255 255
246 246 90
205 205 65
255 255 180
180 180 24
74 65 82
255 255 255
156 156 156
255 156 156
0 0 0
255 255 255
255 148 148
255 123 98
255 0 0
148 148 148
0 0 0
197 255 255
246 246 90
205 205 65
255 255 180
180 180 24
74 65 82
255 255 255
156 156 156
255 156 156
0 0 0
255 255 255
255 148 148
255 123 98
255 0 0
148 148 148
0 0 0
197 255 255
213 255 213
156 222 148
222 255 230
123 189 115
74 65 82
255 255 255
156 156 156
255 156 156
0 0 0
255 255 255
255 148 148
255 123 98
255 0 0
148 148 148
0 0 0
0 172 255
0 0 0
255 255 255
230 230 213
0 0 0
197 197 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 255 255
197 255 255
0 0 0
0 0 0
0 0 0
65 0 0
123 0 0
189 0 0
255 8 0
255 65 0
255 123 0
255 189 0
255 255 0
255 255 123
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

259
graphics/contest/results_screen/tiles.pal
View File

@ -1,259 +0,0 @@
JASC-PAL
0100
256
0 0 0
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
255 106 115
255 57 57
205 32 0
246 213 0
255 123 98
156 180 90
164 148 57
90 106 139
180 172 82
0 0 0
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
164 222 255
106 148 255
24 57 205
246 213 0
255 123 98
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
255 197 255
255 139 255
213 0 139
246 213 0
255 123 98
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
180 255 197
148 255 164
65 172 57
246 213 0
255 123 98
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 255 255
189 189 197
131 131 139
98 98 123
65 74 106
41 49 90
255 255 164
246 213 0
230 106 0
246 213 0
255 123 98
0 0 0
0 0 0
0 0 0
0 0 0
197 255 255
255 255 255
213 213 213
131 131 139
98 98 123
65 74 106
41 49 90
164 222 255
106 148 255
49 82 255
180 255 197
148 255 164
65 172 57
0 0 0
0 0 0
0 0 0
197 255 255
255 255 255
213 213 213
131 131 139
98 98 123
65 74 106
41 49 90
255 139 230
255 139 230
255 49 156
255 255 0
255 255 0
189 172 0
41 49 90
41 49 90
0 0 0
197 123 131
255 255 255
230 246 255
205 238 255
180 238 255
156 230 255
139 230 255
255 205 230
255 255 139
255 230 255
255 255 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
197 255 255
255 255 255
213 213 213
131 131 139
98 98 123
65 74 106
41 49 90
255 172 197
255 172 172
255 180 148
255 189 123
255 197 98
255 205 82
156 156 156
156 156 156
156 156 156
197 255 255
255 255 255
213 213 213
131 131 139
98 98 123
65 74 106
41 49 90
164 222 255
106 148 255
49 82 255
180 255 197
148 255 164
65 172 57
0 0 0
0 0 0
0 0 0
0 0 0
164 222 255
106 230 222
49 238 189
0 255 156
0 255 156
82 255 98
164 255 49
255 255 0
255 172 16
255 90 32
255 8 57
230 57 106
205 115 156
180 164 205
164 222 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/contest/results_screen/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
graphics/door_anims/battle_dome_pre_battle_room.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 432 B

BIN
graphics/door_anims/dewford.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 405 B

BIN
graphics/door_anims/fallarbor_dark_roof.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 432 B

After

Width:  |  Height:  |  Size: 384 B

BIN
graphics/door_anims/lilycove_dept_store_elevator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 298 B

BIN
graphics/door_anims/littleroot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 391 B

BIN
graphics/door_anims/mossdeep.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 411 B

After

Width:  |  Height:  |  Size: 377 B

BIN
graphics/door_anims/oldale.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 434 B

After

Width:  |  Height:  |  Size: 397 B

BIN
graphics/door_anims/poke_mart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 419 B

After

Width:  |  Height:  |  Size: 355 B

BIN
graphics/door_anims/slateport.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 425 B

After

Width:  |  Height:  |  Size: 387 B

BIN
graphics/door_anims/trainer_hill_roof_elevator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 296 B

BIN
graphics/door_anims/verdanturf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 451 B

After

Width:  |  Height:  |  Size: 403 B

131
graphics/frontier_pass/bg.pal
View File

@ -1,131 +0,0 @@
JASC-PAL
0100
128
57 74 74
255 255 255
205 205 205
164 164 164
123 123 123
98 98 115
57 74 74
230 246 255
98 41 65
255 255 230
230 230 197
255 32 32
98 164 222
82 139 197
74 115 172
74 98 106
139 98 115
255 255 255
230 255 222
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
180 230 156
148 238 131
131 222 115
82 172 74
106 189 255
205 205 205
0 0 0
139 98 115
238 255 246
213 238 230
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
189 213 205
148 180 164
106 148 123
65 115 90
106 189 255
205 205 205
0 0 0
139 98 115
255 246 230
246 230 213
205 156 90
180 131 65
98 98 115
41 57 65
57 106 139
65 139 197
230 189 139
205 156 115
180 131 82
156 106 41
106 189 255
205 205 205
0 0 0
139 98 115
246 246 255
230 230 238
189 189 197
156 156 156
156 106 41
41 57 65
57 106 139
65 139 197
230 230 238
189 189 197
156 156 156
123 123 123
106 189 255
205 205 205
0 0 0
139 98 115
246 246 222
246 238 172
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
246 230 139
230 213 49
213 197 57
156 115 57
106 189 255
205 205 205
0 0 0
0 0 0
106 131 238
139 164 213
189 205 205
213 197 131
246 222 164
172 131 131
148 98 106
115 106 148
106 123 197
197 230 230
139 189 131
106 156 74
148 222 189
238 156 131
238 246 255
0 0 0
123 148 189
65 74 106
106 98 115
82 90 180
139 123 139
164 172 189
106 148 131
180 205 213
156 156 156
213 238 230
255 255 255
213 180 172
222 230 238
213 205 156
0 0 0

BIN
graphics/frontier_pass/bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
graphics/frontier_pass/map_screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
graphics/interface/menu_info.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

259
graphics/intro/scene_1/bg.pal
View File

@ -1,259 +0,0 @@
JASC-PAL
0100
256
0 0 0
24 90 0
49 115 0
65 139 0
90 172 0
164 172 255
164 197 255
139 213 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
148 205 98
180 255 131
164 238 98
0 0 0
24 90 0
49 115 0
65 139 0
90 172 0
164 172 255
164 197 255
139 213 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
148 205 98
180 255 131
164 238 98
0 0 0
24 82 0
32 90 0
41 98 0
49 115 0
57 123 0
65 139 0
74 148 0
82 156 0
90 172 0
0 16 0
8 41 0
16 57 0
123 197 16
180 255 131
164 238 98
0 0 0
24 82 0
32 90 0
41 98 0
49 115 0
57 123 0
65 139 0
74 148 0
82 156 0
90 172 0
8 24 8
8 41 0
16 57 0
148 205 98
98 172 74
238 255 238
0 0 0
24 90 0
49 115 0
65 139 0
90 172 0
164 172 255
164 197 255
139 213 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
148 205 98
180 255 131
164 238 98
0 0 0
255 255 255
246 246 238
238 246 230
230 246 222
205 238 222
180 230 230
172 213 238
131 205 238
180 180 156
213 213 230
205 197 213
189 230 115
156 213 98
222 230 222
115 172 98
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
156 246 0
65 90 156
49 115 255
82 82 82
98 98 98
115 115 115
131 131 131
148 148 148
164 164 164
180 180 180
197 197 197
213 213 213
230 230 230
255 255 255
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/intro/scene_1/bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
graphics/misc/mirage_tower.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 904 B

179
graphics/party_menu/bg.pal
View File

@ -1,179 +0,0 @@
JASC-PAL
0100
176
123 156 115
255 255 255
106 106 106
0 0 0
65 205 255
0 139 189
49 189 238
255 156 148
189 90 82
222 123 115
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
139 148 123
74 74 98
65 156 148
139 156 41
205 213 123
180 180 90
82 65 74
32 16 24
255 0 255
255 0 255
255 255 255
230 238 139
98 90 0
255 0 255
255 0 255
115 90 180
139 148 123
255 115 49
65 156 148
139 156 41
205 213 123
180 180 90
82 65 74
82 82 90
255 0 255
255 0 255
255 255 255
123 205 180
57 148 123
255 0 255
255 0 255
164 115 246
123 156 115
74 74 98
115 115 115
255 255 255
131 197 222
57 148 222
41 123 180
131 197 222
41 123 180
115 255 172
90 213 131
65 205 255
0 98 148
82 82 82
255 213 82
255 180 65
123 156 115
74 74 98
115 115 115
255 255 255
213 197 90
197 164 24
156 156 32
213 197 90
156 156 32
255 230 57
205 172 8
255 156 148
156 65 57
82 82 82
255 213 82
255 180 65
123 156 115
74 74 98
115 115 115
255 255 255
213 164 32
197 106 16
164 74 0
213 164 32
164 74 0
255 115 49
197 57 0
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
123 156 115
255 115 49
115 115 115
255 255 255
180 255 164
123 222 131
123 156 98
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
172 238 255
123 213 238
74 172 205
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
246 246 148
246 230 98
222 197 32
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 115 49
115 115 115
255 255 255
255 213 222
255 189 148
238 164 131
255 115 49
255 115 49
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65
57 156 255
255 255 115
115 115 115
255 255 255
180 255 164
123 222 131
131 172 106
255 255 115
255 255 115
255 0 255
255 0 255
255 0 255
255 0 255
82 82 82
255 213 82
255 180 65

BIN
graphics/party_menu/bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 613 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/picture_frame/beauty.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
graphics/picture_frame/cool.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
graphics/picture_frame/cute.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
graphics/picture_frame/lobby.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 719 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
graphics/picture_frame/smart.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
graphics/picture_frame/tough.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

19
graphics/pokemon_storage/box_bg1.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
106 205 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon_storage/box_selection_popup_center.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 107 B

After

Width:  |  Height:  |  Size: 164 B

BIN
graphics/pokemon_storage/box_selection_popup_sides.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 185 B

BIN
graphics/pokemon_storage/item_info_frame.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

BIN
graphics/pokemon_storage/menu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

19
graphics/pokemon_storage/party_menu.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 172 180
41 106 98
82 98 115
74 172 164
57 139 139
164 213 246
115 189 98
255 255 255
123 189 255
0 123 255
41 90 164
123 205 180
8 74 65
164 238 148
65 82 90

0
graphics/pokemon_storage/bg.pal → graphics/pokemon_storage/scrolling_bg.pal
View File

BIN
graphics/pokemon_storage/scrolling_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 228 B

0
graphics/pokemon_storage/bg_move_items.pal → graphics/pokemon_storage/scrolling_bg_move_items.pal
View File

35
graphics/rayquaza_scene/scene_1/clouds.pal
View File

@ -1,35 +0,0 @@
JASC-PAL
0100
32
164 205 180
82 82 90
255 0 255
205 115 0
156 98 16
98 82 32
49 65 49
0 49 65
24 57 65
49 65 74
49 49 57
74 74 82
98 98 106
115 115 131
139 148 148
0 0 0
32 90 115
131 131 131
148 148 148
172 172 172
197 197 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/rayquaza_scene/scene_1/clouds.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 964 B

After

Width:  |  Height:  |  Size: 1.1 KiB

83
graphics/slot_machine/menu.pal
View File

@ -1,83 +0,0 @@
JASC-PAL
0100
80
0 0 0
57 57 49
230 230 230
255 255 255
131 213 172
49 123 74
90 172 106
255 0 255
90 172 106
255 164 41
255 98 57
255 197 156
172 57 0
0 65 24
98 98 90
0 0 0
222 222 222
255 255 255
131 213 172
255 90 0
222 41 0
255 90 0
222 41 0
255 90 0
222 41 0
255 90 0
222 41 0
255 90 0
222 41 0
255 0 255
156 0 0
0 0 0
0 0 0
255 255 255
74 74 213
115 172 255
115 164 74
156 238 74
230 65 24
255 164 41
255 238 32
131 213 172
189 189 189
156 156 156
123 123 123
90 90 90
65 65 65
0 0 0
255 0 255
255 255 255
65 164 82
139 230 139
139 230 139
148 238 148
164 246 164
180 246 180
189 246 189
205 255 205
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
0 0 0
222 222 222
65 90 213
90 172 106
255 255 255
131 213 172
0 98 115
90 90 0
90 90 0
156 16 0
156 16 0
106 156 246
205 205 0
205 205 0
246 106 74
246 106 74
0 0 0

BIN
graphics/slot_machine/menu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
graphics/starter_choose/birch_bag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/starter_choose/birch_grass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 691 B

BIN
graphics/starter_choose/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

131
graphics/summary_screen/tiles.pal
View File

@ -1,131 +0,0 @@
JASC-PAL
0100
128
180 180 115
74 65 57
255 255 255
222 230 246
213 213 189
246 255 255
115 106 98
98 156 222
74 148 189
57 148 164
32 148 139
16 148 115
156 222 164
98 180 139
49 139 115
0 106 98
180 180 115
74 65 57
255 255 255
90 106 0
123 139 32
255 246 205
115 106 98
90 222 123
90 205 98
90 189 74
98 172 49
98 156 24
238 164 255
189 156 164
148 148 82
106 148 0
180 180 115
74 65 57
255 255 255
172 180 172
205 205 197
246 255 238
115 106 98
238 222 24
213 189 57
189 164 98
164 139 131
139 115 172
205 222 123
172 172 148
139 131 180
115 90 213
180 180 115
74 65 57
255 255 255
0 0 0
0 0 0
246 255 246
115 106 98
222 24 238
189 16 238
164 8 238
131 8 246
106 0 246
172 222 222
139 148 230
106 74 238
82 0 255
180 180 115
74 65 57
148 32 172
189 106 213
230 189 255
255 255 255
213 148 246
189 139 205
255 230 255
230 180 213
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 98 90
180 180 115
74 65 57
255 255 255
222 230 246
246 246 222
246 255 255
115 106 98
255 205 74
230 164 98
205 123 123
180 82 148
156 41 172
230 156 255
197 98 238
164 49 222
131 0 205
98 180 106
0 0 0
213 213 205
255 255 255
98 98 98
230 8 8
255 189 115
65 205 255
0 139 189
255 156 148
189 90 82
139 246 255
24 164 213
255 189 180
213 115 106
0 0 0
98 180 106
0 0 0
213 213 205
255 255 255
98 98 98
230 8 8
255 189 115
238 238 172
164 164 98
0 0 0
0 0 0
0 0 0
0 0 0
255 0 0
164 0 0
255 255 255

BIN
graphics/summary_screen/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
graphics/trainer_card/one_star.pal → graphics/trainer_card/bronze.pal
View File

BIN
graphics/trainer_card/card.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 970 B

BIN
graphics/trainer_card/card_fr.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

0
graphics/trainer_card/two_stars.pal → graphics/trainer_card/copper.pal
View File

51
graphics/trainer_card/four_stars.pal
View File

@ -1,51 +0,0 @@
JASC-PAL
0100
48
139 98 115
246 246 222
246 238 172
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
246 230 139
230 213 49
213 197 57
156 115 57
106 189 255
205 205 205
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0

0
graphics/trainer_card/back_fr.bin → graphics/trainer_card/frlg/back.bin
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
graphics/trainer_card/badges_fr.png → graphics/trainer_card/frlg/badges.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 587 B

After

Width:  |  Height:  |  Size: 587 B

0
graphics/trainer_card/bg_fr.bin → graphics/trainer_card/frlg/bg.bin
View File

0
graphics/trainer_card/0star_fr.pal → graphics/trainer_card/frlg/blue.pal
View File

0
graphics/trainer_card/two_stars_fr.pal → graphics/trainer_card/frlg/bronze.pal
View File

0
graphics/trainer_card/female_bg_fr.pal → graphics/trainer_card/frlg/female_bg.pal
View File

0
graphics/trainer_card/front_fr.bin → graphics/trainer_card/frlg/front.bin
View File

0
graphics/trainer_card/front_link_fr.bin → graphics/trainer_card/frlg/front_link.bin
View File

0
graphics/trainer_card/four_stars_fr.pal → graphics/trainer_card/frlg/gold.pal
View File

0
graphics/trainer_card/one_star_fr.pal → graphics/trainer_card/frlg/green.pal
View File

0
graphics/trainer_card/three_stars_fr.pal → graphics/trainer_card/frlg/silver.pal
View File

0
graphics/trainer_card/stickers_fr.png → graphics/trainer_card/frlg/stickers.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

0
graphics/trainer_card/stickers_fr1.pal → graphics/trainer_card/frlg/stickers1.pal
View File

0
graphics/trainer_card/stickers_fr2.pal → graphics/trainer_card/frlg/stickers2.pal
View File

0
graphics/trainer_card/stickers_fr3.pal → graphics/trainer_card/frlg/stickers3.pal
View File

0
graphics/trainer_card/stickers_fr4.pal → graphics/trainer_card/frlg/stickers4.pal
View File

BIN
graphics/trainer_card/frlg/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

56
graphics/trainer_card/gold.pal
View File

@ -1,19 +1,51 @@
JASC-PAL
0100
16
48
139 98 115
246 197 0
205 164 0
246 197 0
246 197 0
246 197 0
246 197 0
246 197 0
246 246 222
246 238 172
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
246 230 139
230 213 49
213 197 57
156 115 57
106 189 255
205 205 205
0 0 0
0 0 0
189 148 16
255 213 82
0 0 0
0 0 0
189 148 16
246 197 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0

0
graphics/trainer_card/0star.pal → graphics/trainer_card/green.pal
View File

0
graphics/trainer_card/three_stars.pal → graphics/trainer_card/silver.pal
View File

19
graphics/trainer_card/star.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 98 115
246 197 0
205 164 0
246 197 0
246 197 0
246 197 0
246 197 0
246 197 0
0 0 0
0 0 0
189 148 16
255 213 82
0 0 0
0 0 0
189 148 16
246 197 0

BIN
graphics/trainer_card/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

6
graphics_file_rules.mk
View File

@ -632,9 +632,6 @@ $(WALLPAPERGFXDIR)/ludicolo/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
$(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/whiscash/bg.4bpp
@cat $^ >$@
$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
$(INTERFACEGFXDIR)/outline_cursor.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
@ -675,9 +672,6 @@ $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
$(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
$(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp
@cat $^ >$@
$(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 5 -Wnum_tiles

15
include/constants/battle_anim.h
View File

@ -298,10 +298,17 @@
#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288)
// battlers
#define ANIM_ATTACKER 0
#define ANIM_TARGET 1
#define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3
#define ANIM_ATTACKER 0
#define ANIM_TARGET 1
#define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3
// Below are used by AnimTask_ShakeMon2 and AnimTask_SetGrayscaleOrOriginalPal
#define ANIM_PLAYER_LEFT (MAX_BATTLERS_COUNT + 0)
#define ANIM_PLAYER_RIGHT (MAX_BATTLERS_COUNT + 1)
#define ANIM_OPPONENT_LEFT (MAX_BATTLERS_COUNT + 2)
#define ANIM_OPPONENT_RIGHT (MAX_BATTLERS_COUNT + 3)
#define ANIM_ATTACKER_FORCE (MAX_BATTLERS_COUNT + 4)
// stereo panning constants [0-255]
//

2037
include/constants/easy_chat.h
View File

File diff suppressed because it is too large Load Diff

108
include/constants/game_stat.h
View File

@ -1,60 +1,60 @@
#ifndef GUARD_CONSTANTS_GAME_STAT_H
#define GUARD_CONSTANTS_GAME_STAT_H
#define GAME_STAT_SAVED_GAME 0
#define GAME_STAT_FIRST_HOF_PLAY_TIME 1
#define GAME_STAT_STARTED_TRENDS 2
#define GAME_STAT_PLANTED_BERRIES 3
#define GAME_STAT_TRADED_BIKES 4
#define GAME_STAT_STEPS 5
#define GAME_STAT_GOT_INTERVIEWED 6
#define GAME_STAT_TOTAL_BATTLES 7
#define GAME_STAT_WILD_BATTLES 8
#define GAME_STAT_TRAINER_BATTLES 9
#define GAME_STAT_ENTERED_HOF 10
#define GAME_STAT_POKEMON_CAPTURES 11
#define GAME_STAT_FISHING_CAPTURES 12
#define GAME_STAT_HATCHED_EGGS 13
#define GAME_STAT_EVOLVED_POKEMON 14
#define GAME_STAT_USED_POKECENTER 15
#define GAME_STAT_RESTED_AT_HOME 16
#define GAME_STAT_ENTERED_SAFARI_ZONE 17
#define GAME_STAT_USED_CUT 18
#define GAME_STAT_USED_ROCK_SMASH 19
#define GAME_STAT_MOVED_SECRET_BASE 20
#define GAME_STAT_POKEMON_TRADES 21
#define GAME_STAT_UNKNOWN_22 22
#define GAME_STAT_LINK_BATTLE_WINS 23
#define GAME_STAT_LINK_BATTLE_LOSSES 24
#define GAME_STAT_LINK_BATTLE_DRAWS 25
#define GAME_STAT_USED_SPLASH 26
#define GAME_STAT_USED_STRUGGLE 27
#define GAME_STAT_SLOT_JACKPOTS 28
#define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29
#define GAME_STAT_ENTERED_BATTLE_TOWER 30
#define GAME_STAT_UNKNOWN_31 31
#define GAME_STAT_BATTLE_TOWER_BEST_STREAK 32
#define GAME_STAT_POKEBLOCKS 33
#define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34
#define GAME_STAT_WON_LINK_CONTEST 35
#define GAME_STAT_ENTERED_CONTEST 36
#define GAME_STAT_WON_CONTEST 37
#define GAME_STAT_SHOPPED 38
#define GAME_STAT_USED_ITEMFINDER 39
#define GAME_STAT_GOT_RAINED_ON 40
#define GAME_STAT_CHECKED_POKEDEX 41
#define GAME_STAT_RECEIVED_RIBBONS 42
#define GAME_STAT_JUMPED_DOWN_LEDGES 43
#define GAME_STAT_WATCHED_TV 44
#define GAME_STAT_CHECKED_CLOCK 45
#define GAME_STAT_WON_POKEMON_LOTTERY 46
#define GAME_STAT_USED_DAYCARE 47
#define GAME_STAT_RODE_CABLE_CAR 48
#define GAME_STAT_ENTERED_HOT_SPRINGS 49
#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50
#define GAME_STAT_PLAYED_BERRY_CRUSH 51
#define GAME_STAT_SAVED_GAME 0
#define GAME_STAT_FIRST_HOF_PLAY_TIME 1
#define GAME_STAT_STARTED_TRENDS 2
#define GAME_STAT_PLANTED_BERRIES 3
#define GAME_STAT_TRADED_BIKES 4
#define GAME_STAT_STEPS 5
#define GAME_STAT_GOT_INTERVIEWED 6
#define GAME_STAT_TOTAL_BATTLES 7
#define GAME_STAT_WILD_BATTLES 8
#define GAME_STAT_TRAINER_BATTLES 9
#define GAME_STAT_ENTERED_HOF 10
#define GAME_STAT_POKEMON_CAPTURES 11
#define GAME_STAT_FISHING_CAPTURES 12
#define GAME_STAT_HATCHED_EGGS 13
#define GAME_STAT_EVOLVED_POKEMON 14
#define GAME_STAT_USED_POKECENTER 15
#define GAME_STAT_RESTED_AT_HOME 16
#define GAME_STAT_ENTERED_SAFARI_ZONE 17
#define GAME_STAT_USED_CUT 18
#define GAME_STAT_USED_ROCK_SMASH 19
#define GAME_STAT_MOVED_SECRET_BASE 20
#define GAME_STAT_POKEMON_TRADES 21
#define GAME_STAT_UNKNOWN_22 22
#define GAME_STAT_LINK_BATTLE_WINS 23
#define GAME_STAT_LINK_BATTLE_LOSSES 24
#define GAME_STAT_LINK_BATTLE_DRAWS 25
#define GAME_STAT_USED_SPLASH 26
#define GAME_STAT_USED_STRUGGLE 27
#define GAME_STAT_SLOT_JACKPOTS 28
#define GAME_STAT_CONSECUTIVE_ROULETTE_WINS 29
#define GAME_STAT_ENTERED_BATTLE_TOWER 30
#define GAME_STAT_UNKNOWN_31 31
#define GAME_STAT_BATTLE_TOWER_SINGLES_STREAK 32
#define GAME_STAT_POKEBLOCKS 33
#define GAME_STAT_POKEBLOCKS_WITH_FRIENDS 34
#define GAME_STAT_WON_LINK_CONTEST 35
#define GAME_STAT_ENTERED_CONTEST 36
#define GAME_STAT_WON_CONTEST 37
#define GAME_STAT_SHOPPED 38
#define GAME_STAT_USED_ITEMFINDER 39
#define GAME_STAT_GOT_RAINED_ON 40
#define GAME_STAT_CHECKED_POKEDEX 41
#define GAME_STAT_RECEIVED_RIBBONS 42
#define GAME_STAT_JUMPED_DOWN_LEDGES 43
#define GAME_STAT_WATCHED_TV 44
#define GAME_STAT_CHECKED_CLOCK 45
#define GAME_STAT_WON_POKEMON_LOTTERY 46
#define GAME_STAT_USED_DAYCARE 47
#define GAME_STAT_RODE_CABLE_CAR 48
#define GAME_STAT_ENTERED_HOT_SPRINGS 49
#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50
#define GAME_STAT_PLAYED_BERRY_CRUSH 51
#define NUM_USED_GAME_STATS 52
#define NUM_GAME_STATS 64
#define NUM_USED_GAME_STATS 52
#define NUM_GAME_STATS 64
#endif // GUARD_CONSTANTS_GAME_STAT_H

4
include/constants/maps.h
View File

@ -14,8 +14,8 @@
// IDs for dynamic warps. Both are used in the dest_warp_id field for warp events, but they
// are never read in practice. A dest_map of MAP_DYNAMIC is used to indicate that a
// dynamic warp should be used, at which point the warp id is ignored. It can be passed to
// SetDynamicWarp/SetDynamicWarpWithCoords as the first argument, but this argument is unused.
// dynamic warp should be used, at which point the warp id is ignored. They can be passed
// as the argument to SetWarpDestinationToDynamicWarp, but this argument is unused.
// As only one dynamic warp is saved at a time there's no need to distinguish between them.
#define WARP_ID_SECRET_BASE 0x7E
#define WARP_ID_DYNAMIC 0x7F

Some files were not shown because too many files have changed in this diff Show More