ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,857 Commits 1 Branch 0 Tags 235 MiB
3bd81d347d
Commit Graph

6857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blackforest92
3bd81d347d Add missing Gen8 icons 2021-07-31 14:48:55 +07:00
ghoulslash
fd69375489
Merge pull request #1575 from Blackforest92/pokemon_expansion 
Fix Arctozolt, Heliolisk, and Chespin
 2021-07-24 07:13:16 -06:00
Blackforest92
365b578a66 Fix Arctozolt, Heliolisk, and Chespin 2021-07-24 13:46:02 +07:00
ultima-soul
3fca4c82a0
Merge pull request #1572 from LOuroboros/pikachu 
Assigned dummy anims to the front sprite of each Pikachu and Pichu special form
 2021-07-15 10:10:05 -07:00
LOuroboros
e55fe62d59 Assigned dummy anims to the front sprite of each Pikachu and Pichu special form 2021-07-15 13:42:51 -03:00
DizzyEggg
96b0700ea9
Merge pull request #1513 from Blackforest92/pokemon_expansion 
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
 2021-07-15 11:17:06 +02:00
ultima-soul
efdc513912
Merge pull request #1559 from ExpoSeed/PE/fix-redefinition-error 
Include expansion_branches.h in global.h
 2021-07-04 13:42:14 -07:00
ExpoSeed
630d172393 Include expansion_branches.h in global.h 2021-07-04 12:41:21 -05:00
ghoulslash
3189cc548f
Merge pull request #1553 from ExpoSeed/PE/fix-redefinition-error 
Fix redefinition error in pokemon_config.h
 2021-07-04 09:32:01 -06:00
ExpoSeed
788b9f675f Fix redefinition error in pokemon_config.h 2021-07-02 14:36:02 -05:00
ExpoSeed
6f25c47d6b
Merge pull request #1528 from ultima-soul/num_species_back_animation_fix 
Add back NUM_SPECIES to sSpeciesToBackAnimSet definition.
 2021-06-07 17:16:10 -05:00
ultima-soul
11a8517320 Add back NUM_SPECIES to sSpeciesToBackAnimSet definition. 2021-06-07 15:04:41 -07:00
ExpoSeed
e7c19f3d9b
Merge pull request #1526 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-06-07 15:56:45 -05:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
luckytyphlosion
7a7ebe1827
Merge pull request #1461 from Fontbane/patch-1 
Rename sText_WildPkmnAppeared2 to reflect its use
 2021-06-04 22:42:24 -04:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use 
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
 2021-06-04 22:32:33 -04:00
ultima-soul
45fb16c40a
Merge pull request #1494 from LOuroboros/feathers_PE 
Corrected the Wings/Feathers #2
 2021-06-02 22:56:39 -07:00
GriffinR
a21ceb2e3c
Merge pull request #1457 from Kurausukun/const 
Re-add const to gEvolutionTable in daycare.c
 2021-06-02 16:28:39 -04:00
