Commit Graph

1186 Commits

Author SHA1 Message Date
Kermalis
6e102abc92 Merge branch 'master' into stuff 2025-03-10 00:26:55 -04:00
Kermalis
35a53e5a0a main_loops.c 2025-03-09 23:55:49 -04:00
Kermalis
0108e666d8 const void* data 2025-03-09 16:29:02 -04:00
Kermalis
1e2ed281eb Clean 1 2025-03-09 14:41:42 -04:00
DizzyEggg
d8c733b17d merge with master 2025-03-09 18:27:35 +01:00
Seth Barberee
f76a61bae9
Merge pull request #353 from DizzyEggg/code_8040094
code_8040094.s (unknown move file + dungeon_map.c)
2025-03-09 09:46:31 -07:00
DizzyEggg
b0c055b7fa sub_803E250 2025-03-09 15:12:05 +01:00
DizzyEggg
4734201c6d dungeon map documentation done 2025-03-07 14:35:34 +01:00
DizzyEggg
ce798ff03e dungeon map documentation 2025-03-07 10:25:51 +01:00
DizzyEggg
7dd904a428 document some dungeon map 2025-03-07 00:26:17 +01:00
DizzyEggg
bfbcea5f9f split dungeon map file 2025-03-06 23:33:39 +01:00
DizzyEggg
59ac6518b6 sub_8040894 2025-03-06 17:13:38 +01:00
DizzyEggg
8686fa4c73 sub_80402AC and game version defines 2025-03-06 13:12:11 +01:00
DizzyEggg
7e2702c699 sub_8040150 2025-03-05 19:05:37 +01:00
DizzyEggg
d75dd097e0 code_805D8C8 esta muerto 2025-03-05 09:03:32 +01:00
DizzyEggg
aa4cbaef15 dungeon menu others done 2025-03-04 16:16:19 +01:00
DizzyEggg
5a972144b9 more dungeon menu others 2025-03-04 14:23:57 +01:00
DizzyEggg
9c2e1b2aa4 menu dung documentation 2025-03-04 13:38:19 +01:00
DizzyEggg
34f4d6f7a7 More others menu 2025-03-04 10:06:14 +01:00
DizzyEggg
9cb12a8258 start others menu 2025-03-03 22:05:09 +01:00
DizzyEggg
2d0e962d9e dungeon menu stairs 2025-03-03 20:42:35 +01:00
DizzyEggg
7a865991b1 dungeon menu tile done 2025-03-03 18:52:19 +01:00
DizzyEggg
e670716324 dungeon menu moves done 2025-03-03 14:46:42 +01:00
Fex Collects
4ef2fb4a44 Small variable documentation update 2025-03-03 04:47:02 +00:00
DizzyEggg
631c9c3485 sub_8063C88 2025-03-02 17:46:34 +01:00
DizzyEggg
341fc1cc94 document WindowHeader struct 2025-03-02 16:12:50 +01:00
DizzyEggg
6cc3f98aaf Use Window and WindowTemplate 2025-03-02 15:24:33 +01:00
DizzyEggg
c018798262 sub_8063834 2025-03-02 14:29:22 +01:00
DizzyEggg
49b2c1911b more menus 2025-03-02 13:33:28 +01:00
DizzyEggg
abbf389ffd more menus 2025-03-02 12:34:10 +01:00
DizzyEggg
0f62647e51 more dung menus 2025-03-02 11:42:12 +01:00
DizzyEggg
5916b9cd40 morea clean-up dung menus 2025-03-02 11:03:19 +01:00
DizzyEggg
f3cda6d2f4 more dungeon menu file splits 2025-03-02 00:28:16 +01:00
DizzyEggg
ee1abc1836 file splits 2025-03-01 23:49:41 +01:00
DizzyEggg
7ad89f101d start splitting dungeon menu files 2025-03-01 20:31:56 +01:00
DizzyEggg
ad52ac1b72 documentation dungeon menu 2025-03-01 17:24:31 +01:00
DizzyEggg
05a1d0aec8 Get rid of the fakematch in the Windows struct 2025-02-28 21:56:14 +01:00
DizzyEggg
ee9401e833 sub_8062748 2025-02-28 20:20:00 +01:00
Seth Barberee
2e7ba57cc4
Merge pull request #348 from DizzyEggg/monster_archieve
Some checks failed
GithubCI / build (push) Has been cancelled
Move main gMonsterFileArchive array to C
2025-02-27 12:30:08 -08:00
DizzyEggg
4b944408f0 Put gMonsterFileArchive in file system header 2025-02-27 15:53:27 +01:00
DizzyEggg
5571afa937 Merge branch 'master' into monster_archieve 2025-02-27 15:44:25 +01:00
DizzyEggg
94918e8dc3 move some data to code_803E724 2025-02-27 15:26:47 +01:00
DizzyEggg
fee9f2f208 Match sub_803EF90, introduce WINDOW_DUMMY macro 2025-02-27 15:21:08 +01:00
DizzyEggg
1019d61512 Fix fakematch in sub_808F468 2025-02-26 18:40:06 +01:00
Seth Barberee
8b7253c315
Merge pull request #343 from DizzyEggg/sub_807F43C
Match sub_807F43C and introduce a macro for X/Y conversion to PixelPos
2025-02-26 07:58:10 -08:00
DizzyEggg
9d723ee37c Make pos->pixelPos conversion more readable 2025-02-26 15:09:10 +01:00
DizzyEggg
1d6e876997 merge and review comments 2025-02-26 09:53:49 +01:00
Seth Barberee
b641525d63
Merge pull request #341 from DizzyEggg/gUnknown_3000E94
Some checks are pending
GithubCI / build (push) Waiting to run
Move some EWRAM/IWRAM variables to their respective C files
2025-02-25 14:51:19 -08:00
DizzyEggg
e47260c871 Match CreatePokemonInfoTabScreen 2025-02-25 22:54:57 +01:00
Seth Barberee
a7d4629e6f
Merge pull request #340 from DizzyEggg/sub_803DF60
Some checks are pending
GithubCI / build (push) Waiting to run
Match sub_803DF60 and sub_803E02C
2025-02-25 07:34:37 -08:00
DizzyEggg
fd127911d0 Match sub_803DF60 and sub_803E02C 2025-02-25 14:29:43 +01:00
DizzyEggg
5518ecb8ab Match sub_8023758 and sub_80237E0 2025-02-25 11:19:28 +01:00
DizzyEggg
37e5bd599d Move gFontPalette to EWRAM 2025-02-25 10:55:07 +01:00
Seth Barberee
aaaa562452
Merge pull request #337 from DizzyEggg/patch-5
Remove NAKED define from globalh.
2025-02-24 12:56:44 -08:00
DizzyEggg
4330d57165
Remove NAKED define from globalh. 2025-02-24 21:37:16 +01:00
DizzyEggg
793e31ca7c Match sub_803D4D0 and sub_8091E94 2025-02-24 17:30:19 +01:00
DizzyEggg
bca598f131 friend areas map final touches 2025-02-24 11:33:29 +01:00
DizzyEggg
040c4a486e more documentation 2025-02-24 11:20:40 +01:00
DizzyEggg
f184a6750d more documentation of friend areas map 2025-02-23 23:26:54 +01:00
DizzyEggg
31fc24a433 documenting friend area maps 2025-02-23 22:26:26 +01:00
DizzyEggg
9d605e7d06 documenting 2025-02-23 20:59:06 +01:00
DizzyEggg
b4cdd4b10e start documenting windows 2025-02-23 15:45:00 +01:00
DizzyEggg
00f3dbfccc decompile code_800F990 2025-02-23 12:48:06 +01:00
DizzyEggg
aef4bcf76f code_8010F28 clean-up 2025-02-21 11:01:54 +01:00
DizzyEggg
13b49a48eb Merge branch 'master' of https://github.com/pret/pmd-red into code_8010F28 2025-02-21 09:11:13 +01:00
AnonymousRandomPerson
feff193221
Merge pull request #333 from DizzyEggg/dungeon_names
Some checks failed
GithubCI / build (push) Has been cancelled
Rename xxx_dungeon_8042F6C to RunDungeon
2025-02-20 20:33:04 -05:00
DizzyEggg
15ac8eb00d sub_8011300 2025-02-21 00:34:47 +01:00
DizzyEggg
d3e14d4767 sub_8010F28 2025-02-20 15:45:11 +01:00
DizzyEggg
500b486b33 Rename xxx_dungeon_8042F6C to RunDungeon 2025-02-20 12:44:18 +01:00
DizzyEggg
f65e3d61ff Move gMonsterArchieve to C 2025-02-19 22:57:18 +01:00
DizzyEggg
45e7e74240 Get rid of UnkTextStruct2_sub 2025-02-19 10:21:23 +01:00
DizzyEggg
abf677b928 unify unktextstruct2[4] into unktextstruct3 2025-02-19 09:59:57 +01:00
DizzyEggg
d47faa5e21 const/ewram data to code_8066D04 2025-02-18 22:43:59 +01:00
DizzyEggg
afb9fbeaf8 sub_8067A80 2025-02-18 14:39:43 +01:00
DizzyEggg
1ce273c082 sub_8067768 2025-02-17 18:46:52 +01:00
Seth Barberee
aef98f539a
Merge pull request #322 from DizzyEggg/dungeon2
Some checks are pending
GithubCI / build (push) Waiting to run
dungeon2.s - sub_809034C
2025-02-16 09:30:25 -08:00
DizzyEggg
4dff9fada9 dungeon - sub_809034C 2025-02-16 15:47:16 +01:00
DizzyEggg
b9eea73121 Merge branch 'master' of https://github.com/pret/pmd-red into code_8015080 2025-02-16 10:13:49 +01:00
DizzyEggg
22349c5b9a move code_8015080 data to c 2025-02-16 10:07:25 +01:00
AnonymousRandomPerson
9f3e4b9c8d
Merge pull request #319 from DizzyEggg/code_809A560
Some checks are pending
GithubCI / build (push) Waiting to run
code_809A560.s
2025-02-15 11:21:09 -05:00
DizzyEggg
2e5fce662a sub_80155F0 2025-02-15 14:28:00 +01:00
DizzyEggg
176de96f3c decompile event_flag 2025-02-14 21:24:51 +01:00
DizzyEggg
0849ab32f4 data moved to code_809A560 2025-02-14 14:34:58 +01:00
DizzyEggg
0e1a2f021d more data code_809A560 2025-02-14 12:47:35 +01:00
DizzyEggg
bdc60be5c8 sub_809B648 2025-02-14 11:03:35 +01:00
DizzyEggg
6e68321507 sub_809B474 2025-02-13 09:31:49 +01:00
DizzyEggg
f2da3f2acc IsTextboxOpen_809B40C 2025-02-12 15:58:39 +01:00
DizzyEggg
061cee7a8e sub_809B028 2025-02-12 14:48:57 +01:00
DizzyEggg
48a8b10c66 sub_809AFFC 2025-02-12 13:03:18 +01:00
DizzyEggg
6050bcf13b sub_809ADD8 2025-02-12 12:26:43 +01:00
Seth Barberee
e34ec1b862 decomp few more funcs 2025-02-09 10:48:33 -08:00
Seth Barberee
782bca6cf3 more decomp 2025-02-08 16:53:52 -08:00
Seth Barberee
151821a077 decomp a few more funcs 2025-02-07 17:37:53 -08:00
Seth Barberee
29df447bad small cleanup based on WIP func 2025-02-06 22:36:43 -08:00
Seth Barberee
92894a678e 80% pog 2025-02-06 22:18:46 -08:00
Seth Barberee
d79f2ab2f1 random passerby match of sub_8042520 2025-02-06 08:10:52 -08:00
Seth Barberee
246644cd65 Add funcs matched by @Kermalis 2025-02-06 08:10:52 -08:00
Seth Barberee
076860a27a match sub_80990EC thanks to @DizzyEggg 2025-02-06 08:10:52 -08:00
Seth Barberee
4626355378 split and move more data to src 2025-02-06 08:10:51 -08:00
Seth Barberee
34e5bfadf6 more decomp of effect funcs 2025-02-06 08:10:51 -08:00
Seth Barberee
4eb269b480 document a little and decomp more funcs 2025-02-06 08:10:51 -08:00
Seth Barberee
754f5b7e85 more status sprite func decomp 2025-02-06 08:10:51 -08:00
Seth Barberee
46dbaf66af decomp more status graphics func 2025-02-06 08:10:51 -08:00
Seth Barberee
d0a0285f75 match sub_800F7D0 thanks to @DizzyEggg 2025-02-06 08:10:51 -08:00
Seth Barberee
bbfe80ea0c decomp another file 2025-02-06 08:10:51 -08:00
Seth Barberee
0f67614ae8 finish up code_8002774_2 2025-02-06 08:10:51 -08:00
AnonymousRandomPerson
0979edd00e Renamed GetMoveName to BufferMoveName 2025-02-03 20:44:02 -06:00
AnonymousRandomPerson
d3e522681b Document some death text symbols
Based on TheZZAZZGlitch's video.
2025-02-03 20:44:02 -06:00
AnonymousRandomPerson
1ec6bc5e21 Renamed GetItemAIFlag to match pmdsky-debug 2024-12-28 23:57:20 -06:00
AnonymousRandomPerson
560560bbe7 Documented GetItemAIFlag param 2024-12-28 23:55:27 -06:00
AnonymousRandomPerson
39dff3a9ec Renamed ActionParameter.lastItemThrowPosition 2024-12-28 23:15:35 -06:00
AnonymousRandomPerson
299177c47a Renamed EntityExists to EntityIsValid 2024-12-28 22:11:54 -06:00
AnonymousRandomPerson
1bbebecafc Documented ActionParameter struct 2024-12-28 22:11:26 -06:00
DizzyEggg
d44fcd3987 Match RedrawPartnerSelectionMenu 2024-12-24 10:17:51 +01:00
Seth Barberee
ac32ebdef7
Merge pull request #308 from DizzyEggg/sprite_oams
Some checks are pending
GithubCI / build (push) Waiting to run
2024-12-23 09:45:47 -08:00
DizzyEggg
a9889e1977 match sub_8036B28 2024-12-23 10:45:47 +01:00
DizzyEggg
6441fae27a add getters for sprite x,y,unk6_1 and tilenum 2024-12-23 09:37:55 +01:00
DizzyEggg
220779d721 Match AddAxSprite 2024-12-22 13:42:39 +01:00
DizzyEggg
fe3577f516 TryCreateModeArrows matched 2024-12-22 11:08:28 +01:00
DizzyEggg
a32c559336 more sprite oam clean-up 2024-12-22 10:23:15 +01:00
DizzyEggg
5a18f5af52 Sprite OAM clean-up 2024-12-21 15:53:40 +01:00
Seth Barberee
3bed5dacd3
Merge pull request #307 from DizzyEggg/mon_flags
Some checks failed
GithubCI / build (push) Has been cancelled
Make pokemon flag static inlines more readable
2024-12-20 08:22:42 -08:00
DizzyEggg
4fe9f5d061 Fix pokemon flag static inlines 2024-12-20 15:17:39 +01:00
DizzyEggg
5c3981ec93 decompile code_8272724 iwram text functions 2024-12-20 11:28:05 +01:00
DizzyEggg
09211e1974 Match GetUnitSum_808D544 sub_808E400 2024-12-19 12:35:23 +01:00
DizzyEggg
bdae856769 iwram init done 2024-12-18 12:09:22 +01:00
DizzyEggg
0c53d4011f start iwram init 2024-12-18 11:28:07 +01:00
DizzyEggg
5865a607d8 ewram init merge master 2024-12-17 15:57:28 +01:00
Seth Barberee
47339753e1
Merge pull request #286 from SethBarberee/dec_2024
Some checks are pending
GithubCI / build (push) Waiting to run
Pokemon.s
2024-12-16 17:13:03 -08:00
DizzyEggg
62ca91f771 Match sub_801F280 2024-12-16 10:38:11 +01:00
Seth Barberee
0776e271cc more code_2 work 2024-12-15 13:13:17 -08:00
Seth Barberee
cd2c46d027 finish off pokemon_3.s thanks to @DizzyEggg 2024-12-15 13:13:17 -08:00
Seth Barberee
fb98bb9ec1 decompile more of code_2 and move some data 2024-12-15 13:13:17 -08:00
Seth Barberee
c7248641ee decomp sub_808F798 2024-12-15 13:13:17 -08:00
Seth Barberee
fd1e3ad981 clean up include and add ewram for pokemon.c 2024-12-15 13:13:17 -08:00
Seth Barberee
456dfec6b0 move some data over and nonmatch GetUnitSum 2024-12-15 13:13:17 -08:00
Seth Barberee
ba3f4714b1 Decomp more of pokemon.s 2024-12-15 13:13:17 -08:00
DizzyEggg
edd2454349 remove EWRAM_DATA_2 2024-12-15 21:12:36 +01:00
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