summaryrefslogtreecommitdiff
path: root/data/dungeon
AgeCommit message (Collapse)Author
2021-12-20Translate all .include to #includemid-kid
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-10-01Fixed CRLF->LF (#58)Cheng Hann Gan
Co-authored-by: Cheng Hann Gan <chenghann_gan@ultimatesoftware.com>
2021-09-09Defined more in-dungeon structs and enums (#53)Cheng Hann Gan
* 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-07-12minor code cleanupSeth Barberee
2021-07-10Decompiled some item related functions (#42)Dennis
* 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-06-26convert remaining floorID headers to JSONSeth Barberee
2021-06-25convert all story line floorIDs to JSONSeth Barberee
2021-06-24convert Sky Tower and Sky Tower Summit to JSONSeth Barberee
2021-06-24convert MagmaCavern pokemon dataSeth Barberee
2021-06-09Dungeon pokemon/Floor ID JSON Part 1 (#39)Seth Barberee
* 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-05-15Sese's April/May Dump (#37)Seth Barberee
* 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-03-23Miscellaneous Work (Again) (#31)Seth Barberee
* 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-01-22split out all dungeon floor id dataSeth Barberee
2020-12-05split more main_data offSeth Barberee
2020-12-04splitting more dungeon floor dataSeth Barberee
2020-12-03split out more floor dataSeth Barberee
2020-10-29splitting more post story floor dataSeth Barberee
2020-10-29main data from story line dungeon split outSeth Barberee
2020-10-29split out main story dungeon floor dataSeth Barberee
2020-10-28continue splitting dungeon floor id data by dungeonSeth Barberee
2020-10-22more work on dungeon dataSeth Barberee
2020-10-22split sinister woods data offSeth Barberee
2020-10-22start moving dungeon data to respective directoriesSeth Barberee