Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary ( #4641 )
...
* Filename in list (no proper sorting yet)
* Line number and message in error list + removed sorting
* Style adjustment
* Added missing file/line number to "expected N passes/successes"
* Fixed Known Failing Passing test list
* Separated test list from totals
* Assumption fails list
* Better names
* Filename for KNOWN_FAILINGs passing
* Moved total back to the bottom
* Spaces correction
* Fixed test list count
* Source file for Alloc fails on tests
* Moved sourceLine from BattleTest to Test struct
* Fixed assumptions failed "and more" counter
* Fixed ASSUMPTION block not printing their line numbers
* Fixed when stopLine is printed
* Renamed stopLine to failedAssumptionsBlockLine
2024-07-20 18:22:40 +02:00
psf
522a8ba3f7
Allow users to increase MAX_MONEY ( #4943 )
...
* Added GetMaxNumMoneyDigits and GetMoneyBoxHorizontalPosition to header
Replaced use of PrintMoneyAmount
* Added define for MAX_MONEY_DIGITS
Removed GetMaxNumMoneyDigits
Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS
Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS
* Use preproc and MAX_MONEY_DIGITS to increase the width of the sell item money box
* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS
* Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS
* Removed width and tilemap changes
* Modified CountDigits to count digits greater than 1
Fixed PrintMoneyAmount to work with large digits
* Added an early return to PrependFontIdToFit
* First prototype working
* Updated GetMoneyBoxHorizontalPosition with amount
* Updated GetMoneyBoxHorizontalPosition with amount
* Got version working with one space before
* Got version working with one space before
* Got version working with all spacingOC
* cleaned up PrintMoneyAmount
* Created CalculateleadingSpacesForMoney
* Cleaned up for PR
* Changed tabs to spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4943\#issuecomment-2223023365
2024-07-13 11:16:34 +02:00
Bassoonian
b695ddfe37
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge11july
2024-07-11 09:57:03 +02:00
Ariel A
88cfd9e267
fix: Removed LoadSpriteSheetByTemplate offset's dependence on EWRAM memory layout
2024-07-11 00:01:45 -04:00
Eduardo Quezada
ee1d14755a
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-06-02 11:06:41 -04:00
Bassoonian
e3959a764b
Rename MgbaPrintf_ to Test_MgbaPrintf ( #4642 )
2024-05-31 17:54:25 +02:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
Eduardo Quezada
73a13e5dd4
Some review changes
2024-05-18 10:40:09 -04:00
Eduardo Quezada
569749f9c2
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# Makefile
# gflib/sprite.h
# graphics/object_events/pics/pokemon/wailord.png
# include/constants/event_objects.h
# include/random.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_pointers.h
# src/event_object_movement.c
# src/random.c
# src/scrcmd.c
2024-05-18 10:12:17 -04:00
Ariel A
d785fad8cf
refactor: code review for expansion
2024-05-17 21:37:18 -04:00
Ariel A
d3849f2fc6
Merge branch 'followers' into followers-expanded-id
2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610
refactor: code review for expansion
2024-05-17 20:45:32 -04:00
Eduardo Quezada
3160cbb97d
Removed usages of DEBUG define
2024-05-17 11:23:31 -04:00
Eduardo Quezada
47e8851b07
Fix code style (pt 1)
2024-05-17 11:23:01 -04:00
Eduardo Quezada
d5268b9f01
Final cleanup
2024-05-16 18:08:10 -04:00
Eduardo Quezada
5b734d420b
End of line
2024-05-16 17:32:02 -04:00
Eduardo Quezada
6eba5bcb80
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
2024-05-16 17:31:46 -04:00
Eduardo Quezada
ab682ce900
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/items.h
# src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything ( #3949 )" ( #4525 )
...
This reverts commit e2d70d440e0d2b400953
2024-05-13 19:19:37 +02:00
Eduardo Quezada
35a76248d1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
2024-05-06 16:03:29 -04:00
Martin Griffin
e42a0a6dbe
Narrower fonts
2024-04-25 18:40:37 +01:00
Eduardo Quezada
3d9c7732f6
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
30851b0ad8
Fixed Egg's summary screen softlock ( #4301 )
2024-03-24 18:59:28 +01:00
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_3_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
DizzyEggg
48d49b40c5
Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming
2024-03-07 20:57:07 +01:00
DizzyEggg
3b45fda8e9
Use u32 in gflib functions and remove unused ( #4250 )
2024-03-06 22:22:05 +01:00
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned
2024-03-06 16:13:06 +01:00
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Ariel A
195d2bb79a
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05: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
Ariel A
a407c72235
Cleaned up follower code.
...
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
2024-02-12 20:37:01 -05:00
Eduardo Quezada
ec83b11354
Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210
...
# Conflicts:
# gflib/malloc.c
2024-02-10 18:05:20 -03:00
Eduardo Quezada
1aa7fea14f
Made OW_GFX_COMPRESS into C ifs
2024-01-19 10:58:02 -03:00
Eduardo Quezada
8cab1b7094
Fixed braces style
2024-01-18 17:07:17 -03:00
Eduardo Quezada
381a0bf8a1
Fixed compile issues
2024-01-18 09:10:20 -03:00
Eduardo Quezada
5d372b5f8a
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# gflib/sprite.c
# graphics/object_events/pics/pokemon/togetic.png
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/event_object_movement.c
# src/field_effect_helpers.c
2024-01-18 08:12:09 -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
8a52316dd2
Reformatted for code review. Moved config to include/config/decap.h.
2024-01-17 01:12:04 -05:00
Ariel A
499b4a6d42
Replaced if directives with conditions, where possible.
2024-01-09 19:34:29 -05: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
Ariel A
398a9ee8fa
Merge branch 'followers' into followers-expanded-id
2023-12-31 01:49:56 -05:00
Ariel A
7d7531f2fa
Merge branch 'master' into followers
2023-12-31 01:28:27 -05:00
Ariel A
dcaaac92d9
Added support for compressed OW graphics.
...
Added CpuSmartCopy macros (Credit: luckytyphlosion)
2023-12-31 00:35:27 -05:00
Jaizu
934a1fdd8c
Remove old debug function
2023-12-25 16:06:34 -05:00
Martin Griffin
74a6b8764c
overworld_ascending_frames to simplify overworld_frames ( #3625 )
...
Introduces relativeFrames which automates the process of using
overworld_frames with ascending frames.
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-18 13:47:15 +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
Bassoonian
3b337672e9
Fix static variable names
2023-12-08 12:46:52 +00:00
Icedude907
e5ac2a103e
Incorporate review changes
2023-11-24 10:25:39 +13:00
