ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-20 05:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,086 Commits 1 Branch 0 Tags 235 MiB
cda75bca70
Commit Graph

5086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSKardabox
b394ad7781 Add space 2018-12-23 11:55:01 +05:30
Diegoisawesome
36c7b5f183
Merge pull request #467 from DizzyEggg/nonmatchings 
Match some functions
 2018-12-22 18:17:52 -06:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
adb4927504 Merge with master 2018-12-22 23:30:41 +01:00
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
bea1faec10 some ai scripts touch 2018-12-22 21:43:21 +01:00
DizzyEggg
53b9d4a224 Dont clear AI flags on move choose. Will come in handy in smart ai switch logic 2018-12-22 20:57:12 +01:00
KDSKardabox
67beec5cbe Move 2 functions of electric from ice 2018-12-23 00:34:00 +05:30
DizzyEggg
6dffa6d17c Match and clean up fldeff misc 2018-12-22 19:33:45 +01:00
DizzyEggg
8fcb3f71c7 Match electric c 2018-12-22 18:52:05 +01:00
DizzyEggg
72532c9eee Match and clean up party_menu.c 2018-12-22 17:32:21 +01:00
DizzyEggg
f7a7ddde0c Fix Quick Guard 2018-12-22 15:10:24 +01:00
DizzyEggg
0748069705
Merge pull request #53 from ultima-soul/battle_engine 
Added new battle items.
 2018-12-22 13:54:19 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
Diegoisawesome
a39783a637 More trade.c 2018-12-22 01:26:53 -06:00
Melody
55005f1588 improve call_if macros 2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d improve goto_if macros 2018-12-21 20:28:24 -05:00
DizzyEggg
1374c11a1c Review pokemon storage system chaanges 2018-12-21 22:35:01 +01:00
Diegoisawesome
052d458f48 sub_80796B4 is a pain 2018-12-21 12:20:28 -06: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
Diegoisawesome
e1ada979db
Merge pull request #465 from golemgalvanize/decompile_ice 
Decompile ice
 2018-12-21 02:18:03 -06: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
Marcus Huderle
efd7013f62 Add poison bubble effect to Poison Jab 2018-12-20 14:58:13 -06:00
Marcus Huderle
4aecea2ce8 Add Night Slash animation 2018-12-20 12:46:08 -06:00
Marcus Huderle
ecda59a406 Add Poison Jab animation 2018-12-20 11:58:21 -06:00
Marcus Huderle
0369780db9 Add Rock Polish animation 2018-12-20 10:18:17 -06: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
Diegoisawesome
864b383177
Merge pull request #460 from melthelesbian/applymovement_tweaks 
update applymovement to remove magic numbers
 2018-12-19 17:19:02 -06:00