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

48 Commits

Author SHA1 Message Date
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
9bfef357a2 Merge commit 'e4e90ea' into pret-merge 
Conflicts:
	src/battle_setup.c
	src/field_specials.c
	src/menu_helpers.c
	src/pokedex_area_screen.c
	src/roamer.c
	src/script.c
 2025-05-27 18:53:30 +02:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +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
Eduardo Quezada
17e570407e
Remove trailing whitespace (#6968) 2025-05-23 22:33:12 +02:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
khbsd
26f28103ec
Add Time-Based Encounters (#6454) 2025-04-09 09:49:09 +02:00
DizzyEggg
bfa9d905e1
Free some IWRAM (#6000) 2025-01-11 13:30:11 +01:00
Bassoonian
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
Bassoonian
22994c79d4
Add support for multiple roamers (#4762) 
* Replicate initial commit

* Integrate the rest of Duke's vanilla commits

* Alter Roamer struct to add frostbite support

* Fix some indentation issues

* Add option to hide substitute followers

* Revert "Add option to hide substitute followers"

This reverts commit 3fadaafae50aeb48c089d5a27af6deca9580ff64.

* Incorporate feedback
 2024-06-15 11:17:32 +02:00
ravepossum
8b70cea725
Fix screen select bar popping in too early for area screen in HGSS dex (#4094) 
* fixing screen select bar popping in too early for area screen in HGSS pokedex

* exit early from select bar load function if dex is disabled

* remove unnecessary early exit

---------

Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-02-05 15:40:25 +01:00
Aaghat
daeb2efd46 some minor clean up 2023-09-11 17:55:17 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
TheXaman
933ec5ee65 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2022-10-30 15:10:32 +01:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
TheXaman
8006b8dbcd Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2022-04-16 23:17:55 +02:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
TheXaman
8f94b91365 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2021-11-27 12:11:24 +01:00
TheXaman
111555132f Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2021-11-18 16:48:49 +01:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR
c291fa8e7f Propagate BG_COORD constants 2021-11-03 23:02:06 -04:00
GriffinR
50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
TheXaman
abf5d238c2 PokedexPlus with HGSS styled UI by TheXaman 
more ui, BROKEN atm

type icons in info screen

working topbar

dpad for switching and white mon name

initial working stats screen

additional stats, proper move list array

Working stats screen, all infos in, all icons in, buggy when switching

Fixed sprite bug, proper sprite destruction, works with old compiler

new navigation: info>area>stats

power+accuracy text, change of positions

layout for stats screen, other screen visually broken

new stats layout properly working plus toggle infos

show lvl of LevelUpMove and TM/HM of TMHM_Move

3 dashes for EggMoves and CORRECT icon for TM/HMs pog

improved layout and contest move data!

TutorMoves now available

hold dpad to scroll, pure relieve

search by move code working

6evs, 16 character move names, tripple digit moves, new eduardo layout

working tileset, info screen no correct xy layout for elements yet

new list menu start

new layout working, only missing stats bars

new list, new search

fixed area screen change and fixed "new caught" bug (type icons)
 2020-11-08 00:49:14 +01:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
Phlosioneer
cd069446e0 Merge branch 'master' into pokedex-area-const-array 2019-03-31 20:43:42 -04:00
Phlosioneer
3181c64c64 Change names from MAP_AREA_ to MAP_GROUP_ 2019-03-31 20:40:14 -04:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
Phlosioneer
7f70b629f5 Document sAreaGlowTilemapMapping 
I used a script to generate the format for the array, so I can easily
change its formatting if needed.
 2019-03-12 05:35:15 -04:00
Tetrable
a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00
DizzyEggg
7f6f6c33ab Fix BgAttributes 2018-12-26 13:05:02 +01:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00