Commit graph

958 commits

Author SHA1 Message Date
kittenchilly
1acaf7f869
Fixed icons 2023-10-26 17:34:21 -04:00
kittenchilly
ad210c5170
Update icon.png 2023-10-26 17:34:21 -04:00
kittenchilly
91b4659d5c
Ogerpon sprites 2023-10-26 17:34:21 -04:00
kittenchilly
d9ccc80b31
Sprites 2023-10-26 17:34:21 -04:00
leo60228
95aa3028bb
updated great tusk sprite 2023-10-25 00:23:22 -04:00
leo60228
f6e5076dc0
add new sprites 2023-10-24 23:20:59 -04:00
leo60228
176dec6e6f
new tinkaton sprite 2023-10-23 18:19:37 -04:00
leo60228
95e0dabfa3
icon/palette fixes 2023-10-23 18:16:48 -04:00
leo60228
1359df7f86
new iron bundle and tinkatink sprites 2023-10-23 17:53:25 -04:00
Alex
0756dc1d4a
coords and roaring moon 2023-10-23 16:16:11 -04:00
Alex
d1165c0471
A few better sprites 2023-10-23 16:14:06 -04:00
Eduardo Quezada
f570d14f2d Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
# Conflicts:
#	include/constants/species.h
#	sound/cry_tables.inc
#	src/data/pokemon_graphics/enemy_mon_elevation.h
#	src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248)
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440)
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
2023-10-22 21:15:07 +02:00
sbird
8992a2f0de fixup! fix normal hoeen dex colors 2023-10-22 03:53:31 +02:00
sbird
e34f32fdc1 fix normal hoeen dex colors 2023-10-22 03:34:38 +02:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems
(cherry picked from commit 6dc58dcc17)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder
(cherry picked from commit e081d2b773)
2023-10-18 14:34:00 -04:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
2023-10-15 00:30:00 -03:00
kittenchilly
a795148068
Add Pikachu World Cap mini icon (#3401) 2023-10-11 11:02:28 +02:00
Eduardo Quezada
f830b0725a GMAX -> GIGANTAMAX 2023-10-10 18:07:12 -03:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
20e3b43f7c
HGSS Style Pokedex (#3288) 2023-10-02 17:28:37 -03:00
Aaghat
58cd22ba6c Added dark mode 2023-09-17 17:08:21 +05:30
Aaghat
75bf32e0d1 Applied requested changes 2023-09-17 17:07:58 +05:30
Alex
db039ee4e2
Tera Shards Icons (#3307) 2023-09-14 07:38:45 -03:00
Aaghat
e2390733c5 remove the HGSS prefixes 2023-09-11 17:25:18 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
kittenchilly
2fa4206bf1
Add new Substitute doll sprites (#3263) 2023-09-04 19:48:43 -03:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) (#3268) 2023-08-31 14:52:18 -04:00
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
2023-08-31 14:28:01 -04:00
kittenchilly
48d6fe2e64 Merge branch 'upcoming' into ultraburst 2023-08-26 14:43:31 -05:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 (#3205) 2023-08-25 16:33:15 -04:00
voloved
2a2cd77cf4
Allow Cycling Through Balls in the Last Ball Used Menu (#3039) 2023-08-24 19:23:26 -04:00
CyanSMP64
ef69021f0f some more tweaks by mrds 2023-08-24 13:00:31 +12:00
CyanSMP64
fd37946c1d resize golduck 2023-08-22 20:31:13 +12:00
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim
Document stat change animation
2023-08-20 14:29:11 -04:00
CyanSMP64
4e5809a0d0 tweak graveler, pikachu 2023-08-20 22:08:54 +12:00
CyanSMP64
60a2878f8f tweak growlithe, slowbro, poliwag 2023-08-19 16:15:20 +12:00
CyanSMP64
c33660e00f fix arcanine and zard 2023-08-19 15:37:41 +12:00
CyanSMP64
ec24754489 fix arcanine, change bg colour of green pokemon 2023-08-18 17:24:30 +12:00
CyanSMP64
74de0ef3ca set background colour 2023-08-16 13:58:31 +12:00
CyanSMP64
0c27db10d6 Review mon sprites 0001-0080 2023-08-15 20:24:07 +12:00
kittenchilly
3435c590c9 Merge branch 'upcoming' into ultraburst 2023-08-12 18:58:38 -05:00
gruxor
f493ae8c69
Fixed item sprites with palette errors (#3222) 2023-08-12 18:13:33 -04:00
kittenchilly
c3a8edae32 Sprites and fixes 2023-08-11 13:36:01 -05:00
GriffinR
60a6c9d160
Merge pull request #1903 from GriffinRichards/frontier-gfx
Fix some frontier gfx, adjacent cleanup
2023-08-10 14:49:44 -04:00
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
GriffinR
6598cb30bc Document stat change animation 2023-08-08 23:56:16 -04:00