Commit Graph

16 Commits

Author SHA1 Message Date
Seth Barberee
e80b02cb09 move more data to src 2022-04-10 09:45:16 -07:00
Seth Barberee
b2e109dab1 Move some data to src and add some more headers
- Finish moving all data for main menu to src
- Move some more data to wonder_mail
- Add some headers to clean up some externs
2022-02-17 18:54:59 -06:00
mid-kid
99a038284b Translate all .include to #include
This decision was made to reduce the complexity of using .include whilst
juggling with tools/scaninc and tools/preproc:
- tools/scaninc doesn't apply the proper search rules for .include (it
  assumes #include behavior). In particular, it doesn't consider paths
  starting from $PWD, and doesn't scan the included files as a result.
- .include had to be processed before #include by preproc in many cases,
  as code was being included that had to be preprocessed by CPP (think
  of #define). This contradicts standard GCC behavior.

To make include paths consistent across the asm/ data/ and src/
directories, the following files were moved:
- constants/ → include/asm/constants/
- asm/macros/ → include/asm/macros/
- asm/macros.inc → include/asm/macros.inc
- include/macros/m4a.inc → include/asm/macros/m4a.inc

As part of the necessary changes for this to work, the scaninc method in
the makefile was improved to generate .d files that don't choke when
files are missing.
2021-12-20 16:29:12 +01:00
mid-kid
51bff00712 Finish de-incbinning data_80D47B8.s and data_80DED44.s 2021-12-20 16:11:19 +01:00
AnonymousRandomPerson
7acad69795 Renamed inconsistent color macros 2021-12-19 17:19:13 -06:00
AnonymousRandomPerson
b458476078 Swapped out more text macros 2021-12-14 22:54:04 -05:00
Cheng Hann Gan
938a88551f
Labeled more symbols (#77)
* Labeled more symbols

* Fixed comment typo

* Renamed some functions
2021-11-20 08:47:46 -08:00
Cheng Hann Gan
a432de845c
Expanded charmap usage (#76)
* Added item icons/Hiragana to charmap

* Use color formatting charmap macros

* Removed redundant text formatting macros
2021-11-18 09:21:00 -08:00
Seth Barberee
3e5dd1d047
Death by 74 files (#65)
* death by 74 files

* 20% reached

* doc move stuff in pokemon

* fix undef reference

* doc more and plumb a few more constanst for num party members and num moves

* that struct is def PokemonMove.. clean up all code with it
2021-10-22 10:01:07 -07:00
Seth Barberee
0d3b11e81a
Data work and decomp some mail/pelipper board (#54)
* data work and decomp some mail/pelipper board

* resuce -> rescue

* label more data
2021-09-24 00:49:43 -05:00
Seth Barberee
4eff188244
Thank You Mail and minor DungeonEnitity Work (#52)
* Thank You Mail: split out code into own file w/ data

* use constant for facingDir
2021-09-08 21:32:59 -07:00
Seth Barberee
f402e46cd3
Sese's April/May Dump (#37)
* splitting lots of pokemon square and labeling lots of other things

* actually commit this stuff

* more moving data and things

* more screen work

* split out some pokemon dungeon data

* lots of data work

* push more data work

* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more

* lots of item work

* label more item things

* subtype -> category and doc types/category
2021-05-15 18:59:55 -05:00
Seth Barberee
d316d1e359
Preproc all the data (#35)
* actually put C files in preproc and use it for formatted type names. Cleaned up makefile like pokeemerald

* finish adding all colors and text macros to charmap

* preproc all the data and use text macros

* move all of wonder_mail_1 to src

* unify wonder_mail and wonder_mail_mid

* small code cleanup

* name two more exclusive pokemon funcs

* decomp a few more wonder mail funcs

* clean up MemoryFill call

* doc more of wonder mail in main menu
2021-04-05 22:05:09 -05:00
Seth Barberee
22fec43f18
More menu work (#33)
* split adventure log menu out and decompile

* add most adventure log matchings w/ 2 nonmatchings and move some relevant data

* more work on other menus

* fully decomp debug stuff around 203B3F0

* more debug menu work

* fix CreatePartnerSelectionMenu nonmatch

* move more data and clean some data up
2021-04-03 20:44:48 -05:00
Seth Barberee
a2d206665c
Move some data and Splitting (#32)
* move friend area settings to src

* split out playtime into different C file and decomp a few more funcs

* time -> play_time

* fix include

* split out more wonder mail stuff

* unify 203B2C0 and unkDungeon structs. snuck in a decomp func too

* split out more menu screens

* work some more on trade items

* doc a few more things

* add a close nonmatch and decomp nullsub and small func

* rollback struct attempt since it causes nonmatchings

* only one func left in asm

* death to trade_item asm and unify into one C file

* more docing and cleanup

* label main menu and trade items menu global menu struct

* doc itemMode
2021-03-30 13:11:51 -05:00
Seth Barberee
2fd4f339b4
Miscellaneous Work (Again) (#31)
* move some personality data from asm to C

* combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu

* decomp some more wonder mail funcs and label some more data

* lots of data splitting and move some to src

* split out more dungeon data

* continue splitting out more dungeon data

* doc rescue team rank/pts funcs/data and exclusive pokemon ewram

* doc more sound things and decomp a func

* decomp LoadTeamRankBadge and label some data members

* split out rescue team and text util stuff

* forgot a constant

* match a few funcs and clean up a few

* cleaned up sub_80A28B4
2021-03-23 12:11:10 -05:00