Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-23 14:16:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #90 from cawtds/expansion-update

Browse Source 
Expansion update ab6c97e04f0f9be9296cb23ac83eec70015bdcbd
This commit is contained in:
cawtds 2025-11-15 04:19:53 +01:00 committed by GitHub
commit 7b290b568c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
399 changed files with 21193 additions and 12267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
asm/macros/battle_script.inc
View File

@ -13,7 +13,7 @@
.byte 0x2
.endm
.macro unused0x3
.macro unused_0x3
.byte 0x3
.endm
@ -45,14 +45,16 @@
.byte 0xa
.endm
.macro healthbarupdate battler:req
.macro healthbarupdate battler:req updateState:req
.byte 0xb
.byte \battler
.byte \updateState
.endm
.macro datahpupdate battler:req
.macro datahpupdate battler:req updateState:req
.byte 0xc
.byte \battler
.byte \updateState
.endm
.macro critmessage
@ -187,8 +189,13 @@
.4byte \jumpInstr
.endm
.macro unused_0x21
.macro jumpifstatignorecontrary battler:req, comparison:req, stat:req, value:req, jumpInstr:req
.byte 0x21
.byte \battler
.byte \comparison
.byte \stat
.byte \value
.4byte \jumpInstr
.endm
.macro jumpbasedontype battler:req, type:req, jumpIfType:req, jumpInstr:req
@ -358,9 +365,8 @@
.byte 0x3a
.endm
.macro absorbhealthbarupdate battler:req
.macro isdmgblockedbydisguise
.byte 0x3b
.byte \battler
.endm
.macro return
@ -673,10 +679,8 @@
.byte 0x75
.endm
.macro various battler:req, id:req
.macro unused_0x78
.byte 0x76
.byte \battler
.byte \id
.endm
.macro setprotectlike
@ -759,7 +763,7 @@
callnative BS_RemoveStockpileCounters
.endm
.macro setdrainedhp
.macro unused_0x88
.byte 0x88
.endm
@ -935,7 +939,7 @@
.4byte \failInstr
.endm
.macro trysetdestinybondtohappen
.macro unused_0xab
.byte 0xab
.endm
@ -1011,9 +1015,10 @@
.4byte \jumpInstr
.endm
.macro tryrestorehpberry battler:req
.macro tryactivateitem battler:req, flag:req
.byte 0xbb
.byte \battler
.byte \flag
.endm
.macro halvehp failInstr:req
@ -1292,7 +1297,7 @@
.byte 0xf3
.endm
.macro subattackerhpbydmg
.macro unused_0xf4
.byte 0xf4
.endm
@ -1338,7 +1343,7 @@
.byte \trigger
.endm
.macro tryworryseed failInstr:req
.macro tryoverwriteability failInstr:req
.byte 0xfe
.4byte \failInstr
.endm
@ -1615,14 +1620,6 @@
.4byte \failInstr
.endm
.macro tryupdaterecoiltracker
callnative BS_TryUpdateRecoilTracker
.endm
.macro tryupdateleaderscresttracker
callnative BS_TryUpdateLeadersCrestTracker
.endm
.macro trytidyup clear:req, jumpInstr:req
callnative BS_TryTidyUp
.byte \clear
@ -1762,6 +1759,10 @@
.2byte \flags
.endm
.macro clearspecialstatuses
callnative BS_ClearSpecialStatuses
.endm
.macro clearmoveresultflags flags:req
callnative BS_ClearMoveResultFlags
.2byte \flags
@ -1784,11 +1785,8 @@
.4byte \jumpInstr
.endm
.macro jumpiflastuseditemholdeffect holdEffect:req, secondaryId:req, jumpInstr:req
callnative BS_JumpIfLastUsedItemHoldEffect
.byte \holdEffect
.2byte \secondaryId
.4byte \jumpInstr
.macro tryflingholdeffect
callnative BS_TryFlingHoldEffect
.endm
.macro swapsidestatuses
@ -1940,12 +1938,6 @@
.4byte \jumpInstr
.endm
.macro infatuatewithbattler battler:req, infatuateWith:req
callnative BS_InfatuateWithBattler
.byte \battler
.byte \infatuateWith
.endm
.macro setlastuseditem battler:req
callnative BS_SetLastUsedItem
.byte \battler
@ -2077,9 +2069,8 @@
.byte \id
.endm
.macro arenawaitmessage id:req
.macro arenawaitmessage
callnative BS_ArenaWaitMessage
.byte \id
.endm
.macro waitcry
@ -2159,11 +2150,6 @@
.4byte \failInstr
.endm
.macro setsimplebeam failInstr:req
callnative BS_SetSimpleBeam
.4byte \failInstr
.endm
.macro tryentrainment failInstr:req
callnative BS_TryEntrainment
.4byte \failInstr
@ -2366,8 +2352,8 @@
.4byte \jumpInstr
.endm
.macro jumpifleafguardprotected battler:req, jumpInstr:req
callnative BS_JumpIfLeafGuardProtected
.macro jumpifabilitypreventsrest battler:req, jumpInstr:req
callnative BS_JumpIfAbilityPreventsRest
.byte \battler
.4byte \jumpInstr
.endm
@ -2386,10 +2372,6 @@
.4byte \failInstr
.endm
.macro curecertainstatuses
callnative BS_CureCertainStatuses
.endm
.macro tryresetnegativestatstages
callnative BS_TryResetNegativeStatStages
.endm

