ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-30 14:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,694 Commits 1 Branch 0 Tags 235 MiB
c32d5f455b
Commit Graph

326 Commits

Author SHA1 Message Date
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
ultima-soul
e15a86caae Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8. 2020-11-17 10:32:24 -08:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08: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
8d86169283 Merge remote-tracking branch 'pret/master' into IE-pretSync 2020-11-07 14:54:52 -03:00
Kurausukun
83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04:00
Eduardo Quezada D'Ottone
353f9eca42
Merge pull request #30 from AsparagusEduardo/PE-PokemonConfig 
Updated types and stats in configuration file.
 2020-10-23 12:40:10 -03:00
Eduardo Quezada
b1903af8c1 Adapting move changes (part 1) 2020-10-17 23:08:39 -03:00
ExpoSeed
1a024b0826
Merge pull request #12 from AsparagusEduardo/PR-TradeSpecificEvo 
Added Karrablast/Shelmet evolution method.
 2020-10-16 20:55:15 -05:00
Eduardo Quezada
2b95f9fc43 Updated types and stats in config. 2020-10-16 21:04:11 -03:00
LOuroboros
16f4fda35b Tweaked EVO_MAP evolutions 
The EVO_MAP evolution method was using numerical IDs instead of proper labels, which wasn't intuitive.
On top of that, there were better maps to choose for some of the species that made use of it.
 2020-10-15 06:35:37 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -03:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
