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

1849 Commits

Author SHA1 Message Date
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
golem galvanize
dded980cde fix building 2018-10-17 23:36:18 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
golem galvanize
2c6d634acd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec decompiled some more of the file 2018-10-17 20:03:02 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak
ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41 Further synchronisation 2018-10-17 01:11:44 +01:00
DizzyEggg
d3215ff96f Fix wild double battle issues 2018-10-16 22:19:53 +02:00
Deokishisu
78a912a039
Fix "Vigaroth" misspelling to "Vigoroth" 2018-10-16 12:06:38 -04:00
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01:00
DizzyEggg
67384c08be Implement double wild battle functionality 2018-10-15 21:19:52 +02:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop 
[WIP] Shop
 2018-10-14 19:03:48 -05:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
DizzyEggg
ef11706dc7 Begin wild double battles 2018-10-14 22:37:07 +02:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice 
Decompile apprentice
 2018-10-14 13:20:38 -05:00
Diegoisawesome
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct 
Clean a couple of battlestructs' fields
 2018-10-14 13:18:29 -05:00
Diegoisawesome
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap 
Move HEAP_SIZE to malloc and use void instead of empty argument list
 2018-10-14 13:15:31 -05:00
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers 
Decompile field effect helpers
 2018-10-14 12:48:18 -05:00
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos 
Use defines for text chars
 2018-10-14 12:21:37 -05:00
DizzyEggg
ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
f47ed3268c Finish documenting apprentice for now 2018-10-14 17:00:41 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661 Use defines for text chars 2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +02:00
DizzyEggg
36b8a6a9a2 More apprentice work 2018-10-13 23:23:33 +02:00
DizzyEggg
a496a763ca Merge record mixing, pokemon and global with apprentice 2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop 2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c Merge branch 'master' of github.com:pret/pokeemerald 2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814 Port/decompile cable_club.s 2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b Merge remote-tracking branch 'upstream/master' into shop 
# Conflicts:
#	asm/shop.s
 2018-10-13 10:22:58 -05:00
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
golem galvanize
d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02:58 -05:00
golem galvanize
803c2388ce finish porting field_effect_helpers 2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0 ported some of field_effect_helpers 2018-10-09 17:32:39 -04:00
Diegoisawesome
72c9abbb66
Remove invalid version entries 2018-10-07 23:28:36 -05:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files 
Decompile/Port battle_anim_80A5C6C
 2018-10-07 12:23:07 -05:00
DizzyEggg
413e26e83d port 80d51ac 2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069 Decompile battle_anim_80A9C70 2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8 battle anim 80a5c6c decompiled 2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
Diegoisawesome
7a7aeed5e8
Merge pull request #347 from Deokishisu/GamV 
Fill out VERSION_ enum with all possible values
 2018-10-06 13:45:21 -05:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
Deokishisu
2070c246f9
Added new findings about invalid version IDs. 
After transferring Pokemon up to Gen 6 and then to Gen 7, I discovered that invalid version IDs display the "a distant land" string that is used for the Gamecube games, so that information was added in a comment.

Also clarified that it's not just Gen 4 that displays the Johto string, it's Gen 4 and up.
 2018-10-06 07:40:56 -04:00
DizzyEggg
17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Deokishisu
76a9cf0d54
Fix captitalization of HGSS in comment and match FRLG formatting in enum 2018-10-06 01:56:03 -04:00
Deokishisu
cc0d2288d5
Match comment formatting 2018-10-06 01:46:17 -04:00
Deokishisu
024700769a
Document all possible VERSION_ numbers and add them to the enum 2018-10-06 01:45:36 -04:00
Tetrable
61ab631dec
Fixed a small error 2018-10-05 23:02:04 +01:00
Tetrable
e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3 Full support for moves hitting all battlers 2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f Add pop-up to battlescripts 2018-09-29 13:36:33 +02:00
DizzyEggg
731ff38067 Ability pop-up functionality is done 2018-09-29 12:47:35 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe Ability pop-up fail, maybe will do something about it later 2018-09-23 14:24:06 +02:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master 
Rename voicegroups
 2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6 Rename voicegroups 2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe Merge remote-tracking branch 'Tetra/master' 2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e Use macros and defines in tileset_anims 2018-09-22 15:02:49 -05:00
DizzyEggg
60e8c80c4c Merge branch 'master' into battle_engine_v2 2018-09-22 19:14:56 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
fd15e23419 Placeholder entries for gen7 moves 2018-09-22 14:04:15 +02:00
DizzyEggg
bf11c35eaf Add gen7 learsnets for pokemon 2018-09-22 13:52:38 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4 Shell Smash move effect 2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836 Close combat effect 2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2 Growth gen6 effect 2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
d05875dd04 New mega trigger sprite 2018-09-20 20:59:00 +02:00
DizzyEggg
0755240fbc link battles mega evo fix hopefully????? 2018-09-20 17:59:17 +02:00
DizzyEggg
2bae70a66b Convert mega related struct fields to a seperate struct 2018-09-20 17:33:27 +02:00
DizzyEggg
a181900141 Merge branch 'master' into battle_engine_v2 2018-09-20 11:58:23 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05: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
1018b8f2a8
Merge pull request #13 from Tetrable/battle_engine_v2 
Add periods to the end of ability descriptions.
 2018-09-17 20:03:32 +02:00