14
asm/macros/event.inc
View File

@ -988,10 +988,10 @@
@ Gives the player a Pokémon of the specified species and level, and allows to customize extra parameters.
@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
.macro givemon species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, isShiny, gmaxFactor, teraType, dmaxLevel
.macro givemon species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, shinyMode, gmaxFactor, teraType, dmaxLevel
callnative ScrCmd_createmon, requests_effects=1
.byte 0
.byte 6 @ assign to first empty slot
.byte PARTY_SIZE @ assign to first empty slot
.set givemon_flags, 0
.2byte \species
.2byte \level
@ -1016,7 +1016,7 @@
.ifnb \move2; .set givemon_flags, givemon_flags | (1 << 18); .endif
.ifnb \move3; .set givemon_flags, givemon_flags | (1 << 19); .endif
.ifnb \move4; .set givemon_flags, givemon_flags | (1 << 20); .endif
.ifnb \isShiny; .set givemon_flags, givemon_flags | (1 << 21); .endif
.ifnb \shinyMode; .set givemon_flags, givemon_flags | (1 << 21); .endif
.ifnb \gmaxFactor; .set givemon_flags, givemon_flags | (1 << 22); .endif
.ifnb \teraType; .set givemon_flags, givemon_flags | (1 << 23); .endif
.ifnb \dmaxLevel; .set givemon_flags, givemon_flags | (1 << 24); .endif
@ -1042,7 +1042,7 @@
.ifnb \move2; .2byte \move2; .endif
.ifnb \move3; .2byte \move3; .endif
.ifnb \move4; .2byte \move4; .endif
.ifnb \isShiny; .2byte \isShiny; .endif
.ifnb \shinyMode; .2byte \shinyMode; .endif
.ifnb \gmaxFactor; .2byte \gmaxFactor; .endif
.ifnb \teraType; .2byte \teraType; .endif
.ifnb \dmaxLevel; .2byte \dmaxLevel; .endif
@ -1050,7 +1050,7 @@
@ creates a mon for a given party and slot
@ otherwise
.macro createmon side:req, slot:req, species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, isShiny, gmaxFactor, teraType, dmaxLevel
.macro createmon side:req, slot:req, species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, shinyMode, gmaxFactor, teraType, dmaxLevel
callnative ScrCmd_createmon, requests_effects=1
.byte \side @ 0 - player, 1 - opponent
.byte \slot @ 0-5
@ -1078,7 +1078,7 @@
.ifnb \move2; .set givemon_flags, givemon_flags | (1 << 18); .endif
.ifnb \move3; .set givemon_flags, givemon_flags | (1 << 19); .endif
.ifnb \move4; .set givemon_flags, givemon_flags | (1 << 20); .endif
.ifnb \isShiny; .set givemon_flags, givemon_flags | (1 << 21); .endif
.ifnb \shinyMode; .set givemon_flags, givemon_flags | (1 << 21); .endif
.ifnb \gmaxFactor; .set givemon_flags, givemon_flags | (1 << 22); .endif
.ifnb \teraType; .set givemon_flags, givemon_flags | (1 << 23); .endif
.ifnb \dmaxLevel; .set givemon_flags, givemon_flags | (1 << 24); .endif
@ -1104,7 +1104,7 @@
.ifnb \move2; .2byte \move2; .endif
.ifnb \move3; .2byte \move3; .endif
.ifnb \move4; .2byte \move4; .endif
.ifnb \isShiny; .2byte \isShiny; .endif
.ifnb \shinyMode; .2byte \shinyMode; .endif
.ifnb \gmaxFactor; .2byte \gmaxFactor; .endif
.ifnb \teraType; .2byte \teraType; .endif
.ifnb \dmaxLevel; .2byte \dmaxLevel; .endif

