Commit Graph

1419 Commits

Author SHA1 Message Date
pikalaxalt
765f06b1a6
Merge remote-tracking branch 'origin/master' into scrcmd_11 2023-12-10 20:00:55 -05:00
PikalaxALT
fdbb0d450f
Merge branch 'master' into mystery_gift 2023-12-09 19:14:41 -05:00
AtSign
c8f2b5eb91 Decomped unk_02018380 2023-12-08 17:13:55 -08:00
tgsm
9b1f9354b4 certificates_app: Address review comments 2023-12-07 22:29:48 -06:00
PikalaxALT
8471fad7f1
Propagate some GetEgg documentation 2023-12-07 02:13:08 -05:00
pikalaxalt
d94cd98173
Finish scrcmd_11.c, rename to scrcmd_mystery_gift.c 2023-12-09 17:12:29 -05:00
PikalaxALT
adc8cef1b1
through MGMessageSuccess_ManaphyEgg 2023-12-07 01:48:36 -05:00
PikalaxALT
8599650126
scrcmd_11.c through ScrCmd_MysteryGift 2023-12-07 00:39:32 -05:00
PikalaxALT
6bd2b0a7df
capitalize MG_TAG_* defines 2023-12-06 22:45:59 -05:00
PikalaxALT
ac98817004
Update fn names; document public routines 2023-12-06 21:08:07 -05:00
PikalaxALT
2ffd8f2a1b
Rename mystery_gift.c functions 2023-12-06 20:19:46 -05:00
PikalaxALT
f8c138d321
Finish mystery_gift.c 2023-12-06 20:08:53 -05:00
PikalaxALT
ec1f0aa45a
Through sub_0202DC2C 2023-12-01 19:06:03 -05:00
red031000
88401e59ae
start cleaning up blackout.c 2023-11-30 04:52:49 +00:00
tgsm
cecbf74501 flags: Name flags 0x143, 0x144, 0x161 2023-11-28 15:00:19 -06:00
tgsm
704a80bb95 Decompile most of overlay 78 (certificates app) 2023-11-28 15:00:19 -06:00
tgsm
c75faae5fd heap: Add a heap ID for the certificates app 2023-11-28 15:00:19 -06:00
tgsm
ccab6eda04 Name ScrCmd_425 and sub_0203FA8C 2023-11-28 15:00:19 -06:00
Adrienn Tindall
a1b964d44e ov10_0221BEF4 2023-11-28 13:39:14 -05:00
Adrienn Tindall
2951dc81b2 UnkBtlCtxSub_76 -> TrainerAIData 2023-11-28 13:18:15 -05:00
Adrienn Tindall
564374a762 Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-11-28 12:57:29 -05:00
Adrienn Tindall
e0794d586f Start work on trainer ai decomp (overlay 10) 2023-11-28 12:57:28 -05:00
Adrienn Tindall
a07a825cf3
Merge branch 'master' into master 2023-11-28 09:44:01 -05:00
Adrienn Tindall
b4d5132fc3 Merge remote-tracking branch 'upstream/master' 2023-11-27 20:59:41 -05:00
Adrienn Tindall
fa7714c0da Indentation and stuff 2023-11-20 22:47:12 -06:00
cbt6
36fed81cfb Decompile scrcmd_9 2023-11-18 10:35:35 +08:00
Adrienn Tindall
881ba91f8e Decompile battle_02261FD4 2023-11-16 14:15:44 -05:00
Akira Akashi
ecc014ba66
Merge branch 'master' into master 2023-11-16 14:41:37 +00:00
Akira Akashi
fdb788ec86
Merge branch 'master' into master 2023-11-16 13:59:01 +00:00
Adrienn Tindall
31c2acf86f Merge remote-tracking branch 'upstream/master' 2023-11-16 08:53:12 -05:00
Akira Akashi
410543eaf4
Merge branch 'master' into master 2023-11-16 04:40:17 +00:00
tgsm
c82778962b Decompile overlay 30 (saving app on touch screen) 2023-11-12 02:51:56 -06:00
tgsm
a4efb4782b Fix various function declarations 2023-11-08 17:52:09 -06:00
tgsm
3c607e68a6 gx_layers: Replace "layers" with "planes", use GfGfx prefix
This also renames `gx_layers` to `gf_gfx_planes`.
2023-11-08 15:24:53 -06:00
red031000
db3ba72ee8
event_data -> save_vars_flags 2023-11-07 16:11:30 +00:00
Adrienn Tindall
0a2e8810a8
Merge branch 'master' into master 2023-11-03 15:10:37 -04:00
Adrienn Tindall
3d56715df7 Port exp function from plat
Co-Authored-By: Rachel <lhearachel@proton.me>
2023-11-03 15:05:52 -04:00
tgsm
40b2844896 Use planemask constants where applicable 2023-10-29 23:00:34 -05:00
Akira Akashi
48f4ce315e
Merge branch 'master' into systask-with-env 2023-10-23 20:23:49 +01:00
cbt6
726696a2f9 Use BattleBg and Terrain enum types 2023-10-23 20:31:37 +08:00
cbt6
28645caf88 Document battle background and terrain 2023-10-21 23:00:27 +08:00
tgsm
a891862aca Decompile unk_02007200 -> systask_environment 2023-10-18 12:53:25 -05:00
cbt6
26dff435e5
Merge branch 'master' into overlay_25 2023-10-19 01:19:01 +08:00
Adrienn Tindall
453be7ae90 Add GX Plane Mask constants 2023-10-18 13:13:32 -04:00
Adrienn Tindall
ad21c6be30 Address review + document alph puzzle strings 2023-10-18 11:02:34 -04:00
cbt6
69c3133abe Use character constants 2023-10-18 22:35:29 +08:00
cbt6
d073e63932 Address review comments 2023-10-18 07:13:45 +08:00
cbt6
b5e78fc855 Add header file 2023-10-17 10:22:36 +08:00
cbt6
9dac4034a5 Decompile overlay_25 2023-10-17 10:00:03 +08:00
Adrienn Tindall
6b4675b3de Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-10-16 21:31:51 -04:00
Adrienn Tindall
2e9fd85518 Fix build errors 2023-10-16 21:31:49 -04:00
Adrienn Tindall
8f9a4bc67d
Update include/unk_02004A44.h
Co-authored-by: Thomas <doodrabbit@hotmail.com>
2023-10-13 14:07:16 -05:00
Adrienn Tindall
99f548a4c2 Battle Setup terrain documentation 2023-10-12 18:16:49 -04:00
Adrienn Tindall
345421952e Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-10-12 16:44:07 -04:00
Adrienn Tindall
7db4002cc6 lil bit of battle code 2023-10-12 16:44:01 -04:00
Adrienn Tindall
564885303a
Merge branch 'master' into master 2023-10-12 11:20:45 -05:00
Adrienn Tindall
52d46501be Cleanup 2023-10-12 08:26:53 -04:00
Adrienn Tindall
5e504f9f14 Fix OPTIONS error 2023-10-12 07:05:06 -04:00
Adrienn Tindall
4b5b18cdbb
Merge branch 'master' into master 2023-10-12 06:02:32 -05:00
Adrienn Tindall
b96b821a6f Finish up function decomp 2023-10-12 05:55:54 -04:00
tgsm
c61cba7602 berry_pots_app: Address review comments 2023-10-11 14:45:17 -05:00
Adrienn Tindall
41e65fc8ee Fixed checksum errors 2023-10-11 04:40:04 -04:00
Adrienn Tindall
479139ef82 Pinpointing checksum 2 2023-10-11 03:47:07 -04:00
Adrienn Tindall
d9febdd154 Shasum checkpoint
Having checksum issues with the next few functions and can't pinpoint it yet
2023-10-11 03:39:38 -04:00
tgsm
cbbee56dfd unk_0200CF18: Make two parameters const for a function
Gets rid of a couple of ugly casts in the Berry Pots app.
2023-10-10 23:51:17 -05:00
tgsm
a864a3fc55 game_stats: Add constants for stats 0 and 5 2023-10-10 23:51:17 -05:00
tgsm
07807855e1 berry_pots_app: Clean up, document some things 2023-10-10 23:51:17 -05:00
tgsm
e64c533cbd text: Fix AddTextPrinterParameterized2 declaration 2023-10-10 23:51:17 -05:00
tgsm
b4050e2a5d overlay 16: Fix ov16_022017FC declaration 2023-10-10 23:51:17 -05:00
tgsm
f5e26c409c Start decompiling overlay 17 2023-10-10 23:51:17 -05:00
cbt6
0e342f83b3 Name script command function 2023-10-09 22:41:58 +08:00
cbt6
4d6eca0c37 Merge remote-tracking branch 'pret/master' into unk_0206D494 2023-10-09 22:09:23 +08:00
cbt6
3c83fe7713 Address review comments 2023-10-09 22:07:49 +08:00
cbt6
f0fc5863a6 Make constants for npc trades 2023-10-09 22:06:14 +08:00
cbt6
190b8795b3 Typedef gymmick type 2023-10-09 22:04:54 +08:00
Adrienn Tindall
422d91257e up to ov110_021E6904 2023-10-08 20:33:05 -04:00
Adrienn Tindall
2369ee5d82
Merge branch 'master' into unk_0208E600 2023-10-08 09:04:50 -05:00
cbt6
247f272399 Decompile unk_0206D494 2023-10-05 23:31:57 +08:00
Adrienn Tindall
7cbb805018 Fix merge errors 2023-10-05 11:21:29 -04:00
Adrienn Tindall
5eca720d48 Merge remote-tracking branch 'upstream/master' 2023-10-05 10:44:37 -04:00
red031000
689be3b6b0
cleanup error handling 2023-10-05 00:52:18 +01:00
abaresk
6001b30a6b Merge branch 'master' into unk_0208E600 2023-10-02 16:44:47 +00:00
abaresk
8c62fb7421 Apply more changes 2023-10-02 16:43:12 +00:00
abaresk
3525555285 Apply changes 2023-10-02 16:31:13 +00:00
cbt6
328ae88e38
Merge branch 'master' into move-names 2023-10-01 10:22:54 +08:00
Adrienn Tindall
e97c7db482
Merge branch 'master' into farfetchd-puzzle 2023-09-30 14:11:29 -05:00
Adrienn Tindall
f7beb045b4
Merge branch 'master' into farfetchd-puzzle 2023-09-30 13:32:20 -05:00
Adrienn Tindall
135d719def
Merge branch 'master' into unk_0200CF18 2023-09-30 13:30:37 -05:00
abaresk
1086f3ee4c Minor changes 2023-09-29 14:50:59 +00:00
abaresk
054c46a513 Decompile trainer_memo.c 2023-09-29 04:43:51 +00:00
cbt6
c4ba7955f2 Fix moves using names from other generations 2023-09-27 03:12:23 +08:00
Adrienn Tindall
ef830ff24c
cleanup encounter.c
Up to Battle Random functions

