Ninjdai
4c0f6d5831
Backup commit2
2023-11-09 15:12:02 +01:00
ghoulslash
e52349b474
fix missed conflict
2023-05-22 12:28:32 -04:00
Bassoonian
c05404e772
Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge
2023-05-12 13:48:52 +02:00
ghoulslash
b227d4c637
Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs
2023-05-11 10:03:46 -04:00
GriffinR
36e6981ac0
Replace some & usage with %
2023-04-26 16:12:00 -04:00
ghoulslash
6c8cf2c026
merge w master
2023-04-15 22:04:35 -04:00
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
LOuroboros
f06c040bca
Updated the debug menu
...
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
-And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
2023-03-08 15:27:22 -03:00
GriffinR
dbf757be88
Treat map data as const
2023-03-08 12:00:30 -05:00
Eduardo Quezada
9917f5cc8b
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
...
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
Eduardo Quezada
41bf9ea63c
Removed trailing whitespaces
2023-02-26 18:43:15 -03:00
GriffinR
de56e400ff
Sync clone object macro
2023-02-08 13:11:10 -05:00
Eduardo Quezada
4a9515e8db
Restored improvements from upstream
2023-01-20 12:34:15 -03:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
GriffinR
a203c03eac
Add bugfix to LoadObjectEventPalette
2023-01-18 10:33:39 -05:00
Eduardo Quezada
011ec16f1e
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
tustin2121
33f3a7c11a
Adding FindObjectEventPaletteIndexByTag bugfix
...
The code in event_object_movement.c indicates that OBJ_EVENT_PAL_TAG_NONE was meant to be a sentinel for the bottom of each of the tables involving palettes in there. sObjectEventSpritePalettes is the exception, but the functions that access it look for OBJ_EVENT_PAL_TAG_NONE even though it's not in the table. If the palette tag isn't in the table, the functions which scan it fall off the bottom of the table into an infinite loop of scanning 256 "entries" of the table (because it uses a u8 index), and the game locks up. In vanilla, the search simply never falls off the bottom of the table. It seems the developers intended for that last entry to be {NULL, OBJ_EVENT_PAL_TAG_NONE}.
2022-11-07 06:09:21 -05:00
Eduardo Quezada
e4a439aa46
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
...
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
GriffinR
6db489e2d5
Use constants for overworld object palette slots
2022-09-27 20:16:48 -04:00
Eduardo Quezada
f969effd36
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
2022-09-25 12:51:39 -03:00
Eduardo Quezada
8a68596b64
Removed free macro
2022-09-16 20:36:44 -03:00
Eduardo Quezada
63156b4398
Removed malloc macro
2022-09-16 20:24:26 -03:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
TheXaman
367b12801e
changed debug_config.h to overworld_config.h,
...
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
2022-09-02 12:33:42 +02:00
TheXaman
ad57551db1
removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation
2022-09-02 12:10:11 +02:00
TheXaman
04c40677bd
Changed the way debug flags are handled, now in constants/battle_config.h
2022-08-30 17:41:35 +02:00
TheXaman
61c95421eb
Update src/event_object_movement.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-08-30 17:01:46 +02:00
TheXaman
bed5639074
Changed preproc defines to TRUE/FALSE, small cleanup
2022-08-29 19:36:44 +02:00
TheXaman
8c9a59ec1c
Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh
2022-08-29 19:13:11 +02:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
GriffinR
e5c36cd745
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-03 14:21:13 -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
GriffinR
1ca1bff81c
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
cbt6
6d6dac3add
Use ARRAY_COUNT in sStepTimes for step functions
2022-05-15 21:44:04 +08:00
TheXaman
c54bf21b01
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2022-04-16 23:18:35 +02:00
ghoulslash
959f3cca77
merge w pret
2022-04-07 12:11:45 -04:00
GriffinR
5d58cdd297
Fix bunny hoppy typo
2022-02-28 13:34:39 -05:00
GriffinR
1ff0b0efa9
Add missing collision constant usage
2022-01-29 21:13:46 -05:00
GriffinR
3d0326106e
Z coord / height -> elevation
2022-01-21 12:48:19 -05:00
ghoulslash
384bdaee18
merge w pret
2021-11-28 19:09:43 -05:00
TheXaman
5780560007
fixed some bugs, thanks to cbt
2021-11-28 20:28:54 +01:00
cbt6
c59c7b0518
Use enums for jump distances
2021-11-28 12:01:29 +08:00
cbt6
b6430098d4
Rename speed parameter to distance in jump functions
2021-11-28 12:01:29 +08:00
TheXaman
2f8896f2f0
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2021-11-18 15:13:04 +01:00
