Commit Graph

1048 Commits

Author SHA1 Message Date
DizzyEggg
8a7eeca82a quick sav 2024-12-15 14:51:40 +01:00
DizzyEggg
ea779d534f start work on ewram init 2024-12-15 12:35:09 +01:00
DizzyEggg
40ceb381ed move reg control vars to ewram, merge with unused vblank 2024-12-14 23:15:43 +01:00
DizzyEggg
76931b997a sync m4a_1.s with pokeemerald and move to src 2024-12-14 19:25:43 +01:00
Seth Barberee
166c388734
Merge pull request #289 from DizzyEggg/code_807E5AC
Some checks failed
GithubCI / build (push) Has been cancelled
code_807E5AC.s and data_80F4E2C.s (and other similar data files)
2024-12-11 19:38:46 -08:00
Kermalis
1d726bf70c Repairs 2024-12-06 15:44:04 -05:00
DizzyEggg
b6e4f986ea sub_807EAA0 2024-12-04 19:36:24 +01:00
DizzyEggg
c9e26cabec dungeon config done 2024-12-04 18:18:55 +01:00
DizzyEggg
9b490b58e9 more work 2024-12-04 16:32:18 +01:00
DizzyEggg
69925b8b98 dungeon config 2024-12-04 15:43:48 +01:00
DizzyEggg
86232a8ceb Fix ReturnMoveAction 2024-12-04 12:49:41 +01:00
DizzyEggg
db1f3b00b1 remove type chart.h 2024-12-04 11:54:20 +01:00
DizzyEggg
53cb5d78ad more data 2024-12-04 11:14:24 +01:00
Kermalis
8c99f6d1cd Merge branch 'master' into other-menus 2024-12-04 03:04:03 -05:00
Kermalis
d3652cf59b SpriteOAM memes 2024-12-04 02:47:10 -05:00
DizzyEggg
396427cc75 more data 2024-12-03 20:00:39 +01:00
DizzyEggg
cdaa211c58 use f248 for modifiers 2024-12-03 19:19:22 +01:00
DizzyEggg
96f571e629 dungeon battle data work 2024-12-03 15:53:52 +01:00
DizzyEggg
4938100a3f start code_807E5AC 2024-12-03 13:36:12 +01:00
DizzyEggg
a503a5c186 GroundLink_GetArea GroundLink_GetPos 2024-12-03 10:48:59 +01:00
DizzyEggg
ad09542cea move const data to memory.s 2024-12-02 13:16:40 +01:00
DizzyEggg
235a453f1d Fix fatal error func declarations 2024-12-02 12:37:12 +01:00
DizzyEggg
27bd13dd5b clean memory include 2024-12-02 12:25:04 +01:00
DizzyEggg
750bdcf2a5 get rid of unkMemoryStruct 2024-12-02 12:19:15 +01:00
DizzyEggg
4b2f32bfd2 decompile memory.s 2024-12-02 12:00:19 +01:00
DizzyEggg
4aa5a9011a sync agb_flash and io_reg with pokeemerald 2024-12-01 20:47:31 +01:00
Kermalis
0d8af0446c other_menus2.s 2024-11-30 23:51:57 -05:00
Kermalis
1c70293fb8 Match sub_8037810 2024-11-30 21:14:52 -05:00
DizzyEggg
9527a3a38e Put const data in text.c 2024-11-30 16:06:02 +01:00
DizzyEggg
ae1bd9d384 remove text1.h text2.h 2024-11-30 15:15:04 +01:00
DizzyEggg
a2cd66ed50 some ewram vars in text.c 2024-11-30 14:35:27 +01:00
DizzyEggg
d0fb95482c merge text1 text2 2024-11-30 13:59:29 +01:00
Seth Barberee
e311a742c1
Merge pull request #275 from DizzyEggg/sub_807AB38
sub_807AB38
2024-11-29 07:42:02 -08:00
Seth Barberee
4bc6b95082
Merge pull request #276 from DizzyEggg/sub_80A60D8
fix sub_80A60D8 fakematch
2024-11-29 07:32:49 -08:00
DizzyEggg
86c247954e remove GROUND_SCRIPT_INCOMPLETE_DECLARATIONS 2024-11-29 11:11:37 +01:00
DizzyEggg
08c0d6f895 fix sub_80A60D8 fakematch 2024-11-29 10:42:32 +01:00
DizzyEggg
2cdb9ea2e4 sub_807AB38 2024-11-29 09:56:09 +01:00
AnonymousRandomPerson
5e0eed3b94 Merge branch 'master' of https://github.com/pret/pmd-red 2024-11-28 11:54:57 -06:00
Seth Barberee
27a13cca68
Merge pull request #271 from DizzyEggg/m4a_sync
sync m4a.c with pokeemerald
2024-11-28 08:42:19 -08:00
DizzyEggg
b9cd0dddc3 sub_80453AC and sub_804550C 2024-11-28 14:04:20 +01:00
DizzyEggg
60d76caac6 sync m4a with pokeemerald 2024-11-28 11:35:01 +01:00
AnonymousRandomPerson
15342e5f94 Synced some symbol names with Sky 2024-11-27 11:38:06 -06:00
Seth Barberee
33a7303313
Merge pull request #269 from DizzyEggg/sub_80869E4
Some checks are pending
GithubCI / build (push) Waiting to run
Match sub_80869E4 and sub_8002A70 with correct params
2024-11-27 08:51:01 -08:00
Seth Barberee
797ca93bfb address review comments 2024-11-27 08:01:49 -08:00
Seth Barberee
7c82fb42e5 Name BlowAwayTarget 2024-11-27 08:00:26 -08:00
Seth Barberee
aad85e9c0d finish up orb funcs 2024-11-27 08:00:26 -08:00
Seth Barberee
f471b50de6 name more move funcs 2024-11-27 08:00:26 -08:00
Seth Barberee
9d57cc28d1 name more move action funcs 2024-11-27 08:00:26 -08:00
Seth Barberee
b859e1be40 cleanup some includes 2024-11-27 08:00:25 -08:00
DizzyEggg
d0cc8671d0 Match sub_80869E4 and related clean-up 2024-11-27 15:07:17 +01:00
DizzyEggg
c73ff121b1 poisoned typo 2024-11-26 21:26:04 +01:00
DizzyEggg
c3547222ef match sub_8083568 2024-11-26 14:02:23 +01:00
DizzyEggg
414d291d57 sub_806C4D4 2024-11-25 19:59:05 +01:00
DizzyEggg
9d3b787619 sub_806C330 2024-11-25 18:54:12 +01:00
DizzyEggg
15c4f42b33 sub_806BC68 2024-11-25 15:57:21 +01:00
DizzyEggg
87f623136d Fix and unify IQ struct and joinetAt struct 2024-11-25 10:41:19 +01:00
DizzyEggg
f972f7b3be sub_806B404 2024-11-23 21:26:58 +01:00
DizzyEggg
a64495b6b3 sub_806AD3C 2024-11-22 17:12:03 +01:00
DizzyEggg
d4d2d809dd sub_806ABAC 2024-11-22 13:53:30 +01:00
DizzyEggg
1de7c500e9 sub_806A914 2024-11-22 12:00:34 +01:00
DizzyEggg
4c03997749 sub_806A5A4 2024-11-22 10:16:40 +01:00
AnonymousRandomPerson
7bc00c325e
Merge pull request #264 from DizzyEggg/text2_drawchar
Some checks failed
GithubCI / build (push) Has been cancelled
match xxx_draw_char
2024-11-21 21:01:51 -05:00
DizzyEggg
c5d63c6212 match xxx_draw_char 2024-11-21 22:32:10 +01:00
DizzyEggg
12422602e3 merge master 2024-11-21 08:59:33 +01:00
AnonymousRandomPerson
bba5f35836 Add missing comment offsets to Dungeon struct 2024-11-20 18:52:43 -05:00
AnonymousRandomPerson
d53a2666cd Removed unnecessary fill 2024-11-20 18:47:52 -05:00
AnonymousRandomPerson
ab308c9547 Fix typo 2024-11-20 18:43:54 -05:00
AnonymousRandomPerson
fd22062489
Merge pull request #253 from DizzyEggg/code_804AFAC
dungeon_generation.c code_804AFAC.s and code_804FD30.s
2024-11-20 18:38:16 -05:00
DizzyEggg
c4cd78c242 sub_8071DA4 and getbodysize 2024-11-20 11:07:01 +01:00
DizzyEggg
d1107af5a0 match sub_808CE74 and sub_808CFD0 2024-11-19 16:38:27 +01:00
DizzyEggg
4a5fd910aa dungeon generation is finished 2024-11-19 12:39:41 +01:00
DizzyEggg
0843612de4 start sub_8051A74 2024-11-18 21:13:57 +01:00
DizzyEggg
9c461115bb GenerateFloor matched 2024-11-18 17:16:24 +01:00
DizzyEggg
378a00c510 ResetInnerBoundaryTileRows 2024-11-18 15:36:03 +01:00
DizzyEggg
361d20a623 merge with master 2024-11-18 12:00:41 +01:00
DizzyEggg
ad8c36c679 sub_8051438 2024-11-18 11:22:12 +01:00
DizzyEggg
5fcb028d81 some unknown, maybe fixed floors dung generation 2024-11-18 09:27:57 +01:00
Mateon1
a9ff59b103
Clean up related Tile stuff 2024-11-16 19:43:17 +01:00
Mateon1
9ab3ae9aaa
Math refactoring/cleanup 2024-11-16 19:43:17 +01:00
Mateon1
4c8a8f4b30
GetTile -> const Tile* 2024-11-16 19:43:16 +01:00
Mateon1
8ba2124f1e
Rename Positions 2024-11-16 19:42:40 +01:00
Mateon1
f46866840c
Move CompactPos struct to common header 2024-11-16 19:42:19 +01:00
Mateon1
bba6da7537
Convert callers to s24_8, use struct for type safety 2024-11-16 19:42:19 +01:00
Mateon1
1912820813
math cleanup 2024-11-16 19:41:48 +01:00
Mateon1
2e61c49bdf
Rename 8-byte fixpoint 2024-11-16 19:41:48 +01:00
AnonymousRandomPerson
082fb078dc Merge branch 'master' of https://github.com/pret/pmd-red 2024-11-16 12:18:40 -05:00
AnonymousRandomPerson
583b4df544 Rename statuses and activePokemon 2024-11-15 22:43:04 -05:00
Kermalis
04d4fb7878 Fix 32bit reads/writes 2024-11-15 19:21:24 -05:00
Kermalis
d7fbd95975 Update pokemon.h 2024-11-15 16:54:26 -05:00
Kermalis
7506f05cb8 Update code_8097670.h 2024-11-15 16:30:57 -05:00
Kermalis
de1e9dcb08 Clean common strings and personality test 1 2024-11-15 16:13:01 -05:00
DizzyEggg
973838de7a sub_805124C 2024-11-15 15:35:02 +01:00
DizzyEggg
cf71f88356 StairsAlwaysReachable 2024-11-15 13:17:41 +01:00
AnonymousRandomPerson
5f48654c20 Sync some dungeon vars names with Sky 2024-11-15 00:00:57 -05:00
DizzyEggg
799ea6a5c6 GenerateSecondaryTerrainFormations failed attempt 2024-11-14 15:05:08 +01:00
DizzyEggg
cb5242ba6c SpawnNonEnemies 2024-11-12 17:41:53 +01:00
DizzyEggg
a71b26de35 rename unk4 to spawnOrVisibilityFlags 2024-11-12 13:23:47 +01:00
DizzyEggg
102403cd9a decompile dungeon_generation 2024-11-12 12:30:12 +01:00
DizzyEggg
366690ced9 GenerateMonsterHouse 2024-11-11 21:44:55 +01:00
DizzyEggg
445f0a84e2 GenerateKecleonShop 2024-11-11 21:01:00 +01:00
DizzyEggg
ad0f0f4050 SetTerrainObstacleChecked 2024-11-11 17:01:04 +01:00
Kermalis
875e3fefa1 Complete code_80450F8.s 2024-11-11 10:13:58 -05:00
Kermalis
0df055bcc6 Replace EntTrapInfo with Trap 2024-11-10 22:51:33 -05:00
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
fa08c0e691 dungeon_serializer.c 2024-11-10 15:11:07 -05: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
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
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
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
DizzyEggg
419ea066de encoding 2024-11-05 12:00:21 +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
Mateon1
d950923709
Rgb32 back to RGB 2024-11-01 15:32:15 +01:00
Mateon1
021809df3f
Improve comments 2024-11-01 15:26:45 +01:00
Mateon1
97048546c5
pallete -> palette 2024-11-01 15:05:30 +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
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
cc3f1d1096 Match some nonmatchings 2024-10-31 11:52:35 +01:00
DizzyEggg
a39687ba3e merge master 2024-10-30 08:57:22 +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
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
Mateon1
4ca729fce0
More animation stuff 2024-10-28 23:41:24 +01:00
Mateon1
53154c0797
axPokemon fields 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
c85a9947c4 dungeon_cutscene cleanup 2024-10-26 21:09:23 -07:00
Seth Barberee
30100cb8da decomp ZapdosPreFightDialogue 2024-10-26 19:10:28 -07:00
DizzyEggg
83df45a81a r0 to pokemon 2024-10-26 19:50:48 +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
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
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
96db7fa27b clean dungeon message externs 2024-10-22 12:52:48 +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
e69cf646c8 sub_80532B4 2024-10-21 12:14:32 +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
8302d3be66 Update exp multiplier comment 2024-10-20 22:15:03 +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
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
18a14e2e4a exp multiplier inline 2024-10-17 11:14:09 +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
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
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