762
data/battle_scripts_1.s
View File

File diff suppressed because it is too large Load Diff

20
data/battle_scripts_2.s
View File

@ -19,12 +19,6 @@ BattleScript_OldMan_Pokedude_CaughtMessage::
endlinkbattle
finishturn
BattleScript_GhostBallDodge::
waitmessage B_WAIT_TIME_LONG
printstring STRINGID_ITDODGEDBALL
waitmessage B_WAIT_TIME_LONG
finishaction
@ pokemerald
.align 2
gBattlescriptsForUsingItem::
@ -92,9 +86,8 @@ BattleScript_UseItemMessage:
BattleScript_ItemRestoreHPRet:
clearmoveresultflags MOVE_RESULT_NO_EFFECT
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
waitmessage B_WAIT_TIME_LONG
return
@ -259,7 +252,10 @@ BattleScript_WallyBallThrow::
finishturn
BattleScript_ShakeBallThrow::
animatewildpokemonafterfailedpokeball BS_TARGET
waitmessage B_WAIT_TIME_LONG
printfromtable gBallEscapeStringIds
waitanimation
waitmessage B_WAIT_TIME_LONG
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd
@ -307,3 +303,9 @@ BattleScript_TrainerBSlideMsgRet::
BattleScript_TrainerBSlideMsgEnd2::
call BattleScript_TrainerBSlideMsgRet
end2
BattleScript_GhostBallDodge::
waitmessage B_WAIT_TIME_LONG
printstring STRINGID_ITDODGEDBALL
waitmessage B_WAIT_TIME_LONG
finishaction

24
data/scripts/debug.inc
View File

@ -374,7 +374,29 @@ Debug_EventScript_SetHiddenNature::
dynmultistack 0, 0, TRUE, 7, FALSE, 0, NULL
switch VAR_RESULT
case MULTI_B_PRESSED, Debug_EventScript_InflictStatus1_Close
special SetHiddenNature
special SetHiddenNature
releaseall
end
Debug_EventScript_SetAbility::
special ChoosePartyMon
waitstate
callnative DebugNative_GetAbilityNames
dynmultipush gStringVar1, 0
dynmultipush gStringVar2, 1
dynmultipush gStringVar3, 2
dynmultistack 0, 0, FALSE, 3 FALSE, 0, NULL
switch VAR_RESULT
case MULTI_B_PRESSED, Debug_EventScript_SetAbilityClose
special SetAbility
Debug_EventScript_SetAbilityClose:
releaseall
end
Debug_EventScript_SetFriendship::
special ChoosePartyMon
waitstate
callnative DebugNative_Party_SetFriendship
releaseall
end

1
data/specials.inc
View File