DizzyEggg
2042788fdc Mega Evolution done except sprites. 2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
Tetrable
967eb2a276 Accidentally got rid of move defines, added them back 2018-09-16 16:41:52 +01:00
Tetrable
9397618d9d Missed a description 2018-09-16 16:40:02 +01:00
Tetrable
8d4d5b501c Add periods to the end of ability descriptions. 2018-09-16 16:36:47 +01:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil 
Decompile cable_car_util.c
 2018-09-16 01:06:33 -05:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +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
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
DizzyEggg
a08d9dd451 Merge branch 'master' into anims 2018-09-12 22:59:04 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
Slawter666
991151f461 Move item_use data to C 2018-09-11 03:04:19 +01:00
DizzyEggg
10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
DizzyEggg
b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg
2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
Diegoisawesome
e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
d945a8bf2f Macroize main_menu and general cleanup 2018-09-07 19:24:33 -05:00
Slawter666
54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Marcus Huderle
fa9d1759bd checkpoint 2018-09-06 11:37:45 -05:00
Diegoisawesome
8defc345f0
Merge pull request #313 from ultima-soul/overworld_and_mapping 
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…
 2018-09-05 16:50:25 -05:00
ultima-soul
857ac33adb Fixed a typo. 2018-09-05 17:25:44 +00:00
ultima-soul
f505ba1bc7 Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. 2018-09-05 01:13:17 +00:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
DizzyEggg
24b9cd721f More Battle Factory 2018-09-03 22:55:55 +02:00
Slawter666
5c66b8a7ef Label event_object_movement.c 2018-09-02 23:20:45 +01:00
DizzyEggg
0238b1c8ec More battle factory work 2018-09-02 19:41:33 +02:00
DizzyEggg
10eb952db5 Start battle factory 2018-09-02 18:10:36 +02:00
Marcus Huderle
8ecf3b2159 Start decompiling shop.c 2018-09-01 17:15:35 -05: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
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
ead21250a6 Label all battle ai scripts 2018-09-01 19:05:06 +02:00
DizzyEggg
38c89b9d0f Bank to battler 2018-09-01 18:36:08 +02:00
DizzyEggg
ce949ba705 document move type variables in pss 2018-09-01 18:31:53 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +02:00
Diegoisawesome
8e5c72766c
Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 
Decompile battle_dome
 2018-08-29 14:13:39 -05:00
DizzyEggg
3dea8fa265 battle tent review changes 2018-08-29 20:38:54 +02:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
DizzyEggg
78cad0dee5 try battle tent and fail 2018-08-26 15:27:06 +02:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
447e65860c Merge branch 'master' into decompile_battle_frontier_1 2018-08-25 20:02:09 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
DizzyEggg
62a645abaf Up To CopyDomeTrainerName 2018-08-25 18:46:15 +02:00
Diegoisawesome
96d744706d Merge branch 'master' of https://github.com/pret/pokeemerald 2018-08-23 02:42:45 -05:00
Diegoisawesome
26ef40553c Move data from include to src 2018-08-23 02:32:34 -05:00
Slawter666
ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666
4db5ef3ae6 Convert more data 2018-08-22 21:41:34 +01:00
Slawter666
ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
DizzyEggg
5da12f2b21 battle dome - more work 2018-08-19 22:26:07 +02:00
DizzyEggg
239c56496b This is impossible 2018-08-19 17:13:05 +02:00
DizzyEggg
fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
DizzyEggg
e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
DizzyEggg
63cbc8f3cc battle dome - a couple more functions 2018-08-18 00:54:18 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome
f65da613cf
Merge pull request #299 from DizzyEggg/contest_ai 
Decompile Contest ai
 2018-08-15 16:19:18 -07:00
DizzyEggg
e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
Tetrable
8896b54e8f Add national/hoenn dex defines, update dex arrays 2018-08-15 20:10:28 +01:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
a54fa23b5f Begin battle frontier 1 2018-08-15 15:49:50 +02:00
DizzyEggg
92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
DizzyEggg
c806992cfc Port contest ai from pokeruby 2018-08-15 11:43:57 +02:00
Diegoisawesome
0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
Diegoisawesome
332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper 2018-08-14 22:37:59 -07:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
Diegoisawesome
6dac87abfd Cleanup and document learn_move 2018-08-12 14:28:15 -07:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
b40957c09b Finish decompiling learn_move 2018-08-12 13:33:41 -07:00
Diegoisawesome
bd2b7beb07 Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 13:17:51 -07:00
Diegoisawesome
335f4c1e81
Merge pull request #296 from DizzyEggg/event_data 
Event data
 2018-08-12 13:17:36 -07:00
