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

617 Commits

Author SHA1 Message Date
AlexOn1ine
aa20b2bc0f master to upcoming merge 2025-11-22 10:39:52 +01:00
hedara90
cd6d293ad1
Fix some move animations leaking VRAM and freeing already freed tags (#7977) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-11-20 14:19:48 +01:00
Bivurnum
48f15b14a2
Follower NPCs no longer move if the player would be forced back onto the same tile. (#8260) 2025-11-16 21:15:06 +01:00
Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. (#7777) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-11-14 20:28:55 +01:00
Hedara
dd17524fc9 Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge 
sha1sum changed

 Conflicts:
	include/global.h
	include/overworld.h
	include/pokemon.h
	src/map_name_popup.c
	src/pokedex_area_screen.c
	src/pokemon.c
 2025-11-01 15:09:20 +01:00
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values (#2183) 
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.

Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.

Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
 2025-10-19 17:37:13 +01:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Bivurnum
f6a120310e
Bug fix: add handling for forced movements into/after ledge jumps with follower NPCs (#7055) 2025-08-04 15:10:20 +02: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
Hedara
51a5577f65 Merge branch 'master' into master-upcoming 
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
 2025-06-25 14:17:07 +02:00
Bivurnum
bfb0c2fa73
Added createfollowernpc macro to make a new follower from a gfx id (#7196) 2025-06-25 10:59:25 +02:00
i0brendan0
0ccf797cce
Fixes Roamers not saving shininess (#7185) 2025-06-23 15:05:01 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) (#7018) 2025-06-18 10:59:24 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming 
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
 2025-05-28 14:26:15 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
 2025-05-27 19:22:40 +02:00
GriffinR
0c32d840fa
Merge pull request #2141 from pret/porymap-6 
Update for Porymap 6
 2025-05-27 10:53:17 -04:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Hedara
a90dd491d2 Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge 2025-05-24 19:35:01 +02:00
Hedara
950dbe7897 Merge commit '16357c7' into pret-merge 
Conflicts:
	include/battle.h
	include/battle_controllers.h
	include/battle_script_commands.h
	include/contest.h
	include/list_menu.h
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
	src/battle_main.c
	src/battle_message.c
	src/battle_tower.c
	src/berry_crush.c
	src/contest.c
	src/ereader_helpers.c
	src/evolution_scene.c
	src/hall_of_fame.c
	src/mauville_old_man.c
	src/mystery_gift_menu.c
	src/pokedex.c
	src/pokenav_conditions_search_results.c
	src/pokenav_menu_handler_gfx.c
	src/pokenav_ribbons_list.c
	src/rom_header_gf.c
	src/union_room.c
	src/union_room_battle.c
	src/union_room_player_avatar.c
 2025-05-24 19:22:31 +02:00
Kurausukun
e1e7d1cf35
Fixes for C23 Support (#2138) 
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
 2025-05-19 09:11:59 +01:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
AlexOn1ine
33607529cd conflicts 2025-05-16 10:46:32 +02:00
Hedara
578c5f96cd Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge 
Conflicts:
	include/battle_gfx_sfx_util.h
	src/apprentice.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_dome.c
	src/battle_gfx_sfx_util.c
	src/battle_script_commands.c
	src/battle_tv.c
	src/item_menu.c
	src/move_relearner.c
	src/pokemon.c
	src/scrcmd.c
 2025-05-15 21:31:54 +02:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex (#2134) 2025-05-09 16:33:23 +01:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) (#6500) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-04-27 14:56:18 +02:00
cawtds
ee911ffbae
FakeRtc datetime and ResetRtcScreen day increments (#5695) 
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-04-12 13:17:58 -07:00
Hedara
e419606a10 Merge branch 'upcoming' into merrps-dns 2025-04-09 12:48:18 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +02:00
Isaac Aronson
74e84da571
Remove NDEBUG guard on cycle counter functions 2025-03-31 13:11:18 -05:00
Isaac Aronson
926a7437da
Add AI thinking cycle count display to frame count 2025-03-30 17:24:36 -05:00
GriffinR
04eb22f4ea Fix offset for towerInterview in BattleFrontier 2025-03-15 17:45:42 -04:00
hedara90
b08a5fb15a
Tests for checking all move animations (#6297) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-03-13 13:46:48 +01:00
Eduardo Quezada
a756bb501c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music (#2053) 
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
 2025-01-17 17:54:38 +00:00
Eduardo Quezada
89f90e1f69 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-03 13:58:10 -03:00
ghoulslash
d8ea4fa1ec Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2025-01-02 08:28:21 -05:00
Eduardo Quezada
dbc3cc28b8 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-21 09:31:23 -03:00
hedara90
e579333427
Egg cycle length fix (#5828) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-12-20 11:23:51 +01:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
ghoulslash
6f78288a9b fix dexNavSearchLevels array size 2024-11-13 21:21:45 -05:00
ghoulslash
54484593b3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-10-18 21:46:54 -04:00
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
ghoulslash
2e52e3331f merge w upcoming 2024-10-04 12:56:21 -04:00