Commit Graph

396 Commits

Author SHA1 Message Date
AnonymousRandomPerson
d9b1ef43a6 Labeled Warp Scarf variables 2022-01-06 21:52:23 -06:00
AnonymousRandomPerson
2fa42b2987 Moved some constants from data to source 2022-01-04 23:34:35 -06:00
AnonymousRandomPerson
c30cf5c6da Decomped EvaluateItem() 2022-01-04 00:00:31 -06:00
AnonymousRandomPerson
a61f7ea2a1 Decomped HasItem() 2021-12-29 23:33:22 -06:00
Seth Barberee
edf909be4d
Merge pull request #91 from AnonymousRandomPerson/master
More item AI decomp
2021-12-28 23:00:59 -06:00
AnonymousRandomPerson
ea10f7b7bd Created header for pokemon_3 2021-12-28 22:15:56 -06:00
AnonymousRandomPerson
d40d2e55a3 Decomped IsTargetStraightAhead() 2021-12-28 21:38:42 -06:00
AnonymousRandomPerson
4bf154654b Decomped TargetThrownItem() 2021-12-28 21:38:39 -06:00
Seth Barberee
6512ebff67
Merge pull request #90 from pret/pokemon_mail_data
Pokemon mail data and some decomp
2021-12-28 21:34:16 -06:00
Seth Barberee
f0ef6ae481 decomp some more 2021-12-24 17:45:49 -06:00
Seth Barberee
e7a59a1a21 move pokemon mail data to src 2021-12-22 17:00:21 -06:00
Seth Barberee
7a1956f51d
Merge pull request #87 from SethBarberee/personality_test_data_2
Personality test data 2
2021-12-21 15:05:05 -06:00
Seth Barberee
4fd4208364
Delete build artifacts on clean target (#89)
* delete build artifacts on clean target

* clean out the graphics files too

* fix up auto-gen message on pokemon_found and move END_OF_TABLE to actual end of table
2021-12-21 14:47:46 -06:00
Seth Barberee
3a1307e907 use personality natures for wraparound 2021-12-21 10:01:41 -06:00
Seth Barberee
74b7676ae2
Merge pull request #86 from mid-kid/master
More disassembly and dependency generation fixes...
2021-12-20 17:31:22 -06:00
mid-kid
010d641899 Explicitly declare dependencies for generated files
These are harder to pick up automatically, and will only change when the
tools are edited, anyway...

Any other methods for solving this issue can always be reconsidered
later down the line...
2021-12-20 16:29:19 +01:00
mid-kid
99a038284b Translate all .include to #include
This decision was made to reduce the complexity of using .include whilst
juggling with tools/scaninc and tools/preproc:
- tools/scaninc doesn't apply the proper search rules for .include (it
  assumes #include behavior). In particular, it doesn't consider paths
  starting from $PWD, and doesn't scan the included files as a result.
- .include had to be processed before #include by preproc in many cases,
  as code was being included that had to be preprocessed by CPP (think
  of #define). This contradicts standard GCC behavior.

To make include paths consistent across the asm/ data/ and src/
directories, the following files were moved:
- constants/ → include/asm/constants/
- asm/macros/ → include/asm/macros/
- asm/macros.inc → include/asm/macros.inc
- include/macros/m4a.inc → include/asm/macros/m4a.inc

As part of the necessary changes for this to work, the scaninc method in
the makefile was improved to generate .d files that don't choke when
files are missing.
2021-12-20 16:29:12 +01:00
mid-kid
bc43a77380 Finish de-incbinning data_80E59A8.s and data_80E7D40.s 2021-12-20 16:16:37 +01:00
mid-kid
51bff00712 Finish de-incbinning data_80D47B8.s and data_80DED44.s 2021-12-20 16:11:19 +01:00
Seth Barberee
3e84c8e11b
Merge pull request #88 from AnonymousRandomPerson/master
Renamed inconsistent color macros
2021-12-19 17:52:44 -06:00
AnonymousRandomPerson
7acad69795 Renamed inconsistent color macros 2021-12-19 17:19:13 -06:00
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
Seth Barberee
8e1c66d8bd
Merge pull request #85 from AnonymousRandomPerson/master
More AI decomp
2021-12-19 16:38:51 -06:00
AnonymousRandomPerson
0369264407 Decomped GetMapTileAtPosition() 2021-12-18 00:22:03 -05:00
AnonymousRandomPerson
c033aea36e Moved gDungeonGlobalData definition to dungeon_global_data.h 2021-12-17 23:39:50 -05:00
AnonymousRandomPerson
b1fc911965 Decomped InSameRoom_2() 2021-12-17 23:38:06 -05:00
AnonymousRandomPerson
da8fcb2ac8 Decomped CanSee() 2021-12-14 23:26:56 -05:00
AnonymousRandomPerson
b458476078 Swapped out more text macros 2021-12-14 22:54:04 -05:00
AnonymousRandomPerson
cd9a8c5a38 Decomped CanTarget() 2021-12-14 22:54:03 -05:00
mid-kid
087405b9d9 Dump and document status sprites 2021-12-13 10:44:48 -06:00
mid-kid
8213467c21 Dump status names and descriptions 2021-12-13 10:44:48 -06:00
mid-kid
ca10fd795e Dump unidentified tables 2021-12-13 10:44:48 -06:00
mid-kid
2fcfbc2266 Finish de-incbinning data.s 2021-12-13 10:44:48 -06:00
Cheng Hann Gan
c53bdc35f8
Dungeon random/AI decomp + converted positions to structs (#83)
* Decomped RollPercentChance()

* Decomped DungeonRandomCapped()

* Decomped DungeonRandom()

* Decomped FindRockItemTargets()

-Added position struct.
2021-12-12 12:52:06 -08:00
Cheng Hann Gan
a34c9ab91b
AI decomp + type cleanup (#82)
* Decomped SetAction()

* Changed MapTile.tileType to u16 bit field

* Decomped FindStraightThrowableTargets()

* Cleaned up CannotAttack()

* Cleaned up some externs

* Converted dungeon action to substruct
2021-12-09 10:56:12 -08:00
Seth Barberee
4fc272fea6
No wifi + 2 days on train = more decomp (#80)
* No wifi + 2 days on train = more decomp

* layin some more

* one func, one file
2021-12-01 14:33:06 -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
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
Cheng Hann Gan
a432de845c
Expanded charmap usage (#76)
* Added item icons/Hiragana to charmap

* Use color formatting charmap macros

* Removed redundant text formatting macros
2021-11-18 09:21:00 -08: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
Cheng Hann Gan
0ea22237c9
Decomped DecideUseItem (#73) 2021-11-13 16:59:20 -08:00
Seth Barberee
561ea52847
Luminous cave (#72)
* fully decomp luminous cave

* remove header file. this one isn't ready yet

* doc few fields and func

* doc more of luminous cave
2021-11-10 08:43:51 -08:00
mid-kid
681ca68ac9
Disassemble some more tables and the first graphic (#71)
* Sync tools/ directory with pokeemerald

We really ought to have a central repository for this mess

* Make incremental builds faster

Scientists hate him!
He made NODEP disappear with this ONE SIMPLE TRICK!!!
Want to know more? -> __click here__ <-

* Disassemble some more tables and the first graphic
2021-11-04 14:07:26 -07:00
Seth Barberee
f1394cbb03
Merge pull request #70 from mid-kid/master
Disassemble a script-related table
2021-11-04 08:47:50 -07:00
mid-kid
8f162f70ba Disassemble a script-related table 2021-11-04 02:10:38 +01:00
Seth Barberee
e29e61a4a1
Merge pull request #68 from SethBarberee/sese_work
Moves and some friend_area_action_menu
2021-11-02 16:37:00 -07:00
Seth Barberee
3a1db3dfac Moves and some friend_area_action_menu 2021-11-02 16:31:16 -07:00
Seth Barberee
f99f00b180
Merge pull request #69 from mid-kid/master
Extract shop dialogue
2021-11-02 16:17:25 -07:00