Commit Graph

2232 Commits

Author SHA1 Message Date
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
2018-12-22 16:12:27 -06:00
DizzyEggg
c805bab483 Storage - review changes 2018-12-22 23:00:22 +01:00
DizzyEggg
1374c11a1c Review pokemon storage system chaanges 2018-12-21 22:35:01 +01:00
Diegoisawesome
87fd6b8dc2
Merge pull request #463 from ShinyDragonHunter/old_unown_macro
Use a macro for OLD_UNOWN base stats
2018-12-21 12:15:34 -06:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00:00
golem galvanize
314b718471 finish porting ice 2018-12-21 01:37:59 -05:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
golem galvanize
64832ff67e start ice 2018-12-20 16:20:34 -05:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff
Decompile / port fldeff_80F9BCC
2018-12-19 22:16:59 -06:00
Diegoisawesome
c74bfbe110
Merge pull request #462 from Deokishisu/Move-data-out-of-wild_encounter.c
Move data out of wild_encounter.c
2018-12-19 22:11:57 -06:00
Deokishisu
a3543c9a34 Move data out of wild_encounter.c
wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.
2018-12-19 22:50:54 -05:00
garak
5eac3ce1a2 rename fldeff_misc 2018-12-19 22:19:54 -05:00
Marcus Huderle
b7ce383a96 Document a bunch of battle anims 2018-12-19 21:19:44 -06:00
garak
af208a6bbb Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff 2018-12-19 21:35:32 -05:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu
Decompile party menu
2018-12-19 19:57:31 -06:00
garak
f801eed3a8
clean fldeff file 2018-12-19 20:52:41 -05:00
golem galvanize
d6589d1abc another fix 2018-12-19 20:50:36 -05:00
golem galvanize
44fae5a688 add TM constant use 2018-12-19 20:44:40 -05:00
golem galvanize
64d4eed63b hidden conversation fixes applied 2018-12-19 20:27:44 -05:00
Diegoisawesome
5b73fe138c
Merge pull request #457 from golemgalvanize/decompile_water
Decompile water
2018-12-19 19:16:40 -06:00
golem galvanize
038836d21d pretty sure it's fixed now 2018-12-19 20:08:01 -05:00
golem galvanize
085e793460 one line cleanup in summary_screen 2018-12-19 19:55:51 -05:00
golem galvanize
fabbbdd02a fix up party_menu 2018-12-19 19:53:52 -05:00
golem galvanize
6f0dd694ea removed weird comment 2018-12-19 19:48:28 -05:00
DizzyEggg
128239d65e Almost there 2018-12-19 22:47:27 +01:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
golem galvanize
e771854eae removed commented out attempt 2018-12-19 10:51:55 -05:00
golem galvanize
0fa120ebcd get a nonmatching slightly more functional 2018-12-19 10:48:15 -05:00
golem galvanize
cd785011fe decompiled water 2018-12-19 10:31:37 -05:00
golem galvanize
f7df299be8 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water 2018-12-18 20:23:32 -05:00
golem galvanize
15a7b1bc08 begin water.s 2018-12-18 20:23:07 -05:00
Marcus Huderle
b2ac3b6d6f Decompile most of battle_anim_effects_3.c 2018-12-18 19:15:59 -06:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
Diegoisawesome
2c7948bae8
Merge pull request #452 from Meowsy/pokemon-adding-easer
Add macros to simplify defining front animations and still pics.
2018-12-18 14:27:01 -06:00
Meowsy
d6b31346c3 Additional SPECIES_* documentation. 2018-12-18 10:03:57 -05:00
Meowsy
9ca27f1332 Document return value. 2018-12-18 09:20:43 -05:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -05:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
Meowsy
e92245ab06 Add macros to simplify defining front animations and still pics. 2018-12-17 12:29:35 -05:00
Meowsy
62c4379a21 Remove magic numbers. 2018-12-17 12:28:11 -05:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
golem galvanize
71a7a8a075 decompiled up to sub_81B8A7C 2018-12-17 02:39:17 -05:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00