Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,646 Commits 1 Branch 0 Tags
main
Commit Graph
477 Commits
Author SHA1 Message Date
Suppai_Neko aa31fc840f Fixed looking back at pokemon when leaving door going south 2023-04-07 21:19:28 -07:00
Suppai_Neko d28afca972 Merged Emerald Expansion and Follower Pokemon 2023-04-07 19:22:49 -07:00
W1serV1ser d076aa96d4 Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-29 21:31:06 -07:00
sbird aea5d79aa2 [trainer_parties] implement fully customizable npc trainer parties 
fix nature related bug, fix hash generation, add tests
 2023-03-25 20:00:04 +01:00
GriffinR 6be9a79b8c Merge pull request #1871 from GriffinRichards/doc-trendy-sayings 
Document the trendy sayings word group
 2023-03-24 08:05:51 -04:00
Eduardo Quezada 51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
 2023-03-19 20:28:56 -03:00
Eduardo Quezada 2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
Martin Griffinandsbird f1b9872bf0 Test moves, items, and abilities in battle 
Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic
Spikes tests!

Co-authored-by: sbird <sbird@no.tld>
 2023-02-01 13:53:57 +00:00
Eduardo Quezada 749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
GriffinR 36c89d345c Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
Eduardo Quezada e0802f13a2 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 
# Conflicts:
#	include/link_rfu.h
 2023-01-03 15:40:33 -03:00
Eduardo Quezada 66d1c9bc65 Documenting padding in structs used by Saveblocks 2022-12-17 22:55:43 -03:00
GriffinR 483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
Eduardo Quezada 1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	asm/macros/battle_ai_script.inc
#	asm/macros/battle_script.inc
#	data/battle_ai_scripts.s
#	include/link_rfu.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
#	src/sound.c
 2022-09-13 16:22:42 -03:00
Eduardo Quezada 65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
crater-git 940f9f1726 Moved branch defs to config.h, now only for compat 2022-08-24 16:10:32 -04:00
Eduardo Quezada afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
Eduardo Quezada 13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada 7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
W1serV1ser 2873b75645 Fixed messed up commits and applied proper changes 
This SHOULD be a fixed commit, where pret is properly merged, the bug fixes relating to the follower and saves, bikes, and ground effects, and the improved dynamic palette system is present.
 2022-07-06 20:11:02 -07:00
W1serV1ser 21ec0f0223 Revert "Merge branch 'master' into FollowingPokemon_Gen1-3" 
This reverts commit 63b2bd9a44, reversing
changes made to a716f522f3.
 2022-07-06 09:02:50 -07:00
W1serV1ser c6b9e7994f Revert "Merge branch 'FollowingPokemon' into master" 
This reverts commit 435a4f84e2, reversing
changes made to bee11f31cd.
 2022-07-06 00:37:51 -07:00
W1serV1ser 435a4f84e2 Merge branch 'FollowingPokemon' into master 2022-07-05 23:21:20 -07:00
GriffinR 7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
Martin Griffin 1cc59acca9 Static assertion for size of save structs 2022-05-25 19:48:42 +01:00
LOuroboros 577791a6bc Moved order of defined header files in include/global.h 2022-05-13 10:52:09 -03:00
LOuroboros 2263caef7a Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine 2022-05-13 03:17:31 -03:00
LOuroboros f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR 62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
ultima-soul 84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
ultima-soul 86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
W1serV1ser 005059dfed Squashed commit of the following: 
commit fabad02201
Merge: 087244104 eb07617a2
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Thu Feb 10 16:03:45 2022 -0800

    Merge branch 'pret:master' into master

commit eb07617a20
Merge: 7d2344c07 a86a27918
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 9 08:34:10 2022 -0500

    Merge pull request #1623 from kiliwily/master

    Update money.c

commit a86a279184
Author: kiliwily <69381603+kiliwily@users.noreply.github.com>
Date:   Sun Feb 6 16:25:56 2022 +0100

    Update money.c

commit 7d2344c07b
Merge: f494238a9 dc7d86f02
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 2 22:09:36 2022 -0500

    Merge pull request #1616 from GriffinRichards/missing-req

    Add missing :req, remove old macros

commit f494238a9d
Merge: e30b16f0f 1ff0b0efa
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 30 23:00:05 2022 -0500

    Merge pull request #1621 from GriffinRichards/constants-collision

    Add missing collision constant usage

commit 1ff0b0efa9
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 29 21:13:46 2022 -0500

    Add missing collision constant usage

commit e30b16f0fd
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 21:50:15 2022 -0500

    Fix Swap_HandleQuitSwappingResposne typo

