Commit Graph

2634 Commits

Author SHA1 Message Date
Adrienn Tindall
9f138177c2
Merge branch 'master' into master 2023-12-29 03:53:20 -05:00
Adrienn Tindall
605051f0f5 Up to BattleSystem_CheckMoveEffect
Did you know that according to gen 4 coding, Hurricane and Thunder hitting outside of weather are considered move effects?
2023-12-29 03:40:40 -05:00
Akira Akashi
cbc51475b0
Merge pull request #275 from tgsm/text-printer
Decompile text printer code
2023-12-28 16:36:04 +00:00
Adrienn Tindall
0b6d686e3b Up to ov12_0224B528 2023-12-28 01:29:56 -05:00
tgsm
28d550a2e6 text: Remove unneeded casts 2023-12-25 17:24:58 -06:00
tgsm
cd206e3927 text: Address more review comments, fix speed/color constants 2023-12-25 16:04:26 -06:00
tgsm
6ea98d1e48 text: Address review comments + import an enum from pokeemerald 2023-12-25 15:42:16 -06:00
tgsm
eb3f13ef76 text: Remove no-longer-used asm/include/text.inc 2023-12-25 15:42:16 -06:00
tgsm
9731f12019 text: Sync with pokediamond 2023-12-25 15:42:16 -06:00
tgsm
0df75daf4b text: AddTextPrinterParameterized{3 -> WithColorAndSpacing} 2023-12-25 15:42:16 -06:00
tgsm
2ba5fab2b2 text: AddTextPrinterParameterized{2 -> WithColor} 2023-12-25 15:42:15 -06:00
tgsm
e078b812cc Decompile text printer code 2023-12-25 15:42:14 -06:00
Adrienn Tindall
4177fafd8a
Merge pull request #264 from adrienntindall/master
Exp Task
2023-12-24 14:54:54 -05:00
Adrienn Tindall
f77b177d00 StatStruct -> PokemonStats 2023-12-24 14:46:51 -05:00
Adrienn Tindall
196ce4bd8b requested changes 2023-12-24 12:59:33 -05:00
Adrienn Tindall
af75586c8d Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-12-22 11:35:35 -05:00
Adrienn Tindall
61783f7bb6 Minor documentation 2023-12-22 11:35:27 -05:00
Adrienn Tindall
def7e95a81
Update src/battle/battle_system.c
Co-authored-by: PikalaxALT <PikalaxALT@users.noreply.github.com>
2023-12-22 10:21:05 -06:00
Adrienn Tindall
ca84bad1f3
Update src/battle/battle_system.c
Co-authored-by: PikalaxALT <PikalaxALT@users.noreply.github.com>
2023-12-22 10:20:52 -06:00
Adrienn Tindall
ca68608608
Merge branch 'master' into master 2023-12-22 11:19:11 -05:00
Adrienn Tindall
3e1a975b77 Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-12-22 11:08:35 -05:00
Adrienn Tindall
5d4c08f6c0 Disobedience code
https://www.youtube.com/watch?v=Mpi0wyVRP0I
2023-12-22 11:08:33 -05:00
PikalaxALT
f315473a18
Merge pull request #280 from red031000/master
field_alph_checks -> alph_checks
2023-12-21 11:39:31 -05:00
Akira Akashi
9538b3fac4
Merge branch 'master' into master 2023-12-21 16:20:52 +00:00
Akira Akashi
9c32196273
Merge pull request #281 from PikalaxALT/actions-bump-add-and-commit-v9
Update action template versions
2023-12-21 16:20:35 +00:00
Adrienn Tindall
6c85dc5c58
Merge branch 'master' into master 2023-12-21 11:18:49 -05:00
PikalaxALT
aee85f9382
Update action template versions 2023-12-21 11:09:59 -05:00
Adrienn Tindall
b3e6499bc1 Battle Controller Player Safari Functions 2023-12-20 02:41:37 -05:00
Akira Akashi
e5de63fd5f
Merge branch 'master' into master 2023-12-20 02:45:53 +00:00
Akira Akashi
c7ccef423b
Merge pull request #279 from PikalaxALT/fix_cmakelists
Update CMakeLists.txt to correctly generate compile_commands.json
2023-12-20 02:45:35 +00:00
Akira Akashi
778a65b0a1
Merge branch 'master' into fix_cmakelists 2023-12-20 02:33:15 +00:00
red031000
a3da5655ca
field_alph_checks -> alph_checks 2023-12-20 02:30:19 +00:00
Adrienn Tindall
4754b344c4
Merge branch 'master' into master 2023-12-19 13:53:31 -05:00
Adrienn Tindall
439efca963
Merge pull request #271 from PikalaxALT/mystery_gift
mystery_gift.c
2023-12-19 11:49:45 -05:00
Adrienn Tindall
1338864a40
Merge branch 'master' into mystery_gift 2023-12-19 11:39:45 -05:00
Adrienn Tindall
4656429461
Merge pull request #269 from red031000/master
start cleaning up blackout.c
2023-12-19 11:39:19 -05:00
Adrienn Tindall
74d1e5c7e1 Address review changes 2023-12-19 11:35:24 -05:00
Adrienn Tindall
88c914311b Finish decompiling battle_system.c 2023-12-19 05:46:37 -05:00
Adrienn Tindall
8ce73b5428 Document BattleSystem->MessageFormat field 2023-12-19 04:55:36 -05:00
Adrienn Tindall
35201982a6 Document battle_system static functions 2023-12-19 02:11:10 -05:00
Adrienn Tindall
3b3b6c820c Add message tag constants 2023-12-19 01:19:21 -05:00
Akira Akashi
f051f04094
Merge branch 'master' into fix_cmakelists 2023-12-18 17:30:05 +00:00
Adrienn Tindall
a2d94aca41 Update AddTextPrinterParameterized params 2023-12-18 06:37:36 -05:00
Adrienn Tindall
067c7f4d3a add OFFSET_OF macro 2023-12-17 18:00:31 -05:00
Adrienn Tindall
4b1cf5cc40 Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold 2023-12-17 17:37:22 -05:00
Adrienn Tindall
c2d87dcde8 Decomp battle print message functions 2023-12-17 17:37:11 -05:00
Adrienn Tindall
24a06bb1bb
Update src/battle/battle_02261FD4.c
Co-authored-by: PikalaxALT <PikalaxALT@users.noreply.github.com>
2023-12-17 16:29:53 -06:00
red031000
e2ce896d12
use state enums 2023-12-17 04:01:40 +00:00
pikalaxalt
1562b47c66
Merge remote-tracking branch 'origin/master' into mystery_gift 2023-12-16 20:51:55 -05:00
pikalaxalt
7334c8e356
Address other review comments 2023-12-16 20:51:34 -05:00