DizzyEggg
f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome
25832810f6
Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome
32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat 
Pikalax's Easy chat
 2018-08-12 12:17:23 -07:00
Diegoisawesome
6bb761a711
Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome
26e18f2292
Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
MCboy
1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
MCboy
9e9ec8dc96
god damn it contributers :c 2018-08-12 23:17:27 +04:30
MCboy
f7c3151ef2
add functions to header 2018-08-12 22:31:19 +04:30
MCboy
e6db9c5d19
add function to header 2018-08-12 22:29:44 +04:30
MCboy
8650f2345d
define function in header 2018-08-12 22:28:41 +04:30
DizzyEggg
7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
DizzyEggg
3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00
Diegoisawesome
a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome
cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome
94eef0bfa5
Merge pull request #294 from DizzyEggg/learnsets 
Make learnsets easier to edit
 2018-08-11 16:27:52 -07:00
DizzyEggg
7b9a7765e0 Make learnsets easier to edit 2018-08-12 00:42:25 +02:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
DizzyEggg
9bb7a2c7a5 make move desc compile 2018-08-12 00:09:53 +02:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
DizzyEggg
0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
DizzyEggg
7961aa44ba start porting slot machine 2018-08-11 17:57:20 +02:00
DizzyEggg
59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +02:00
DizzyEggg
4cb1e880da Reflect Type and SOAK 2018-08-11 13:30:34 +02:00
DizzyEggg
e259000dc3 Coil and Quiver Dance 2018-08-11 12:29:01 +02:00
DizzyEggg
674d35861c Couple bug fixes 2018-08-11 12:16:00 +02:00
Diegoisawesome
1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
garak
45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
DizzyEggg
d230d986fa Me First. 2018-08-05 16:43:07 +02:00
DizzyEggg
de85f88bbb Support for two typed moves. 2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
065032bf35 Moves changing terrains 2018-08-05 12:43:57 +02:00
DizzyEggg
2218949d7c Topsy Turvy and Ion Deluge. 2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d Rapid Spin blews all hazards, Quash and a couple of new move effects 2018-08-04 22:23:07 +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
f8f46244fb Add Infatuation to debug. 2018-08-03 22:45:27 +02:00
DizzyEggg
2d73637ff4 Introduce argument and do Draining kiss 2018-08-03 19:01:03 +02:00
DizzyEggg
39f9b1ddf0 Experience on caught mon 2018-08-03 18:01:14 +02:00
DizzyEggg
320120d529 Merge with master 2018-08-03 00:20:34 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
DizzyEggg
92f3d89598 Gravity and Heal Block preventing after choosing a move 2018-08-02 21:27:28 +02:00
DizzyEggg
c7baa71a5e Add placeholder string for not done moves. 2018-08-02 20:32:13 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
Diegoisawesome
759bc2671c
Merge pull request #280 from DizzyEggg/decompile_part_mon_summary 
Decompile a few pokemon summary screen functions
 2018-08-02 08:27:05 -07:00
DizzyEggg
b73075f822 Update Unusable Moves 2018-07-31 23:09:47 +02:00
DizzyEggg
44a454ecb4 Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done 2018-07-30 20:41:16 +02:00
DizzyEggg
d24ab9daac Little move table fixes 2018-07-29 21:44:35 +02:00
DizzyEggg
d15d27e8fb
Merge pull request #7 from Tetrable/battle_engine_v2 
add existing effects to gen 4 moves, label needed move effects
 2018-07-29 21:17:53 +02:00
Tetrable
05b763964c
add existing effects to remaining moves, labelled needed custom effects 2018-07-29 19:13:24 +01:00
DizzyEggg
9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
DizzyEggg
3d93da7133 Add Imposter 2018-07-29 12:21:28 +02:00
DizzyEggg
d628d1f5fd Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support 2018-07-29 11:32:40 +02:00
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Tetrable
a3d5096d9c
add existing effects to gen 4 moves, label needed move effects 2018-07-28 17:55:23 +01:00
DizzyEggg
ec9693c797 ate abilities 2018-07-28 18:41:57 +02:00
DizzyEggg
3a0c244f40 Add Harvest 2018-07-28 17:13:47 +02:00
DizzyEggg
b3e6dc8457 Add Gluttony 2018-07-28 16:33:01 +02:00
DizzyEggg
43fc4b6933 Add Magic Bounce 2018-07-28 10:41:20 +02:00
DizzyEggg
a452661cb9 Prankster and Gale Wings 2018-07-28 00:25:02 +02:00
DizzyEggg
0148cc8b0c merge with master, gen6 move names 2018-07-28 00:01:34 +02:00
DizzyEggg
9088c0bdb5 Introduce battle config; Snow Warning Done. 2018-07-27 23:40:10 +02:00
DizzyEggg
f51812d0fe Add Fell Stinger 2018-07-26 23:40:55 +02:00
DizzyEggg
d991d669da Add Moxie 2018-07-26 22:52:13 +02:00
DizzyEggg
16d38f5343 Add a couple of gen5 abilities 2018-07-26 21:56:23 +02:00
DizzyEggg
1c95c36338 Healing Wish and Lunar Dance 2018-07-26 20:36:16 +02:00
Diegoisawesome
e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome
5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
DizzyEggg
100ce73a12 Sticky Web done 2018-07-24 22:09:55 +02:00
DizzyEggg
f8b1f0a45c Stealth Rock and Toxic Spikes 2018-07-24 21:47:00 +02:00
DizzyEggg
45bc76d94c Side Status from u16 to u32 2018-07-24 20:13:02 +02:00
DizzyEggg
3f7e6e9fe0 Add U-turn effect 2018-07-23 22:43:05 +02:00
DizzyEggg
567a0240f3 Fix crits and do Worry Seed 2018-07-23 22:18:56 +02:00
DizzyEggg
6570324432 New crit calculator. 2018-07-23 21:36:05 +02:00
DizzyEggg
41aecb14f5 Merge branch 'battle_engine_v2' of git://github.com/Tetrable/pokeemerald into Tetrable-battle_engine_v2 2018-07-23 20:35:16 +02:00
Tetrable
b2b416a2b1
add new move effects to battle_moves.h 2018-07-23 14:41:01 +01:00
LOuroboros
8f87dd7fac
Update battle_moves.h 
Assigned the FLAG_DMG_MINIMIZE to the relevant moves.
 2018-07-23 10:39:35 -03:00
