atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6411 commits 2 branches 40 tags 600 MiB
Commit graph

4304 commits

Author SHA1 Message Date
amiosi
c83c09fc3a tabs -> spaces 2021-01-04 22:09:09 -05:00
amiosi
24be2c8c39 fix alolan form movesets 2021-01-04 22:04:51 -05:00
GriffinR
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu 
Remove unnecessary subtraction in switch
 2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master 
Fix/document possible division by zero in ConvertScaleParam
 2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c Remove unnecessary subtraction in switch 2021-01-04 19:50:05 -05:00
Sierraffinity
67a656a4df Fix/document possible division by zero in ConvertScaleParam 2021-01-04 16:26:28 -08:00
GriffinR
0ca76fc179 Some decoration labels, use constant for tileset size 2021-01-04 16:27:57 -06:00
GriffinR
039108284d Clean up gDecorations with gItems format 2021-01-04 16:27:57 -06:00
GriffinR
e0c0143f41 Fix substitute back sprite 2021-01-04 10:14:01 -05:00
GriffinR
06af0f0fe5 Remove unnecessary string.h includes 2021-01-03 13:36:07 -05:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen 
Document battle factory screen
 2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr 
Minor field_screen_effect / field_player_avatar documentation
 2021-01-03 01:59:36 -05:00
ultima-soul
b58a8390f3 Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:21:52 -08:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc 
Index battle controller cmd tables
 2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2 Label a few flash effect functions 2021-01-01 13:34:25 -05:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
GriffinR
84fbcc9dd6 Fix modern -> UBFIX macro change 2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
093610b46e Finish factory swap screen doc 2020-12-31 00:26:14 -05:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
GriffinR
7ae78dc773 Finish factory select screen doc 2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d Index battle controller cmd tables 2020-12-29 17:21:58 -05:00
LOuroboros
32cb306b85
Tweaked evolution.h 
Litleo doesn't need to have 2 different evolutions into Pyroar.
 2020-12-27 00:10:14 -03: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
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08: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
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags 
Add Galarian Form mon flags
 2020-12-21 10:05:19 -07:00
ghoulslash
a1e3700d10
Merge pull request #1299 from LOuroboros/cacophony 
Cacophony
 2020-12-21 09:47:52 -07:00
Kurausukun
3203bac053 fix struct 2020-12-20 23:15:35 -05:00
Kurausukun
14e2898a29 fix structs and some function logic 
(currently does not match)
 2020-12-20 02:54:33 -05:00
ExpoSeed
ef6a7fbf43 Add Galarian Form mon flags 2020-12-18 18:25:24 -06:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms 
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
 2020-12-18 08:17:49 -03:00
ultima-soul
ad67068f7e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data 2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08: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
LOuroboros
77871c5eda Dealt with Cacophony 
By copy-pasting back in the BE's include/constants/abilities.h and commenting out the 2 instances where ABILITY_CACOPHONY is normally used in this branch.
 2020-12-14 16:26:00 -03:00
Sierraffinity
1aca378634 Fix name of SetDexNumberColor 2020-12-12 21:08:15 -08:00
GriffinR
b1197ac2da UBFIX for if_status_not_in_party 2020-12-12 23:57:25 -05:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
Sierraffinity
abef3065d0 Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition 2020-12-12 20:29:20 -08:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
Michael Panzlaff
eaff64e223 remove trailing spaces 2020-12-12 13:19:08 +01:00
Michael Panzlaff
f177c736fc more CgbSound decipher work 2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5 use better m4a variable/constant names 2020-12-11 16:33:55 +01:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
ExpoSeed
76e40fe2dd
Fix incorrect bug description 2020-12-09 16:45:27 -06:00
Jaizu
8b46a3b305
Change Pidgey front animation 2020-12-07 12:07:50 +01:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags 
Add mon flags
 2020-12-03 15:07:17 -05:00
GriffinR
c76aaa2aa4
Merge pull request #1259 from GriffinRichards/fix-backpicindex 
Designated initializers for gTrainerBackPicTable
 2020-12-01 16:26:42 -05:00
GriffinR
076b2c2edc Designated initializers for gTrainerBackPicTable 2020-11-30 15:32:08 -05:00
GriffinR
571c5988ec
Merge pull request #1257 from Kurausukun/menu_nonmatching 
[LEAK INFORMED] match sub_819A080
 2020-11-27 11:10:03 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