@ -465,4 +465,5 @@ gSpecials::
def_special TrySkyBattle
def_special TryPrepareSecondApproachingTrainer
def_special SetHiddenNature
def_special SetAbility
gSpecialsEnd::

BIN
graphics/pokemon/bombirdier/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 567 B

BIN
graphics/pokemon/bombirdier/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 877 B

After

Width:  |  Height:  |  Size: 780 B

26
graphics/pokemon/bombirdier/normal.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
153 210 164
153 211 165
52 41 48
74 57 66
15 15 15
38 210 161
102 91 96
185 170 175
239 227 225
147 125 133
80 29 37
77 74 75
230 76 98
255 251 255
74 57 66
102 91 96
117 105 110
153 62 73
167 171 167
123 130 123
230 76 98
147 125 133
180 165 170
16 16 16
225 215 218
249 247 248
0 0 0
0 0 0
0 0 0

24
graphics/pokemon/bombirdier/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
153 210 164
153 211 165
52 41 48
84 81 81
74 57 66
15 15 15
38 210 161
102 91 96
185 170 175
239 227 225
186 80 100
121 120 119
189 184 186
147 125 133
80 29 37
160 74 85
171 167 168
255 251 255
136 134 133
167 171 167
123 130 123
180 165 170
16 16 16
225 215 218
230 220 223
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/clodsire/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 698 B

BIN
graphics/pokemon/dipplin/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 531 B

BIN
graphics/pokemon/dipplin/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 520 B

24
graphics/pokemon/dipplin/normal.pal
View File

@ -1,17 +1,19 @@
JASC-PAL
0100
14
16
0 183 239
101 16 12
36 77 28
43 97 14
143 19 11
189 28 16
230 74 53
95 171 29
75 133 61
197 168 80
250 136 107
164 216 74
16 16 16
95 171 29
241 201 80
198 169 83
254 254 254
101 16 12
157 24 17
222 81 69
249 164 162
36 77 28
75 133 61
229 238 129
253 253 253
0 0 0

24
graphics/pokemon/dipplin/shiny.pal
View File

@ -1,17 +1,19 @@
JASC-PAL
0100
14
16
0 183 239
128 65 0
160 53 43
43 97 14
184 93 0
214 143 1
255 211 22
95 171 29
255 118 66
197 168 80
255 250 137
164 216 74
16 16 16
95 171 29
241 201 80
198 169 83
254 254 254
194 80 3
221 143 0
255 212 22
249 164 162
185 77 49
255 118 66
229 238 129
253 253 253
0 0 0

BIN
graphics/pokemon/duraludon/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 891 B

BIN
graphics/pokemon/enamorus/front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 832 B

BIN
graphics/pokemon/frigibax/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 919 B

BIN
graphics/pokemon/frigibax/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 475 B

After

Width:  |  Height:  |  Size: 418 B

BIN
graphics/pokemon/frigibax/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 540 B

32
graphics/pokemon/frigibax/normal.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
153 210 164
102 104 113
65 73 73
170 177 183
143 153 163
175 155 10
249 216 0
222 223 222
15 15 15
156 151 156
142 187 183
194 231 233
114 94 22
255 181 9
209 147 16
118 152 148
153 211 165
62 66 87
153 121 3
196 154 0
227 193 44
252 215 39
106 115 138
145 162 173
166 175 189
16 16 16
174 186 207
214 223 232
195 232 233
255 255 255
62 103 133
46 63 92

32
graphics/pokemon/frigibax/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
153 210 164
75 114 106
52 74 64
134 186 173
116 161 150
175 155 10
249 216 0
222 223 222
15 15 15
156 151 156
142 187 183
194 231 233
143 103 130
255 179 230
255 143 219
118 152 148
153 211 165
61 89 106
151 98 104
196 154 0
246 201 215
252 215 39
92 137 147
145 162 173
159 184 189
16 16 16
174 186 207
214 223 232
195 232 233
255 255 255
62 103 133
46 63 92

BIN
graphics/pokemon/furfrou/dandy_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/dandy_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 710 B

