Commit Graph

101 Commits

Author SHA1 Message Date
PikalaxALT c5aa5d3722 Fix faulty search&replace 2021-03-18 15:00:06 -04:00
PikalaxALT 18f1080882 Finish syncing pokemon.c with emerald 2021-03-18 14:33:43 -04:00
PikalaxALT d864eb510e Sync DRAW_SPINDA_SPOTS from pokeemerald 2021-03-18 13:23:05 -04:00
PikalaxALT c779411957 Sync EVO_MODE consts from emerald 2021-03-18 13:14:08 -04:00
PikalaxALT a172f0064c Fix accidental ++ deletion 2021-03-17 08:34:03 -04:00
PikalaxALT 4d86834d12 Document item use functions in pokemon.c 2021-03-16 21:16:31 -04:00
PikalaxALT 783488aae5 Name nullsubs in battle ctlrs 2021-03-16 16:41:28 -04:00
PikalaxALT 81da6acff5 battle_gfx_sfx_util sync emerald names to unnamed syms 2021-03-15 19:32:49 -04:00
PikalaxALT 31f4edbe50 Document more symbols in battle 2021-03-14 20:10:19 -04:00
Deokishisu 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
hjk321 fc16ee9498 Fix storage magic numbers
I could *kinda* understand missing SendMonToPc, but IN THE STRUCT ITSELF?!
2021-02-22 10:04:27 -06:00
Deokishisu 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
GriffinR 1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
Deokishisu 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
GriffinR 0f21fc13ef Fix hang when releasing after adding new moves 2020-10-11 16:10:03 -04:00
Evan fcb999beea document battle_message.c 2020-05-01 19:54:35 -06:00
PikalaxALT ea207f6334 Clean up includes 2020-04-08 17:03:26 -04:00
PikalaxALT 218555e72c through sub_811D5C0 2020-03-21 10:48:55 -04:00
PikalaxALT 6753e18db0 through sub_8090FC4 2020-03-13 20:53:22 -04:00
PikalaxALT d2b0f36b7d Port PSS utility functions 2020-03-11 09:55:45 -04:00
PikalaxALT 188ebdccca sCombinedMoves 2020-02-01 12:06:10 -05:00
PikalaxALT 52fbc43d73 Address review comments 2020-01-25 21:00:51 -05:00
PikalaxALT 70e7f464ca PLAYER_NAME_LENGTH to 7 2020-01-24 21:57:31 -05:00
PikalaxALT 7824a413de Normalize union room UnkStruct arrays; remove STAT_STAGE_ defines 2020-01-23 10:10:57 -05:00
PikalaxALT c365f58833 Address review comments 2020-01-19 16:19:35 -05:00
GriffinR fba3fc738a Document Pokemon Tower scripts 2020-01-16 13:05:26 -05:00
GriffinR f544f6e356 Document Cerulean City scripts 2020-01-14 16:41:38 -05:00
PikalaxALT 5f2865f026 Merge level-up learnsets 2019-12-20 11:11:17 -05:00
PikalaxALT bb8c712f75 Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
2019-11-24 08:44:21 -05:00
PikalaxALT 14725e1592 Address review comments 2019-11-23 19:21:31 -05:00
PikalaxALT e3bc9c44cd battle_message 2 2019-11-23 18:12:33 -05:00
jiangzhengwenjz 972c044d71 party_menu fourth quarter 2019-11-24 03:03:29 +08:00
PikalaxALT e7cb5476c4 Port evolution_scene 2019-11-20 11:08:30 -05:00
PikalaxALT 1849ad778d Merge pull request #158 from jiangzhengwenjz/nonmatching
real match OakSpeechNidoranFSetup
2019-11-19 14:05:42 -05:00
jiangzhengwenjz 42185e5c3a OakSpeechNidoranFSetup 2019-11-19 08:26:43 +08:00
jiangzhengwenjz a4a44dd18e fire; update constants 2019-11-09 12:26:53 +08:00
PikalaxALT eff10f0e50 Battle message buffers; review comments 2019-11-04 20:32:10 -05:00
PikalaxALT 57b328ad40 Decomp hall_of_fame 2019-11-04 16:20:11 -05:00
PikalaxALT e9cf9fc104 port shedinja_maker_maybe; resolve within-array party pointers 2019-10-28 12:16:01 -04:00
jiangzhengwenjz 1230a5c48a clean up 2019-10-26 01:31:50 +08:00
jiangzhengwenjz 1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT 221259d0d6 sys flags 2019-10-21 10:42:24 -04:00
jiangzhengwenjz a28bb81ab7 battle_main remaining funcs 2019-10-18 09:55:23 +08:00
PikalaxALT 2f0ae810f7 Merge branch 'master' into trainers 2019-10-17 21:26:00 -04:00
PikalaxALT 2435bcc09d sys flag rearrange 2019-10-17 21:24:47 -04:00
PikalaxALT 97dc0a6903 Trainer dump pass 2; flag refactoring 2019-10-17 17:11:34 -04:00
ultima-soul 5f6672ee07 Rename trainer front pics and palettes. 2019-10-16 22:52:41 -07:00
jiangzhengwenjz a6c0088073 battle_main data decomp 2019-10-16 08:31:44 +08:00
jiangzhengwenjz 9243e792f3 minor fixes 2019-10-16 02:18:41 +08:00
ultima-soul 9d33d5600a Move data to C. 2019-10-14 18:37:06 -07:00