Commit Graph

17 Commits

Author SHA1 Message Date
Seth Barberee
2ec7cc5bad fix nonmatch and move question references 2021-12-19 14:59:10 -08:00
Seth Barberee
3021ae9077 all data moved except questions 2021-12-19 14:59:10 -08:00
AnonymousRandomPerson
b458476078 Swapped out more text macros 2021-12-14 22:54:04 -05:00
Cheng Hann Gan
938a88551f
Labeled more symbols (#77)
* Labeled more symbols

* Fixed comment typo

* Renamed some functions
2021-11-20 08:47:46 -08:00
Geotale
1355271988
Add some labels and convert some strings for some data (#74)
* Adding in all missing strings and labels

Quite a few strings and labels were missing. This should fix all of them. "NaiveQuest1Answers" might have the second option incorrect, but it's kinda hard to count bytes and this does seem to be a valid answer, and should be checked in the future.

* Add all strings, labels, and update pointers

Like the previous commit, I have 0 clue if this builds lol -- I can't quite test this, because I can't run a compiler to do so, and I don't own a copy of the game. Should still match I would think. JobHeadline may have something incorrect about trailing 0 bytes, but it seems to have been an observational mistake on my end on it having 5 of them rather than 4?

* Fix consistency with previous labels (+typo fix)

Basically just "Message" with "Text", and replace "Headlline" with "Headline"

* Fix mistyped labels from previous commit

It seems I'm not very good at this assembly thing. "NewFriendAreas" -> "NewFriendArea", like originally.

* Replace the rest of "Message" with "Text"

I forgot to replace some stuff

* Forgot an A

Insert an A to create "BraveQuest2A_Ignore" instead of "BraveQuest2_Ignore"

* Forgot a space, remove more

Removed some extra whitespace, add a space between ".string" and a quotation mark that I had missed. Hope this didn't break anything somehow.

* Add back all comments, fix missing pointer

I accidentally deleted all comments. I've now fixed that, and added in a pointer to NaiveQuest1_Love because I had missed it somewhere else.

* Add in TimidQuest3 answer pointers I had missed

This should be the last of the missing pointers?

* Tabs -> Spaces

Fixed formatting by converting all tabs to spaces. I don't actually know when I changed them to tabs, but I'd guess I did pretty early on...

* Add some labels

A few labels were missing, tried to fill them in.

* Made a data assembler!

I can now basically ensure that the files match! Found an error with two labels reversed, but that seems to be the only thing that was incorrect.

* Left out a space somehow

Simply just adds a space between a ".string" and the actual string

* Make the files actually match

Took a bit of time, but I believe I've finally got this file actually matching!
I was lazy with strings when first encoding and wrote decimal offsets for octal character encodings sometimes which is fun. All instances of this should now be fixed!

* Fix some labels

I believe this was just missing two labels that I forgot to change when copy-pasting them for the general format...
Meh, still, glad to have it fixed.

* Replace hexadecimal string escapes with octal ones

I tried committing this before but it doesn't seem to have worked for some reason -- Just in case it did and I'm rewriting this on accident.
I should have done some research apparently -- ARM asm doesn't support hexadecimal escape sequences, only octal ones. Should be fixed now!

* Replace octal escape sequences with ".byte"

It turns out those aren't supported either -- That's okay, though it looks a bit more messy imo.

* Update data/pokemon_mail.s

* fix up conflicts and labels

Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2021-11-18 10:19:20 -08: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
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
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
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
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
z80rotom
3829eabfd2
Added missing personality test results (#2) 2020-12-02 14:57:26 -06:00
Seth Barberee
c6cef4c839 start converting personality descriptions 2020-11-03 14:03:13 -06:00
Seth Barberee
3ba62db61d pointer up these strings 2020-10-29 21:19:24 -05:00
Seth Barberee
de91e24ec8 add pointers for shifting stuff around 2020-10-29 19:42:05 -05:00
Seth Barberee
9b8e49226f start moving some data into c of personality test 2020-10-17 12:27:49 -05:00