Commit Graph

3997 Commits

Author SHA1 Message Date
Marcus Huderle
d3ff307f9f Remove asm/use_pokeblock.s 2019-03-24 08:23:27 -05:00
Marcus Huderle
4fd2b0b484 Decompile remaining functions in use_pokeblock.s 2019-03-23 17:23:14 -05:00
huderlem
cd192e303d
Merge pull request #579 from ultima-soul/use_pokeblock
Decompile use_pokeblock  (5 NONMATCHING)
2019-03-23 11:29:40 -05:00
Marcus Huderle
24e7269117 Match sub_81674BC 2019-03-23 11:22:41 -05:00
Marcus Huderle
fffdbe4e79 Match sub_8167420 2019-03-23 11:16:53 -05:00
Marcus Huderle
511ff2f20f Match sub_8166BEC and do some cleanup 2019-03-23 10:41:09 -05:00
Marcus Huderle
a5ee2c14fd Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Marcus Huderle
91fa5faf4a Match sub_8166564 2019-03-23 10:10:51 -05:00
Fontbane
e8add87bf3 Document Field Effects and some related text
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Fontbane
7d54c2b960 EventScript and Text Documentation
In event_script.s. Also renamed a couple events for consistency/detail.
2019-03-23 09:57:37 -05:00
DizzyEggg
cbdecf2f8d Make it compile 2019-03-23 09:51:27 -05:00
DizzyEggg
77c4856e62 Nonmatchings go away 2019-03-23 09:51:27 -05:00
Marcus Huderle
65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	src/use_pokeblock.c
2019-03-23 09:39:46 -05:00
huderlem
abe56579c1
Merge pull request #622 from huderlem/ereader
Finish decompiling ereader and faraway island code
2019-03-22 14:40:50 -05:00
Marcus Huderle
253de64e63 Merge remote-tracking branch 'upstream/master' into ereader 2019-03-22 14:35:47 -05:00
Marcus Huderle
a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle
f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
Marcus Huderle
768a68d3e8 Decompile ereader.c up to faraway island code 2019-03-21 18:36:12 -05:00
Marcus Huderle
7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
huderlem
7154d2614d
Merge pull request #595 from Phlosioneer/move-tutor
Move tutor
2019-03-17 17:32:42 -05:00
Marcus Huderle
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
Marcus Huderle
4ae8a52473 Finish decompiling contest_painting_effects.c 2019-03-17 16:25:18 -05:00
Phlosioneer
691392fd5d Clean up intro_credits_graphics constants 2019-03-16 12:37:04 -05:00
Phlosioneer
a029254faa Apply new macros to intro graphics struct 2019-03-16 12:37:04 -05:00
Phlosioneer
eeb329909c Fix anonymous struct 2019-03-16 12:37:04 -05:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
291df27dcb Use new MUS_NONE constant in sound.c 2019-03-16 12:31:29 -05:00
Phlosioneer
092608aef6 Add a constant for "no music" on maps. 2019-03-16 12:31:29 -05:00
aueuaio
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
Phlosioneer
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
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
c3feb9871f Use PIXEL_FILL macro 2019-03-08 04:02:05 -05:00
Phlosioneer
622096a9d3 spaces => tabs 2019-03-08 04:00:11 -05: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
Phlosioneer
eaddf396b2 I was dumb and forgot to add merge fixes 2019-03-08 02:35:19 -05:00
Phlosioneer
b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00
Phlosioneer
af182d6f16 Minor cleanup before pushing 2019-03-08 02:10:44 -05:00
Phlosioneer
69aec91577 Decompile move tutor stuff
2 nonmatching.
2019-03-08 01:56:38 -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