Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,764 Commits 3 Branches 0 Tags 874 MiB
Commit Graph

3764 Commits

Author SHA1 Message Date
Diegoisawesome e95140270b
Merge pull request #556 from DizzyEggg/patch-2 
Fix two battle scripting macros
 2019-02-14 10:35:12 -06:00
DizzyEggg cb57044531
Fix two battle scripting macros 2019-02-14 13:05:49 +01:00
Diegoisawesome efc5494834
Merge pull request #555 from Diegoisawesome/master 
scaninc: Fix C comment consumption logic
 2019-02-13 22:00:32 -06:00
Diegoisawesome 05d02e804e Fix C comment consumption logic 2019-02-13 21:55:39 -06:00
Diegoisawesome 047c282763
Merge pull request #548 from Phlosioneer/intro-movie-state-machine 
Document the intro movie state machine
 2019-02-13 21:24:20 -06:00
Phlosioneer e7d0268143 Fix spelling of Rayquaza 2019-02-13 21:41:28 -05:00
Diegoisawesome aa5d5fa34a
Merge pull request #550 from Phlosioneer/name-palette-return-values 
Name the possible return values of palette fading functions
 2019-02-13 20:15:47 -06:00
Diegoisawesome dfb896356c Merge branch 'master' of github.com:pret/pokeemerald 2019-02-12 00:40:42 -06:00
Diegoisawesome 449fb25f23 Clear up misnamed time-based flags and functions 2019-02-12 00:40:34 -06:00
Diegoisawesome 16eff049a1
Merge pull request #552 from Phlosioneer/ignore-trigraph-warning 
Ignore trigraph warning
 2019-02-10 21:40:15 -06:00
Phlosioneer 05ad946b83 Ignore trigraph warning 2019-02-10 22:12:43 -05:00
Phlosioneer d0cc8dfc17 Change negative constant into unsigned hex constant 2019-02-09 22:02:56 -05:00
Phlosioneer 37bea25b01 Name the possible return values of palette fading functions 
Also replace implicit conversion from gPalette.active into a status with
if statements, to make the return value clear.

I've also added comments when the check is redundant.
 2019-02-09 21:50:12 -05:00
Phlosioneer 45297797e6 Document the intro movie state machine 
Need to study the water droplet animation more closely before they can
be renamed; otherwise, this names every major symbol in this file.
 2019-02-09 21:07:07 -05:00
Marcus Huderle 6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06: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 6add3e1794 Document some battle dome stuff 2019-02-08 11:08:25 -06:00
Marcus Huderle 4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
Marcus Huderle 3a40f5203b Remove old rom_818CFC8.h header 2019-02-07 17:41:44 -06:00
Marcus Huderle 85040e26fd Document battle pike 2019-02-07 17:37:41 -06:00
Marcus Huderle 4785a07acd Document battle factory functions 2019-02-07 12:58:09 -06:00
Marcus Huderle b52871433a Fix typo 2019-02-07 11:54: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 1253cbf5f6 Document some battle anim things 2019-02-06 21:14:28 -06:00
huderlem e9149b8608
Merge pull request #544 from Diegoisawesome/master 
Add json to list of LF line-end files
 2019-02-05 15:45:51 -06:00
Diegoisawesome bc4cc9f78a Merge branch 'master' of github.com:pret/pokeemerald 2019-02-05 14:35:42 -06:00
Diegoisawesome 37e86d7578 Add json to list of LF line-end files 2019-02-05 14:35:31 -06:00
huderlem b0ee100975
Merge pull request #543 from pret/mapdata 
Convert map data to JSON
 2019-02-04 21:36:18 -06:00
Marcus Huderle d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
Diegoisawesome 646533cfa3
Merge pull request #542 from Slawter666/pss 
Label some summary screen functions
 2019-02-04 09:46:39 -06:00
Slawter666 fa352cfda3 Some more labelling 2019-02-04 14:35:49 +00:00
Slawter666 3d79aeb9da More documentation 2019-02-04 12:44:09 +00:00
Slawter666 804e955c8d Label some more functions 2019-02-04 11:38:44 +00:00
garak 82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
Slawter666 031fd66393 Label some summary screen functions 2019-02-02 22:14:04 +00:00
Diegoisawesome ff48e5ada0
Merge pull request #541 from Diegoisawesome/master 
Misc documentation
 2019-02-02 16:00:56 -06:00
Diegoisawesome d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Diegoisawesome 59807c0f2c
Merge pull request #536 from DizzyEggg/menu 
Use Menu and List Menu input defines
 2019-02-02 12:45:35 -06:00
DizzyEggg ea79f1c8f6 tabs 2019-02-02 19:41:34 +01:00
Diegoisawesome e8952c2374
Merge pull request #539 from DizzyEggg/ram_vars 
Move ram vars in sym files to C
 2019-02-02 11:17:50 -06:00
Diegoisawesome 47c105bef6
Merge pull request #538 from DizzyEggg/data 
Dump last battle anim file
 2019-02-02 11:12:29 -06:00
Diegoisawesome f7cb3719e2
Merge pull request #537 from DizzyEggg/bttle 
Name battle's action 11
 2019-02-02 11:11:55 -06:00
DizzyEggg 363fa9bed2 Clean up ram vars 2019-02-02 12:44:00 +01:00
DizzyEggg a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +01:00
DizzyEggg a740bc7190 Name action 11 2019-02-02 11:32:00 +01:00
DizzyEggg 23b240ab65 Fix Menu and List Menu input defines 2019-02-02 11:04:38 +01:00
Diegoisawesome 46a3969f69 Add constants for flags and vars 2019-02-02 00:25:43 -06:00
Diegoisawesome 9d8a43a1fb
Merge pull request #534 from DizzyEggg/patch-1 
Get rid of an unnecessary extern
 2019-02-01 14:51:04 -06:00