ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-24 20:30:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,644 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

7644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
ec9a2e3a78
Merge pull request #1787 from Blackforest92/pokemon_expansion 
Adding 2nd frames to Gen VI Pokemons + Fix to Magnemite
 2021-10-22 07:54:34 -03:00
Jademalo
eb860a368e Improve IDE support 2021-10-22 04:30:33 +01:00
Blackforest92
81011fffc3 allow builder to use anim_front of female pyroar, adjust herdier back position 2021-10-22 09:58:21 +07:00
GriffinR
6067aa65b4 Fix shadw typo 2021-10-21 22:15:08 -04:00
GriffinR
303ce856ad Fix GET_CARD_BATTLE_LOST typo 2021-10-21 16:54:16 -04:00
Blackforest92
19e3eabc4c Fix HERDIER backsprite 2021-10-21 22:55:23 +07:00
GriffinR
0fbf5f59b3
Merge pull request #1522 from GriffinRichards/fix-sectorsperslot 
Fix incorrect NUM_SECTORS_PER_SLOT define
 2021-10-19 16:40:40 -04:00
GriffinR
bc409baeff Fix incorrect NUM_SECTORS_PER_SLOT define 2021-10-19 16:30:00 -04:00
Blackforest92
4e9af083db forgot to adjust front pic coordinate, only remember meowstic though 2021-10-19 19:47:37 +07:00
Blackforest92
626aa4e754 Fixes stray pixel on magnemite backsprite 2021-10-19 19:27:01 +07:00
Blackforest92
86d4658bd3 Added anim_front.png to gen6 pokemons + fix to magnemite 2021-10-19 19:20:12 +07:00
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle 
Miscellaneous battle documentation
 2021-10-19 08:09:17 -04:00
BuffelSaft
a374bbf9f3
Merge pull request #1785 from SonikkuA-DatH/SonikkuA-DatH-patch-1 
For Magnemite sprite errors
 2021-10-19 18:08:42 +13:00
SonikkuA-DatH
dff6555287
Magnemite 
made highlights white
 2021-10-18 21:01:29 -07:00
BuffelSaft
b2969b6782
Merge pull request #1699 from AsparagusEduardo/PE_ArceusAnimations 
Updated Arceus' forms' animations
 2021-10-19 16:35:03 +13:00
SonikkuA-DatH
c84811ac20
Magnemite back 
Retweak. Shiny broke things for base, so went to source
 2021-10-18 18:02:22 -07:00
SonikkuA-DatH
377e46e2ec
For Magnemite sprite errors 
Fixing Magnemite eye to use whites
Also fix back pixel
 2021-10-18 17:49:08 -07:00
GriffinR
24b4e898ad More mauville_old_man clean up 2021-10-18 14:40:04 -04:00
GriffinR
b31bddddca Clean up metatile_behavior 2021-10-18 12:54:29 -04:00
GriffinR
7590bacec1 Label remaining symbols in field_specials 2021-10-18 02:14:29 -04:00
GriffinR
46dd10c87b Clean up trainer_pokemon_sprites 2021-10-18 01:56:24 -04:00
GriffinR
db8ce5d7f9 Clean up mauville_old_man, drop ScrSpecial prefix 2021-10-18 01:09:41 -04:00
ghoulslash
ba741421d9
Merge pull request #1777 from AsparagusEduardo/fix_pyroarF 
Fixed Female Pyroar's sprite position
 2021-10-17 22:04:09 -04:00
GriffinR
ed6fdd743f Some pokemon_icon clean up 2021-10-17 22:04:08 -04:00
GriffinR
a950f9c771 Clean up international_string_util 2021-10-17 21:51:11 -04:00
GriffinR
f2e0c9ec9d Some pokedex clean up 2021-10-17 21:32:09 -04:00
Eduardo Quezada D'Ottone
3cdf736eb8 Merge branch 'PokemonExpansion' into fix_pyroarF 
# Conflicts:
#	graphics/pokemon/pyroar/backf.png
 2021-10-17 19:38:20 -03:00
GriffinR
371a13e9f9 Clean up in save_location 2021-10-17 17:38:52 -04:00
GriffinR
c70ec9748a Some union_room_chat clean up 2021-10-17 17:27:32 -04:00
GriffinR
164590e37d
Merge pull request #1512 from GriffinRichards/minor-constants 
Add some misc constants/usage
 2021-10-17 11:32:30 -04:00
BuffelSaft
0b7072e007
Merge pull request #1780 from rh-hideout/revert-1666-bKGD_PE 
Revert "Fix the 'bKGD: invalid index' error"
 2021-10-17 23:49:26 +13:00
Eduardo Quezada D'Ottone
80d8e4cfd4
Revert "Fix the 'bKGD: invalid index' error" 2021-10-17 07:32:49 -03:00
GriffinR
ff594ccb82 Fix leftover icon_shadow names 2021-10-17 03:22:55 -04:00
GriffinR
ece7ef3410 Correct usage of MysteryEvent to MysteryGift 2021-10-17 03:00:48 -04:00
GriffinR
d0455485c3 Clean up mystery gift headers 2021-10-17 02:18:24 -04:00
GriffinR
3cd27acbea Document wonder news 2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d Clean up mevent2 2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c Clean up wonder card/news view 2021-10-17 01:15:16 -04:00
GriffinR
356e6d7f08 Clean up mystery gift menu 2021-10-16 23:58:11 -04:00
GriffinR
845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
Eduardo Quezada D'Ottone
9986591b6f Fixed Female Pyroar's sprite position 2021-10-16 17:22:24 -03:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle 2021-10-15 22:46:43 -04:00
GriffinR
1f39c34ca4
Merge branch 'master' into minor-constants 2021-10-15 22:44:49 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union 
Document link_rfu / Union Room
 2021-10-15 22:44:01 -04:00
GriffinR
e3bb257bcf Fix some trainer card link access 2021-10-15 12:22:19 -04:00
GriffinR
c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
Eduardo Quezada D'Ottone
2e8ad12857
Merge pull request #1648 from BuffelSaft/genders-in-PSS 
PSS supports gender differences (kinda)
 2021-10-15 08:55:44 -03:00
BuffelSaft
3631561638 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald into genders-in-PSS 2021-10-15 16:17:55 +13:00
BuffelSaft
7610a9abad Fix bug with female icon sprites 
Thanks to AsparagusEduardo for this code!
 2021-10-15 16:17:08 +13:00
PikalaxALT
187f10be9d
Merge pull request #1518 from GriffinRichards/calcrom-data 
Make calcrom data info optional
 2021-10-14 15:22:28 -04:00