ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,077 Commits 1 Branch 0 Tags 235 MiB
fcc6444c2e
Commit Graph

6077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
fcc6444c2e
Merge pull request #1329 from ultima-soul/add_fairy_frlg_icon_ie 
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
 2021-01-21 12:20:15 -07:00
ghoulslash
c5491664bd
Merge pull request #1326 from ultima-soul/add_fairy_type_icon_ie 
Add Fairy-type Icon to Fix Contest Move Viewing Crash
 2021-01-21 12:19:10 -07:00
ghoulslash
9b1a482837
Merge pull request #1317 from ultima-soul/form_species_tables_ie 
Add Form Species ID Tables
 2021-01-20 13:54:58 -07:00
ultima-soul
f571c8af2a Merge branch 'form_species_tables' into form_species_tables_ie 2021-01-20 11:34:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
ExpoSeed
162476c012
Merge pull request #1353 from Syreldar/patch-1 
Updated berries' path on spritesheet_rules.mk
 2021-01-16 17:38:25 -06:00
ghoulslash
b006f04ad5
Merge pull request #1256 from ghoulslash/item_expansion 
add z crystal and z ring
 2021-01-15 11:50:54 -07:00
ExpoSeed
5250aaf265
Merge pull request #1277 from LOuroboros/x_items_IE 
Reworked the effects of the X Items #2
 2021-01-15 12:04:54 -06:00
Syreldar
a2794ae351
Updated berries' path on spritesheet_rules.mk 2021-01-15 09:52:19 +01:00
ghoulslash
e013c44340
Merge pull request #1319 from LOuroboros/item_tweaks 
Updated the type-enhancing items' boost
 2021-01-12 09:24:55 -07:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
LOuroboros
f4d34f70c4 Renamed some X Defend labels to reflect its new name 2021-01-10 01:54:41 -03:00
LOuroboros
db37c4f25c Review correction to src/data/pokemon/item_effects.h 2021-01-09 21:47:58 -03:00
ghoulslash
5dcbdf08f0
Merge pull request #1323 from ExpoSeed/IE/sync 
Sync Item Expansion
 2021-01-07 11:46:31 -07:00
LOuroboros
91c92e9c04 #if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE 2021-01-04 06:49:18 -03:00
ultima-soul
3c8194c612 Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:30:41 -08:00
ultima-soul
9c34121a50 Fix crash when viewing Contest Moves in Summary Screen by adding Fairy type icon. 2021-01-02 14:03:46 -08:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
GriffinR
dfe03618c7
Merge pull request #1284 from GriffinRichards/deadname 
Remove deadnaming, sync BgEvent
 2020-12-31 14:35:23 -05:00
GriffinR
ef60edd933 Remove deadnaming, sync BgEvent 2020-12-31 14:27:46 -05:00
GriffinR
0c74e2097f
Merge pull request #1282 from Sierraffinity/master 
Change how mon affine transform fix is handled
 2020-12-30 21:21:12 -05:00
Sierraffinity
b88922daea Merge branch 'master' of github.com:pret/pokeemerald 2020-12-30 17:37:17 -08:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
LOuroboros
7049413ce2 Updated the type-enhancing items' boost 2020-12-30 15:59:13 -03:00
GriffinR
e1fd2f2a89
Merge pull request #1280 from Sierraffinity/master 
Add fixes for undefined behavior with modern compiler
 2020-12-26 22:08:48 -05:00
Sierraffinity
127bb97c0e Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite 2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d Add UBFIX for null deref in sub_80D08CC 2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6 Add UBFIX for null derefs in sub_8088950 2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea Add UBFIX for null deref in CameraObjectReset2 2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower 
Label remaining subs in battle_tower.c
 2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
GriffinR
4ec5c888b4
Merge pull request #1275 from Kurausukun/berrycrush_nonmatching 
[LEAK INFORMED] Correct Berry Crush Structs and Eliminate Non/Fakematchings
 2020-12-22 00:16:36 -05:00
Kurausukun
254b4e621c change "filler" to "unk", remove newline 2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8 fix remaining functions, finally matches 2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390 oops 2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6 fix sub_8021A28 2020-12-21 20:24:36 -05:00
Kurausukun
3203bac053 fix struct 2020-12-20 23:15:35 -05:00
Evan
728586de51 make ultranecrozium-z description fit 2020-12-20 16:36:31 -07:00
Kurausukun
14e2898a29 fix structs and some function logic 
(currently does not match)
 2020-12-20 02:54:33 -05:00
Evan
d500bd4e2f fix zring and ultranecrozium descriptions 2020-12-19 22:17:20 -07:00
Evan
f05249c8da Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-12-19 22:13:37 -07:00
GriffinR
49bdaeb940
Remove redundant modern CFLAGS 2020-12-16 14:10:30 -05:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush 
fakematch fixes, begin documenting Berry Crush (based on #1187)
 2020-12-14 23:22:41 -05:00
Kurausukun
69cfe5ad01 use direction constant 2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9 name a2 2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327 fix indentation 2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a document reuse of variables in link mode 2020-12-14 21:41:30 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names 
refactor m4a.c/m4a_1.s constant/variable/type naming
 2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix 
Use BUGFIX for some inline fixes
 2020-12-14 20:00:59 -05:00
GriffinR
6dea3374d2
Merge pull request #1271 from Sierraffinity/pkmn_affine_anim_bugfix 
Add bugfix for Pokémon with affine transforms as part of their entry animation glitching when being sent out/put back in ball
 2020-12-13 18:43:55 -05:00