Commit Graph

132 Commits

Author SHA1 Message Date
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 f1fdcc2b0a more splitting and labeling with some decomp 2021-06-18 17:56:20 -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 eaa141c612 Keep on keepin on (#38)
* end of may dump of work

* move save text to src

* decomp a little more
2021-05-23 16:19:35 -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 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
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 7fa4f1a92b Fully decomp save.s (#28)
* some work on decomping more save stuff

* code cleanup and decomp another save func

* fully decomp save and combine split save c files

* fix two nonmatchings
2021-02-21 13:13:55 -06:00
Seth Barberee c754c2a046 Decomp more of personality_test (#27)
* decomp most of personality_test

* just gonna move the funcs to src in assembly for now so I can combine stuff

* label another func and some cleanup

* one func of personality test left in asm

* small cleanups and labeling of funcs
2021-02-19 18:01:53 -06:00
Seth Barberee 8dfd044ef3 Some Personality and data (#26)
* decomp few personality funcs and clean up some pointers in the dungeon data

* de-pointer-ify friend area dialogue

* clean pointers on a personality test question

* decomp a few more main menu funcs and dump some more data

* label some funcs
2021-02-07 21:10:12 -06:00
Seth Barberee 74daf03fd7 Main Menu and Scripts (#25)
* label more funcs, dump scripts/text, and decomp main menu

* decomp vram func and dump more data

* add forgotten file

* get rid of goto in UpdateMenu
2021-01-31 19:07:31 -06:00
Seth Barberee 076ff9ce59 small dungeon work.. to trigger webhook 2021-01-28 18:57:21 -06:00
Seth Barberee cb77386b65 more headway on Pokemon funcs and labeled in asm 2021-01-22 10:39:42 -06:00
Seth Barberee 10cda4ba81 split out all dungeon floor id data 2021-01-22 10:26:43 -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 87cd9885a9 Friend Area Decomp Work (#15)
split out and work on friend area stuff
2020-12-31 18:30:16 -06:00
Seth Barberee f90f3affeb Wonder mail Pt. 1 (#11)
Some work on decomping/labeling wonder mail. Renamed corresponding assembly/C files. Labeled a few strings in data too.
2020-12-15 16:28:03 -06:00
Mateusz Naściszewski efdaf621cb Translating Decompression
Hopefully part one of many, some NONMATCHINGs in the larger functions, sadly.
2020-12-15 00:51:45 +01:00
Mateusz Naściszewski c0ae9ddc9e Continue dumping and documenting strings 2020-12-13 00:30:31 +01:00
Mateusz Naściszewski 0f877a3561 Improve calcrom, add incbin counting, fix a few existing issues (#7) 2020-12-12 14:44:18 -06:00
Seth Barberee 448de33aef dump/label more data from data_800D090 2020-12-12 14:12:37 -06:00
Mateusz Naściszewski 5e2842c698 Text data cleanup! (#6)
* Text data cleanup!

Reformatted and fixed up all of data/text/, and extended charmap.txt

The `#P` metacharacter (prompt) acts like a newline, so I reformatted it as such.
All `.string` macros followed by `.byte 0x00` have been replaced with `.asciz` where possible, and `.string "...\0"` elsewhere, note that `.asciz` does not respect the charmap, so characters such as 'é' in 'Pokémon' or the various buttons would be incorrectly encoded.
Also cleaned up occurences of `.byte 0x24`, which should just be a literal '$' inside the string.

* Nuke all instances of `.asciz`

As discussed on Discord, globally replaced all `.asciz` macros with `.string "...\0"`, as `.asciz` did not respect the charmap.

* Minor string consistency fixes
2020-12-12 12:30:04 -06:00
Mateusz Naściszewski 1b9aeaf518 Move personality test data out of data_80EBA18 (#5) 2020-12-11 14:54:07 -06:00
Mateusz Naściszewski 7e2c662672 data_80F4278.s dumping (#4)
* Dumping menu text, part 1

* Continuing to dump text

* Renamed actions array according to suggestion
2020-12-11 12:28:28 -06:00
Mateusz Naściszewski 5fd50012a4 Resolve a few text incbins (#3) 2020-12-11 11:44:12 -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 a4fdac9553 slight cleanup
Found a few things when I attempted to decompile GameLoop.
2020-12-02 15:13:09 -06:00
z80rotom 3829eabfd2 Added missing personality test results (#2) 2020-12-02 14:57:26 -06:00
Seth Barberee 4d8d319b1f fix up matching 2020-11-24 17:00:01 -06:00
Seth Barberee 02df19855d Revert "more data dumping"
This reverts commit 88cac20034.
2020-11-24 16:53:42 -06:00
Seth Barberee 88cac20034 more data dumping 2020-11-24 11:21:46 -06:00
Seth Barberee 0c3daaaabd some more data dump work 2020-11-21 20:09:25 -06:00
Seth Barberee 2832112389 dumping some more text 2020-11-20 11:18:59 -06:00
Seth Barberee 0f6b5a1649 data dumping and doc'ing 2020-11-17 13:10:13 -06:00
Seth Barberee 3b75b10bbb more decomping and some data dumping 2020-11-14 17:44:04 -06:00
Seth Barberee a1cd2ce87f some data dumping and doc # of friend areas 2020-11-07 19:01:11 -06:00
Seth Barberee df9385ed9e continue my slow pace 2020-11-07 17:29:46 -06:00
Seth Barberee 1c2975874b remove tiny text data file 2020-11-03 14:12:29 -06:00
Seth Barberee c6cef4c839 start converting personality descriptions 2020-11-03 14:03:13 -06:00
Seth Barberee 83cc1bbd4d conntinue datadumping 2020-11-03 11:27:42 -06:00
Seth Barberee c7158dcc65 some more data dumping 2020-11-02 11:48:58 -06:00
Seth Barberee d842f0e072 more data sifting 2020-10-31 00:09:55 -05:00
Seth Barberee 73d44f33ac stringify categories 1-2 on personality test 2020-10-30 20:11:06 -05:00
Seth Barberee 36790d5591 seperate each personality question 2020-10-30 11:27:34 -05:00