Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
GriffinR
18319e8da3
Misc missing constant use
2023-08-10 01:42:18 -04:00
Eduardo Quezada
3aaa89ce71
Changed all instances of gSpeciesNames so that it uses GetSpeciesName
2023-07-07 14:37:51 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
50d3003a0d
Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW
2021-11-03 19:54:20 -04:00
GriffinR
085f8adec6
Start remaining menu documentation
2021-11-03 17:38:08 -04:00
GriffinR
9a0618afc3
Add COPYWIN constants
2021-11-03 15:29:18 -04:00
GriffinR
fdaf436960
Add font id constants
2021-10-30 19:54:15 -04:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
5f9069628d
Clean up mevent2
2021-10-17 01:35:26 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
GriffinR
e3bb257bcf
Fix some trainer card link access
2021-10-15 12:22:19 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -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
GriffinR
dfdcfc1568
Document remaining functions in cable_club
2021-08-15 16:22:15 -04:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
GriffinR
557152b06e
Minor link cleanup
2021-03-21 13:40:40 -05:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
GriffinR
a5852d57d1
Use TASK_NONE constant
2021-02-24 11:03:25 -05:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
PokeCodec
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
GriffinR
4911849723
Document link contest connection
2020-08-13 16:27:40 -04:00
GriffinR
35867f531b
Some link rfu cleanup / link.c documentation
2020-06-08 15:24:25 -04:00
GriffinR
3f97763181
Document cable_club.c
2020-06-06 16:10:03 -04:00
GriffinR
4fe507e453
Document union_room.c
2020-05-31 13:11:18 -04:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
GriffinR
10220d3b76
Label TryRecordMixLinkup
2020-01-12 19:39:30 -06:00
GriffinR
6a470ddfda
Some script clean up, document secret base secrets show
2020-01-12 19:39:30 -06:00
GriffinR
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
GriffinR
5c5c1836bb
Document Trainer Fan Club
2019-11-20 09:08:24 -06:00
GriffinR
ef8370566f
Document Contest scripts
2019-11-13 18:20:55 -06:00
GriffinR
af83b41dd1
Document Contest Hall berry blenders and misc
2019-11-13 18:20:55 -06:00
Marcus Huderle
8df4982b3f
Merge remote-tracking branch 'upstream/master' into document-trade
2019-10-12 15:39:17 -05:00
GriffinR
1b7607bd91
Document cable_club.inc
2019-10-12 15:14:57 -05:00
GriffinR
07fa82c911
Last non-anim trade.c doc
2019-10-10 03:50:51 -04:00
GriffinR
2c062dc764
More trade documentation
2019-10-09 05:56:44 -04:00
GriffinR
66a68159b1
Continue trade doc
2019-10-05 10:41:37 -04:00
GriffinR
6b556900f8
Move union room data, more trade doc
2019-10-04 17:24:03 -04:00
GriffinR
4a7f061885
Document some of trade
2019-10-03 19:39:37 -04:00
GriffinR
c3c8fb40cf
Move trade data, some trade.c clean up documentation
2019-10-03 01:16:22 -04:00
DizzyEggg
b0223f691f
Clean up data headers
2019-04-05 07:53:23 -05:00
PikalaxALT
aafe9df454
through sub_8018798
2019-03-31 15:43:51 -05:00
Phlosioneer
9372731c3e
Merge branch 'master' into main-menu-state-machine
2019-03-02 17:35:44 -05:00
