Hedara
67e30c96c0
Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge
...
Conflicts:
include/item_menu.h
2025-11-01 14:56:09 +01:00
Estellar
0965dffe70
Use TaskFunc wherever posible ( #2188 )
2025-10-18 17:53:50 +01:00
AlexOn1ine
bc73f4654b
merge master 31/07/25
2025-08-01 12:18:11 +02:00
Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks ( #2163 )
2025-07-23 09:28:34 +01:00
cawtds
21499cbee1
Refactor field moves ( #6660 )
2025-05-31 09:03:12 +02:00
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
Bassoonian
e5ac2fe0b1
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
Ariel A
1c011a9c1c
Merge branch 'master' into followers
2022-10-07 20:52:15 -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
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
GriffinR
06dc93fc2f
Clean up field_poison.c
2022-07-06 21:04:54 -04:00
Ariel A
28ec60a776
Fixed some field effect palettes. Removed leftover CacheLightMetatiles.
2022-05-10 23:21:54 -04:00
GriffinR
a8b466dc80
Disambiguate fieldmap names
2022-01-19 10:15:32 -05:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04:00
Ariel Antonitis
8a3b04e837
Merge branch 'master' into romhack
2021-09-02 01:03:13 -04:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
Ariel Antonitis
3201422bbb
Merge branch 'master' into romhack
2021-05-04 22:14:50 -04:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
Ariel Antonitis
221569a710
Merge branch 'master' into romhack
2021-04-18 22:17:53 -04:00
GriffinR
756fad0e61
Document some event object movement
2021-04-06 14:34:36 -04:00
Ariel Antonitis
66dd1aecf9
Made (most) field effects use dynamic palettes.
2021-03-03 01:21:40 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld
2020-07-15 00:40:47 -04:00
GriffinR
beeb673ba1
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
2020-07-08 16:03:32 -04:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld
2020-07-08 15:51:58 -04:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
eb80012757
Document more misc field effects
2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
GriffinR
06025e887f
Allow flag/var counts to be updated alongside values
2020-06-24 17:00:19 -04:00
GriffinR
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -04:00
GriffinR
f53e2491bf
Document union_room_player_avatar.c
2020-06-01 10:23:12 -04:00
GriffinR
8d3b7bd0b1
Use metatile labels for decor gfx
2020-04-13 14:43:50 -04:00
GriffinR
487080b425
Minor player avatar doc
2020-04-01 02:54:26 -04:00
Marcus Huderle
49421a41b2
Move field effects data and graphics into own directory, and cleanup naming for object events
2020-02-12 17:32:51 -06:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
GriffinR
6a470ddfda
Some script clean up, document secret base secrets show
2020-01-12 19:39:30 -06:00
GriffinR
570881b119
Rename event_object directories
2019-11-21 00:44:55 -05:00
GriffinR
7034f59c14
Rename EventObj to ObjEvent
2019-11-21 00:14:40 -05:00
GriffinR
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
GriffinR
9fbcd552de
document remainder of secret_base scripts, delete unneeded scripts.incs
2019-09-06 02:12:00 -04:00
garak
fbbc2b1d8b
finish src metatile labels
2019-06-16 10:08:07 -05:00
Marcus Huderle
033580da96
Document secret base
2019-04-05 16:24:57 -05:00
Phlosioneer
c429e6d69c
Move gPlayerFacingPosition out of sym_ewram.txt ( #617 )
...
* Move gPlayerFacingPosition out of sym_ewram.txt
* Fix tabs in sym_ewram.txt
* Remove redundant faraway island extern
2019-04-01 19:30:41 -05:00
Phlosioneer
9848f84b9e
Use constants for Oam .shape and .size fields
...
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
bf45b83c65
Finish documenting event vars
2019-02-27 23:54:51 -05:00
Marcus Huderle
95dcff581b
Document some fieldmap stuff
2018-12-29 11:36:54 -06:00
DizzyEggg
7e4db39da5
Fix bldcnt gpu reg args
2018-12-26 13:43:07 +01:00
