fcd39ec726
won't be needing this anymore
2021-03-19 16:25:12 -04:00
37e5dd9c33
match RollCredits, with thanks to shoomer
2021-03-19 16:24:22 -04:00
c94e5e9ab0
Merge remote-tracking branch 'upstream/master' into port_matchings
2021-03-19 14:34:58 -04:00
0643255c85
port task00_mystery_gift matching from emerald
2021-03-19 05:12:21 -04:00
31a32c955e
fakematch sub_805EE3C
...
I have no idea why this won't actually match, but thanks to pidgey for figuring out this fakematch
2021-03-19 04:53:28 -04:00
c11710288a
port moar fixes and documentation
2021-03-19 02:25:43 -04:00
f18aeb187d
[LEAK-INFORMED] fix cut nonmatchings
2021-03-18 23:47:39 -04:00
f41d7b222c
[LEAK-INFORMED] match InitObjectEventStateFromTemplate
...
additionally, port range fixes from emerald as well as a couple other
things
2021-03-18 22:30:59 -04:00
ed16a7409a
Merge pull request #403 from PikalaxALT/battle_multi_buffer
...
Battle documentation (14032021)
2021-03-18 15:25:46 -04:00
c5aa5d3722
Fix faulty search&replace
2021-03-18 15:00:06 -04:00
18f1080882
Finish syncing pokemon.c with emerald
2021-03-18 14:33:43 -04:00
d864eb510e
Sync DRAW_SPINDA_SPOTS from pokeemerald
2021-03-18 13:23:05 -04:00
c779411957
Sync EVO_MODE consts from emerald
2021-03-18 13:14:08 -04:00
d86c9b0976
Document battle_anim_mons, 1
2021-03-18 08:49:31 -04:00
5add6bc54f
Name undocced syms in battle_transition
2021-03-17 12:50:25 -04:00
a172f0064c
Fix accidental ++ deletion
2021-03-17 08:34:03 -04:00
4d86834d12
Document item use functions in pokemon.c
2021-03-16 21:16:31 -04:00
c4b61cc0ed
Document FRLG-unique vars in main.c
2021-03-16 16:57:52 -04:00
783488aae5
Name nullsubs in battle ctlrs
2021-03-16 16:41:28 -04:00
fa6b2c4615
nvalidmons -> nValidMons
2021-03-16 14:56:43 -04:00
aedd30e104
Remove unneeded pokedude macros
2021-03-16 14:30:30 -04:00
7794570c71
Document pokedude battle controller, 1
2021-03-16 13:51:03 -04:00
6fc2bdf840
battle_controller_link_partner sync labels from emerald
2021-03-16 09:46:17 -04:00
10f0222d28
Battle controller opponent sync labels from emerald
2021-03-16 08:24:53 -04:00
a2367448b8
sync berry crush with emerald
2021-03-16 03:49:48 -04:00
14aa5bf52f
Remove unused, unneeded fields from BattleHealthboxInfo
2021-03-15 20:17:47 -04:00
81da6acff5
battle_gfx_sfx_util sync emerald names to unnamed syms
2021-03-15 19:32:49 -04:00
c6563b78c0
Sync new field name in BattleStruct
2021-03-15 16:19:15 -04:00
2f4f63afdb
Document old man batttle controller
2021-03-15 14:27:50 -04:00
67cdab24f8
Use macro in BufferPartyVsScreenHealth_AtEnd
2021-03-15 08:37:11 -04:00
df9bed0548
Revert HERE and USED macros
2021-03-15 08:33:37 -04:00
37537e38f9
Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer
2021-03-14 21:04:11 -04:00
5075067ecd
Merge pull request #402 from GriffinRichards/nonmatch-fix
...
Use global symbols for assembly on modern
2021-03-14 20:52:30 -04:00
31f4edbe50
Document more symbols in battle
2021-03-14 20:10:19 -04:00
077faeb1bd
Use global symbols for assembly on modern
2021-03-14 19:13:23 -04:00
99ec579deb
Name symbols in battle_anim_special.c
2021-03-14 16:29:33 -04:00
75b9fbc92f
check __CLION_IDE__ predefine in global.h
2021-03-13 17:51:27 -05:00
d87e2e2fc2
Merge branch 'master' of github.com:pret/pokefirered into battle_multi_buffer
2021-03-13 17:50:30 -05:00
e1f76f1689
Merge pull request #401 from SethBarberee/emerald_backport_1
...
Backport 2 nonmatching fixes from emerald
2021-03-13 16:53:10 -05:00
6bcf9e64b1
backport 2 nonmatching fixes from emerald
2021-03-12 16:16:57 -06:00
f7f7e9a70d
More documentation in battle_main
2021-03-12 16:56:09 -05:00
b38a5a85d4
Resolve link comm buffers in gBattleStruct
2021-03-12 15:37:28 -05:00
4d1e074514
Fix Son/Daughter name swap
2021-03-12 12:47:51 -05:00
1c03a923b7
Merge pull request #399 from Deokishisu/patch-1000
...
Fix Typos / Use Box Constants / Name an Unknown
2021-03-11 15:11:53 -05:00
651b59d631
Update calcrom ignore path
2021-03-10 18:11:47 -05:00
28e3522acb
Use NONMATCHING on modern for gcc-arm-none-eabi
2021-03-10 17:55:46 -05:00
bf6e80850c
Sync Berry Fix makefiles with pokeemerald
2021-03-10 17:19:11 -05:00
b2f0efc6f7
Replace Travis CI with Github workflow
2021-03-10 16:45:38 -05:00
a7233dcd0c
Use GENDER_COUNT Constants & Rename an Unknown in field_player_avatar.c
...
`gUnknown_835B882` has been cleaned up and renamed to `sPlayerAvatarGfxToStateFlag` to match pokeemerald.
2021-03-10 16:45:11 -05:00
0589bd5827
Fix Typos / Use Box Constants
...
The Celadon City scripts that give Eevee misspelled it as Eeevee. Fixed.
The comment explaining `boxRSEggsUnlocked` in the `ExternalEventFlags` struct had an incorrect deposit requirement listed and was fixed.
Also, replaced the literals with the `TOTAL_BOXES_COUNT` and `IN_BOX_COUNT` constants in `pokemon.c`'s `IsPokemonStorageFull` function. Thanks hjk321 for pointing that out.
2021-03-10 16:22:08 -05:00
Kurausukun