start cleaning up encounter.c

fix build

fix build again

remove two files from bad rebase

switch fully to battle type constants

rename TRAINER to Trainer

few more funcs

finish cleanup

address some review comments

de-capitalise std_script
2023-09-23 14:48:45 +01:00
abaresk
375fdcdf53 Document Farfetch'd puzzle 2023-09-21 01:17:32 +00:00
PikalaxALT
3493070eb5
Merge remote-tracking branch 'origin/master' into unk_0200CF18 2023-09-17 18:36:10 -04:00
red031000
6b4322a8c1
#208 split PR 4, rename some misc funcs 2023-09-12 03:48:29 +01:00
PikalaxALT
c7579167fa
more renaming; dump a/1/7/5 1st pass 2023-09-08 21:03:13 -04:00
PikalaxALT
427947688a
Renaming stuff in unk_0200CF18.c, 4 2023-09-03 21:42:26 -04:00
PikalaxALT
649836dca6
Renaming stuff in unk_0200CF18.c, 3 2023-09-03 16:57:28 -04:00
PikalaxALT
5302212ee6
Renaming stuff in unk_0200CF18, 2 2023-09-02 12:43:21 -04:00
PikalaxALT
e80bfc3f84
Renaming stuff in unk_0200CF18, 1 2023-09-01 21:04:02 -04:00
PikalaxALT
ae2ed7963b
Finish unk_0200CF18.s decomp phase 2023-09-01 17:50:27 -04:00
PikalaxALT
b4287088ed
Through sub_0200E1E8 2023-08-31 21:19:02 -04:00
PikalaxALT
c6ad9c520d
through sub_0200E11C 2023-08-31 21:09:56 -04:00
PikalaxALT
99f3138a7f
Through sub_0200DD7C 2023-08-31 19:36:22 -04:00
PikalaxALT
1d096a3a29
through sub_0200DD10 2023-08-31 17:53:11 -04:00
PikalaxALT
14a87e8dcd
Merge branch 'master' of github.com:pret/pokeheartgold into unk_0200CF18 2023-08-31 07:07:40 -04:00
PikalaxALT
e0cc79dedb
through sub_0200DC40 2023-08-30 20:50:28 -04:00
abaresk
2cf8dce85a Use typedefs 2023-08-30 16:12:28 +00:00
abaresk
3a3511e130 Merge branch 'master' into gymmick-init 2023-08-30 05:05:38 +00:00
abaresk
623590c1c0 Decompile gymmick_init.c 2023-08-30 04:59:30 +00:00
PikalaxALT
acc4b1b103
through sub_0200DBB8 2023-08-29 21:10:06 -04:00
PikalaxALT
39d80d77d7
through sub_0200D748 2023-08-29 18:12:23 -04:00
Adrienn Tindall
d71da395be Fix conflicts 2023-08-29 11:54:02 -04:00
PikalaxALT
ad6fbb130c
through sub_0200D71C 2023-08-28 19:45:35 -04:00
PikalaxALT
255f47043f
sub_0200D2B4, sub_0200D2F0 2023-08-27 20:49:10 -04:00
PikalaxALT
fa1781984f
through sub_0200D124 2023-08-27 19:42:36 -04:00
Adrienn Tindall
96c1096bfc
Merge branch 'master' into master 2023-08-27 18:26:56 -05:00
PikalaxALT
ff2ef2b32e
Through sub_0200D0E4 2023-08-27 19:09:44 -04:00
PikalaxALT
35843a861b through sub_0200D044 2023-08-27 16:46:18 -04:00
PikalaxALT
6bf63fb4ce through sub_0200CF70 2023-08-27 16:15:29 -04:00
PikalaxALT
a77c74f9b4 Rename structs; decompile sub_0200CF18 2023-08-27 15:19:30 -04:00
PikalaxALT
84e0068c98 Unpack voltorb_flip.narc 2023-08-27 14:38:44 -04:00
Adrienn Tindall
0027f960a0
Merge branch 'master' into master 2023-08-27 13:13:59 -05:00
Adrienn Tindall
258bbe12c3 Some narc loading/unloading functions 2023-08-27 05:34:43 -04:00
PikalaxALT
0ed1e7c200 Fix pointer style conflict in BattleSetup::party 2023-08-25 20:08:45 -04:00
PikalaxALT
70f7a8b9e5 Remove decomp comments; add BATTLER_MAX define 2023-08-25 18:10:16 -04:00
PikalaxALT
291f117683
Merge branch 'battle_setup' of github.com:PikalaxALT/pokeheartgold into battle_setup 2023-08-25 16:43:01 -04:00
PikalaxALT
f85e12fbc0
Name battle setup scrcmds; dump a/0/8/4
New name: application/record/record.narc
2023-08-25 16:30:45 -04:00
Adrienn Tindall
d81c4e1d19
Merge branch 'master' into battle_setup 2023-08-25 15:13:37 -05:00
PikalaxALT
8d7a6720da
Merge remote-tracking branch 'origin/master' into battle_setup 2023-08-25 07:01:08 -04:00
Adrienn Tindall
5e5e1774d3
Merge branch 'master' into goldenrod-tunnel 2023-08-24 14:20:43 -05:00
red031000
7cb5e90e26
Save_PCStorage_Get -> SaveArray_PCStorage_Get 2023-08-24 19:47:37 +01:00
abaresk
1622cb5f2a Document Goldenrod tunnel switch puzzle 2023-08-24 06:27:13 +00:00
Adrienn Tindall
7aaee19910
Merge branch 'master' into master 2023-08-23 19:53:50 -05:00
PikalaxALT
4ced3fca96
Qualify static methods in battle_setup.c 2023-08-23 20:33:11 -04:00
PikalaxALT
326bb6241d
Finish decomp of battle_setup, move to src/battle/ 2023-08-23 20:21:18 -04:00
PikalaxALT
12838c4121
through sub_02052574 2023-08-23 20:10:58 -04:00
PikalaxALT
5bfb4ba26a
through sub_0205230C 2023-08-23 18:44:47 -04:00
PikalaxALT
1645f2d0a9
sub_020520B0 2023-08-23 17:52:45 -04:00
Adrienn Tindall
222a6d864f Some struct documentation 2023-08-23 15:38:55 -04:00
PikalaxALT
b98ac3b797
through sub_02051F2C -> BattleSetup_InitForFixedLevelFacility 2023-08-22 20:39:40 -04:00
PikalaxALT
cb452519cf
Merge remote-tracking branch 'origin/master' into battle_setup 2023-08-22 19:33:40 -04:00
Adrienn Tindall
e3399023be More function decomp
Credits to @luckytyphlosion for assisting in ov110_021E5D90 matching

