ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,530 Commits 1 Branch 0 Tags 235 MiB
dc53ff7782
Commit Graph

896 Commits

Author SHA1 Message Date
Ninjdai
56d3506a6f Added day/night system 2023-11-11 20:08:20 +01:00
Alex
db039ee4e2
Tera Shards Icons (#3307) 2023-09-14 07:38:45 -03:00
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
GriffinR
16c0be7ed2 Fix some frontier gfx, adjacent cleanup 2023-08-03 11:15:15 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul (#3192) 
* [battle, anim] woodhammer animation overhaul

* squashme: timings

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-01 19:10:18 -04:00
Eclipse
c76e5deb9f
Fixed Wailord icon (#3183) 2023-07-30 10:08:56 -04:00
Eclipse
ca792d43cc
Gender differences sprites, final part (#3122) 
* The last survivors

* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-07-18 21:31:22 -04:00
CyanSMP64
219ac7830c
Update female Alakazam's front sprite design (#3149) 2023-07-18 12:56:15 -04:00
Eclipse
fb8989414f
Fixed Mega Venasaur icon (#3137) 2023-07-16 02:40:21 -04:00
SonikkuA-DatH
6382640f8a
Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127) 
* Casrform graphics. Palette changes, edited backs, and 2 Frame anims

* Castform Graphics

* Cherrim graphics, and Castform redefinitions

* Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette

* Revised Spinda Spot drawing function, removed tabs

* Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set

* Spacing

* Forgot shiny pal. Fixed

* Delete .vs directory

* remove vs ref
 2023-07-14 11:45:40 -04:00
GriffinR
f4111d8082 Sync castform folder organization 2023-07-09 14:57:51 -04:00
Eduardo Quezada
1562280bce Fixed SPECIES_NONE icon 2023-07-07 14:50:01 -04:00
Eduardo Quezada
adfc0af372 Mon graphics are now loaded depending on their availability 
- If it has a female sprite/palette, it's loaded.
- If it the species is enabled and it has a sprite/palette, it's loaded.
- Otherwise, load the SPECIES_NONE graphics.
 2023-07-07 14:36:30 -04:00
Eduardo Quezada
4405f79d24 Merge branch 'RHH/master' into RHH/upcoming 2023-07-06 13:15:06 -04:00
Eduardo Quezada
f21953f254 Merge remote-tracking branch 'pret/master' into RHH/master 2023-07-06 13:06:31 -04:00
Eduardo Quezada D'Ottone
862602233d
Gender differences sprites, part 3 (#3095) 2023-07-04 11:36:24 -04:00
SubzeroEclipse
c18ac55016 Tweaked Houndoom 
Edited both male and female Houndoom sprites to make female's horns thinner.
 2023-07-03 22:10:56 +02:00
SubzeroEclipse
5c98b9b427 Fixed Quagsire and Nuzleaf 
Tweaked Quagsire female back and Nuzleaf to make their differences a bit more noticeable and faithful to the originals.
 2023-07-03 18:12:39 +02:00
SubzeroEclipse
49e7893ed2 Fixed Meganium shiny 
There was a mismatch between the normal and the shiny that I didn't notice at first, so the regular palette was fixed. Thanks to CyanSixFour for pointing that out.
 2023-07-02 07:28:08 +02:00
SubzeroEclipse
23d51df7c0 Added Hisuian Sneasel 2023-07-01 11:16:31 +02:00
SubzeroEclipse
d202bdd09c Added even more gender difference sprites, 2/2 2023-07-01 10:25:17 +02:00
Eduardo Quezada D'Ottone
2100a760ad
A selection of animation frames (redone) (#3090) 
* Applin Family

* Placeholder single frames to macro

* Stufful/Bewear

* Chewtle/Drednaw

* Rookidee/Corvisquire/Corviknight

* Rolycoly/Carkol/Coalossal

* Missing animations

* Grubbin/Charjabug/Vikavolt

* Turtonator and Wimpod/Golisopod

* Jangmo-O/Hakamo-O/Kommo-O

* Pyukumuku and Dewpider/Araquanid

* Fixed Charjabug/Vikavolt palettes

* Pincurchin and Sizzlipede/Centiscorch

* Alolan Exeggutor and Salandit/Salazzle

* Reverted PLACEHOLDER_ONE_FRAME_ANIMATION for a separate PR

* Forgot Pyukumuku's animation
 2023-06-30 14:13:42 +02:00
SubzeroEclipse
0733e0908c Added even more gender difference sprites, 1/2 2023-06-30 10:40:46 +02:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff (#3063) 
* Removed gCastformFrontSpriteCoords

* Removed sCastformElevations and IsCastformForm

* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct

* Scrubbed unused BS commands

* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants

* Removed redundant function in Pokémon Debug menu

* Removed handling in animation scripts

* Removed gBattleMonForms

* Reduced MAX_MON_PIC_FRAMES to 2

* Removed Castform/Cherrim makefile stuff

* Fixed weather form change tests not checking species.

* Fixed Castform palettes after Lunos' PR
 2023-06-30 09:58:07 +02:00
Eduardo Quezada D'Ottone
67b196cd86
Try fixing Clear Amulet palette issue (#3086) 2023-06-27 22:14:56 -04:00
Eclipse
fc52414383
Added many more gender differences sprites (#3082) 
Added sprites for the remaining Gen1 mons and a couple of evolutions.
 2023-06-27 21:11:01 -04:00
Eclipse
a44af6f06f
Gender differences sprites, part 1 (#3070) 
* Added some gender difference sprites
Added sprites for:
- Pikachu/Raichu
- Doduo/Dodrio
- Goldeen/Seaking
- Xatu
- Politoed
- Meditite/Medicham
- Gible/Gabite/Garchomp

NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird.

* Swapped Pikachu sprites
Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had.

* Added Gloom and Vileplume

* Fixed Pikachu forms
Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this.

* Swapped a few more sprites
Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back
 2023-06-26 19:04:19 -04:00
PacFire
4b3b9b5e0a
Added icon for Clear Amulet (#3078) 
* Update graphics.h

* Update item_icon_table.h

* Update items.h

* Add files via upload

added icon for clear amulet, shards still missing.

* Add files via upload

added clear amulet's palette

* Update graphics.h
 2023-06-26 18:19:33 -04:00
ghoulslash
5de84d9a2f
Killed the bKGD invalid index warnings and fixed the bit depth of the species sprites (#3051) 2023-06-24 13:27:40 -04:00
ghoulslash
7371a9e401
Add many gen 8 move animations (#2861) 
* port many gen8 and 9 move anims from cfru

* fix thunder cage, shell smash, shelter anims. update anim credits

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-06-21 13:19:54 -04:00