LOuroboros
b790a75853
Update battle_moves.h 
Assigned the following flags to the relevant moves: FLAG_RECKLESS_BOOST, FLAG_IRON_FIST_BOOST, FLAG_SHEER_FORCE_BOOST, FLAG_STRONG_JAW_BOOST, FLAG_MEGA_LAUNCHER_BOOST, FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER.

Assigned the effect EFFECT_SEMI_INVULNERABLE to MOVE_PHANTOM_FORCE and MOVE_SHADOW_FORCE.

The only flags that are not assigned yet, in theory, are FLAG_STAT_STAGES_IGNORED and FLAG_DMG_MINIMIZE.
 2018-07-23 08:45:59 -03:00
DizzyEggg
831816e9b2 Switch-in abilities with a message 2018-07-22 22:21:47 +02:00
DizzyEggg
6a7d58003b Add Bad Dreams 2018-07-22 21:05:12 +02:00
DizzyEggg
fdd8765256 Add Storm Drain redirection 2018-07-22 19:34:13 +02:00
DizzyEggg
fee81d03ab A couple of gen4 abilities 2018-07-22 18:40:18 +02:00
DizzyEggg
51dc76c7e8 Captivate and new accuracy calc 2018-07-22 15:08:32 +02:00
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
DizzyEggg
4ec43cbed1 Gen 5 move names, telekinesis, power/guard split/swap 2018-07-21 23:12:10 +02:00
DizzyEggg
fcca2afc81 More gen4 move effects battlescrips. 2018-07-21 21:58:07 +02:00
DizzyEggg
b203cf4ca4 Add a couple of gen4 moves battlescripts 2018-07-21 16:34:43 +02:00
DizzyEggg
9d4d8c5dac Add new Sturdy effect 2018-07-21 15:11:13 +02:00
DizzyEggg
6cffd5b045 Add new field end turn effects 2018-07-21 13:24:20 +02:00
DizzyEggg
66a3c13f49 Add new Side turn effects 2018-07-21 12:56:07 +02:00
DizzyEggg
382f640809 Start Side/Field end turn 2018-07-21 12:10:08 +02:00
vblm12
07ea34e4c2 Make TrainerMonPtr fields const 2018-07-20 22:08:38 -05:00
vblm12
c41b8123e3 Move trainer defines to one place in opponent.h... 
... to match pokeruby
 2018-07-20 22:03:22 -05:00
DizzyEggg
1468107002 Add Roost endturn effect 2018-07-19 21:18:20 +02:00
DizzyEggg
f3be5ad22d Do new battler end turn effects. 2018-07-18 22:07:48 +02:00
DizzyEggg
81b29ae7c1 Merge with pokeemerald 2018-07-16 22:45:06 +02:00
DizzyEggg
118fa3afce IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL 2018-07-16 22:00:27 +02:00
DizzyEggg
0852cba111 Fix dynamic move power moves, get rid of gDynamicBasePower' 
'
 2018-07-16 21:42:03 +02:00
DizzyEggg
f250436db0 Working physical special split 2018-07-16 21:04:56 +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
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
DizzyEggg
6f484c20ce Final ai damage calc touches 2018-07-15 18:07:01 +02:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master 
Document list_menu.c and main_menu.c
 2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