Kurausukun
54becd2303
whitespace 2020-11-26 01:35:08 -05:00
Kurausukun
94cbd3ff1b [LEAK INFORMED] match sub_819A080 2020-11-26 01:30:59 -05:00
LOuroboros
1083130125 Another one 
Made Crabrawler evolve in the Ice Room of the Shoal Cave too.
 2020-11-25 10:42:57 -03:00
ExpoSeed
3adf316574 Add mon flags 2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e A few more evo related changes. 
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
 2020-11-25 01:15:19 -03:00
LOuroboros
d817950fb6 Readded the EVO_MAP based Eevee->Leafeon and Eevee->Glaceon evos 2020-11-24 23:49:18 -03:00
GriffinR
9d056e8656 Move object event pal declarations to graphics 2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
LOuroboros
210cfabe4c Another one 
In SwSh, Magneton can evolve with a Thunder Stone just like Charjabug
 2020-11-23 11:02:23 -03:00
LOuroboros
e6f44328a1 Commented out parameters 2020-11-23 10:49:32 -03:00
LOuroboros
bb75b1ad17
A few evolution updates 
- Changed the Eevee->Leafeon evo method from EVO_MAP to EVO_ITEM, which is more accurate in comparison as of Gen. 8 since we still don't have the actual evo method implemented.
- Changed the Eevee->Glaceon evo method for the same reason.
- Added Vikavolt's Thunder Stone based evolution as a second option.
 2020-11-23 10:45:00 -03:00
GriffinR
0aa06c307b
Merge pull request #1251 from ExpoSeed/patch-1 
Document bugged IV inheritance difference
 2020-11-17 14:25:36 -05:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code 2020-11-17 17:40:26 +01:00
Eduardo Quezada D'Ottone
14bc55007b
Merge pull request #1226 from ExpoSeed/PE-ifdef-items 
ifdef items in base_stats.h and uncomment vanilla hold items
 2020-11-17 11:29:42 -03:00
LOuroboros
1f33a030ac Fixed the pal. of Nu-Arceus' Fighting and Flying forms 2020-11-16 22:05:43 -03:00
ExpoSeed
4db1f02154 Remove ifdefs for vanilla items 2020-11-16 18:58:11 -06:00
LOuroboros
ae4525d170 Fixed the pal. of Arceus' Fighting and Flying forms 2020-11-16 18:39:49 -03:00
LOuroboros
cad5b57b42
sanityIsBagEgg -> sanityIsBadEgg 
Fixed a typo.

Lunos#4026
 2020-11-16 15:36:38 -03:00
ExpoSeed
e5f043ff72
Fix grammar 2020-11-15 16:28:09 -06:00
ExpoSeed
3f157b5293
Document bugged IV inheritance difference 2020-11-15 16:24:19 -06:00
ExpoSeed
c8e3104adc ifdef items in base_stats.h 2020-11-15 11:46:38 -06:00
Eduardo Quezada D'Ottone
afeb0c5ae4 Fixed Greninja form species names. 2020-11-14 09:10:16 -03:00
Eduardo Quezada D'Ottone
54630ff5a9 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/evolution.h
 2020-11-13 16:40:31 -03:00
Eduardo Quezada D'Ottone
3981720343 Review changes 4 2020-11-13 16:36:31 -03:00
Eduardo Quezada D'Ottone
d3a5921122 Review changes 3 2020-11-13 16:34:53 -03:00
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
26db02e95a Review changes 1 2020-11-13 15:36:36 -03:00
LOuroboros
47c0a38401 Added Rayquaza's Mega Evolution to the list of evolutions 2020-11-11 15:19:56 -03:00
Eduardo Quezada D'Ottone
dbd02d1857 Fixed defines. 2020-11-10 20:05:01 -03:00
Eduardo Quezada D'Ottone
caf6253ba3 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon_icon.c
 2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
d97932c009 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon.c
 2020-11-10 19:29:50 -03:00
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences 
Support for Gender Differences
 2020-11-10 12:31:03 -07:00
ExpoSeed
3e3c655f43
Merge pull request #563 from AsparagusEduardo/Fix-LitleoPyroarGender 
Fixing Litleo's and Pyroar's gender ratio.
 2020-11-10 11:42:25 -06:00
