fc4aa4fff7
Sync trade anim
2023-01-09 15:38:30 -05:00
a7609df31b
Sync union_room_player_avatar
2022-11-08 13:37:11 -05:00
8aae7ac7f3
Sync pokedex constants
2022-10-29 23:46:39 -04:00
9241dc6fe7
Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4
...
# Conflicts:
# include/battle.h
# include/cable_club.h
# src/battle_anim_fire.c
# src/battle_anim_ghost.c
# src/battle_anim_ground.c
# src/battle_message.c
# src/cable_club.c
2022-09-04 17:44:13 -03:00
feb3d9cbab
Merge pull request #537 from GriffinRichards/doc-bmsg
...
Sync/document battle_message.c
2022-08-23 10:45:48 -04:00
616ab63d94
More sync with battle controllers
2022-08-20 16:13:03 -04:00
26e8d57ba1
Special Trainer IDs
2022-08-18 12:58:27 -04:00
e37c78c73f
Usage of ST_OAM_AFFINE constants
2022-08-18 12:10:09 -04:00
56f8b1a47c
Merge pull request #536 from GriffinRichards/sync-data
...
Sync data.c
2022-08-17 11:36:07 -04:00
a064849864
Sync/document battle_message.c
2022-08-12 13:58:24 -04:00
874f1c9832
Sync data.c
2022-08-12 12:07:43 -04:00
2cda0b61ce
Reverted ++ operators not related to battle_util.c, battle_util2.c, or battle_main.c
2022-08-08 16:05:16 -04:00
ac973aa38d
Sync src/battle_util.c with pokeemerald
2022-08-07 22:37:10 -04:00
dcb9d9de1e
Synced src/pokeball.c
2022-07-29 21:39:25 -04:00
c40791fd4e
SPRITE_INVALID_TAG -> TAG_NONE
2022-07-29 18:37:43 -04:00
4998b976e1
Standarized use of star in pointer types
2022-07-29 10:35:48 -04:00
7f53f533bb
Synced src/battle_script_commands.c
2022-07-29 09:42:03 -04:00
0709da5867
Multiple changes 2
2022-07-28 01:20:05 -04:00
f5e9cc595b
Multiple changes
...
- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK
2022-07-27 18:14:48 -04:00
611112269e
StringCopy10 to StringCopy_Nickname
2022-07-27 14:35:19 -04:00
04a57bb791
Update pokemon.c
2022-06-24 21:35:22 -03:00
08a18d6e32
Sync/update trainer classes
2022-01-10 13:48:08 -05:00
92d6d97c65
Fix party size calculations for larger-than-six PARTY_SIZE
2022-01-01 22:23:41 +10:30
b2c74cae84
Sync global
2021-11-19 20:36:59 -05:00
e13a99717b
Add fix to disallow negative current HP values
2021-09-13 21:51:56 +01:00
c7473dac0b
Use SHINY_ODDS where necessary
2021-08-19 19:24:11 +02:00
cb90fda18d
Refactor some field effect graphics
2021-05-03 13:27:37 -04:00
c99894bc60
Document Pokemon Summary Screen, 1
2021-04-04 09:59:40 -04:00
d95cdf42f5
Document ShouldIgnoreDeoxysForm, 2
2021-03-18 18:24:10 -04:00
815636f271
Document ShouldIgnoreDeoxysForm
2021-03-18 18:23:41 -04:00
27897b0581
<minor> Fix visual alignment in sFriendshipEventDeltas
2021-03-18 17:53:32 -04:00
014596dea5
Document and refactor AdjustFriendship
2021-03-18 17:50:55 -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
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
783488aae5
Name nullsubs in battle ctlrs
2021-03-16 16:41:28 -04:00
81da6acff5
battle_gfx_sfx_util sync emerald names to unnamed syms
2021-03-15 19:32:49 -04:00
31f4edbe50
Document more symbols in battle
2021-03-14 20:10:19 -04: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
fc16ee9498
Fix storage magic numbers
...
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
2021-02-22 10:04:27 -06:00
57e3f5e0f8
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
...
The `giftRibbons` field in `SaveBlock1` has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and FRLG. US & JP Colosseum Bonus Discs', Colosseum and XD's, Pokémon Channel's, and PokémonBox: Ruby & Sapphire's interactions with these fields has been documented.
The `giftRibbon#` fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the `obedient` bit was renamed `eventLegal`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
I still maintain that `eventLegal` is a misnomer and it should be called `fatefulEncounter` in all three repos.
2021-02-16 16:56:31 -05:00
1f6dc0e86b
Use trainer constants in flags, automatically update flags/vars count
2021-01-29 15:50:01 -05:00
90e5a5ff7e
Fix Egregious Magic Numbers in GetBattleBGM
...
Whoever originally decomped this function must've been really fed up with this file.
Renamed GetMUS_ForBattle to GetBattleBGM to be consistent with pokeemerald.
This entire function was magic numbers, so I replaced them with the appropriate constants.
2021-01-08 04:09:59 -05:00
0f21fc13ef
Fix hang when releasing after adding new moves
2020-10-11 16:10:03 -04:00
fcb999beea
document battle_message.c
2020-05-01 19:54:35 -06:00
ea207f6334
Clean up includes
2020-04-08 17:03:26 -04:00
218555e72c
through sub_811D5C0
2020-03-21 10:48:55 -04:00
GriffinR