9c7db9f45e New AI damage and type functions 2018-07-15 12:39:07 +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
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
b24427f3bf Introduce Field Statuses 2018-07-14 13:17:10 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
1afbcda042 Add ability names 2018-07-14 11:20:57 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
DizzyEggg
e94a0e2ddf Add new gen constants. 2018-07-13 23:31:00 +02:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg
9892298645 Merge branch 'master' into final_battle_files_touches 2018-07-07 14:11:04 +02:00
Diegoisawesome
f79ac26ce3 Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer 2018-07-05 20:33:07 -07:00
Diegoisawesome
5189442bcc Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut 2018-07-05 20:32:12 -07: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
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00
DizzyEggg
15fe5a031b Merge branch 'master' into decompile_battle_tent 2018-06-30 14:43:41 +02:00
DizzyEggg
30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
Marcus Huderle
5e00c0bfcf Fix map constants 2018-06-20 19:54:21 -05:00
Marcus Huderle
ed8b006e67 Rename map-layout-related things 2018-06-20 19:54:21 -05: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
3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle
acc1a5d446 Get all map constants from include/ rather than constants/ 2018-06-15 07:49:21 -05:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
ed245b677a Add remaining rodata to event_object_movement.c 2018-06-11 18:17:31 -05:00
Marcus Huderle
89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Marcus Huderle
eb8dbff4a7 Move event_object_movement_helpers into event_object_movement 2018-06-11 10:56:14 -05:00
Marcus Huderle
73327f0d44 Decompile field_ground_effect into event_object_movement.c 2018-06-11 10:23:14 -05:00
Marcus Huderle
4018acfae1 Update event object struct members 2018-06-11 09:19:17 -05:00
Marcus Huderle
38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00
DizzyEggg
5526d980ec union room is too hard 2018-06-10 18:28:37 +02:00
DizzyEggg
166295acc7 union room prepare for battle 2018-06-09 22:14:52 +02:00
DizzyEggg
dbb9cdd424 more link stuff 2018-06-04 12:07:32 +02:00
DizzyEggg
e50f4b4999 still going 2018-06-03 22:39:10 +02:00
DizzyEggg
e95b1156d2 more progress 2018-06-03 09:37:01 +02:00
Diegoisawesome
0b09575fd4
Merge pull request #249 from golemgalvanize/decompile_pokedex 
Decompile pokedex
 2018-06-01 00:02:46 -07:00
Diegoisawesome
dd28854a22
Merge pull request #255 from DizzyEggg/decomp_record_mixing 
Fix pika's Record Mixing PR
Also closes #107.
 2018-05-30 16:51:30 -07:00
DizzyEggg
ff0c615870 decompile rom_8034C54 2018-05-27 23:26:01 +02:00
DizzyEggg
9e7965fab0 document record mixing 2018-05-26 00:25:36 +02:00
DizzyEggg
b051cbaaab more record mixing decomp 2018-05-25 21:00:41 +02:00
PikalaxALT
6ae395a636 Merge branch 'master' into contest 2018-05-24 10:26:55 -04:00
DizzyEggg
03b593d3c3 try my luck with record mixing 2018-05-22 21:54:57 +02:00
DizzyEggg
4d5bfc149e Merge branch 'master' into decomp_record_mixing 2018-05-20 12:16:45 +02:00
DizzyEggg
1a8d5132d6 fix record mixing for real 2018-05-20 10:51:09 +02:00
Diegoisawesome
de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks 
Decompile field tasks
 2018-05-19 23:34:30 -05:00
DizzyEggg
d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
DizzyEggg
e44f35c7b7 fix record mixing merge conflicts 2018-05-19 12:32:44 +02:00
DizzyEggg
4857757431 merge list menu and list indicators 2018-05-19 11:36:31 +02:00
DizzyEggg
1ead30ad40 decompile menu indicators 2018-05-19 10:54:02 +02:00
DizzyEggg
303c9f0917 start menu indicators decomp 2018-05-16 22:16:22 +02:00
DizzyEggg
0cf3836a03 decompile menu helpers 2018-05-15 20:22:19 +02:00
Diegoisawesome
23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
PikalaxALT
8d0da7d8e0 Propagate ASM_DIRECT --> NAKED renaming 2018-05-11 09:41:32 -04:00
PikalaxALT
4488bbe9e6 Merge branch 'master' into contest 2018-05-11 09:25:26 -04:00
PikalaxALT
c15b50ac68 through prints_contest_move_description 2018-05-11 08:44:21 -04:00
Diegoisawesome
2b6d2dfadd Merge branch 'master' of https://github.com/pret/pokeemerald 2018-05-10 18:38:24 -05:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
PikalaxALT
9bee601b16 through sub_80DB174 2018-05-10 19:28:52 -04:00
PikalaxALT
508a8e5182 through sub_80DAFA0 2018-05-10 18:16:58 -04:00
PikalaxALT
7fdebe0d15 through sub_80DAE0C 2018-05-10 17:54:30 -04:00
PikalaxALT
dfc83cf28f Merge branch 'master' into contest 2018-05-10 09:47:12 -04:00
Diegoisawesome
80062972ae Begin porting field_effect 2018-05-10 03:02:33 -05:00
golem galvanize
13efa1ef62 fixing conflicts 2018-05-10 03:34:36 -04:00
golem galvanize
d31600e70e finish decompiling pokedex 2018-05-10 03:30:42 -04:00
PikalaxALT
4470f77b3d Merge branch 'master' into mauville_old_man 2018-05-09 15:30:21 -04:00
Diegoisawesome
b570f87152 Merge master from pret 2018-05-09 05:10:23 -05:00
Diegoisawesome
d66c1c642c Port/decompile fieldmap.c 2018-05-09 05:07:56 -05:00
PikalaxALT
f6fbecbc41 through sub_80DA874 2018-05-07 20:49:23 -04:00
PikalaxALT
e8bb464de9 through sub_80DA4F4 2018-05-07 19:46:48 -04:00
PikalaxALT
fd1d75ce37 Merge branch 'master' into mauville_old_man 2018-05-07 18:18:00 -04:00
PikalaxALT
61cc1d5574 Rename symbols using Ruby as a reference 2018-05-07 18:11:20 -04:00
PikalaxALT
0231ed13ee Remaining functions in mauville_old_man 2018-05-07 16:35:29 -04:00
Slawter666
7f2329253f requested changes 2018-05-06 17:31:50 +01:00
Slawter666
190ac275bb
Formatting item_icon_table.h 2018-05-06 13:45:56 +01:00
Slawter666
279a6e1ddc Convert item_icon_table.inc to C 2018-05-06 13:37:28 +01:00
Slawter666
22ec43a6ed resolve merge conflicts 2018-05-05 18:50:26 +01:00
PikalaxALT
e6cca15232 sub_80D8B38 2018-05-04 18:59:59 -04:00
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT
c6115a2fec through sub_8120C0C 2018-05-03 17:03:52 -04:00
PikalaxALT
0bc7759f9b through sub_8120748 2018-05-03 13:40:08 -04:00
Marcus Huderle
cdb5e9e314
Merge pull request #242 from DizzyEggg/decompile_battle_records 
Decompile battle records
 2018-05-03 08:42:44 -07:00
