Phlosioneer
703554c4df
Ranges are magic
2019-03-16 12:25:02 -05:00
Phlosioneer
61344a4fee
Document the water droplet data.
2019-03-16 12:25:02 -05:00
garak
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
garak
14211fb495
fix incbin paths
2019-03-16 12:21:47 -05:00
Phlosioneer
8e1537fb57
Document map name popup flag
2019-03-10 09:23:58 -05:00
huderlem
32f71b2976
Merge pull request #600 from Phlosioneer/summary-screen-macros
...
Summary screen macros
2019-03-08 13:37:12 -06:00
huderlem
f235d07db5
Merge pull request #590 from Phlosioneer/ok-bot-symbol-counting
...
Improve OK bot's symbol counting
2019-03-08 13:35:57 -06:00
huderlem
d637317e32
Merge pull request #592 from Phlosioneer/extern-cleanup
...
Extern cleanup
2019-03-08 13:28:49 -06:00
Phlosioneer
146c194b0c
Actually change the variable name this time
2019-03-08 03:12:08 -05:00
Phlosioneer
5886f82ef5
Merge branch 'master' into extern-cleanup
2019-03-08 02:45:26 -05:00
Marcus Huderle
bd157b301d
Scaninc: Don't insert missing headers into dependencies
2019-03-07 09:46:14 -06:00
Phlosioneer
6638ebe7fd
Fix copyright mixup
2019-03-07 08:46:55 -06:00
Phlosioneer
b0c634d531
Support absolute paths
2019-03-07 08:46:55 -06:00
Phlosioneer
105e1721d6
Overhaul scaninc to work recursively
...
This also fixes the bug where scaninc would ignore #include lines
in assembly files.
2019-03-07 08:46:55 -06:00
Diegoisawesome
0081474018
Merge pull request #606 from DizzyEggg/angery
...
Fix Controllers end command function names
2019-03-05 14:17:44 -06:00
DizzyEggg
e79b6f747b
Fix Controllers end command function names
2019-03-05 20:07:59 +01:00
Diegoisawesome
842e3c8b42
Merge pull request #605 from DizzyEggg/rename
...
Rename an erroneously named battlescript
2019-03-05 10:41:30 -06:00
Diegoisawesome
fd4a0c499d
Merge pull request #604 from DizzyEggg/flying
...
Clean up flying.c
2019-03-05 10:41:15 -06:00
DizzyEggg
596d85bcbd
What is love, baby dont hurt me
2019-03-05 17:07:37 +01:00
DizzyEggg
b150091436
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
DizzyEggg
b9c216638c
try flying
2019-03-05 16:52:40 +01:00
DizzyEggg
3507ac3974
Start fixing flying.c
2019-03-05 09:02:05 +01:00
Diegoisawesome
cb2922e7d7
Merge pull request #603 from Phlosioneer/makefile-map-fix
...
Fix make to look for .json files instead of folders
2019-03-05 01:15:40 -06:00
Phlosioneer
18902219ad
Fix make to look for .json files instead of folders
...
Currently, when Make is building the maps, it considers every
folder in the data/maps/ directory as a map that needs to be built,
even folders that are empty. This can be a problem when modding on
a separate branch, because git doesn't always clean up directories
when switching branches (usually because of hidden files in those
directories), so switching back to an unmodded branch will leave
an empty folder that confuses make.
This commit changes the makefile so that it only checks directories
that have map.json files in them.
2019-03-05 01:46:20 -05:00
Diegoisawesome
deb555310d
Merge pull request #602 from garakmon/fly
...
match sub_810EE14 in flying.c
2019-03-04 23:37:57 -06:00
Phlosioneer
ac7a048380
Removed PREV and NEXT macros, changed summary name
2019-03-04 00:25:07 -05:00
Phlosioneer
05199f8fc7
Fix merge issue
2019-03-03 22:27:57 -05:00
garak
1758eb99df
match sub_810EE14 in flying.c
2019-03-03 22:08:58 -05:00
Phlosioneer
2879fe7fe0
Merge branch 'master' into summary-screen-macros
2019-03-03 16:58:54 -05:00
Phlosioneer
63e700af6c
Use macros for summary windows
...
Other minor changes and fixes are included
2019-03-03 16:50:51 -05:00
Phlosioneer
f378a5a316
Fix symbol overcounting, add partial symbols
2019-03-03 15:02:26 -05:00
shinny456
1e7f4a80c7
port the rest of flying (leave 2 nonmatchings to egg)
2019-03-03 09:33:19 -06:00
Phlosioneer
4ea5e85bed
Fix typos
...
This is an updated version of #554 , since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Phlosioneer
e03595a10d
Bugfixes from #591
2019-03-03 09:31:08 -06:00
huderlem
c9d2fcabef
Merge pull request #553 from Phlosioneer/main-menu-state-machine
...
Document main_menu state machine, name window constants
2019-03-03 09:28:35 -06: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
80a4ee1145
Remove water.h and flying.h
2019-03-02 17:23:10 -05:00
DizzyEggg
043071ae12
Don't extern gMoveNames
2019-03-02 08:25:14 -06: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
49bef25856
Clean up the last extern functions
2019-03-02 03:18:08 -05:00
Phlosioneer
ee69426838
Eliminate more externs
2019-03-02 02:44:02 -05:00
Phlosioneer
0f6cc27e81
Fixed decomp issue around LoadPalette
...
In LoadLinkPartnerEventObjectSpritePalette, using paletteNum += 6 causes
GCC to "mark" paletteNum's register as a possible overflow, even though
it performs the overflow check. Then, when passing args to LoadPalette,
GCC fails to recognize that 0x100 + ((any u8) << 4) can never overflow
as a u16. It then does an overflow check before calling LoadPalette.
Assigning to a temp variable seems to avoid this "marking" behavior.
2019-03-02 00:36:59 -05:00
Phlosioneer
3ceb1667c9
Reduce externs
2019-03-01 22:32:50 -05:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff
...
Document overworld.c and link stuff in general
2019-03-01 08:43:55 -06:00
Phlosioneer
a7e5852f1d
More minor fixes
2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59
Fix minor errors
2019-03-01 01:18:58 -05:00
Phlosioneer
d0f665fddc
Fix tabs
2019-03-01 01:09:53 -05:00
Phlosioneer
2d0e0083bb
Improve OK bot's symbol counting
2019-03-01 01:06:27 -05:00
