Eduardo Quezada
|
80447bee8e
|
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
|
2024-10-15 20:56:56 -03:00 |
|
luckytyphlosion
|
a55c75d350
|
Get rid of common syms (#2040)
|
2024-10-14 23:52:11 -04:00 |
|
Kurausukun
|
52c2728ff6
|
remove gflib
|
2024-09-18 10:37:34 -04:00 |
|
Bassoonian
|
bbc05234b9
|
Make Pokémon Sprite Visualizer name official (#4745)
* Rename files to PSV
* Rename functions and defines
* Add missing newlines
* Integrate feedback
|
2024-06-09 12:12:35 -04:00 |
|
Eduardo Quezada
|
6eba5bcb80
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
|
2024-05-16 17:31:46 -04:00 |
|
Eduardo Quezada
|
ac16a52918
|
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
This reverts commit e2d70d440e, reversing
changes made to 0d2b400953.
# Conflicts:
# gflib/text.c
# include/config/decap.h
# src/battle_message.c
# src/item.c
|
2024-05-13 19:19:37 +02:00 |
|
Eduardo Quezada
|
502a56efd1
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
|
2024-02-13 20:35:05 -03: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 |
|
Ariel A
|
85aab338a9
|
Merge branch 'guillotine' into guillotine-expansion
|
2024-01-08 19:43:06 -05:00 |
|
Ariel A
|
1ce961768e
|
Added automatic runtime decapitalization.
|
2024-01-07 20:21:14 -05:00 |
|
aronson
|
3c21e23555
|
Allocate initialized sections for EWRAM and IWRAM (#3892)
|
2024-01-02 14:24:52 +00:00 |
|
Eduardo Quezada D'Ottone
|
644ed8e5b3
|
Fixed ld_script.ld artifact from a previous pret version (#3731)
|
2023-12-15 00:04:40 +01:00 |
|
Eduardo Quezada
|
1fc712f153
|
Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210
# Conflicts:
# Makefile
# data/battle_scripts_1.s
# gflib/malloc.c
# gflib/malloc.h
# include/battle.h
# ld_script.ld
# ld_script_modern.ld
# src/battle_ai_script_commands.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/species_info.h
# src/pokemon.c
|
2023-12-10 13:27:09 -03:00 |
|
Icedude907
|
e5ac2a103e
|
Incorporate review changes
|
2023-11-24 10:25:39 +13:00 |
|
Icedude907
|
a0bf504bc1
|
Linkerscript now tracks RAM/ROM usage
|
2023-11-12 15:24:10 +13:00 |
|