Commit Graph

12 Commits

Author SHA1 Message Date
Phlosioneer
5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -05:00
Phlosioneer
9372731c3e Merge branch 'master' into main-menu-state-machine 2019-03-02 17:35:44 -05:00
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
Phlosioneer
49bef25856 Clean up the last extern functions 2019-03-02 03:18:08 -05:00
Phlosioneer
72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
DizzyEggg
788caa4fe2 pokenav 2019-02-23 13:34:01 +01:00
Phlosioneer
c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00
Phlosioneer
eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Phlosioneer
40d4f7f8db Minor fixes 2019-02-18 01:10:59 -05:00
Phlosioneer
7ad225a72f Address formatting issues and use constants 2019-02-18 00:16:27 -05:00
Phlosioneer
f528552583 Rename pokenav file 2019-02-17 23:14:14 -05:00