ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 20:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,310 Commits 1 Branch 0 Tags 235 MiB
408485263d
Commit Graph

4310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
e230afd543 Merge branch 'master' into learn 2018-12-24 22:01:52 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
Diegoisawesome
2bca45bcf5 More link stuff, stumped on sub_807A728 2018-12-24 14:39:05 -06:00
Melody
370b1093cd fix feebas check 2018-12-24 13:48:31 -06:00
Marcus Huderle
c2fdbb0ef7 Decompile psychic.c 2018-12-24 10:52:56 -06:00
Marcus Huderle
f1213ebb4b Decompile dark.c 2018-12-24 09:55:00 -06:00
Diegoisawesome
3f08e0c76c Some more trade nonsense 2018-12-24 03:03:02 -06:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
Diegoisawesome
980b055bf0
Merge pull request #471 from DizzyEggg/clean 
Get rid of externs and add includes
 2018-12-24 01:33:57 -06:00
Diegoisawesome
f835a35662
Merge pull request #470 from Rangi42/master 
Fix OLD_UNOWN_BASE_STATS formatting
 2018-12-23 21:10:37 -06:00
Marcus Huderle
c17f7d73fa Merge remote-tracking branch 'origin/battle_engine_v2' into features 
# Conflicts:
#	ld_script.txt
#	src/effects_1.c
 2018-12-23 17:24:14 -06:00
DizzyEggg
72aa9eb5a9 clear headers more 2018-12-24 00:20:38 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
DizzyEggg
c583559a80 Get rid of unused stuff 2018-12-23 19:03:42 +01:00
DizzyEggg
bd817d70d6 Refactor battle intro, allow to speed it up 2018-12-23 18:47:00 +01:00
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros 
improve compare macros
 2018-12-23 11:17:30 -06:00
Diegoisawesome
e874267edb
Merge pull request #469 from DizzyEggg/data 
Move some data to C
 2018-12-23 10:45:19 -06:00
Diegoisawesome
f1ee374e93
Merge pull request #468 from KDSKardabox/resolve_ice_electric_split 
Move 2 incorrectly split functions of electric from ice
 2018-12-23 10:42:01 -06:00
DizzyEggg
efa820469a move data to c 2018-12-23 14:52:47 +01:00
DizzyEggg
6d57a9dfc8 start data converting 2018-12-23 13:52:53 +01:00
DizzyEggg
c23b1acc5e Merge with master 2018-12-23 10:26:58 +01:00
KDSKardabox
436122ec93 Add new line at EOL 2018-12-23 13:07:00 +05:30
Diegoisawesome
a5c09bfec6 S'more trade 2018-12-23 01:26:38 -06:00
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