commit 2efbd5f549
Merge: 4188dd405 3d0326106
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:51:56 2022 -0500

    Merge pull request #1608 from GriffinRichards/fix-fieldmap

    Fix some incorrect fieldmap names

commit 4188dd405c
Merge: 9f2b6ab2f 6470b0d00
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:44:26 2022 -0500

    Merge pull request #1620 from LOuroboros/gBallSpriteTemplates

    Used ball constants in gBallSpriteTemplates

commit 6470b0d004
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Wed Jan 26 18:36:21 2022 -0300

    Used ball constants in gBallSpriteTemplates

commit dc7d86f026
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 19:26:22 2022 -0500

    Add new macro comments

commit 2495d18132
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 18:51:56 2022 -0500

    Add missing :req, remove old macros

commit 9f2b6ab2f2
Merge: 79dfac92c 2cc301603
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 22 21:41:37 2022 -0500

    Merge pull request #1613 from Kurausukun/m4asymbols

    Move M4A Track Definitions

commit 2cc301603e
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 21:30:39 2022 -0500

    lmao whitespace

commit 0872441048
Merge: 3c46f3194 79dfac92c
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 22 18:28:09 2022 -0800

    Merge branch 'pret:master' into master

commit 3b756bfb3d
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 20:38:41 2022 -0500

    fix compilation on modern

commit 317e302147
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:43:11 2022 -0500

    fix inconsistent indentation

commit 04013fbdf2
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:41:31 2022 -0500

    forgot we could do this

commit a83e41b2cc
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:37:46 2022 -0500

    move m4a track definitions

commit 3d0326106e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 12:48:19 2022 -0500

    Z coord / height -> elevation

commit 79dfac92c9
Merge: 874317268 30d970441
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 09:55:43 2022 -0500

    Merge pull request #1604 from GriffinRichards/clean-spinda

    Document Spinda spot algorithm

commit fb81d9ad4a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 23:26:39 2022 -0500

    Correct map data comment

commit 8743172686
Merge: 062cdbe01 7d75e1631
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 12:11:27 2022 -0500

    Merge pull request #1612 from AsparagusEduardo/pret_misc

    Small documentation and cleanup

commit 7d75e16312
Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date:   Thu Jan 20 12:25:48 2022 -0300

    Small documentation and cleanup

commit 062cdbe01c
Merge: a7e6045d7 bd43b905b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 08:53:44 2022 -0500

    Merge pull request #1599 from GriffinRichards/fix-tilemaps

    Break up graphics/interface and graphics/misc

commit a7e6045d71
Merge: 69759b2d1 f899a02ac
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 22:17:37 2022 -0500

    Merge pull request #1597 from GriffinRichards/misc-cleanup

    Miscellaneous fixes

commit c4f33f2b2b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:54:55 2022 -0500

    TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE

commit e682c12519
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:39:11 2022 -0500

    sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE

commit e3b49604d4
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:59:37 2022 -0500

    Use metatile layer constants in shop

commit 8200fda14e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:56:54 2022 -0500

    Fix decorations metatile attribute names

commit a8b466dc80
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:15:32 2022 -0500

    Disambiguate fieldmap names

commit f127e64a3c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 09:37:12 2022 -0500

    Name overworld tilemaps for their bg, add layer type constants

commit 30d9704418
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:27:17 2022 -0500

    Specify unsigned in spot comment

commit 313f14ed63
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:00:18 2022 -0500

    Add Spinda spot color constants

commit 177863da47
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 16:04:02 2022 -0500

    Fix typo

commit 225147a94f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 13:19:52 2022 -0500

    Document Spinda spot algorithm

commit 69759b2d12
Merge: 14a11899c 8b920691e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:44:58 2022 -0500

    Merge pull request #1601 from GriffinRichards/fix-decor-flag

    Fix FLAG_DECORATION_0 name

commit 14a11899cf
Merge: dad413276 a4d31da92
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:37:26 2022 -0500

    Merge pull request #1603 from LOuroboros/patch-2

    Updated the value of MAX_MAP_DATA_SIZE

commit a4d31da923
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Sun Jan 16 19:22:28 2022 -0300

    Updated the value of MAX_MAP_DATA_SIZE

commit dad4132762
Merge: 60162a98b 429d53b95
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 14:03:20 2022 -0500

    Merge pull request #1596 from GriffinRichards/player-avatar-arr-const

    Add missing array constants in field_player_avatar

commit 60162a98b9
Merge: 755d9143a 6d6ff9126
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 13:55:16 2022 -0500

    Merge pull request #1602 from GriffinRichards/charmap-quote

    Allow right single quotation mark in charmap

