Commit Graph

422 Commits

Author SHA1 Message Date
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
mid-kid
412a2d1dbe Extract shop dialogue 2021-11-03 00:08:22 +01:00
Cheng Hann Gan
dd128d78c6
Decomped more dungeon AI (#67)
* Decomped IsMovingClient()

* Fixed typos in boss dialogue

* Fixed spelling of Pelipper

* Decomped CannotUseItems

* Decomped ShouldAvoidEnemies()

* Decomped HasAbility()

* Decomped HasTactic()

* Decomped CannotMove

* Decomped CannotAct() and IsCharging()
2021-10-28 09:01:07 -07:00
Cheng Hann Gan
c98fb2c112
Decomped DecideAction() (#66)
* Decomped DecideAction()

* Defined dungeon Pokémon array sizes
2021-10-22 10:20:01 -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
3f7ee3a806
Decomped entityExists() (#64) 2021-10-15 15:30:33 -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
IIMarckus
de6af79187 Kill Freenode. 2021-10-08 04:42:35 -06: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
Cheng Hann Gan
0313c6bbc5
Defined DungeonEntity (#51)
* Defined DungeonEntity

* Rename EntityType enums

* Revert EntityType rename
2021-09-03 21:47:29 -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
Seth Barberee
e005410884 hopefully fix OK bot 2021-08-08 17:37:09 -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