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
0e3fc4956b
Rename asm file
2019-03-05 00:06:43 -05:00
Phlosioneer
907492fd6e
Split rom asm file in half
...
The first half is ui/menu stuff, while the second half is link-related
stuff.
2019-03-04 23:26:51 -05:00
Phlosioneer
cae63cf1c7
Rename move tutor to move relearner
2019-03-04 20:56:39 -05: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
27aa27a2e9
Fix tabs
2019-03-03 02:58:50 -05:00
Phlosioneer
4907ce6f7f
Fully document move_tutor (formerly learn_move)
2019-03-03 02:50:40 -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
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
Phlosioneer
da0687987d
Pick better names for constants
2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01
Add macros for metatile manipulation
2019-02-28 22:21:16 -06:00
hondew
9ed0f77528
fixed issues in data and include dirs
2019-02-28 21:21:56 -06:00
hondew
53d7e21332
fix formatting in slot_machine.c
2019-02-28 21:21:56 -06:00
hondew
6a4202cdbd
tidied lucky flags
2019-02-28 21:21:56 -06:00
hondew
1dc0d346d9
fix spelling error
2019-02-28 21:21:56 -06:00
hondew
dd8ecabe26
fix mistakes and bad formatting
2019-02-28 21:21:56 -06:00
hondew
f965f1b13d
label luckyFlags
2019-02-28 21:21:56 -06:00
hondew
a6eb879267
minor reeltime changes
2019-02-28 21:21:56 -06:00
hondew
47a3477ab1
finish DecideReelTurns
2019-02-28 21:21:56 -06:00
hondew
f8f046c850
clean up slot machine more
2019-02-28 21:21:56 -06:00
hondew
67fe781ed2
clean up slot machine until AwardPayout
2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f
document slot machine
2019-02-28 21:21:56 -06:00
DizzyEggg
baf95a8e7a
get rid of ugly cast
2019-02-28 17:26:09 -06:00
Phlosioneer
99bfd8c80f
VAR_0x3F20 is not a var
2019-02-28 00:10:44 -05:00
Phlosioneer
373d73eb3b
Fix last special var
2019-02-28 00:06:27 -05:00
Phlosioneer
bf45b83c65
Finish documenting event vars
2019-02-27 23:54:51 -05:00
