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
GriffinR
d137a1a0c1
Use constants in compare macro
2019-12-18 19:12:09 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
GriffinR
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
GriffinR
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
GriffinR
82f55f2381
Merge master into ObjEvent rename
2019-12-15 02:00:00 -05:00
GriffinR
6967caefb2
Split finditem_std from giveitem_std
2019-12-14 08:41:46 -06:00
GriffinR
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
GriffinR
6ac7efb54f
Document Scotts House and begin frontier macros
2019-11-17 08:16:28 -06:00
GriffinR
5e01871f8b
Document Trainer Hill
2019-11-16 13:02:35 -06:00
GriffinR
c0ae1cbc1c
Document Lilycove scripts
2019-11-13 18:20:55 -06:00
GriffinR
702ef745d9
Add comments to hidemoneybox macro
2019-11-07 11:07:49 -05:00
GriffinR
d5685db19a
Fold nops into hidemoneybox
2019-11-07 10:37:15 -05:00
GriffinR
dba94e3971
Update fldeff sparkle macro
2019-11-06 16:41:56 -06:00
GriffinR
6730df2321
Document Abandoned Ship scripts
2019-11-06 16:41:56 -06:00
GriffinR
58dcd6d99d
Clean up mystery event msg
2019-11-06 16:38:02 -06:00
GriffinR
8055548fa4
Document legendary scripts
2019-10-31 18:28:34 -05:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2
2019-10-16 04:22:34 -04:00
GriffinR
0f15264595
Document rotating_tile_puzzle
2019-10-16 04:09:30 -04:00
GriffinR
90a05cf824
Finish Mossdeep Gym doc, beging documenting rotating tile puzzle
2019-10-15 05:06:13 -04:00
Marcus Huderle
e47b3efdfe
Unify showmonpic and hidemonpic script command names with their function names
2019-10-12 18:58:54 -05:00
GriffinR
b6dffcf8b7
Clean up script_menu documentation
2019-09-19 19:23:24 -04:00
GriffinR
06af24bce5
Use misc ScrCmd constants
2019-09-16 19:44:47 -05:00
Tustin2121
18dee14170
Review fixes
2019-08-17 23:26:46 -04:00
Tustin2121
f4d4424618
Folded nops into hidemoneybox and updatemoneybox
...
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
2019-08-17 13:25:36 -04:00
Tustin2121
6508469259
Rename movobjectoffscreen to copyobjectxytoperm
...
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
PikalaxALT
4fadbaf161
Minor fixes
...
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars
...
Document all event vars
2019-03-02 08:24:46 -06:00
Phlosioneer
da0687987d
Pick better names for constants
2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01
Add macros for metatile manipulation
2019-02-28 22:21:16 -06:00
Phlosioneer
e77e7844ea
Name several vars, document some related events
2019-02-27 20:25:09 -05:00
Diegoisawesome
449fb25f23
Clear up misnamed time-based flags and functions
2019-02-12 00:40:34 -06:00
Diegoisawesome
900f294011
Add var const prefix for some missed var numbers
2019-01-21 22:34:01 -06:00
Melody
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
DizzyEggg
6068495619
Document trainer battle scripts ( #430 )
2018-12-07 16:50:56 -06:00
Melody
a2a99bde11
adds req for macro arguments
2018-12-02 15:14:29 -05:00
Melody
10725def8e
trainerbattle_normal → trainerbattle_single
...
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
Melody
bad5323642
cleans up trainer battle scripts
...
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
DizzyEggg
9828e0e97b
Merge with master
2018-12-02 19:38:05 +01:00
DizzyEggg
725f99a1bf
Use :req macros
2018-12-02 19:24:06 +01:00
Melody
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -05:00
Melody
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
PikalaxALT
d4e8c20f84
Merge branch 'master' into link
2018-01-21 23:20:13 -05:00
DizzyEggg
0bc7fb92db
start decompiling mystery event script
2018-01-21 12:36:11 +01:00
scnorton
c6ff1a6ce3
Merge branch 'master' into link
2018-01-18 12:53:31 -05:00
Diegoisawesome
eb65458b67
Fix setvaddress params
2017-12-21 16:06:12 -06:00
Marcus Huderle
66f9d4c266
Revert initclock arg sizes
2017-12-21 16:02:42 -06:00
Marcus Huderle
173761a5a1
Port generic event script macros from pokeruby
2017-12-21 13:47:52 -06:00
DizzyEggg
54dccc8512
give batter script command names
2017-12-17 20:38:01 +01:00
DizzyEggg
646664ff29
battle setup file is decompiled
2017-12-01 21:25:13 +01:00
Diegoisawesome
2e40384fa2
Extract baseroms from event_scripts
2017-11-10 18:12:18 -06:00
Diegoisawesome
29079c4b99
Dump numerous baseroms, begin moving data to proper files
2017-11-10 01:49:12 -06:00
Diegoisawesome
49c88e6343
Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
2017-10-27 02:02:36 -05:00
Diegoisawesome
431e737453
Final predump fixes
2017-10-27 00:26:34 -05:00
Diegoisawesome
7827feaa2f
Final fixes before dump
2017-10-26 18:03:19 -05:00
Diegoisawesome
17303d963e
More prep
2017-10-24 00:11:26 -05:00
Diegoisawesome
26f9776f6f
Fix some stuff
2017-10-23 22:18:35 -05:00
Diegoisawesome
c23a633a44
Prepare for dumping
2017-10-23 21:18:49 -05:00