PokeCodec
7f1827767c Document size field of unknown struct 2020-09-09 16:09:31 -04:00
PokeCodec
d541002ab6 Type adjust 2020-09-09 15:54:24 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
ghoulslash
ad95f150a9
Expand Pokeball Substructure (#473) 
* expand ball struct element

* remove test case
 2020-07-16 09:10:21 +02:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
153d2ac823 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-08 15:42:14 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
cd4c3b38b5 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:53:59 +01:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
aec7eb6089 Clean up party_menu doc 2019-10-31 14:11:55 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
GriffinR
1ffa890d27 Consolidate remaining pokemon constants 2019-09-22 08:14:22 -05:00
GriffinR
80f58f7b24 Document PLAYER_HAS constants, consolidate poke constants 2019-09-22 08:14:22 -05:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
DizzyEggg
8d128be459 Merge branch 'toto' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-08-25 13:09:31 +02:00
DizzyEggg
cef9dfe22c Make room for hidden abilities 2019-08-25 13:08:58 +02:00
DizzyEggg
58b313956d Merge with master 2019-08-25 12:51:09 +02:00
DizzyEggg
d09c290eba bool8 to u8 2019-08-22 16:46:33 +02:00
DizzyEggg
f05375112b Erase isEgg field from battlemon, ability num to 2 bits 2019-08-21 11:56:49 +02:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
DizzyEggg
fd07c608fc Decompile pokemon unk 6 2019-07-25 18:56:08 +02:00
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
garak
60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak
daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
0518025b92 formatting 2019-05-16 09:43:19 +02:00
DizzyEggg
20841a9f87 Use PLAYER_NAME_LENGTH constant 2019-05-15 16:53:59 -05:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +02:00
DizzyEggg
02594be062 Merge branch 'master' into pokemon_expansion 2019-05-04 09:20:45 +02:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
DizzyEggg
4e5c543327 Remove new items data from battle engine 2019-04-13 14:02:04 +02:00
DizzyEggg
c090f6cda9 Add Unown forms 2019-04-07 12:40:18 +02:00
DizzyEggg
8213222337 Merge with master 2019-04-06 23:20:16 +02:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg
70569e7ebc Use shiny species tag 2019-04-05 07:53:23 -05:00
DizzyEggg
7dcd7362d3 Add Evolution data 2019-04-03 23:00:49 +02:00
DizzyEggg
5219b7b30a Code for new evo methods 2019-04-03 22:19:18 +02:00
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
DizzyEggg
d90767c490 Switch effect and argument fields in BattleMove struct 2019-03-31 15:24:46 +02:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c 
Mostly variables mislabeled as global and some formerly unknown stuff.
 2019-02-23 21:12:35 -05:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
DizzyEggg
11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
DizzyEggg
128239d65e Almost there 2018-12-19 22:47:27 +01:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation 
Pokedex Documentation
 2018-12-15 18:06:42 -06:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Meowsy
bc11a4a9f4 Document various things relating to the Pokedex. 2018-12-15 15:12:28 -05:00
Meowsy
68017b531a Rename UnknownPokemonStruct to BattleTowerPokemon. 2018-12-10 15:49:33 -05:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt 
Match some functions
 2018-11-26 16:58:19 -06:00
DizzyEggg
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
DizzyEggg
81410fee17 Factory done 2018-11-11 16:44:27 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
DizzyEggg
a496a763ca Merge record mixing, pokemon and global with apprentice 2018-10-13 20:38:46 +02:00
DizzyEggg
bf11c35eaf Add gen7 learsnets for pokemon 2018-09-22 13:52:38 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
DizzyEggg
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
e28ce3be78 Fix the strings length issue 2018-09-01 22:03:21 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
239c56496b This is impossible 2018-08-19 17:13:05 +02:00
DizzyEggg
9ff7b0e849 Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst 2018-08-04 20:36:24 +02:00
DizzyEggg
2d73637ff4 Introduce argument and do Draining kiss 2018-08-03 19:01:03 +02:00
DizzyEggg
6f484c20ce Final ai damage calc touches 2018-07-15 18:07:01 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
c00fa14b66 Create template of new dmg calc 2018-07-14 19:29:25 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
c556358e47 label multiuse sprite template functions 2018-07-01 15:28:57 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
9e7965fab0 document record mixing 2018-05-26 00:25:36 +02:00
Diegoisawesome
80062972ae Begin porting field_effect 2018-05-10 03:02:33 -05:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
DizzyEggg
fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
DizzyEggg
084ba7a7a4 decompile all pokemon files 2018-02-10 13:24:03 +01:00
DizzyEggg
9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
Cameron Hall
13bc7a8dd2
Merge pull request #166 from camthesaxman/battle_refactor 
rename/refactor battle code
 2018-02-07 12:46:12 -06:00
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg
237261e193 berry blender review changes 2017-11-27 20:03:41 +01:00
DizzyEggg
95949c772e more of daycare done 2017-11-14 21:43:23 +01:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
DizzyEggg
6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
DizzyEggg
e8903fb4dd start workin on evo scene 2017-10-27 18:52:21 +02:00
DizzyEggg
5e285c3bca Merge branch 'master' into decompile_battle_controllers 2017-10-26 23:13:09 +02:00
camthesaxman
5ea2f463d7 also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants 2017-10-26 13:47:14 -05:00
DizzyEggg
fa36e23683 start opponent controller, thx bird 2017-10-25 21:57:28 +02:00
DizzyEggg
94b3a8dd69 spd to speed 2017-10-24 15:35:36 +02:00
DizzyEggg
0659b19e99 Merge branch 'master' into decompile_battle_controllers 2017-10-24 15:27:55 +02:00
camthesaxman
1bb931245b use SPEED instead of SPD in mon data constants 2017-10-23 20:43:26 -05:00
DizzyEggg
1f3a867a0b battle link partner controller is done 2017-10-23 16:38:11 +02:00
DizzyEggg
813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
DizzyEggg
a3b62f43ee battle 9 is decompiled 2017-10-11 12:49:42 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
DizzyEggg
d87d19cfe5 more battle2 done 2017-10-04 19:25:14 +02:00
DizzyEggg
db58d5e24a battle2 3500 C lines 2017-10-02 23:32:39 +02:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
DizzyEggg
52a951276f battle 4, up to x69 2017-09-25 00:09:13 +02:00
DizzyEggg
898d0b20ad up to x50 2017-09-24 00:29:52 +02:00
DizzyEggg
601fc9e85b atk49 is matching baby WOHOHOHOHO 2017-09-23 20:13:45 +02:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
DizzyEggg
f255cbd7dc Merge branch 'master' into decomp_egg_hatch 2017-09-18 23:50:08 +02:00
DizzyEggg
2e7127284f egg hatch almost decompiled 2017-09-18 23:48:47 +02:00
DizzyEggg
c7592bc87c finish porting cam's port 2017-09-17 15:19:15 +02:00
DizzyEggg
4242ede445 almost there, troubles 2017-09-12 00:01:12 +02:00
DizzyEggg
738e776630 more pokemon2 decomp 2017-09-11 22:28:36 +02:00
DizzyEggg
e69606b5cb praise cam the CHAMP man 2017-09-11 19:42:37 +02:00
DizzyEggg
8e88f2790a pokemon2 get mon data troubles 2017-09-11 18:27:54 +02:00
DizzyEggg
5394435520 more of pokemon3 decompiled 2017-09-11 14:42:13 +02:00
DizzyEggg
154a70e228 start pokemon3 decomp 2017-09-11 11:35:41 +02:00
DizzyEggg
cdd36116f2 label pokemon3.s 2017-09-06 21:48:30 +02:00
DizzyEggg
c6eacc9be5 start porting pokemon1 2017-09-06 17:19:08 +02:00
DizzyEggg
54b8306115 really clean up battle ai 2017-09-05 09:41:48 +02:00
DizzyEggg
2702b0ec9b decomp calc dmg and clean up battle ai 2017-09-04 21:43:13 +02:00
DizzyEggg
92892d140a begin load_save.c 2017-09-04 18:26:39 +02:00
DizzyEggg
048700fe57 decompile rtc 2017-09-02 23:28:44 +02:00
ProjectRevoTPP
689df5cff8 finish decompiling battle_ai.c (#16) 
* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting
 2017-02-03 18:34:56 -08:00