Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,899 Commits 1 Branch 0 Tags
fa39dc76dc880b9ccb7ccaf14875fa9578b81817
Commit Graph
108 Commits
Author SHA1 Message Date
LOuroboros fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
ultima-soul 23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
ultima-soul 0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ultima-soul 3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR c57efdba5d Allow compare + goto_if/call_if as a single statement 2021-11-18 22:06:53 -05:00
GriffinR 591ab7241f Macro comment typo fix, Object->object 2021-11-18 17:24:43 -05:00
GriffinR c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
GriffinR c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
GriffinR 61aa9c3ba9 More updating event macro comments 2021-11-16 17:46:34 -05:00
GriffinR 5d9c31a610 Label slot machine ids, fix GetPriceReduction 2021-11-16 15:43:52 -05:00
GriffinR 63c5905914 Continue updating event macro comments 2021-11-16 13:10:23 -05:00
GriffinR 04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR f85de6eca5 Start event macro comment updates 2021-11-15 10:54:57 -05:00
GriffinR 54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
GriffinR 13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
LOuroboros 554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ultima-soul 02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR b4f66496ed Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
ultima-soul 092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ExpoSeed 6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
GriffinR 4206359862 Fix some object lock names 2021-05-04 01:21:50 -04:00
ultima-soul 56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ultima-soul 939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
GriffinR f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
ultima-soul 5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
Deokishisu 7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

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 `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
GriffinR 9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR 0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
Evan 21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
Evan 99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Aaron B-D 151aca8365 Changed how scripted wild encounters work to include double battles 
Removed the old commands for scripted wild double encounters
 2020-11-17 03:13:00 -05:00
Aaron B-D b83a87c8e8 Added scripted double wild battles 2020-10-19 14:47:32 -04:00
ExpoSeed 3860551777 Mark unused script commands 2020-09-25 13:41:17 -05:00
Ryuhouji 8e2128f22c Fix indentation 2020-07-09 15:36:22 -04:00
Ryuhouji d261374044 Made documentation more readable 
This change will make the script command documentation more user-friendly to read.
Additionally, provided the information on the 'delay' macro. I have confirmed that this
is indeed Frames and not Milliseconds. Updated the macro respectively.
 2020-07-09 15:16:37 -04:00
GriffinR e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
GriffinR c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR e497fc64e3 if_undefeated macro to if_not_defeated 2020-01-12 20:20:02 -05:00
GriffinR f2e7b1507e Port some macro/script fixes from pokefirered 2020-01-11 14:12:31 -05:00
GriffinR 68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome 026e1108b2 Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
Diegoisawesome d42ea06dc5 Merge pull request #939 from GriffinRichards/fix-compare 
Use constants in compare macro
 2019-12-20 23:40:12 -08:00
GriffinR 324a81ed5d Reword yesnobox comment 2019-12-20 18:53:58 -05:00
GriffinR 7628019952 Remove references to LASTRESULT 2019-12-20 08:51:58 -05:00
GriffinR 9e08cfe55f Remove uses of compare_var_to 2019-12-18 19:22:39 -05:00