commit 6d6ff91268
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 10:29:15 2022 -0500

    Allow right single quotation mark in charmap

commit 755d9143a6
Merge: 9ded1eb14 fd7457b05
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 15 12:20:22 2022 -0500

    Merge pull request #1600 from GriffinRichards/remove-berry-fix

    Remove berry fix

commit bd43b905b7
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:39:00 2022 -0500

    Apply palettes to some field effect pngs

commit 4dec9b83a3
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:29:30 2022 -0500

    Move more graphics out of misc

commit 9ded1eb14e
Merge: fa2d25d36 1a33187ba
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 09:12:05 2022 -0500

    Merge pull request #1598 from atasro2/master

    Give sensical names to Unused_AdjustBgMosaic

commit 1a33187bad
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:48:46 2022 +0330

    Move enum to bg.h

commit 998900bd1b
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:37:27 2022 +0330

    Give sensical names to Unused_AdjustBgMosaic

commit fd7457b05a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 13 15:26:20 2022 -0500

    Remove berry fix

commit f899a02ac6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 12 18:34:21 2022 -0500

    Use MON_GIVEN_TO_ constants for givemon

commit 01af8e877f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 14:18:22 2022 -0500

    Move starter choose out of interface/misc

commit 694aa3c65d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:59:24 2022 -0500

    Move balls, shop, link, map popups, and bag out of interface

commit fa2d25d366
Merge: 4024b3f1b ca9bc34be
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 12:26:02 2022 -0500

    Merge pull request #1594 from GriffinRichards/pokestorage-clean

    Misc pokemon_storage_system cleanup

commit d782d3544d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:46:58 2022 -0500

    Move pokeblock graphics out of interface

commit 565dd24309
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:37:13 2022 -0500

    Move party menu graphics out of interface

commit 7103839a61
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:14:59 2022 -0500

    Move summary screen graphics out of interface, fix some names

commit fde18b4774
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:42:00 2022 -0500

    Fix berry crusher graphics name

commit 0a78cb5c9e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:04:47 2022 -0500

    Fix some battle dome graphics names

commit 49418f8c01
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:19:20 2022 -0500

    Add missing commas

commit 3a6c633905
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:16:25 2022 -0500

    Add seteventmon

commit 110fbc559c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:08:14 2022 -0500

    Make item optional for givemon and setwildbattle

commit 4024b3f1b3
Merge: ded202136 d4111d552
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 10 14:56:26 2022 -0500

    Merge pull request #1590 from GriffinRichards/dex-enum

    Convert pokedex defines to enums

commit 3c46f3194e
Merge: 4375a8014 ded202136
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sun Jan 9 13:54:52 2022 -0800

    Merge branch 'pret:master' into master

commit 429d53b95c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 11:12:35 2022 -0500

    Use runningState directly in CheckMovementInputNotOnBike

commit 8b920691e6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 01:31:42 2022 -0500

    Fix FLAG_DECORATION_0 name

commit 4375a80142
Merge: a499e8dc7 30dbf3f85
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 8 21:47:19 2022 -0800

    Merge branch 'pret:master' into master

commit 8f1a760937
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 8 23:53:55 2022 -0500

    Add missing array constants in field_player_avatar

commit ca9bc34bea
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:26:23 2022 -0500

    Clean up pokemon_storage_system graphics

commit 5cbe572607
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:02:12 2022 -0500

    Add window constants in pokemon_storage_system

commit d4111d5520
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 14:50:19 2022 -0500

    Add comment about pokedex reordering

commit 5d033c2e4d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 12:18:49 2022 -0500

    Convert pokedex defines to enums

commit ce55e58ad8
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 4 10:09:42 2022 -0500

    Misc cleanup
 2022-02-11 10:51:47 -08:00
GriffinR 3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR 4024b3f1b3 Merge pull request #1590 from GriffinRichards/dex-enum 
Convert pokedex defines to enums
 2022-01-10 14:56:26 -05:00
W1serV1ser 5ea3d064c6 Added Following Pokemon mechanics and sprites/palettes for all Gen 1 Pokemon 2022-01-08 13:32:43 -08:00
GriffinR 5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
GriffinR aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
ultima-soul 4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
ultima-soul a68a39e35f Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-12-01 20:17:49 -08:00
ultima-soul 23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
ultima-soul 01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08:00
ultima-soul 0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ultima-soul 57bf1c7824 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-21 10:41:12 -08:00
ultima-soul 3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR d414787932 Some TV clean-up 2021-11-16 16:22:17 -05:00