ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-08 02:23:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,847 Commits 1 Branch 0 Tags 235 MiB
69759b2d12
Commit Graph

172 Commits

Author SHA1 Message Date
GriffinR
ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05:00
Marcus Huderle
5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
GriffinR
22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
82f55f2381 Merge master into ObjEvent rename 2019-12-15 02:00:00 -05:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR
a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR
1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04:00
GriffinR
1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
GriffinR
7ba11b7a1b Use VAR_FACING constants 2019-10-07 16:36:02 -05:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR
aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
tustin2121
711e7d884c Document cave transition code. 2019-09-10 13:43:33 -04:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
GriffinR
c2bf668fdd
rename town/city vars 2019-08-05 11:23:45 -04:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
PikalaxALT
4fadbaf161 Minor fixes 
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
 2019-04-03 17:04:42 -05:00
Phlosioneer
3a2ea40188 Rename and document more contest setup functions 
Also properly label the link contest flags variable, and label the
contest window ID's.
 2019-04-03 17:24:32 -04:00
Marcus Huderle
35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars 
Document all event vars
 2019-03-02 08:24:46 -06:00
Phlosioneer
25050b9944 Fix tabs, do suggested rename 2019-03-02 04:13:27 -05:00
Phlosioneer
a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer
bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Phlosioneer
e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer
648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05:00
Phlosioneer
4137dd7b0b Identify unused, never read, and never written vars 2019-02-27 14:42:32 -05:00
Phlosioneer
fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Phlosioneer
accea672f1 Incorporate feedback 2019-02-26 22:04:44 -05:00
huderlem
b3a7a1278a
Merge pull request #577 from Phlosioneer/weather-15 
Document the weather state functions
 2019-02-25 08:03:22 -06:00
Phlosioneer
5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer
e1b2460748 Adjust formatting, rename function 2019-02-25 02:28:41 -05:00
Phlosioneer
b2866fae21 Document the weather state functions 
All weather types are now documented (including WEATHER_15)
 2019-02-22 22:20:42 -05:00
Phlosioneer
08579edbcd Clean up mistakes and bad formatting 2019-02-18 01:03:44 -05:00
Phlosioneer
327de0283d Adjust constants returned by FlipVerticalAndClearForced 2019-02-10 21:16:12 -05:00
Phlosioneer
e75f45dbcf Reverse engineered many of the multiplayer events 
Some corrections to the way events are handled and identified.
 2019-02-10 20:42:50 -05:00
Phlosioneer
f2f1b1978b Done documenting link code in overworld.c 2019-02-10 03:54:50 -05:00
Phlosioneer
3fd878483f Start renaming symbols 
I finally figured out what the code is trying to do. I have a foothold;
the rest should follow.
 2019-02-10 00:50:46 -05:00
Marcus Huderle
40dc6833c5 Fully document tileset animations 2019-02-08 15:07:42 -06:00
Marcus Huderle
abebd2b864 Cleanup externs in overworld.c 2019-02-08 11:48:51 -06:00
Marcus Huderle
3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
Marcus Huderle
95dcff581b Document some fieldmap stuff 2018-12-29 11:36:54 -06:00
Marcus Huderle
d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
DizzyEggg
7f6f6c33ab Fix BgAttributes 2018-12-26 13:05:02 +01:00
Marcus Huderle
dcbc8db6a3 Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c) 2018-12-25 11:46:35 -06:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
0ed2f54d61 Use MAX_SPRITES define 2018-11-28 21:08:22 +01:00
DizzyEggg
95d3c180cc clean up variables in files 2018-11-19 01:03:14 +01:00
DizzyEggg
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
Diegoisawesome
0bbe03f170
Merge pull request #388 from DizzyEggg/clean_savve 
Clean up save related files
 2018-11-18 13:13:56 -06:00
DizzyEggg
7ce3473b0e Clean up save related files 2018-11-18 19:37:18 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
40a44a8508 more battle pytamid 2018-11-17 22:55:39 +01:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
645830624d Continue script_menu.c 2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +01:00
DizzyEggg
e850517123 more battle frontier 2 2018-10-27 21:01:35 +02:00
Slawter666
3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05: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
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
Slawter666
5c66b8a7ef Label event_object_movement.c 2018-09-02 23:20:45 +01:00
DizzyEggg
fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
garak
45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00