Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
Eduardo Quezada
341ce6fd95
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
...
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
2023-06-16 21:25:16 -04:00
Ariel A
d12efe8cd7
Merge branch 'master' into followers
2023-05-15 18:37:38 -04:00
sbird
12d4b43755
Merge remote-tracking branch 'pret/master' into feature/dynmulti
2023-04-24 18:30:30 +02:00
Eduardo Quezada
bd54990333
Review changes
2023-02-15 13:56:11 -03:00
Eduardo Quezada
96865f66af
Updated term to modernFatefulEncounter
2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280
Rename eventLegal to fatefulEncounter
2023-02-11 17:13:53 -03:00
sbird
569fa0a60a
[script-command] add dynmultichoice
...
* supports variable length arguments
* automatically scrolls
* supports building list menus from a stack
2023-01-17 21:49:06 +01:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
GriffinR
ce55e58ad8
Misc cleanup
2022-01-04 10:09:42 -05:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
GriffinR
c89dfd9f56
Finish updating macro comments
2021-11-18 01:47:58 -05:00
GriffinR
c940b67716
Continue macro comment updating
2021-11-17 17:45:59 -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
65d3b58374
Add PARTY_NOTHING_CHOSEN
2021-11-15 10:57:06 -05:00
Ariel Antonitis
8a3b04e837
Merge branch 'master' into romhack
2021-09-02 01:03:13 -04:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
Ariel Antonitis
3201422bbb
Merge branch 'master' into romhack
2021-05-04 22:14:50 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
Ariel Antonitis
d45335f1dc
Fixed graphics & naming inconsistencies with master branch.
2021-03-03 03:28:03 -05:00
Ariel Antonitis
8a3dfbf252
Added pokemon followers & script commands.
2021-03-03 01:04:22 -05: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
GriffinR
c711a2f73b
Document warp spin functions
2021-01-01 17:11:02 -05:00
ExpoSeed
032669e2ab
Change script command table comment alignment from tabs to spaces
2020-09-25 14:05:17 -05:00
ExpoSeed
e7340ca0e1
Add byte comments to script command table
2020-09-25 13:25:36 -05:00
GriffinR
c19289596d
Give/Take to Add/Remove for silent script macros
2020-01-12 23:24:52 -05:00
GriffinR
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
GriffinR
8055548fa4
Document legendary scripts
2019-10-31 18:28:34 -05: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
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
Diegoisawesome
449fb25f23
Clear up misnamed time-based flags and functions
2019-02-12 00:40:34 -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
f497c1508b
Split files from event_scripts.s
...
Also move maps/scripts to scripts/maps
2017-11-11 16:10:17 -06:00