BIN
graphics/pokemon/furfrou/dandy_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 533 B

19
graphics/pokemon/furfrou/dandy_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
160 160 152
64 64 64
122 119 97
224 224 216
204 209 181
16 16 16
52 73 34
77 122 42
110 168 63
24 96 120
72 80 64
255 255 255
184 0 48
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/dandy_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 849 B

19
graphics/pokemon/furfrou/dandy_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
54 91 49
88 88 88
103 184 66
237 241 227
177 175 160
16 16 16
65 145 57
91 134 247
88 88 88
237 241 227
119 118 115
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/dandy_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
54 91 49
50 48 48
103 184 66
119 118 115
88 88 88
16 16 16
65 145 57
91 134 247
177 175 160
255 255 255
237 241 227
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/dandy_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
66 66 68
20 21 22
39 39 40
101 102 107
82 82 89
16 16 16
45 79 40
78 132 58
110 185 43
30 101 126
179 181 180
255 255 255
189 0 48
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/debutante_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/debutante_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 710 B

BIN
graphics/pokemon/furfrou/debutante_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 530 B

19
graphics/pokemon/furfrou/debutante_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
72 73 64
224 224 216
16 16 16
160 160 152
142 119 82
255 240 173
206 189 111
72 80 64
24 96 120
184 0 48
255 255 255
233 234 234
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/debutante_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 941 B

19
graphics/pokemon/furfrou/debutante_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
177 175 160
237 241 227
120 85 30
229 214 89
88 88 88
188 149 56
16 16 16
91 134 247
119 118 115
237 241 227
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/debutante_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
88 88 88
119 118 115
120 85 30
229 214 89
177 175 160
188 149 56
16 16 16
91 134 247
237 241 227
255 255 255
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/debutante_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
20 21 22
101 102 107
16 16 16
66 66 68
158 108 75
251 245 136
211 173 101
179 181 180
30 101 126
189 0 48
255 255 255
233 234 234
0 0 0
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/diamond_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/diamond_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 657 B

BIN
graphics/pokemon/furfrou/diamond_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 558 B

19
graphics/pokemon/furfrou/diamond_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
72 73 64
224 224 216
160 160 152
122 119 97
16 16 16
127 78 38
242 171 89
193 111 38
72 80 64
24 96 120
184 0 48
255 255 255
233 234 234
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/diamond_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 909 B

19
graphics/pokemon/furfrou/diamond_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
111 51 19
237 241 227
252 141 44
177 175 160
16 16 16
228 94 48
119 118 115
59 86 159
91 134 247
88 88 88
119 118 115
237 241 227
188 4 0
0 0 0

19
graphics/pokemon/furfrou/diamond_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
111 51 19
119 118 115
252 141 44
88 88 88
16 16 16
228 94 48
67 65 65
59 86 159
91 134 247
177 175 160
237 241 227
255 255 255
188 4 0
0 0 0

19
graphics/pokemon/furfrou/diamond_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
20 21 22
101 102 107
66 66 68
39 39 40
16 16 16
124 60 37
239 144 88
191 86 42
179 181 180
30 101 126
189 0 48
255 255 255
233 234 234
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/heart_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/furfrou/heart_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 610 B

BIN
graphics/pokemon/furfrou/heart_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 537 B

19
graphics/pokemon/furfrou/heart_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
64 64 64
224 224 216
204 209 181
120 120 112
160 160 152
16 16 16
114 50 77
255 117 147
193 77 98
24 96 120
72 80 64
184 0 48
255 255 255
233 234 234
0 0 0

BIN
graphics/pokemon/furfrou/heart_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 908 B

19
graphics/pokemon/furfrou/heart_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
99 51 78
88 88 88
224 98 118
177 175 160
237 241 227
16 16 16
188 62 109
119 118 115
88 88 88
91 134 247
59 86 159
188 4 0
255 255 255
0 0 0
0 0 0

