Commit Graph

155 Commits

Author SHA1 Message Date
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
FieryMewtwo
18726d97cf
More text cleanup (#62)
* Update build.yml

temporarily so that I can edit without having to try to figure out why my Git client keeps crashing

* Fix references to the old save.inc text labels

* Labels 

welp here we go again

* Give Wonder Mail client 'thanks' text more descriptive function label names

* Change back the workflow
2021-10-11 09:04:44 -07:00
Seth Barberee
25794a39c3
Finish main menu decomp (#59)
* decomp rest of main_menu

* move some main menu data over

* decomp some more wonder mail

* decomp the dungeon dialogue scene switches

* more wonder mail

* consolidate struct_802F204

* another wonder mail func

* more wonder mail

* slight cleanup
2021-10-11 09:03:17 -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
FieryMewtwo
fb7a3a03e7
Update Luminous Cave text to use more descriptive labels (#61)
* Update luminous_cave.inc

* Fix pointers

* Fix pointers

again

* Fix pointers

finally done
2021-10-08 13:24:23 -07:00
Cheng Hann Gan
78632822c3
Added move data JSON (#60)
* Added move data JSON

* Fixed typo

* Fixed name of placeholder move
2021-10-05 17:09:53 -07: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
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
Seth Barberee
0d3b11e81a
Data work and decomp some mail/pelipper board (#54)
* data work and decomp some mail/pelipper board

* resuce -> rescue

* label more data
2021-09-24 00:49:43 -05: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
4eff188244
Thank You Mail and minor DungeonEnitity Work (#52)
* Thank You Mail: split out code into own file w/ data

* use constant for facingDir
2021-09-08 21:32:59 -07:00
Seth Barberee
db05ce306f
More PMD grind (#50)
* more sese grind

* match sub_802ABF8

* some more work
2021-09-01 18:05:30 -07:00
Seth Barberee
459171cf48
Decomp most of friend_rescue (#49)
* decomp most of friend_rescue

* dump corresponding data

* more data dumping and name some personality test funcs

* dump more text
2021-08-20 22:10:15 -05:00
Seth Barberee
d988394595
More data dumping and some code cleaning (#46)
* more data dumping and some code cleaning

* split out cutscene scripts

* initial start at script conversion

* more script work

* use correct type

* clearer up struct field names

* split known scripts into seperate files

* no need to preproc pure ascii strings in debug

* more cutscene work

* split out personality test scripts

* solidify text macros and doc some dungeon fields

* more scripting work
2021-08-12 17:26: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
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
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