Commit Graph

2652 Commits

Author SHA1 Message Date
Marcus Huderle f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
Marcus Huderle 7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -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 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
Phlosioneer c3feb9871f Use PIXEL_FILL macro 2019-03-08 04:02:05 -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 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
Phlosioneer aa7657a82a Move constants into C
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05:00
Phlosioneer 0da83abad2 Several nonmatching functions
Huge and difficult.
2019-03-06 22:27:30 -05:00
Phlosioneer 4345ba8e6c More decompiled and cleanup 2019-03-05 22:32:28 -05:00
Phlosioneer c3594f982d Decompiling pokeblock ui stuff 2019-03-05 20:32:14 -05: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
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
Phlosioneer 9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -05:00
DizzyEggg 3507ac3974 Start fixing flying.c 2019-03-05 09:02:05 +01: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
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
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