e9a3cc6d51
Merge remote-tracking branch 'upstream/master' into move-tutor
...
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
4ae8a52473
Finish decompiling contest_painting_effects.c
2019-03-17 16:25:18 -05:00
691392fd5d
Clean up intro_credits_graphics constants
2019-03-16 12:37:04 -05:00
a029254faa
Apply new macros to intro graphics struct
2019-03-16 12:37:04 -05:00
eeb329909c
Fix anonymous struct
2019-03-16 12:37:04 -05:00
9848f84b9e
Use constants for Oam .shape and .size fields
...
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
291df27dcb
Use new MUS_NONE constant in sound.c
2019-03-16 12:31:29 -05:00
092608aef6
Add a constant for "no music" on maps.
2019-03-16 12:31:29 -05:00
b67c0698c2
add troubleshooting line in INSTALL.md
...
While following the instructions for macos (i have sierra) in INSTALL.md, agbcc/build.sh failed, complaining it couldn't find the /opt/devkitpro/devkitARM/base_tools file. After a bit of research, i found out this file is in the devkitarm-rules package (in the devkitpro repos for pacman). Since installing this package fixes the problem, i added some troubleshooting instructions for it in INSTALL.md.
2019-03-16 12:27:30 -05:00
61fa4cf2ba
Make a powershell version of asmdiff.sh
...
This version can be used with VSCode's built-in diff, and has better
error detection for new contributors.
2019-03-16 12:26:01 -05:00
703554c4df
Ranges are magic
2019-03-16 12:25:02 -05:00
61344a4fee
Document the water droplet data.
2019-03-16 12:25:02 -05:00
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
14211fb495
fix incbin paths
2019-03-16 12:21:47 -05:00
8e1537fb57
Document map name popup flag
2019-03-10 09:23:58 -05:00
32f71b2976
Merge pull request #600 from Phlosioneer/summary-screen-macros
...
Summary screen macros
2019-03-08 13:37:12 -06:00
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
d637317e32
Merge pull request #592 from Phlosioneer/extern-cleanup
...
Extern cleanup
2019-03-08 13:28:49 -06:00
c3feb9871f
Use PIXEL_FILL macro
2019-03-08 04:02:05 -05:00
622096a9d3
spaces => tabs
2019-03-08 04:00:11 -05:00
146c194b0c
Actually change the variable name this time
2019-03-08 03:12:08 -05:00
5886f82ef5
Merge branch 'master' into extern-cleanup
2019-03-08 02:45:26 -05:00
eaddf396b2
I was dumb and forgot to add merge fixes
2019-03-08 02:35:19 -05:00
b93d923826
Merge branch 'master' into move-tutor
2019-03-08 02:27:20 -05:00
eac70acab6
Change filename to something more descriptive
2019-03-08 02:17:01 -05:00
af182d6f16
Minor cleanup before pushing
2019-03-08 02:10:44 -05:00
69aec91577
Decompile move tutor stuff
...
2 nonmatching.
2019-03-08 01:56:38 -05:00
bd157b301d
Scaninc: Don't insert missing headers into dependencies
2019-03-07 09:46:14 -06:00
6638ebe7fd
Fix copyright mixup
2019-03-07 08:46:55 -06:00
b0c634d531
Support absolute paths
2019-03-07 08:46:55 -06:00
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
aa7657a82a
Move constants into C
...
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05:00
0da83abad2
Several nonmatching functions
...
Huge and difficult.
2019-03-06 22:27:30 -05:00
4345ba8e6c
More decompiled and cleanup
2019-03-05 22:32:28 -05:00
c3594f982d
Decompiling pokeblock ui stuff
2019-03-05 20:32:14 -05:00
0081474018
Merge pull request #606 from DizzyEggg/angery
...
Fix Controllers end command function names
2019-03-05 14:17:44 -06:00
e79b6f747b
Fix Controllers end command function names
2019-03-05 20:07:59 +01:00
842e3c8b42
Merge pull request #605 from DizzyEggg/rename
...
Rename an erroneously named battlescript
2019-03-05 10:41:30 -06:00
fd4a0c499d
Merge pull request #604 from DizzyEggg/flying
...
Clean up flying.c
2019-03-05 10:41:15 -06:00
596d85bcbd
What is love, baby dont hurt me
2019-03-05 17:07:37 +01:00
b150091436
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
b9c216638c
try flying
2019-03-05 16:52:40 +01:00
9bea9e1624
Start decompiling menu_unknown
2019-03-05 06:06:20 -05:00
3507ac3974
Start fixing flying.c
2019-03-05 09:02:05 +01:00
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
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
deb555310d
Merge pull request #602 from garakmon/fly
...
match sub_810EE14 in flying.c
2019-03-04 23:37:57 -06:00
0e3fc4956b
Rename asm file
2019-03-05 00:06:43 -05:00
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
cae63cf1c7
Rename move tutor to move relearner
2019-03-04 20:56:39 -05:00
Marcus Huderle