Eduardo Quezada D'Ottone
79edca1ae8 Fixed Pokédex showing by default Female version differences. 2020-11-07 21:24:20 -03:00
luckytyphlosion
4b748d32cc Bugfix for ChooseMoveOrAction_Doubles. 2020-11-07 18:21:17 -05:00
Eduardo Quezada D'Ottone
68627882a5 Merge remote-tracking branch 'pret/master' into PE-pretSync 2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
209ff3aa5e Fixed spacing. 2020-11-06 18:11:05 -03:00
Eduardo Quezada D'Ottone
ed34e90848 Fixed new-line at EOF 2020-11-06 18:08:45 -03:00
Eduardo Quezada D'Ottone
5e33281350 Support for gender difference mon icons. 2020-11-06 17:48:03 -03:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix 
use constants for ball throw count
 2020-11-06 15:41:25 -05:00
Eduardo Quezada D'Ottone
d7fbaa6cbf Support for gender palettes. 2020-11-06 17:12:57 -03:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset 
Simplify RAM reset adaptation for modern
 2020-11-06 15:00:40 -05:00
MCboy
e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d Female Eevee backsprite. 2020-11-06 16:45:25 -03:00
MCboy
3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327 Front pic gender differences for Eevee 2020-11-06 16:21:45 -03:00
PikalaxALT
3112cf5726 swi --> svc 2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48 Simplify RAM reset adaptation for modern 2020-11-06 12:29:40 -05:00
Eduardo Quezada D'Ottone
b494b6e987 Fixing Litleo's and Pyroar's gender ratio. 2020-11-06 14:28:10 -03:00
GriffinR
1220f0655c Revert to original battle factory gcc 10 fix 2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a Fix typo 2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735 Condense fix for battle factory on gcc 10 2020-11-04 16:43:59 -05:00
Eduardo Quezada D'Ottone
6cb73c1e8a
Fixed Trapinch's evolutions abilities. (#555) from AsparagusEduardo 
Fixed Trapinch's evolutions abilities.
 2020-11-04 18:23:15 -03:00
GriffinR
c59a818462 Fix battle factory on gcc 10 2020-11-04 15:35:22 -05:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
Eduardo Quezada D'Ottone
0c6dc6abab Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	graphics/pokemon/burmy/footprint.png
#	graphics/pokemon/gastrodon/footprint.png
#	graphics/pokemon/rotom/footprint.png
#	graphics/pokemon/shellos/footprint.png
#	graphics/pokemon/wormadam/footprint.png
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2020-11-03 00:13:51 -03:00
aaaaaa123456789
ca950a8daf Solve merge conflicts from previous commit 2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
Eduardo Quezada D'Ottone
c598daf228 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-11-02 19:39:18 -03:00
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints 
Added footprints for the Gen. 5 species
 2020-11-02 10:28:06 -08:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities 
Toggle options for abilities and Egg Groups.
 2020-11-01 21:07:24 -06:00
Eduardo Quezada D'Ottone
910d502df2 Review changes 2020-11-01 19:23:45 -03:00
Eduardo Quezada D'Ottone
014afea3df Fixed Trapinch's evolutions abilities. 2020-11-01 16:59:03 -03:00
Eduardo Quezada D'Ottone
44e066cdb4 Fixed missing abilities. 2020-11-01 15:37:01 -03:00
Eduardo Quezada D'Ottone
2c3d4ec7c7 Moved P_UPDATED_STATS ifs to above typing. 2020-11-01 15:32:50 -03:00
LOuroboros
bdcd910397 Swapped tabs to spaces in footprint_table.h 2020-11-01 15:18:41 -03:00
Eduardo Quezada D'Ottone
ad5b728967 Fixed Quick Feet BATTLE_ENGINE define. 2020-11-01 14:50:08 -03:00
Eduardo Quezada D'Ottone
56056c01f4 Fixed identation for real. 2020-11-01 14:45:41 -03:00
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons 
Use constants for menu info icon table
 2020-10-29 23:50:43 -04:00
GriffinR
be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04:00
LOuroboros
6435158742 Added footprints for the Gen. 4 species 2020-10-27 09:38:04 -03:00
Eduardo Quezada
2964cc3828 Filled missing form names. 2020-10-26 22:53:31 -03:00
Eduardo Quezada
ed6fd6c964 Fixed compile 2020-10-26 22:37:01 -03:00
Eduardo Quezada
dbd382e61b Added missing National Dex association. 2020-10-26 22:20:30 -03:00
Eduardo Quezada
2c098d8294 Merge branch 'pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-10-26 20:06:37 -03:00