19
graphics/pokemon/furfrou/heart_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
99 51 78
50 48 48
224 98 118
88 88 88
119 118 115
16 16 16
188 62 109
237 241 227
177 175 160
91 134 247
59 86 159
188 4 0
255 255 255
0 0 0
0 0 0

19
graphics/pokemon/furfrou/heart_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
20 21 22
101 102 107
82 82 89
39 39 40
66 66 68
16 16 16
109 59 70
255 142 150
188 94 102
30 101 126
179 181 180
189 0 48
255 255 255
233 234 234
0 0 0

BIN
graphics/pokemon/furfrou/kabuki_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/furfrou/kabuki_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 635 B

BIN
graphics/pokemon/furfrou/kabuki_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 509 B

19
graphics/pokemon/furfrou/kabuki_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
72 73 64
122 119 97
224 224 216
204 209 181
160 160 152
16 16 16
122 27 18
198 46 25
24 96 120
255 59 38
255 255 255
184 0 48
72 80 64
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/kabuki_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 932 B

19
graphics/pokemon/furfrou/kabuki_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
177 175 160
237 241 227
16 16 16
99 32 31
255 108 63
201 52 49
119 118 115
91 134 247
88 88 88
59 86 159
59 85 156
237 241 227
188 4 0
0 0 0

19
graphics/pokemon/furfrou/kabuki_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
88 88 88
119 118 115
16 16 16
99 32 31
255 108 63
201 52 49
237 241 227
91 134 247
177 175 160
59 86 159
59 85 156
255 255 255
188 4 0
0 0 0

19
graphics/pokemon/furfrou/kabuki_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
20 21 22
39 39 40
101 102 107
82 82 89
66 66 68
16 16 16
119 29 29
196 45 45
30 101 126
255 79 63
255 255 255
189 0 48
179 181 180
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/la_reine_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/la_reine_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 630 B

BIN
graphics/pokemon/furfrou/la_reine_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 516 B

19
graphics/pokemon/furfrou/la_reine_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
122 119 97
72 73 64
224 224 216
160 160 152
204 209 181
37 92 107
85 186 214
53 131 153
16 16 16
24 96 120
255 255 255
184 0 48
72 80 64
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/la_reine_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 908 B

19
graphics/pokemon/furfrou/la_reine_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
37 64 73
50 48 48
70 200 206
177 175 160
237 241 227
16 16 16
119 118 115
23 128 149
91 134 247
59 86 159
88 88 88
119 118 115
237 241 227
188 4 0
0 0 0

19
graphics/pokemon/furfrou/la_reine_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
37 64 73
50 48 48
70 200 206
88 88 88
119 118 115
16 16 16
60 59 59
23 128 149
91 134 247
59 86 159
177 175 160
237 241 227
255 255 255
188 4 0
0 0 0

19
graphics/pokemon/furfrou/la_reine_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
39 39 40
20 21 22
101 102 107
66 66 68
82 82 89
36 101 104
84 205 211
53 148 153
16 16 16
30 101 126
255 255 255
189 0 48
179 181 180
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/matron_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/matron_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 732 B

BIN
graphics/pokemon/furfrou/matron_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 517 B

19
graphics/pokemon/furfrou/matron_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
122 119 97
72 73 64
224 224 216
150 90 126
107 56 86
191 135 174
160 160 152
16 16 16
204 209 181
24 96 120
72 80 64
255 255 255
184 0 48
190 105 141
0 0 0

BIN
graphics/pokemon/furfrou/matron_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 930 B

19
graphics/pokemon/furfrou/matron_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
88 88 88
237 241 227
181 107 211
16 16 16
177 175 160
73 47 89
136 62 182
91 134 247
88 88 88
119 118 115
237 241 227
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/matron_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
119 118 115
181 107 211
16 16 16
88 88 88
73 47 89
136 62 182
91 134 247
177 175 160
237 241 227
255 255 255
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/matron_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
39 39 40
20 21 22
101 102 107
173 86 124
122 58 86
214 139 179
66 66 68
16 16 16
82 82 89
30 101 126
179 181 180
255 255 255
189 0 48
190 105 141
0 0 0

