Commit Graph

153 Commits

Author SHA1 Message Date
Dennis bad7f7f688 More item related decomp (#45)
* decompile sub_80918EC

* some more item related functions

* more item functions

* more decomp, fix types in other places

* more small functions

* more item related decomp

* one more weird branching item function

* fix global.h includes

* figured out branch pattern

* decompile sub_8090F58

* make temporary struct for function

* 🦀 items.s is gone 🦀

* some renaming

* rename some obvious item related constants

* fix spelling error
2021-07-17 09:45:13 -07:00
Seth Barberee a65d358927 minor code cleanup 2021-07-12 17:50:19 -05:00
Dennis da7b30612f More work on item related functions (#44)
* 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

* decompile sub_80915F4

* decompile HasGummiItem

* decompiled another function and renamed stuff

* decompile 2 smaller functions

* more functions

* more decompiling and renaming

* redo change that was undone in the merge
2021-07-12 14:10:32 -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 386299d1f4 Makefile and Install.md Revamp (#41)
* Makefile: move over to gcc for preproc and ditch cpp

* INSTALL: rewrite INSTALL

* README: add CI badge

* Makefile: make tools build before anything else
2021-07-09 19:35:12 -05:00
Seth Barberee 6aa475c631 Sese's vacation work 2021-07-07 11:39:34 -05:00
Seth Barberee f308c79eba 15% pog 2021-06-28 14:28:21 -05:00
Seth Barberee 84821577ad match CalculateEXPGain 2021-06-23 18:05:31 -05: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 f1fdcc2b0a more splitting and labeling with some decomp 2021-06-18 17:56:20 -05:00
Seth Barberee e806b05526 splitting more files and decomp a little more 2021-06-10 20:12:48 -05:00
Seth Barberee 31b46b0782 MedichamResuceDialogue => MedichamRescueDialogue
Thanks Kermalis
2021-06-10 12:03:43 -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 f65dee5a14 Wonder mail and some boss dialogues (#36)
* more wonder mail and main menu work

* Lots of things.. doc'ing, decomping, and other things

* continue decomping boss scenes

* up to Suicune

* up to Mewtwo dialogue

* up to Raquaza

* fix spelling error on Rayquaza and decomp a few more

* up to groudon

* divide > shift
2021-04-19 23:55:40 -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 4886c9f7dc decomp, label, doc, repeat 2021-01-28 09:24:55 -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 ec192a8fa8 5% wooo 2021-01-09 10:33:29 -06:00
Seth Barberee 469212f7ee CPU and GPU Reg Funcs Decomp (#16)
* decomp/doc cpu funcs and gpu reg funcs

* use Cpu32 macro funcs

* address review comments

* decomp SetBGOBJEnableFlags
2021-01-04 13:40:33 -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
Mateusz Naściszewski 01ec8edb40 Document button press related constant 2020-12-28 20:13:22 -06:00
Mateusz Naściszewski 2acfd6ed0f Decompile xxx_update_stuff 2020-12-28 20:13:22 -06:00
Mateusz Naściszewski 1d43c0efeb Decompile GameLoop and lots of renames 2020-12-28 20:13:22 -06:00
Mateusz Naściszewski 372d737a12 Label funcs and globals 2020-12-28 20:13:22 -06:00
Mateusz Naściszewski 6362345b04 Decompile UpdateInput
and some other minor stuff.
2020-12-28 20:13:22 -06:00
Mateusz Naściszewski b64320b043 Match DecompressAT function!
The global variant is still unmatched.
Most of the credit for the hard parts of matching this go to MCBoy, AKA Pidgey on Discord.
2020-12-20 13:50:35 -06:00
Mateusz Naściszewski c68dba1535 Refactor DecompressATGlobal, still not matching 2020-12-20 13:50:35 -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 7c52495879 Fix GetByte NONMATCHING 2020-12-15 04:43:47 +01:00
Mateusz Naściszewski 75b09a819a Finish translating code_800AAA0 to C! 2020-12-15 02:37:00 +01: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 b02a392e94 Make sub_8011940 more comprehensible 2020-12-13 20:30:30 +01:00
Mateusz Naściszewski 2c64b5692f Fix a lot of nonmatchings, some were plain wrong code 2020-12-13 19:50:37 +01:00
Seth Barberee 72aa91c7f8 code_80A26CC: fix nonmatching and decomp a few more 2020-12-08 13:17:08 -06:00
Seth Barberee 195eb49aa8 more decomping of funcs 2020-12-04 15:05:07 -06:00
Seth Barberee 90891b5da7 split a little and decomped a few more funcs 2020-12-03 14:19:07 -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
Seth Barberee 2582d7a868 isemi-identified VRAM and split personality test funcs 2020-11-23 15:22:16 -06:00