Commit Graph

18 Commits

Author SHA1 Message Date
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
Seth Barberee
d168537968 Finish out game options and FatalError
Some data cleanup as well. Thanks pika for the noreturn tip for
FatalError.
2021-06-23 17:35:37 -05:00
Seth Barberee
377bd14ea6
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json

* rule tweaking to actually build tool before parsing JSON

* delete .inc pokemon for tiny Woods and Thunderwave

* silence git complaining about br_ips and ips_patch

* use defines for species and pass the header file for species

* convert sinister woods

* convert MtThunderPeak

* convert silent chasm

* add trial floor_id w/ tiny woods

* change make rule name to fix compile

* MtSteel converted and bugfix

* convert few floor headers and great canyon pokemon

* code cleanup

* unify unkData into UnkTextStruct2

* more code cleanup and some text decomp

* doc more funcs and decomp/split some stuff

* document more save stuff

* more save work and move some data

* pika sniped UpdateNatureTotal

* decomp a litle and convert a few more dungeons

* better scanning for json files

* mt freeze and peak
2021-06-09 22:54:21 -05: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
7b142311a7
Miscellaneous Work (Again) (#30)
* work on debug menu and document that and main menu

* split, decomp, label more funcs

* split exclusive pokemon data out into C

* macro-ize exlusive pokemon data

* decomp 2 more funcs

* decomp a few more

* finally match PromptNewQuestion

* woot 7% aka more debug menu stuff
2021-03-12 15:39:07 -06:00
Seth Barberee
d72e17b5f5
Miscellaneous decomp/labeling/splitting (#29)
* lots of wonder mail work, credits and label some stuff

* nonmatch one intr func, match another, and label unused intr func

* seperate credits out

* split out debug menu and other stuff that isn't main menu

* label another func

* label some more funcs
2021-02-27 12:16:45 -06:00
Seth Barberee
cb77386b65 more headway on Pokemon funcs and labeled in asm 2021-01-22 10:39:42 -06:00
Seth Barberee
d010378f72 mass doc'ing of symbols and some tiny decomp work 2021-01-20 16:02:26 -06:00
Seth Barberee
3c986032f8 docing and one decomp of a function 2020-10-13 17:30:44 -05:00
Seth Barberee
14b4ad7735 some doc'ing and decomping 2020-10-10 14:33:06 -05:00
Seth Barberee
95b06d5d6b split to decomp type name string functions 2020-09-17 12:18:11 -05:00
Seth Barberee
cbe3f0265b dumped friend area names 2020-09-16 21:42:44 -05:00
Seth Barberee
5cdd4a7236 some more splitting 2020-09-16 11:58:10 -05:00
Seth Barberee
7fa7e54165 more datadumping and starting to doc ewram components 2020-09-11 21:26:19 -05:00
Seth Barberee
dad1e6c847 doc'ing more data from datacrytal 2020-09-09 20:31:02 -05:00
Seth Barberee
adc3a5e6bb The great text dump of 2020 2020-09-08 18:46:58 -05:00
Seth Barberee
b22a2ac19e document Team RnRanks 2020-09-05 13:56:17 -05:00
shinny
cef20f5b34 decomp dungeon data getters 2020-06-02 14:56:12 -04:00