BIN
graphics/pokemon/furfrou/pharaoh_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/pharaoh_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 724 B

BIN
graphics/pokemon/furfrou/pharaoh_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 515 B

19
graphics/pokemon/furfrou/pharaoh_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
72 73 64
224 224 216
204 209 181
160 160 152
122 119 97
31 62 96
33 127 196
16 16 16
23 90 137
24 96 120
255 255 255
184 0 48
72 80 64
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/pharaoh_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 938 B

19
graphics/pokemon/furfrou/pharaoh_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
237 241 227
177 175 160
16 16 16
34 50 102
57 91 209
91 134 247
112 184 248
88 88 88
119 118 115
237 241 227
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/pharaoh_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
119 118 115
88 88 88
16 16 16
34 50 102
57 91 209
91 134 247
112 184 248
177 175 160
237 241 227
255 255 255
188 4 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/pharaoh_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
20 21 22
101 102 107
82 82 89
66 66 68
39 39 40
40 57 94
52 111 193
16 16 16
36 79 135
30 101 126
255 255 255
189 0 48
179 181 180
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/star_trim/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/furfrou/star_trim/back.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 683 B

BIN
graphics/pokemon/furfrou/star_trim/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 574 B

19
graphics/pokemon/furfrou/star_trim/normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
72 73 64
224 224 216
16 16 16
160 160 152
122 119 97
38 87 102
130 214 237
73 134 153
24 96 120
72 80 64
184 0 48
255 255 255
233 234 234
0 0 0
0 0 0

BIN
graphics/pokemon/furfrou/star_trim/overworld.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 946 B

19
graphics/pokemon/furfrou/star_trim/overworld_normal.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
237 241 227
44 105 154
177 175 160
80 163 212
16 16 16
28 60 86
119 118 115
91 134 247
88 88 88
188 4 0
237 241 227
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/star_trim/overworld_shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
50 48 48
119 118 115
44 105 154
88 88 88
80 163 212
16 16 16
28 60 86
237 241 227
91 134 247
177 175 160
188 4 0
255 255 255
0 0 0
0 0 0
0 0 0

19
graphics/pokemon/furfrou/star_trim/shiny.pal
View File

@ -1,19 +0,0 @@
JASC-PAL
0100
16
153 211 165
20 21 22
101 102 107
16 16 16
66 66 68
39 39 40
33 86 122
114 203 255
64 130 170
30 101 126
179 181 180
234 68 46
255 255 255
233 234 234
0 0 0
0 0 0

BIN
graphics/pokemon/great_tusk/anim_front.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
graphics/pokemon/great_tusk/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 890 B

BIN
graphics/pokemon/great_tusk/front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

30
graphics/pokemon/great_tusk/normal.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
0 160 232
112 24 48
144 8 56
232 48 120
104 24 40
153 211 165
41 32 62
109 27 27
112 24 50
66 55 99
180 46 46
184 19 73
129 87 69
228 77 109
249 240 67
118 127 157
92 89 163
184 168 158
16 16 16
40 32 64
96 88 160
56 48 88
120 80 64
184 168 160
240 240 216
128 136 160
168 192 216
248 240 88
8 8 8
169 192 216
238 241 218

30
graphics/pokemon/great_tusk/shiny.pal
View File

@ -1,19 +1,19 @@
JASC-PAL
0100
16
0 160 232
160 104 16
216 168 88
248 240 152
104 24 40
16 16 16
56 24 24
153 211 165
48 25 18
109 27 27
101 107 8
85 53 42
180 46 46
166 175 26
129 87 69
229 240 58
249 240 67
111 152 126
128 80 64
96 64 48
120 80 64
184 168 160
240 240 216
72 176 144
176 240 200
248 240 88
8 8 8
184 168 158
16 16 16
167 205 188
238 241 218

BIN
graphics/pokemon/greninja/ash/overworld.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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