Commit Graph

1384 Commits

Author SHA1 Message Date
Kermalis
afa4b04abc axObject info union 2024-11-10 19:43:27 -05:00
Kermalis
2ec9296cc5 Rename nullsub_102 2024-11-10 19:03:09 -05:00
Kermalis
c3cd344ad9 Fix WriteMonster weirdmatch 2024-11-10 18:33:47 -05:00
Kermalis
fa08c0e691 dungeon_serializer.c 2024-11-10 15:11:07 -05:00
Mateon1
3019420318
charmap 2024-11-10 18:11:27 +01:00
DizzyEggg
3eec797b85 AssignGridCellConnections 2024-11-10 15:18:00 +01:00
DizzyEggg
88c5436602 GenerateOuterRingFloor 2024-11-09 17:41:27 +01:00
Kermalis
ab90cf0500 gDungeon->unk644 2024-11-09 10:35:16 -05:00
Kermalis
15b4b39ff7 Match sub_80948E4 2024-11-09 03:22:29 -05:00
Kermalis
c6d89036bb Fix GetBaseSpeciesNoUnown fakematch 2024-11-09 02:53:48 -05:00
DizzyEggg
2a5e97ca89 GenerateCrossroadsFloor 2024-11-08 22:40:16 +01:00
DizzyEggg
76d710229e AssignRooms 2024-11-08 14:29:12 +01:00
DizzyEggg
cf6e42ae19 GenerateExtraHallways 2024-11-08 11:15:52 +01:00
DizzyEggg
2a678ca06c start documenting dungeon generation 2024-11-07 23:28:16 +01:00
DizzyEggg
2510f03439 sub_804C9D0 2024-11-07 22:00:18 +01:00
Kermalis
ddcf8f59a2 Update code_8042B34.c 2024-11-07 13:14:54 -05:00
Kermalis
d96bb4a9aa Names 2024-11-07 13:06:53 -05:00
DizzyEggg
5701369a9a sub_804C43C 2024-11-07 15:11:26 +01:00
Kermalis
e6f00864bd sin_abs_4096 -> sin_4096 2024-11-06 12:54:01 -05:00
Kermalis
5623e4e028 Merge with huevo 2024-11-06 05:17:28 -05:00
Kermalis
459f262817 Merge branch 'master' into math 2024-11-06 05:08:10 -05:00
DizzyEggg
7ae74721b9 sub_804B534 2024-11-06 10:42:40 +01:00
Kermalis
c0872f639c Finish code_8044CC8.s 2024-11-05 10:50:03 -05:00
Kermalis
723475af05 Fix fakematch cuz Mateon 2024-11-05 10:41:40 -05:00
Kermalis
3aee3628f4 Use mateon's func names 2024-11-05 09:57:30 -05:00
Kermalis
25efe1ca67 Finish math.s 2024-11-05 09:43:47 -05:00
Kermalis
e22f8ea6a8 sub_800A5A4 2024-11-05 08:26:09 -05:00
Kermalis
9ae9b85c75 register match sub_800A4E4 2024-11-05 07:02:02 -05:00
DizzyEggg
a9daef337f decompile code_806E8B0 2024-11-05 11:58:44 +01:00
DizzyEggg
3dc536c92c sub_806F370 2024-11-05 10:54:24 +01:00
Kermalis
5f02fed1c5 600 lines of math.s 2024-11-04 18:48:18 -05:00
DizzyEggg
8a88429b87 start work on sub_806EAF4 2024-11-02 21:25:27 +01:00
AnonymousRandomPerson
86157a2c5c Label sub_80099F0 as SetFontsBaseColor
Per @Kermalis
2024-11-01 19:44:07 -04:00
AnonymousRandomPerson
d93a8b64a0
Merge pull request #247 from DizzyEggg/nonmatchings
Some checks are pending
GithubCI / build (push) Waiting to run
Match some register nonmatchings
2024-11-01 19:41:46 -04:00
AnonymousRandomPerson
a169714523
Merge pull request #249 from mateon1/palette
Palette (builds on top of #248)
2024-11-01 17:40:05 -04:00
AnonymousRandomPerson
97a21ed680
Merge pull request #248 from DizzyEggg/rgb
bg_palette_buffer clean-up
2024-11-01 17:37:56 -04:00
Mateon1
6b87f66106
Clean up void casts 2024-11-01 15:41:36 +01:00
Mateon1
d950923709
Rgb32 back to RGB 2024-11-01 15:32:15 +01:00
Mateon1
97048546c5
pallete -> palette 2024-11-01 15:05:30 +01:00
Mateon1
db96148da7
Cleanup sub_8004C00 2024-11-01 15:03:45 +01:00
Mateon1
14a51f514b
Palette cleanup 2024-11-01 15:03:44 +01:00
DizzyEggg
fd89ecf865 Cast to struct PortraitGfx 2024-11-01 13:43:35 +01:00
DizzyEggg
a9c8d282f4 add emotion defines 2024-11-01 13:37:22 +01:00
DizzyEggg
b6efce3120 start working on bg pal struct 2024-11-01 12:40:56 +01:00
DizzyEggg
edb4d8a62a solve conflicts 2024-11-01 08:53:01 +01:00
DizzyEggg
48752a461f Format to Formatted 2024-10-31 14:19:27 +01:00
DizzyEggg
cc7c519d0f gSpeakerNameBuffer and gSpeakerNameSeparator 2024-10-31 14:15:12 +01:00
DizzyEggg
de31304aab FormatString - name 2024-10-31 14:04:53 +01:00
DizzyEggg
9d0ce06023 get rid of nonmatching fakematch sub_809542C 2024-10-31 12:12:25 +01:00
DizzyEggg
cc3f1d1096 Match some nonmatchings 2024-10-31 11:52:35 +01:00
DizzyEggg
e8c610bb1f GetEntInfo used everywhere now 2024-10-30 09:45:29 +01:00
DizzyEggg
6c9c980fa6 small clean-up 2024-10-30 09:01:16 +01:00
DizzyEggg
a39687ba3e merge master 2024-10-30 08:57:22 +01:00
Mateon1
4bf95354c2
Fix weird indentation 2024-10-29 17:50:48 +01:00
DizzyEggg
98b1caf5a8 some copyformatstring clean-up 2024-10-29 16:21:15 +01:00
DizzyEggg
25f63324c7 merge master 2024-10-29 14:56:39 +01:00
DizzyEggg
b71f4b17d8 rename format string related 2024-10-29 14:41:09 +01:00
DizzyEggg
b218d9006b string_format.c clean-up 2024-10-29 14:07:52 +01:00
Mateon1
2eb1cd4c1a
GetEntInfo 2024-10-29 13:59:19 +01:00
DizzyEggg
7438e1cf19 move dialogue variables to ewram 2024-10-29 13:36:50 +01:00
DizzyEggg
c5a1369345 gUnknown_202E748 2024-10-29 12:47:37 +01:00
DizzyEggg
94edb4caec gAvailablePokemonNames 2024-10-29 12:16:13 +01:00
DizzyEggg
131ad370d5 remove gUnknown_202DEA8 2024-10-29 10:51:27 +01:00
DizzyEggg
ae3c73fae3 sub_8015034 2024-10-29 09:44:50 +01:00
AnonymousRandomPerson
0a18379e39 Fix fakematch per @Kermalis 2024-10-28 20:35:04 -04:00
Mateon1
bb474e4b64
Remove addressed comment 2024-10-29 00:31:11 +01:00
Mateon1
6c2b0d6147
Clean up CLIENT_TYPE constants 2024-10-28 23:53:14 +01:00
Mateon1
4ca729fce0
More animation stuff 2024-10-28 23:41:24 +01:00
Mateon1
31b64b7793
GroundScript improvements 2024-10-28 23:40:36 +01:00
Mateon1
ea037dfcb5
Change some struct usage to their first substruct where appropriate 2024-10-28 23:40:36 +01:00
Mateon1
20a3f2251a
Fully move to axdata
(whoops, it's not four-stars for animations, got confused because I used
an [8] array in ghidra for orientations)
2024-10-28 23:40:36 +01:00
Mateon1
76e79ce987
Prepare for EntitySpriteInfo merge 2024-10-28 23:40:36 +01:00
Mateon1
f4a1ad1f45
move axdata to structs 2024-10-28 23:40:36 +01:00
Mateon1
915cdb9fd3
Get rid of Dungeon_ax 2024-10-28 23:40:36 +01:00
Mateon1
49acc1a1eb
Move Entity to axObj 2024-10-28 23:40:36 +01:00
Mateon1
ac5136a2da
Separate out axPokemon subobject 2024-10-28 23:40:35 +01:00
DizzyEggg
f79211a22b AppendString_8014FA8 2024-10-28 22:34:34 +01:00
DizzyEggg
1548fbe89d CreateMenuDialogueBoxAndPortrait 2024-10-27 22:50:33 +01:00
Seth Barberee
1002b399dc fakematch sub_806A338 thanks to @DizzyEggg 2024-10-27 09:52:47 -07:00
Seth Barberee
c85a9947c4 dungeon_cutscene cleanup 2024-10-26 21:09:23 -07:00
Seth Barberee
56290df4e3 match sub_8015F44 and add decomp.me link 2024-10-26 19:23:51 -07:00
Seth Barberee
b3b9c899e8 address review comment and use direction constants 2024-10-26 19:23:49 -07:00
Seth Barberee
f918337cb2 decomp GetAdjustedGroundMap 2024-10-26 19:10:29 -07:00
Seth Barberee
30100cb8da decomp ZapdosPreFightDialogue 2024-10-26 19:10:28 -07:00
Seth Barberee
59827df253 more decomp 2024-10-26 18:52:37 -07:00
AnonymousRandomPerson
90240df441
Merge pull request #242 from DizzyEggg/patch-9
Some checks are pending
GithubCI / build (push) Waiting to run
Better fakematch for SaveUnkTextStructAndXXX_8006438
2024-10-26 17:13:04 -04:00
AnonymousRandomPerson
f61f1ad4b3
Merge pull request #241 from DizzyEggg/patch-8
Match sub_800EB24
2024-10-26 17:12:47 -04:00
AnonymousRandomPerson
f6c3ff236b
Merge pull request #240 from DizzyEggg/patch-7
Match GenerateMailJobInfo
2024-10-26 17:12:16 -04:00
AnonymousRandomPerson
d8329f7eca
Merge pull request #233 from DizzyEggg/code_80521D0
code_80521D0.s (dungeon_message.c and dungeon_move.c)
2024-10-26 17:11:16 -04:00
DizzyEggg
2ed35b81f7
Better fakematch for SaveUnkTextStructAndXXX_8006438 2024-10-26 21:03:36 +02:00
DizzyEggg
ea5744181e
Match sub_800EB24 2024-10-26 20:39:32 +02:00
DizzyEggg
c41b7f0c4e Use move constants in UseMoveAgainstTargets 2024-10-26 20:04:38 +02:00
DizzyEggg
83df45a81a r0 to pokemon 2024-10-26 19:50:48 +02:00
DizzyEggg
94c8da6dcf
Match GenerateMailJobInfo 2024-10-26 19:42:57 +02:00
DizzyEggg
2c03039ddb
Match sub_8007334 2024-10-26 18:36:00 +02:00
DizzyEggg
78c811ed1d Match HandleTextFormat 2024-10-26 18:12:56 +02:00
DizzyEggg
848d0a0b5f move some const data to dungeon move/message 2024-10-25 22:47:46 +02:00
DizzyEggg
b0f1f8a878 new file - dungeon_move.c and clean-up 2024-10-25 21:19:22 +02:00
DizzyEggg
a2bc2f66ec move two functions to dungeon_message.c 2024-10-25 20:21:56 +02:00
DizzyEggg
4c4ec10806 document some of the use move functions 2024-10-25 17:30:31 +02:00
DizzyEggg
5d9b14d5e2 sub_8053704 matched 2024-10-25 15:37:17 +02:00
DizzyEggg
5a48a51b81 commence slaying of the sub_8053704 behemoth 2024-10-24 22:26:18 +02:00
DizzyEggg
db326038f5 merge with master 2024-10-24 19:36:16 +02:00
DizzyEggg
e935c42b5a makuhita's dojo unk68 to portraitptr 2024-10-24 19:33:27 +02:00
DizzyEggg
f28ab41acb sub_8056F80 2024-10-24 19:28:40 +02:00
DizzyEggg
80e20f5c09 sub_8056CE8 2024-10-24 16:59:45 +02:00
DizzyEggg
7988b3b49c sub_80566F8 2024-10-24 13:35:23 +02:00
DizzyEggg
216d931fa6 document called move struct 2024-10-23 16:40:38 +02:00
DizzyEggg
902d82fcaf sub_8055FA0 2024-10-23 14:35:33 +02:00
DizzyEggg
ef2868a2bc sub_8055DDC 2024-10-23 12:35:56 +02:00
AnonymousRandomPerson
67e8cd8400 Decomped DoAlloc
Decomped by Kermalis
2024-10-22 22:20:03 -04:00
AnonymousRandomPerson
dd8c864e38 Decomped xxx_unused_memory_free
Decomped by Kermalis
2024-10-22 22:18:48 -04:00
AnonymousRandomPerson
d35f627606 Decomped DoCreateSubHeap
Decomped by Kermalis
2024-10-22 22:01:32 -04:00
DizzyEggg
389da1c570 sub_80559DC 2024-10-22 16:45:07 +02:00
DizzyEggg
96db7fa27b clean dungeon message externs 2024-10-22 12:52:48 +02:00
DizzyEggg
d27018114b remove code_80521D0.h includes 2024-10-22 12:00:38 +02:00
DizzyEggg
4bb3c6c58c rename 80521D0 to dungeon message 2024-10-22 11:55:53 +02:00
DizzyEggg
c6a0dd2d0f document some of the message log 2024-10-22 11:09:42 +02:00
Isaiah Deppong
c1e2d210d5 removed volatile from sub_8099394 2024-10-21 12:57:27 -04:00
Isaiah Deppong
fb2de3b03f decomp and integrate sub_8099360 - sub_809965C. 2024-10-21 11:52:14 -04:00
DizzyEggg
38af7bc8aa sub_805363C and sprite oam memes again urgh 2024-10-21 15:36:56 +02:00
DizzyEggg
e69cf646c8 sub_80532B4 2024-10-21 12:14:32 +02:00
DizzyEggg
200744bfa4 sub_8052FB8 2024-10-21 11:23:07 +02:00
DizzyEggg
4a4b637e79 merge with master 2024-10-21 09:12:24 +02:00
AnonymousRandomPerson
9e49584621
Merge pull request #231 from DizzyEggg/sub_805D8C8
Some checks failed
GithubCI / build (push) Has been cancelled
Match/Document sub_805D8C8 and fix fakematches with static inlines
2024-10-20 17:02:58 -04:00
DizzyEggg
9b118be5ee make GetTutorialFlag nicer 2024-10-20 22:11:52 +02:00
DizzyEggg
f0712db9cf
Update src/code_805D8C8_1.c
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2024-10-20 21:53:02 +02:00
DizzyEggg
c41bca0474
Update src/code_805D8C8_1.c
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2024-10-20 21:52:54 +02:00
DizzyEggg
b4f59e5bf9
Update src/code_805D8C8_1.c
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2024-10-20 21:52:43 +02:00
DizzyEggg
2c2b5ed409 DisplayYouReachedDestFloorStr 2024-10-20 16:17:15 +02:00
DizzyEggg
68dcdcef5b DisplayDungeonMenuMessage 2024-10-20 14:34:20 +02:00
DizzyEggg
570250ebb9 PrintYesNoFieldMessage 2024-10-20 14:24:26 +02:00
DizzyEggg
1896d9d4ab Give names to portrait/dialogue box creating functions 2024-10-20 13:07:47 +02:00
DizzyEggg
c6b04f6213 DisplayDungeonDialogue 2024-10-20 12:31:25 +02:00
DizzyEggg
2442708b15 document portrait struct 2024-10-20 10:47:13 +02:00
DizzyEggg
76ccab8113 UnkPrintFieldMsgStruct discovered 2024-10-19 17:09:39 +02:00
DizzyEggg
bf99d37eda start code_80521D0 2024-10-18 16:35:13 +02:00
DizzyEggg
ec922a6776 use ASM_MATCH_TRICK in ShowFieldMenu 2024-10-18 09:08:33 +02:00
DizzyEggg
db22b0a484 slight fixes 2024-10-18 09:05:22 +02:00
Isaiah Deppong
01922e2a21 decomp for sub_8099328 2024-10-17 15:50:06 -04:00
DizzyEggg
7cf84b76f5 move some vars from sym ewram 2024-10-17 16:01:38 +02:00
DizzyEggg
54fdf25a43 match ConvertMoneyItemToMoney 2024-10-17 13:18:17 +02:00
DizzyEggg
f33e62f668 Fix most asm usage in move_actions.c 2024-10-17 13:03:09 +02:00
DizzyEggg
18a14e2e4a exp multiplier inline 2024-10-17 11:14:09 +02:00
DizzyEggg
86e7032196 Fix some nonmatchings with static inlines 2024-10-16 16:46:50 +02:00
DizzyEggg
a0e68c46e9 remove DUMMY_TEAM_ITEMS_ASM_MATCH 2024-10-16 16:10:14 +02:00
DizzyEggg
da198b95ca sub_805E2C4 in C 2024-10-16 15:51:30 +02:00
AnonymousRandomPerson
f437721844
Merge pull request #230 from mateon1/groundscript
Some checks failed
GithubCI / build (push) Has been cancelled
Ground scripts
2024-10-15 11:30:04 -04:00
Mateon1
9607bbc020
Refactor color and format constants 2024-10-15 17:14:36 +02:00
DizzyEggg
f813788fe0 match sub_805D8C8 2024-10-15 16:27:41 +02:00
Mateon1
1ef9fc0481
Remove magic number from personality test 2024-10-15 00:26:15 +02:00
Mateon1
aad27b9c26
Ground script decomp 2024-10-15 00:26:15 +02:00
Mateon1
1cbc954776
Personality test cleanup 2024-10-15 00:26:15 +02:00
Mateon1
fa2d34f2d9
Tutorial renames 2024-10-15 00:26:15 +02:00
Mateon1
13b8d6ed69
Remove duplicates in charmap 2024-10-15 00:26:15 +02:00
DizzyEggg
0b4aafae23 merge with master, update dungeon struct 2024-10-13 15:37:03 +02:00
DizzyEggg
74c5df2674 fix some fake/non/weird matches by static inlines 2024-10-13 15:32:58 +02:00
DizzyEggg
fda81d1e1c fix some functions using static inlines 2024-10-13 14:35:12 +02:00
DizzyEggg
ea1013ee85 fix friend area 2024-10-12 21:26:24 +02:00
DizzyEggg
8b7e2e324e sub_8044124 2024-10-12 21:08:16 +02:00
DizzyEggg
854680fe7f xxx_dungeon_8042F6C matched 2024-10-11 12:35:26 +02:00
AnonymousRandomPerson
c997958e97 Update HandleTextFormat decomp.me to closer match 2024-10-09 23:44:06 -04:00
AnonymousRandomPerson
abf9472d50
Merge pull request #225 from DizzyEggg/code_803E724
Some checks are pending
GithubCI / build (push) Waiting to run
Code 803e724
2024-10-09 17:52:26 -04:00
DizzyEggg
8d979b9c83
Update src/code_803E724.c
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
2024-10-09 19:47:08 +02:00
DizzyEggg
26ca0efd5c sub_8042EC8 2024-10-09 15:48:45 +02:00
DizzyEggg
7141bae241 sub_8042B34 2024-10-09 14:04:10 +02:00
DizzyEggg
0f72d97ac4 code_803E724 decompiled 2024-10-09 10:50:25 +02:00
DizzyEggg
4b7e9c6597 sub_803FE30 2024-10-09 10:08:03 +02:00
DizzyEggg
94b0d1cedd sub_803F580 2024-10-08 09:40:32 +02:00
DizzyEggg
200c2e2d35 sub_803EDF0 2024-10-07 14:25:22 +02:00
AnonymousRandomPerson
3032acb2aa Replace hex numbers with chars in HandleTextFormat 2024-10-06 21:52:19 -04:00
AnonymousRandomPerson
f9082a9804
Merge pull request #222 from DizzyEggg/text
Text.s
2024-10-06 21:43:14 -04:00
Seth Barberee
b6499587e5 address final review comment 2024-10-06 12:37:52 -07:00
Seth Barberee
d4bbe9ccaf
Merge branch 'master' into aug_sept_2024 2024-10-04 08:41:12 -07:00
Seth Barberee
15362a9772 address more review comments 2024-10-04 08:43:51 -07:00
DizzyEggg
0d3e64bba6 sub_803EA10 2024-10-04 11:14:02 +02:00
DizzyEggg
8ec9d47818 sub_803E9D0 2024-10-04 11:10:29 +02:00
DizzyEggg
be00dce2e1 change numbers to chars 2024-10-04 09:34:30 +02:00
Seth Barberee
639bd7a26a address most of the review comments 2024-10-02 07:42:51 -07:00
DizzyEggg
2d2794c901 text review changes 2024-10-02 09:38:37 +02:00
DizzyEggg
ebf922c39a InterpretColorChar 2024-10-01 12:34:45 +02:00
DizzyEggg
c579df2588 sub_8009408 2024-10-01 11:34:12 +02:00
DizzyEggg
7220a18265 xxx_draw_string 2024-09-30 11:27:38 +02:00
Seth Barberee
614a8ed0eb document parameters of func 2024-09-29 15:59:35 -07:00
Seth Barberee
2c47580c06 more functions decomped 2024-09-29 15:46:34 -07:00
Seth Barberee
a2c23310bc more documenation 2024-09-28 07:26:09 -07:00
Seth Barberee
52d4d97a82 document more kecleon 2024-09-28 07:25:27 -07:00
DizzyEggg
d0fcc152fb sub_8008E58 2024-09-27 16:52:14 +02:00
DizzyEggg
b9456e1d80 sub_80089AC 2024-09-27 15:22:51 +02:00
Mateon1
3331a71b74
Add BUGFIX to ExecuteScriptCommand
Currently nothing sets the BUGFIX define, but that can be added later.
2024-09-26 18:05:24 +02:00
Seth Barberee
7b4798283a fix: make rebase compile ok 2024-09-25 20:07:45 -07:00
Seth Barberee
9d99557618 More decomp 2024-09-25 20:04:47 -07:00
Seth Barberee
3311aa476e slight updates 2024-09-25 20:04:47 -07:00
Seth Barberee
0ceb445c25 rebase updates 2024-09-25 20:04:47 -07:00
Seth Barberee
24ff46c585 more decomp 2024-09-25 20:04:47 -07:00
Seth Barberee
c280da22dd more decomp 2024-09-25 20:04:47 -07:00
Seth Barberee
6a1a7bcaff more decomp and documentation 2024-09-25 20:04:47 -07:00
Seth Barberee
24da346796 more documentation/cleanup 2024-09-25 20:04:47 -07:00
Seth Barberee
0fca0de856 decomp two more trap funcs 2024-09-25 20:04:47 -07:00
Seth Barberee
55c2ee9990 more documentation 2024-09-25 20:04:47 -07:00