PikalaxALT
7d446a9ef7 through sub_80D8490 2018-05-03 08:51:52 -04:00
PikalaxALT
f9230e80aa through vblank_cb_battle 2018-05-02 19:59:00 -04:00
PikalaxALT
cae0fb8ec2 through sub_81203FC 2018-05-02 16:57:34 -04:00
PikalaxALT
21c3e7e8e5 through SetMauvilleOldMan 2018-05-02 11:31:58 -04:00
PikalaxALT
4bf0950421 through sub_80D7DE8 2018-05-02 08:43:27 -04:00
PikalaxALT
ef29d17c41 through sub_80D7B24 2018-05-01 21:27:24 -04:00
PikalaxALT
4b1e30434d Through sub_80D787C 2018-05-01 19:47:11 -04:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
ae78786723 identify and name battle records things 2018-05-01 15:33:13 +02:00
DizzyEggg
95cf853762 battle records more decomp and subtle name changes 2018-05-01 14:01:54 +02:00
DizzyEggg
f9a2f6c4a2 start decompiling battle records 2018-05-01 12:38:55 +02:00
golem galvanize
f9331f15ef decompiled up to sub_80BFCF4 2018-04-30 20:41:17 -04:00
DizzyEggg
9f97646724 make item compile 2018-04-29 15:34:14 +02:00
DizzyEggg
fd40e93cb5 clear item, save and load save files 2018-04-29 14:21:59 +02:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
golem galvanize
6a401b5386 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-04-25 00:28:57 -04:00
Slawter666
39fd42faea convert data/items.inc to include/data/items.h 
OK
 2018-04-25 02:33:55 +01:00
Slawter666
a49f80d552 Convert item_descriptions.inc to .h 
OK
 2018-04-25 01:41:04 +01:00
Slawter666
a9d65ae6b6 Move files to include/data 2018-04-24 00:58:14 +01:00
Slawter666
5a7a0d621c minor documentation of constants/items.h 2018-04-24 00:17:09 +01:00
Slawter666
2d4ab9f4ac Updated items.c 
Working but non-matching
 2018-04-23 23:25:03 +01:00
Diegoisawesome
d10844f1fe
Merge pull request #237 from KDSKardabox/master 
Decompile mon markings, rotating_gate & field_camera
 2018-04-18 14:12:51 -05:00
Diegoisawesome
4e63a52832
Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks 
decompile battle_anim_sound_tasks
 2018-04-18 11:40:01 -05:00