Kurausukun
5c6b8ea8d6 re-add const to gEvolutionTable in daycare.c 2021-06-01 17:14:45 -04:00
Kurausukun
9f5bf65fb3 [PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make 
consistent use of SOME_VRAM_STORE
 2021-05-31 18:12:35 -05:00
Kurausukun
2bbaf71998 [LEAK-INFORMED] fix CreateShedinja fakematch 
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
 2021-05-31 08:20:46 -05:00
Kurausukun
2705f2e5f4 [LEAK-INFORMED] also pretty dumb 2021-05-31 08:20:46 -05:00
Kurausukun
42021db743 [LEAK-INFORMED] literal dumbest fakematch ever 2021-05-31 08:20:46 -05:00
luckytyphlosion
823c862e4f
Merge pull request #1274 from luckytyphlosion/master 
Improve INSTALL.md
 2021-05-29 10:29:15 -04:00
MandL27
2d92f23240
Merge pull request #1514 from pineapplemachine/pokemon_expansion_evo_fix 
Fixes to pokemon_expansion species evolution data: Galarian Ponyta, Tranquill, and Kubfu
 2021-05-28 11:31:25 -04:00
Sophie Kirschner
1a4c6d3490 Fixes to species evolution data 2021-05-28 18:16:52 +03:00
luckytyphlosion
c5b262159d Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-27 16:36:47 -04:00
luckytyphlosion
8b45c8e48a
Fix github links to pret's. 2021-05-27 16:20:13 -04:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. (#1447) 
* Fix Functions

* Fix ChangeBgY_ScreenOff signature

* Remove unneeded changes

* Fix argument mismatch

Just to get this out of the way

* Not needed

* Update palette.c
 2021-05-27 07:32:09 -05:00
GriffinR
2b062e89c1
Merge pull request #1448 from Kurausukun/dumb 
[LEAK-INFORMED] Fix Fakematch in DrawWallpaper
 2021-05-25 04:41:15 -04:00
Kurausukun
5d5327c0b7 better match 2021-05-25 04:32:47 -04:00
Kurausukun
5ae5cf110d [LEAK-INFORMED] fix fakematch in DrawWallpaper 2021-05-25 04:03:11 -04:00
Blackforest92
d1261165b8 Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor 2021-05-25 11:44:47 +07:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion 
Added missing gen8 battle sprites and available icons and various fixes
 2021-05-24 21:13:12 -07:00
Blackforest92
d74492b591 Returning Alcremie back to monkey 2021-05-25 10:57:06 +07:00
Blackforest92
2dccce7675
Erased Eternamax comment in src/data/pokemon_graphics/enemy_mon_elevation.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-05-25 09:17:50 +07:00
Kurausukun
94939e395b one last goto 2021-05-24 13:31:54 -05:00
gAlfonso-bit
aca96a1510 Mark 0xFFF8 as ~7 
Since 7 is used as a mask, I wondered if 0xFFF8 was used to undo the mask and it turns out it was.
 2021-05-24 07:36:08 -05:00
gAlfonso-bit
ff16812f99
UBFix: uninitialized variables in m4a engine and siirtc.c (#1432) 2021-05-23 09:56:37 -05:00
luckytyphlosion
c723d980e7 Merge branch 'master' of https://github.com/pret/pokeemerald 2021-05-23 10:51:26 -04:00
gAlfonso-bit
ffbbc88801
BUGFIX: battle scripts (#1436) 2021-05-23 09:35:03 -05:00
gAlfonso-bit
a454f9c187
UBFIX: sprite.c (#1442) 
Fix out-of-bounds array access in `SortSprites()`.

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
 2021-05-23 09:10:55 -05:00
ExpoSeed
2ad251cec3
Merge pull request #1491 from surskitty/mega_evolution_hidden_abilities 
Pokemon with no ability recheck first ability slot.
 2021-05-22 14:59:06 -05:00
GriffinR
ef6d91b0e3
Merge pull request #1443 from ExpoSeed/document-playbgm 
Document second parameter of playbgm
 2021-05-21 17:07:07 -04:00
ExpoSeed
6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
Eduardo Quezada D'Ottone
5fd4c35483
Merge pull request #1412 from amiosi/noFlip 
restore and add noFlip values
 2021-05-21 11:44:11 -04:00
Eduardo Quezada D'Ottone
dff6a574f2
Merge pull request #1489 from LOuroboros/panchams_evo_method 
Fixed Pancham's evo method
 2021-05-21 11:38:22 -04:00
LOuroboros
41bc603110 Wings -> Feathers 2021-05-17 22:06:31 -03:00
surskitty
ba42b4daf4 If a Pokemon's ability is set to ABILITY_NONE, try to set it to the first ability slot. #1490 2021-05-17 17:08:01 -04:00
GriffinR
58d83bf9a7
Merge pull request #1440 from GriffinRichards/remove-berry 
Remove leftover berry descriptions
 2021-05-17 03:12:23 -04:00