|
|
9ceef0af2d
|
Freed up saveblock space
|
2023-11-13 21:56:51 +01:00 |
|
|
|
14574d6548
|
Added move type split icons in battle
|
2023-11-13 20:34:59 +01:00 |
|
Ninjdai
|
0124c910aa
|
Upped bag storage capacity
|
2023-11-11 21:56:21 +01:00 |
|
Ninjdai
|
eee68f539d
|
Triple layer metatiles
|
2023-11-11 20:41:45 +01:00 |
|
Ninjdai
|
56d3506a6f
|
Added day/night system
|
2023-11-11 20:08:20 +01:00 |
|
Ninjdai
|
a722911e4e
|
Added textscreen macro
|
2023-11-11 10:49:46 +01:00 |
|
Ninjdai
|
333235a2c5
|
Set Exp Share to behave like newer versions
|
2023-11-10 21:21:17 +01:00 |
|
Ninjdai
|
f93a95244b
|
Set max item capacity in bag to 999
|
2023-11-10 19:47:36 +01:00 |
|
Ninjdai
|
321a29b1ce
|
Set max item capacity in bag to 999
|
2023-11-10 19:46:42 +01:00 |
|
Ninjdai
|
566b8cf939
|
Merged general and generalWithStairs tilesets
|
2023-11-10 19:24:11 +01:00 |
|
Ninjdai
|
2230c67818
|
Added BudportCity PokeCenter and temporary starter bag in boat
|
2023-11-10 10:15:00 +01:00 |
|
Ninjdai
|
87e2a5dc74
|
Added test pokemon encounters
|
2023-11-10 00:40:13 +01:00 |
|
Ninjdai
|
3e9e1ae888
|
More work on start boat
|
2023-11-09 16:27:10 +01:00 |
|
Ninjdai
|
4c0f6d5831
|
Backup commit2
|
2023-11-09 15:12:02 +01:00 |
|
DizzyEggg
|
7eb1b12224
|
Fix Knock Off healing berries (#3509)
|
2023-11-01 14:47:31 +01:00 |
|
DizzyEggg
|
10adba3af4
|
Fixed entry hazards switch in issue (#3316)
* fix entry hazards switch in issue
* accidental known failing fix
|
2023-10-01 10:30:41 -03:00 |
|
kittenchilly
|
baca050724
|
Allow Sliggoo to evolve during overworld fog (#3343)
|
2023-09-26 17:05:44 -03:00 |
|
Eduardo Quezada
|
566ec93492
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
|
2023-09-24 20:32:45 -03:00 |
|
LOuroboros
|
35e76e9868
|
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247)
Co-authored-by: Alex <alexthenotes@gmail.com>
|
2023-09-24 00:01:18 -03:00 |
|
Alex
|
a073e7bd59
|
Adds Gigaton Hammer and Salt Cure (#3297)
|
2023-09-15 11:18:47 -03:00 |
|
ghoulslash
|
582cfb0ae7
|
Convert various to callnatives - Part 1 (#3269)
|
2023-09-11 09:19:56 -04:00 |
|
Eduardo Quezada
|
755e260da4
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# include/constants/battle_move_effects.h
# test/battle/move_effect/multi_hit.c
|
2023-09-10 18:38:46 -03:00 |
|
Alex
|
18577ce598
|
Fix Scale Shot bug and use Canceller Multihit Moves (#3290)
|
2023-09-10 11:57:19 -03:00 |
|
psf
|
75d06bb599
|
Generation 6 Experience Share (#3276)
|
2023-09-07 23:18:18 -03:00 |
|
Eduardo Quezada
|
3333395ff7
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
|
2023-09-07 15:54:55 -03:00 |
|
Eduardo Quezada
|
820113d883
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle_scripts.h
# include/battle_util.h
# src/battle_script_commands.c
# src/battle_util.c
|
2023-09-07 15:13:06 -03:00 |
|
DizzyEggg
|
cfd802423b
|
Fling fixes and tests (#3191)
* begin fling tests
* fling fixes and tests
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* scripts names change
* fix fling's test file
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-05 06:56:36 -03:00 |
|
DizzyEggg
|
7c2ad314d4
|
merge with upcoming
|
2023-09-04 09:40:48 +02:00 |
|
Eduardo Quezada
|
66710ac22a
|
Updated various defines
|
2023-08-31 23:54:11 -04:00 |
|
Eduardo Quezada
|
c4553c71aa
|
5 more callnatives
- jumpifshelltrap
- jumpifemergencyexited
- jumpifrodaffected
- jumpifabsorbaffected
- jumpifmotoraffected
|
2023-08-31 23:43:48 -04:00 |
|
Eduardo Quezada
|
4ac61ad15f
|
handleultraburst, handleprimalreversion, handlemegaevo
|
2023-08-31 22:34:57 -04:00 |
|
Eduardo Quezada D'Ottone
|
c4e88760f5
|
Pret merge (2023/08/31) (#3268)
|
2023-08-31 14:52:18 -04:00 |
|
Eduardo Quezada
|
0d5b00aaf2
|
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
|
2023-08-31 14:28:01 -04:00 |
|
DizzyEggg
|
493c330cbd
|
merge with upcoming
|
2023-08-30 13:23:55 +02:00 |
|
DizzyEggg
|
c29f8259f6
|
remove gActiveBattler entirely
|
2023-08-30 12:46:22 +02:00 |
|
DizzyEggg
|
a7615f9649
|
remove almost all usage of active battler
|
2023-08-30 11:21:10 +02:00 |
|
kittenchilly
|
48d6fe2e64
|
Merge branch 'upcoming' into ultraburst
|
2023-08-26 14:43:31 -05:00 |
|
GriffinR
|
aca7998b93
|
Add missing use of ALL_MOVES_MASK
|
2023-08-16 14:33:15 -04:00 |
|
GriffinR
|
10a10e914b
|
Merge pull request #1910 from GriffinRichards/misc-constants
Use miscellaneous missing constants
|
2023-08-15 17:53:41 -04:00 |
|
GriffinR
|
4c2b12541b
|
Merge pull request #1908 from GriffinRichards/name-buffer
Automatically update nickname buffer sizes
|
2023-08-12 23:36:19 -04:00 |
|
kittenchilly
|
2b27b0bf00
|
Constants
|
2023-08-12 12:30:36 -05:00 |
|
GriffinR
|
b248791f47
|
Merge pull request #1904 from GriffinRichards/temp-alias
Add temp flag and var aliases
|
2023-08-11 15:45:00 -04:00 |
|
Eduardo Quezada
|
f026b51b48
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
# Conflicts:
# src/battle_main.c
# src/battle_tower.c
# src/match_call.c
|
2023-08-11 11:41:44 -04:00 |
|
GriffinR
|
60a6c9d160
|
Merge pull request #1903 from GriffinRichards/frontier-gfx
Fix some frontier gfx, adjacent cleanup
|
2023-08-10 14:49:44 -04:00 |
|
GriffinR
|
18319e8da3
|
Misc missing constant use
|
2023-08-10 01:42:18 -04:00 |
|
kittenchilly
|
c3e31af5f3
|
Ultra burst trigger
|
2023-08-09 22:12:26 -05:00 |
|
Martin Griffin
|
912a80e27a
|
Reference TMs and HMs by move instead of number (#1732)
|
2023-08-09 10:51:01 -04:00 |
|
GriffinR
|
65fee186f8
|
Automatically update nickname buffer sizes
|
2023-08-08 16:28:09 -04:00 |
|
Alex
|
8ee3a3c5bb
|
solve conflics
|
2023-08-07 14:25:30 +02:00 |
|
GriffinR
|
866c32a735
|
Add temp var aliases
|
2023-08-04 14:17:28 -04:00 |
|
