Eduardo Quezada D'Ottone
4aa14355d7
Merge branch 'upcoming' into gen9-species-nomigration
2023-11-06 13:49:02 -03:00
leo60228
b4b4e3cf2b
import oct 31 pokecommunity sprites
2023-11-04 11:04:02 -04:00
kittenchilly
90471741e9
Add Fairy Feather sprite ( #3520 )
2023-11-03 16:32:12 -03:00
Kaitlyn
eeed9612b4
Mon Sprite Fixes
...
- Quaquaval: Pal + Sprite fix
- Oinkologne Male: Pal fix, recommend redoing back sprite.
- Oinkologne Female: Pal + Sprite fix
- Rellor: Pal + Sprite index and shading + Pal fix
2023-11-02 21:34:02 -04:00
Eduardo Quezada D'Ottone
820be61c9f
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4
2023-11-02 21:32:23 -04:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration
2023-11-02 21:28:53 -04:00
kittenchilly
244ca0be95
Add custom female icon sprites for Pikachu and Wobbuffet ( #3506 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-01 18:49:44 -03:00
Bassoonian
15e038cd30
Decapitalise Alcremie file names ( #3488 )
2023-10-30 10:53:26 -03:00
AaghatIsLive
24de138eb5
Add dark mode for Hoenn dex mode (HGSS) ( #3479 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-30 09:21:17 -03:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms ( #3469 )
...
* Alcremie form sprites
Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>
# Conflicts:
# graphics/pokemon/alcremie/lemon_cream/front.png
# graphics/pokemon/alcremie/matcha_cream/back.png
# graphics/pokemon/alcremie/matcha_cream/front.png
# graphics/pokemon/alcremie/mint_cream/front.png
# graphics/pokemon/alcremie/ruby_cream/front.png
# graphics/pokemon/alcremie/salted_cream/front.png
# include/graphics.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/footprint_table.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon.c
* Fixed cries
* Removed Todos
* Temp: all forms use the same icon
* Grouped form data + Fixed missing Level up and Teachable learnsets
* Added missing data for form changes and back animations
* Grouped defines together
* Fixed compile
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
Katy
efae521646
Gen7 Sprites/Animations For Species ( #3426 )
2023-10-28 23:47:58 -03:00
Eduardo Quezada
c74ad8251d
Rearranged dex scrolling list UI to accomodate 4 digits and 12 character names
2023-10-28 17:01:15 -03:00
Eduardo Quezada
b484a215fb
Scrollbar moved to the left
2023-10-28 15:22:07 -03:00
Eduardo Quezada
659bff4c0b
Seen/Owned 4 digits in HGSS dex
2023-10-28 13:48:26 -03:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A ( #3474 )
2023-10-27 19:14:45 -03:00
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
