Commit Graph

215 Commits

Author SHA1 Message Date
AnonymousRandomPerson
a61f7ea2a1 Decomped HasItem() 2021-12-29 23:33:22 -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
f0ef6ae481 decomp some more 2021-12-24 17:45:49 -06: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
AnonymousRandomPerson
0369264407 Decomped GetMapTileAtPosition() 2021-12-18 00:22:03 -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
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
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
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
Seth Barberee
3a1db3dfac Moves and some friend_area_action_menu 2021-11-02 16:31:16 -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
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
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
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
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
386299d1f4
Makefile and Install.md Revamp (#41)
* Makefile: move over to gcc for preproc and ditch cpp

* INSTALL: rewrite INSTALL

* README: add CI badge

* Makefile: make tools build before anything else
2021-07-09 19:35:12 -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
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
e806b05526 splitting more files and decomp a little more 2021-06-10 20:12:48 -05:00
Seth Barberee
31b46b0782 MedichamResuceDialogue => MedichamRescueDialogue
Thanks Kermalis
2021-06-10 12:03:43 -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