ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 12:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,641 Commits 1 Branch 0 Tags 235 MiB
503134167a
Commit Graph

156 Commits

Author SHA1 Message Date
Philipp AUER
55202eac24 rename coords to size in struct MonCoords 2019-01-04 19:59:55 -06:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209 Cleanup and documentation 2018-12-31 02:22:21 -06:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480) 
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
 2018-12-25 11:50:15 -06:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
DizzyEggg
dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
DizzyEggg
a0699dba52 Add Aromatic Mist 2018-11-25 12:59:22 +01:00
DizzyEggg
434e257943 Add Acupressure 2018-11-24 21:06:53 +01:00
DizzyEggg
539b05ff73 Begin working on custom multi battles 2018-11-24 01:02:02 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
a5df797804 Merge branch 'master' into battle_engine_v2 2018-11-19 20:42:07 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06: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
65036b9a09 Merge with master 2018-11-15 21:53:32 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
Slawter666
4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
garak
38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak
901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
DizzyEggg
67384c08be Implement double wild battle functionality 2018-10-15 21:19:52 +02:00
DizzyEggg
d05875dd04 New mega trigger sprite 2018-09-20 20:59:00 +02:00
DizzyEggg
2bae70a66b Convert mega related struct fields to a seperate struct 2018-09-20 17:33:27 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
DizzyEggg
add1f4910c Add mega trigger png 2018-09-17 22:40:49 +02:00
DizzyEggg
abebf479a6 Tweak mega evo to hopefully be compatibile with recorded battles. 2018-09-17 20:37:33 +02:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Diegoisawesome
d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
43b74032fa Make pyramid bag compile. 2018-08-30 20:25:57 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg
81b29ae7c1 Merge with pokeemerald 2018-07-16 22:45:06 +02:00
DizzyEggg
bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
e6d67c7c22 give labels to player controller functions 2018-07-01 15:45:47 +02:00
DizzyEggg
c556358e47 label multiuse sprite template functions 2018-07-01 15:28:57 +02:00
DizzyEggg
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
2d0be91217 Move all trainer defines to trainers.h and identify frontier brain trainer id 2018-06-30 18:55:34 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
DizzyEggg
ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +02:00
DizzyEggg
94752d4207 document battle bars 2018-06-19 00:43:15 +02:00
DizzyEggg
caa36b530a label and document battle windows 2018-06-17 16:48:58 +02:00
DizzyEggg
0fe3e612eb battle tent start and create frontier struct in saveblock 2018-06-17 12:30:09 +02:00
DizzyEggg
edf2ea45b1 merge with master 2018-03-01 10:12:35 +01:00
DizzyEggg
988f0b7e19 Merge branch 'master' into decompile_battle_link_817C95C 2018-03-01 01:01:18 +01:00
DizzyEggg
b846015343 more battle files cleaning 2018-03-01 00:59:52 +01:00
DizzyEggg
a28dfd6da4 Merge branch 'master' into clear_battle_files 2018-02-28 23:58:29 +01:00
DizzyEggg
e93da9b1f9 make strings in battle message static 2018-02-28 23:50:25 +01:00
DizzyEggg
59ff4aec9b decompile and document battle tv 2018-02-27 20:40:09 +01:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00
camthesaxman
f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -06:00
scnorton
c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
camthesaxman
c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
camthesaxman
157b88b6db identity -> position 2018-01-16 14:01:31 -06:00
Diegoisawesome
3241b1405f Add symbols to music_player_table 
Also rename gMPlay structs to gMPlayInfo
 2018-01-09 21:30:54 -06:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
DizzyEggg
314b96af46 static names given s prefix 2017-12-17 23:45:27 +01:00
PikalaxALT
190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman
19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman
00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
DizzyEggg
ce6e97fa0b sprite data fields to array 2017-12-02 21:44:50 +01:00
DizzyEggg
c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
PikalaxALT
cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -05:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
PikalaxALT
236cbf96c8 Merge origin/master into pikalaxalt/link 2017-11-16 19:00:07 -05:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
PikalaxALT
f21c5ebea5 through sub_800B1A0 2017-11-12 23:58:05 -05:00
PikalaxALT
27c0dc0fd5 through sub_800A588 2017-11-10 22:08:17 -05:00
Diegoisawesome
2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
DizzyEggg
f724213a04 review change 3 battle controllers 2017-10-31 18:52:18 +01:00
DizzyEggg
712ae56167 review change battle controllers 2017-10-31 18:04:08 +01:00
DizzyEggg
2d14e6bb67 name one var 2017-10-27 13:29:18 +02:00
DizzyEggg
1506184465 battle controller opponent is done 2017-10-26 23:12:48 +02:00
DizzyEggg
a9bc67dbb0 recorded opponent controller is done 2017-10-25 18:59:07 +02:00
DizzyEggg
94b3a8dd69 spd to speed 2017-10-24 15:35:36 +02:00