Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

107 Commits

Author SHA1 Message Date
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
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
Hedara
66a6e92417 Fixed unused variables 2025-04-11 22:15:47 +02:00
Hedara
fff6bd3ed8 Removed legacy handling, fix if statment argument style 2025-04-11 21:27:49 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00
Eduardo Quezada
0b8aa7b0dc Temp fixes 2025-01-26 12:08:26 -03:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2 
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
 2025-01-26 12:08:10 -03:00
Ariel A
c1d105c31c Merge branch 'lighting' into lighting-expanded-id 2025-01-25 21:45:23 -05:00
Ariel A
521bea6bc3 fix: allowed loading non-word-aligned tileset palettes 2025-01-25 20:59:08 -05:00
Eduardo Quezada
937b3106b4 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-17 19:33:48 -03:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep (#6019) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-15 14:07:12 +01:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
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
Eduardo Quezada
aa6d540b75 Code style adjustments 2024-08-30 12:17:31 -04:00
Greenphx9
ad969c968c Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2 2024-08-25 17:54:28 +10:00
Bassoonian
c1ee43254e Clean up defines lacking spaces 2024-08-15 19:34:56 +02:00
Bassoonian
63a1f85d81 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug 2024-08-14 12:33:04 +02:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
cawtds
5dda4b846e fishing chain only resets on failed attempt or when map warping, encountering different species does not break the chain, differentiate between max shiny streak and max chain length 2024-07-06 15:18:51 +02:00
cawtds
91550eb75f chain fishing refactored 2024-07-03 17:02:12 +02:00
psf
fcf90ab52d
Fishing Enhancements (#4343) 
* Implemented chain fishing

* Added configs

* I_FISHING_MINIGAME implemented

* Refactored Check For Bite

* CLeaned up version of metatile checks

* Removed debug script

* Added helper functinons

* Cleaned up CalculateFishingProximityOdds

* Added new constatnts for cardinal direction and axis

* Updated with constants

* Reordered functions

* Cleaned up some functions

* Moved constants

* Created UpdateChainFishingSpeciesAndStreak
When 3 sides are blocked, every cast will get a mon

* Created DoesFishingMinigameAllowCancel

* Removed fishing chain check

* Fixed bug where streak was not incremented correctly
Fixed bug where Land was not properly counted
Fixed bug where streak was always being read as maxed

* Updated variable and function names

* Updated variable and function names

* Moved UpdateChainFishingSpeciesAndStreak to happen before shiny rolls occur

* Removed debug statements

* Applied feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4343\#discussion_r1551278416

* Fixed default item config and changed gChainFishingDexNavStreak and sLastFishingSpecies to only use EWRAM when features are enabled

* Update include/config/item.h

Include feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4343#discussion_r1567145660

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Changed Dexnav to DexNav per https://github.com/rh-hideout/pokeemerald-expansion/pull/4343\#discussion_r1567145660

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-04-16 22:53:50 +02:00
Ariel A
98221c4f70 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-12-31 02:48:37 -05:00
Ariel A
72c81db042 Merge branch 'followers' into lighting 2023-12-31 01:45:07 -05:00
Ariel A
4689f0b0d0 Fixes for make modern. 2023-10-15 01:39:44 -04:00
Martin Griffin
cbdba65218
Move battle tests off the heap (#3413) 
* Catch OOM in tests

* Alias gBattleTestRunnerState with sBackupMapData

Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
 2023-10-13 20:29:30 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Eduardo Quezada
a6940c9e03 Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002 
# Conflicts:
#	src/battle_ai_script_commands.c
#	src/battle_controller_player.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_controllers.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/mystery_gift_menu.c
#	src/pokemon.c
 2023-10-02 17:17:41 -03:00
Eduardo Quezada
a56eb4f53f Review changes. 2023-09-22 11:19:00 -03:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Ariel A
d800d71461 Merge branch 'followers' into lighting 2023-09-03 17:49:27 -04:00
Eduardo Quezada
f94efa94e1 Merge branch 'RHH/master' into RHH/upcoming 2023-08-02 01:18:07 -04:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
gruxor
215d57e871
Update src/fieldmap.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-07-22 14:47:07 -04:00
gruxor
fc8ee625b6 Fixed outstanding UB with -fanalyzer on modern 2023-07-21 15:51:03 -04:00
Ariel A
91794286b5 Improved light color blending logic. 
Added auxiliary .pla files to gbafx, to support setting color high bits.
Updated light palettes to new system.
 2023-06-08 21:07:07 -04:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Ariel A
996f43120d Merge branch 'followers' into lighting 2023-05-15 18:50:55 -04:00
GriffinR
dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
Ariel A
5cae740eba Merge branch 'followers' into lighting 2022-11-21 22:17:14 -05:00
GriffinR
65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
Ariel A
3a86c8bd4c Merge branch 'followers' into lighting 2022-10-07 21:08:06 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
GriffinR
8b7230c3c4 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:41:28 -04:00
GriffinR
7f1c4720a2 Update arguments for ApplyGlobalTintToPaletteSlot 2022-09-02 19:36:46 -04:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00