DizzyEggg
3d12a02f3e almost decomp sound tasks battle anim 2018-04-18 16:03:15 +02:00
KDSKardabox
7700fe61fe Decompile field camera 2018-04-18 17:42:41 +05:30
KDSKardabox
f5cbefc295 Decompile mon markings 2018-04-17 14:24:39 +05:30
KDSKardabox
936bb5925a Decompile dewford trend 2018-04-16 16:22:13 +05:30
KDSKardabox
447afe4505 Decompile pokemon icon 2018-04-13 17:51:49 +05:30
KDSKardabox
a3d065d0bd Decompile rom6 2018-04-10 12:17:29 +05:30
KDSKardabox
a18dc6aa80 Decompile map_name_popup 2018-04-09 12:52:28 +05:30
KDSKardabox
3948614bff Decompile map_obj_lock 2018-04-03 16:22:31 +05:30
Edouard Veyrier
2f96282c7f cleaner 2018-04-03 00:10:19 +02:00
Edouard Veyrier
b2e8ee836d sub_81607EC and sub_816082C 2018-04-02 20:06:40 +02:00
Edouard Veyrier
09e29a5cf8 Fix three functions to have the right checksum 2018-04-01 18:22:09 +02:00
golem galvanize
069a7e71fc Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-03-30 16:49:08 -04:00
golem galvanize
3006ff177b pushing so I can pull from master 2018-03-30 16:48:30 -04:00
Edouard Veyrier
17b9f5d892 Fix compile error 2018-03-29 15:46:10 +02:00
Edouard Veyrier
cfacd23248 Fix temporarily 2018-03-29 11:56:10 +02:00
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master 
Player PC
 2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call 
Pokenav match call
 2018-03-28 21:33:50 -07:00
Anders Løvig
3f4c717d5c Rename stuff for more consistency 2018-03-29 02:16:02 +02:00
Anders Løvig
57775a946d Rename start menu functions 2018-03-28 21:09:27 +02:00
Edouard Veyrier
75b07292c9 Translate first functions of learn move 2018-03-28 19:20:20 +02:00
Anders Løvig
5bc8ee6465 Added static modifers 2018-03-28 15:45:35 +02:00
Anders Løvig
6cd590f4fd Decompiled start_menu.s 2018-03-28 00:40:00 +02:00
KDSKardabox
f9f64fff42 Resolve conflicts 2018-03-19 16:15:13 +05:30
KDSKardabox
a24ffb1321 Finish decompiling player_pc rodata 2018-03-19 15:57:33 +05:30
KDSKardabox
1f7fb45d0f Decompile more functions 2018-03-15 16:07:24 +05:30
KDSKardabox
e7cf8e5c17 Start decompile player_pc 2018-03-12 13:56:20 +05:30
DizzyEggg
711a345fd4 fix conflicts 2018-03-09 22:54:57 +01:00
Diegoisawesome
ae214eca8b
Merge pull request #226 from DizzyEggg/decompile_list_menu 
Decompile list menu
 2018-03-09 15:49:36 -06:00
PikalaxALT
aa2cb6a974 Rename match call assets 2018-03-06 08:52:29 -05:00
DizzyEggg
62e849a5df item menu is done 2018-03-04 20:03:11 +01:00
DizzyEggg
4c3f8ac6c6 start item menu icons decomp 2018-03-04 18:41:07 +01:00
DizzyEggg
18a92fdcc0 list menu is decompiled 2018-03-03 14:58:41 +01:00
PikalaxALT
df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
DizzyEggg
87274b9eed more list menu work 2018-03-03 01:02:07 +01:00
DizzyEggg
ae29f35afd start decompiling list menu 2018-03-02 16:34:31 +01:00
DizzyEggg
edf2ea45b1 merge with master 2018-03-01 10:12:35 +01:00
PikalaxALT
988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
KDSKardabox
85492c0dac Merge branch 'master' of https://github.com/pret/pokeemerald 2018-03-01 09:13:29 +05:30
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
Diegoisawesome
bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
DizzyEggg
e93da9b1f9 make strings in battle message static 2018-02-28 23:50:25 +01:00
Diegoisawesome
a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch 
Decompile trainer_rematch
 2018-02-28 16:41:54 -06:00
Diegoisawesome
0cd9ba36ce
Merge pull request #224 from DizzyEggg/another_try 
Fix two nonmatching functions
 2018-02-28 13:05:05 -06:00
