Commit Graph

23 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
Cheng Hann Gan
c15bd01b90
Fixed CRLF->LF (#58)
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
2021-10-01 13:31:27 -07:00
Cheng Hann Gan
8237e29a16
Defined more in-dungeon structs and enums (#53)
* Defined DungeonEntity

* Rename EntityType enums

* Revert EntityType rename

* Defined more in-dungeon structs and enums

* Added more dungeon global structs/enums

* Prefixed dungeonGlobalData with g

* Fixed compile errors

* Removed some CRLFs

* Fixed compile after merge

* Revert Makefile

* Rename DungeonEntityData.entityType

Co-authored-by: Seth Barberee <seth.barberee@gmail.com>

* Renamed symbols per PR comments

Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2021-09-09 16:22:48 -07:00
Seth Barberee
a65d358927 minor code cleanup 2021-07-12 17:50:19 -05:00
Dennis
92a8e55fdd
Decompiled some item related functions (#42)
* decompile sub_8091290

* decompile sub_80912c8

* rename functions / struct field

* more names

* decompile 80913A0

* decompile GetItemMove

* decompile sub_80913E0

* rename function

* decompile CanSellItem function

* rename inventory struct

* add some item check functions

* fix renaming stuff

* this file shouldnt have been here

* forgot merge conflict

* decompile more item functions

* rename some stuff

* fix HM/TM naming

* Update src/code_801AFA4.c

Use enum value for USED_TM

* Fix incorrect value

Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2021-07-10 11:23:20 -05:00
Seth Barberee
7d9a587432 convert remaining floorID headers to JSON 2021-06-26 00:32:51 -05:00
Seth Barberee
139aef4531 convert all story line floorIDs to JSON 2021-06-25 17:19:47 -05:00
Seth Barberee
c89c711083 convert Sky Tower and Sky Tower Summit to JSON 2021-06-24 23:27:39 -05:00
Seth Barberee
966b1fe5b6 convert MagmaCavern pokemon data 2021-06-24 18:55:27 -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
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
Seth Barberee
10cda4ba81 split out all dungeon floor id data 2021-01-22 10:26:43 -06:00
Seth Barberee
d6b218ebf5 split more main_data off 2020-12-05 14:14:09 -06:00
Seth Barberee
c3f879ce16 splitting more dungeon floor data 2020-12-04 17:00:36 -06:00
Seth Barberee
0d5c196bff split out more floor data 2020-12-03 21:10:35 -06:00
Seth Barberee
8c2d6a42c8 splitting more post story floor data 2020-10-29 18:26:06 -05:00
Seth Barberee
2e3f461e42 main data from story line dungeon split out 2020-10-29 15:17:49 -05:00
Seth Barberee
ab788bce63 split out main story dungeon floor data 2020-10-29 11:46:35 -05:00
Seth Barberee
fed56ed5e0 continue splitting dungeon floor id data by dungeon 2020-10-28 22:59:48 -05:00
Seth Barberee
2613adee4f more work on dungeon data 2020-10-22 11:48:48 -05:00
Seth Barberee
769dba859e split sinister woods data off 2020-10-22 11:31:46 -05:00
Seth Barberee
787c832231 start moving dungeon data to respective directories 2020-10-22 10:52:57 -05:00