Commit Graph

33 Commits

Author SHA1 Message Date
Seth Barberee 519c9ebb6a lazy day so more decomp away 2022-04-22 19:02:28 -07:00
Seth Barberee 57f540b320 fix a few nonmatchings and code cleanup 2022-03-21 17:48:40 -07:00
Seth Barberee 3477f61cf2 continue doing some more decomp 2022-03-13 17:48:04 -07:00
Seth Barberee aa939e0955 All saving functions decomped
- poke_sub_4 was determined to be Dungeon Index/Floor
- Clean up code that references these functions
2022-03-11 10:14:32 -08:00
Seth Barberee a5c90b0970 decomp some more saving functions 2022-03-11 10:14:30 -08:00
Seth Barberee fd8720b75c Label all entities in Boss Fight Cutscenes (#78)
* label all entities in cutscenes

* remove commented func.. wasn't matching anyway

* Skarmony -> Skarmory
2021-11-22 12:14:58 -06:00
Seth Barberee bfaa55f2fe Label and doc iq skills and tactics info (#75)
* label/doc iq skills/tactics info

* decomp a few more dungeon_util and label some funcs

* doc the IQSkills field
2021-11-15 11:02:26 -08:00
Seth Barberee 3a1db3dfac Moves and some friend_area_action_menu 2021-11-02 16:31:16 -07:00
Seth Barberee 3e5dd1d047 Death by 74 files (#65)
* death by 74 files

* 20% reached

* doc move stuff in pokemon

* fix undef reference

* doc more and plumb a few more constanst for num party members and num moves

* that struct is def PokemonMove.. clean up all code with it
2021-10-22 10:01:07 -07:00
Cheng Hann Gan 2d4c802d76 Extracted species/item/move strings (#63)
* Extracted species/item/move strings

* Used binary strings for bitwise flag variables
2021-10-10 07:59:35 -07:00
Cheng Hann Gan 12aec1bb71 Created species/item data JSONs (#57)
* Created species data JSON

* Added item data JSON

* Removed address field from JSONs

-Moved constants/item.h import to item.h.

* Used default values for some JSON fields

-Use item ID macros for item evolutions.
2021-09-28 09:50:36 -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
Dennis 26e5708818 More pokemon related decomp (#48)
* add struct names

* decompile SaveRecruitedPokemon

* decompile ReadRecruitedPokemon

* decomp anotha one

* some renaming

* another save function

* more backup functions

* sub_808E400

* only one function left in pokemon_2.s

* decomp one more function

* merge 2 structs
2021-08-01 12:09:13 -07:00
Dennis 645c45431b Pokemon related decomp (#47)
* decompile last function in pokemon_1.s

* some pokemon related decomp

* more decomp

* decomp another function

* decompile function

* another one

* decompile GetPokemonLevelData

* decompile more

* more decomp

* more structure and decomp

* decomp another function (need to do some renaming)

* rename some stuff

* I cant do anything without committing these 2 files
2021-07-25 21:11:01 -07:00
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 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 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 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 cb77386b65 more headway on Pokemon funcs and labeled in asm 2021-01-22 10:39:42 -06:00
Seth Barberee 1b0fc9f374 decomp an evolve func for pokemon 2020-10-18 18:16:28 -05:00
Seth Barberee d60e36b6b8 decomp a number of pokemon functions 2020-10-01 17:40:44 -05:00
Seth Barberee 96fdd3aae0 successful decomp of one pokemon data func and struct.. making headway 2020-10-01 13:32:53 -05:00
Seth Barberee cd050a5e7d found more MonsterParameter funcs that weren't in the split and decomped a few of them 2020-09-23 22:56:31 -05:00
Seth Barberee 977ef7d8aa fix guards 2020-09-20 19:33:21 -05:00
Seth Barberee 424db9c41b split out pokemon funcs and decomp another nullsub 2020-09-16 00:15:52 -05:00