DizzyEggg
305a4fa744 match two functions 2018-02-28 19:37:48 +01:00
DizzyEggg
85a959f321 clean up files 2018-02-28 13:07:58 +01:00
DizzyEggg
d29b9d268f make it compile 2018-02-28 00:18:59 +01:00
DizzyEggg
59ff4aec9b decompile and document battle tv 2018-02-27 20:40:09 +01:00
DizzyEggg
a9212eeb66 battle file more done and clean up tv 2018-02-27 18:13:28 +01:00
KDSKardabox
835777dec2 Decompile fleff_flash rodata 2018-02-27 10:33:23 +05:30
DizzyEggg
2fa00d01ee make it compile 2018-02-26 15:56:59 +01:00
PikalaxALT
1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
PikalaxALT
f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
8821d6396a move battle moves to C 2018-02-26 12:59:52 +01:00
DizzyEggg
8ff9cb0ede give up for now 2018-02-26 11:45:47 +01:00
PikalaxALT
80906f022b Cleanup; create enums for trainer rematches 2018-02-25 22:33:58 -05:00
DizzyEggg
4a45b4de4e more work 2018-02-25 18:45:00 +01:00
KDSKardabox
a3c17fad22 Decompile Fossil Special & Groundshake Data 2018-02-22 12:17:46 +05:30
KDSKardabox
5ed68a87f8 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-18 17:35:36 +05:30
KDSKardabox
b1cb82fc67 Finish fldeff_groundshake 2018-02-18 17:33:48 +05:30
KDSKardabox
52b631a092 Decompile more functions 2018-02-18 04:30:20 +05:30
Diegoisawesome
ebd88b3606 Merge branch 'master' of https://github.com/pret/pokeemerald into intro 2018-02-17 04:03:59 -06:00
Diegoisawesome
1605f62535 Decompile credits 2018-02-17 04:00:22 -06:00
Diegoisawesome
bc4bb5b32e Start intro_credits_graphics decomp 2018-02-16 13:08:21 -06:00
KDSKardabox
e518a40508 [WIP} Start decomp Ground Shake 2018-02-16 15:21:27 +05:30
Diegoisawesome
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
KDSKardabox
ffeca135bc Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-16 09:29:11 +05:30
golem galvanize
6cbea9af6d Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-02-15 18:20:53 -05:00
golem galvanize
4a71a61e58 start decompiling 2018-02-15 18:20:19 -05:00
Diegoisawesome
34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
DizzyEggg
824699f505 overworld review changes2 2018-02-15 23:09:52 +01:00
KDSKardabox
a200d9406b Finish fldeff_softboiled.c 2018-02-15 22:32:28 +05:30
KDSKardabox
301664db2f Matching the unmatched and another function 2018-02-15 17:12:02 +05:30
DizzyEggg
90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
DizzyEggg
4b4495f3fe overworld review changes 2018-02-15 12:36:52 +01:00
KDSKardabox
64683e1473 [WIP] Decompile fledd_softboiled.h 2018-02-15 15:29:26 +05:30
KDSKardabox
2fb78b5ca8 Fix reviewed points. 2018-02-15 09:47:42 +05:30
KDSKardabox
895c72cb26 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-15 09:45:15 +05:30
golem galvanize
c3c30417ef fixes 2018-02-14 20:45:27 -05:00
KDSKardabox
deeaac2bf1 Decompile fldeff_sweetsecent.c 2018-02-14 17:24:31 +05:30
golem galvanize
e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
golem galvanize
e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
KDSKardabox
c959dc1174 Finish fldeff_strength.s 2018-02-13 23:08:54 +05:30
KDSKardabox
e375606810 [Do not Merge] fldeff_strength.s 2018-02-13 21:52:33 +05:30
KDSKardabox
aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald 
# Conflicts:
#	include/strings.h
 2018-02-13 10:02:27 +05:30
KDSKardabox
ae321d6e7c move to strings.h 2018-02-13 09:32:40 +05:30
KDSKardabox
7b360b2e33 Review fixes 2018-02-13 09:16:38 +05:30
golem galvanize
4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-12 14:00:47 -05:00
golem galvanize
f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
DizzyEggg
f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg
382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
KDSKardabox
54922641af Port smokescreen.s 2018-02-12 16:44:04 +05:30
KDSKardabox
185cf71842 Missing label 2018-02-12 16:17:57 +05:30
KDSKardabox
d52a54e64f Updating pokedex count function labels 2018-02-12 16:15:51 +05:30
Diegoisawesome
a4787bc06a
Merge pull request #207 from DizzyEggg/decompile_pokemon_123 
Decompile and clean pokemon files
 2018-02-11 22:13:15 -06:00
golem galvanize
f2144e9932 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-11 20:34:56 -05:00
PikalaxALT
590c4b500b Merge branch 'master' into record_mixing 2018-02-11 20:12:40 -05:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
golem galvanize
42cfbcb197 some fixes 2018-02-11 18:00:45 -05:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
golem galvanize
601a942db4 decompile main_menu 2018-02-11 17:19:36 -05: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
1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
DizzyEggg
9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
golem galvanize
56e1a52823 Fixes 2018-02-08 21:00:28 -05:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data 
Move data from asm to pokemon_1.c
 2018-02-08 14:06:57 -06:00
DizzyEggg
9df5e16343 more battle labels 2018-02-08 12:13:29 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
DizzyEggg
1a32010f13 iwram common symbols to c 2018-02-07 23:21:51 +01:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
DizzyEggg
c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
Diegoisawesome
802b505d7b
Merge pull request #199 from DizzyEggg/decompile_rtc_screen 
decompile rtc reset screen
 2018-02-07 13:03:59 -06:00
Diegoisawesome
ccae0ee970
Merge pull request #198 from DizzyEggg/decompile_item_icon 
decompile item icon
 2018-02-07 12:59:40 -06:00
Diegoisawesome
1ae5adbb19
Merge pull request #196 from DizzyEggg/decompile_ray_scene 
Decompile rayquaza scene
 2018-02-07 12:59:13 -06:00
DizzyEggg
a61dc815b0 bag arrow to item count plus 1 2018-02-07 19:51:41 +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
Diegoisawesome
3fb2471016
Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen 
Decompile berry tag screen
 2018-02-07 12:27:25 -06:00
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01:00