Co-Authored-By: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
2023-08-22 19:26:42 -04:00
red031000
ee2ad104a7
rename savedata to saveData 2023-08-22 17:56:55 +01:00
red031000
d9ec904872
address review 2023-08-22 09:15:09 +01:00
red031000
a3916ec46d
fix an accidental replacement with the last PR 2023-08-22 09:12:08 +01:00
red031000
e36deb2333
fsys to fieldSystem 2023-08-22 09:11:59 +01:00
Adrienn Tindall
b19121fff3 OPTIONS -> Options 2023-08-22 04:11:56 -04:00
Adrienn Tindall
66b7574ecb Through ov110_021E5C60
credit to @cbt6 for helping match ov110_021E5C60

Co-Authored-By: cbt6 <91667135+cbt6@users.noreply.github.com>
2023-08-22 03:59:51 -04:00
tgsm
d045d2b396 overlay 16: Use constants where known to be applicable 2023-08-21 23:28:13 -05:00
tgsm
7d68071dd1 BERRY_POT -> BerryPot 2023-08-21 23:28:13 -05:00
tgsm
ddfca82ac7 CreateBerryPotsArgs -> BerryPotsArgs_New 2023-08-21 23:28:13 -05:00
tgsm
7980b66660 heap: HEAP_ID_OV16 -> HEAP_ID_BERRY_POTS 2023-08-21 23:28:13 -05:00
tgsm
189a90da93 overlay 16: Cleanup, some documentation
Source: Bulbapedia
2023-08-21 23:28:13 -05:00
tgsm
dab5786396 Decompile most of overlay_16_022014A0 2023-08-21 23:28:13 -05:00
tgsm
cbfb0fc306 Decompile overlay_16_02201948 2023-08-21 23:28:13 -05:00
tgsm
c5fe072b31 heap: Add heap ID for overlay 16 2023-08-21 23:28:13 -05:00
tgsm
1c65521a66 unk_0203E348: Fill out BerryPotsArgs struct 2023-08-21 23:28:13 -05:00
Adrienn Tindall
45249f9ab8 Fix heap ID typing issues 2023-08-21 23:51:13 -04:00
PikalaxALT
9a38c48b1e
sub_02051D18 2023-08-21 20:38:51 -04:00
PikalaxALT
71e811d5ef
Merge remote-tracking branch 'origin/master' into battle_setup 2023-08-21 19:56:56 -04:00
PikalaxALT
942073fd6a
Merge branch 'master' into bugfix/no_include_gmm_in_headers 2023-08-21 19:21:42 -04:00
PikalaxALT
0cb34a78d7
Don't include msg.naix in headers 2023-08-21 19:11:30 -04:00
PikalaxALT
93e7765365
Merge remote-tracking branch 'origin/master' into battle_setup 2023-08-20 19:26:20 -04:00
PikalaxALT
a39afb0185
through BattleSetup_SetChatotVoiceClip 2023-08-20 16:56:37 -04:00
Adrienn Tindall
b5964fb7ff Added redquested changes 2023-08-20 13:48:58 -04:00
Adrienn Tindall
82c7c28334 Finish fixing conflicts 2023-08-20 11:44:32 -04:00
Adrienn Tindall
d5729523f3 Merge remote-tracking branch 'upstream/master' 2023-08-20 11:27:51 -04:00
PikalaxALT
1ff22ae375
through BattleSetup_New_PalPark 2023-08-20 11:19:14 -04:00
PikalaxALT
d6dd8f53ae
BattleSetup_New 2023-08-20 10:58:28 -04:00
red031000
b0e931cf1f
rename PARTY and party related things 2023-08-20 14:24:55 +01:00
Adrienn Tindall
a80a8b25c9 Clean up battle file structure + struct names 2023-08-19 18:39:58 -04:00
Adrienn Tindall
785587748e Merge remote-tracking branch 'upstream/master' 2023-08-19 17:56:16 -04:00
PikalaxALT
b75e580cf8 This commit brought to you by anti-snake league
Additional documentation
Refactor pal_park.json for brevity and ease of access
2023-08-19 09:39:18 -04:00
PikalaxALT
5c7136be5e Pal Park documentation; dump a/1/2/5 2023-08-18 20:41:48 -04:00
PikalaxALT
ab8036814b Finish unk_020557E0.c 2023-08-18 17:37:06 -04:00
Adrienn Tindall
1d3cc4cf36 Expand BattleSystem struct 2023-08-17 05:46:49 -04:00
Adrienn Tindall
b85df66b94 More battle record related functions? 2023-08-17 01:49:01 -04:00
PikalaxALT
c2770e210d thru sub_02055900 2023-08-15 21:11:36 -04:00
PikalaxALT
52a4f898ef Start decomping unk_020557E0 2023-08-15 18:43:11 -04:00
Adrienn Tindall
6e31ae87bc Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-08-10 15:10:45 -04:00
Adrienn Tindall
b1ee7c62fc Battle record related functions?
Im not quite sure tbh
2023-08-10 15:10:43 -04:00
Akira Akashi
e6bad963ea
Merge branch 'master' into master 2023-08-10 19:43:44 +01:00
Adrienn Tindall
b918a98eaa Up to Battle Random functions 2023-08-10 02:33:33 -04:00
Adrienn Tindall
1cab87a688 Fix BattleHpBar struct 2023-08-08 04:50:11 -04:00
Adrienn Tindall
b0e786c7a2 eventually red will learn that if she doesn't review my PRs she'll just get more and more stuff to review 2023-08-06 04:12:55 -04:00
Adrienn Tindall
f03a6345e8 red was feeding me misinformation smh 2023-08-05 21:55:28 -04:00
Adrienn Tindall
868337b6ac red lied to me about a const existing smh 2023-08-05 16:46:30 -04:00
Adrienn Tindall
0e30fb741f Add consts 2023-08-05 16:17:31 -04:00
Adrienn Tindall
09b1564c9f Background handling function
Huge credits to @YohannDR for helping me figure out BattleSystem_SetBackground

Co-Authored-By: YohannDR <81297939+yohanndr@users.noreply.github.com>
2023-08-05 15:57:29 -04:00
cbt6
f177d44734 Decompile scrcmd_move_tutor 2023-08-02 01:08:51 +08:00
Adrienn Tindall
f137021532 More documentation before going to bed 2023-08-01 01:39:02 -04:00
Adrienn Tindall
d1f08f385d More Battle System Function Documentation 2023-08-01 00:25:01 -04:00
Adrienn Tindall
15a10f7494 Minor BattleSystem struct documentation 2023-07-31 16:12:48 -04:00
Adrienn Tindall
063a81bfdf Recover status function 2023-07-31 15:48:10 -04:00
Adrienn Tindall
ed04b83fc1 Next function is long 2023-07-30 13:42:01 -04:00
Adrienn Tindall
442d04ae15 More lo hanging fruit 2023-07-29 01:21:45 -04:00
Adrienn Tindall
1f3256dfae More battle system return functions 2023-07-29 00:19:10 -04:00
Adrienn Tindall
eae74e7623 Fix BattleSystem_GetBattleType return value 2023-07-27 23:41:57 -04:00
Adrienn Tindall
f9e1e8d9c0 documentation work 2023-07-27 23:08:36 -04:00