Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.6.0 #3350

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
373 commits
Select commit Hold shift + click to select a range
d3f170e
Cleaned: createvisualtask AnimTask_ShakeMonInPlace
AsparagusEduardo Jul 31, 2023
1d25dd0
Cleaned: createvisualtask AnimTask_ShakeMon2
AsparagusEduardo Jul 31, 2023
b4ad3be
Cleaned: createvisualtask AnimTask_ShakeMon
AsparagusEduardo Jul 31, 2023
323b771
Cleaned: createvisualtask AnimTask_ScaleMonAndRestore & AnimTask_Rota…
AsparagusEduardo Jul 31, 2023
5fc5e57
Cleaned: createvisualtask AnimTask_RockMonBackAndForth & AnimTask_Pos…
AsparagusEduardo Jul 31, 2023
eef07a9
Cleaned: createvisualtask AnimTask_HorizontalShake
AsparagusEduardo Jul 31, 2023
ac519bd
Cleaned: createvisualtask AnimTask_FlailMovement & AnimTask_ElectricC…
AsparagusEduardo Jul 31, 2023
2cf7f54
Cleaned: 3 more createvisualtask
AsparagusEduardo Jul 31, 2023
d0277fc
Cleaned: createvisualtask AnimTask_BlendColorCycle
AsparagusEduardo Jul 31, 2023
e21346d
Fixed Rage Powder's animation not turning the user red
AsparagusEduardo Jul 31, 2023
44eb626
[battle, anim] woodhammer animation overhaul (#3192)
SBird1337 Aug 1, 2023
7a81499
MOVE_CORROSIVE_GAS Effect (#3152)
ghoulslash Jul 31, 2023
f94efa9
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Aug 2, 2023
1d8ad1b
[battle, movesets] revert bulbasaur's level up change
Aug 2, 2023
5543c9d
[battle, movesets] revert bulbasaur's level up change (#3194)
mrgriffin Aug 2, 2023
b3295d1
Reverted BattleMove power to u8 (#3187)
mrgriffin Aug 2, 2023
b08b6a3
Optimize BuildOamBuffer
mrgriffin Jul 25, 2023
17555fe
Animation script cleanup and fixes - Part 2 (#3193)
mrgriffin Aug 2, 2023
7d8bcce
Optimize sprite.c (#3175)
SBird1337 Aug 3, 2023
16c0be7
Fix some frontier gfx, adjacent cleanup
GriffinRichards Aug 1, 2023
e7bc42f
use IsValidForBattle
DizzyEggg Aug 3, 2023
6d4dadd
Add temp flag aliases
GriffinRichards Aug 3, 2023
4ae6ae4
Reset all battler IDs at battle start (#3111)
ghoulslash Aug 4, 2023
cc30d2f
start removing duplicate controller functions
DizzyEggg Aug 4, 2023
a0dd77d
Improve AI switching, so it doesn't get killed on switch-in (#3146)
ghoulslash Aug 4, 2023
7ba8a02
more work on controllers
DizzyEggg Aug 4, 2023
7360a4a
up to return mon to ball
DizzyEggg Aug 4, 2023
866c32a
Add temp var aliases
GriffinRichards Aug 4, 2023
c72bb27
faint animation
DizzyEggg Aug 4, 2023
41847cd
STAT_ANIM constant usage
GriffinRichards Aug 4, 2023
5a8b6c1
ball throw and start removing empty controller functions
DizzyEggg Aug 5, 2023
c4bfe40
remove empty controller functions
DizzyEggg Aug 5, 2023
cbebdf0
handle se, bgm and fainting cry
DizzyEggg Aug 5, 2023
a505cd7
simplify the get mon set mon data functions more
DizzyEggg Aug 5, 2023
1793b9e
more controller functions
DizzyEggg Aug 5, 2023
0b4c1aa
more work on controllers
DizzyEggg Aug 5, 2023
f9e131b
fix recorded, exp update the same for player partner
DizzyEggg Aug 5, 2023
18db0cb
controller string
DizzyEggg Aug 5, 2023
ffb0e20
hide show party status summary
DizzyEggg Aug 5, 2023
af899c9
stuff
DizzyEggg Aug 5, 2023
a9483c3
trainer intro ball throw
DizzyEggg Aug 6, 2023
ef8024d
draw trainer pic
DizzyEggg Aug 6, 2023
e8d6c99
more controllers work
DizzyEggg Aug 6, 2023
833f7dd
LF shenanigans
AsparagusEduardo Aug 7, 2023
34d38bd
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Aug 7, 2023
546b0c7
handle move anim
DizzyEggg Aug 7, 2023
b8ba613
health bar update
DizzyEggg Aug 7, 2023
ce18df4
replace global usage of gActiveBattler in controller files
DizzyEggg Aug 7, 2023
8ee3a3c
solve conflics
AlexOn1ine Aug 7, 2023
fc66a8c
Adds Mortal Spin and Population Bomb (#3178)
AsparagusEduardo Aug 7, 2023
f72ec36
improve switching with ai bad moves
DizzyEggg Aug 8, 2023
8a3eaad
Renamed "ButItFailed" script name to align with names below it
AsparagusEduardo Aug 8, 2023
be0861b
Update src/battle_ai_main.c
DizzyEggg Aug 8, 2023
087a2ce
Fix Bravo Trainer Tower member names
GriffinRichards Aug 8, 2023
65fee18
Automatically update nickname buffer sizes
GriffinRichards Aug 8, 2023
6598cb3
Document stat change animation
GriffinRichards Aug 9, 2023
8d5ba6c
allow ai vs ai battles
DizzyEggg Aug 9, 2023
a0c3481
small fixes
DizzyEggg Aug 9, 2023
d0fe75b
fixes
DizzyEggg Aug 9, 2023
fec8f14
IsAiAiBattle function
DizzyEggg Aug 9, 2023
5f7819f
no exp for ai mons
DizzyEggg Aug 9, 2023
912a80e
Reference TMs and HMs by move instead of number (#1732)
mrgriffin Aug 9, 2023
6eaaa50
Correct berry fix graphics colors, more PLTT constant use (#1892)
GriffinRichards Aug 9, 2023
d1c2a30
Merge pull request #1907 from GriffinRichards/fix-tv
GriffinRichards Aug 9, 2023
c3e31af
Ultra burst trigger
kittenchilly Aug 10, 2023
079f2da
Fix some missing constant use in Apprentice
GriffinRichards Aug 10, 2023
18319e8
Misc missing constant use
GriffinRichards Aug 10, 2023
d5d46bb
More DISPLAY_WIDTH/HEIGHT constant usage
GriffinRichards Aug 10, 2023
275e5ef
Make more use of AI_GetHoldEffect + Fake Out changes
AlexOn1ine Aug 10, 2023
bcb6f72
Use AI_DATA->holdEffects instead AI_GetHoldEffect
AlexOn1ine Aug 10, 2023
60a6c9d
Merge pull request #1903 from GriffinRichards/frontier-gfx
GriffinRichards Aug 10, 2023
9226b23
Remove ewram in headers
Kermalis Aug 11, 2023
a0b42d0
Merge pull request #1911 from Kermalis/remove-ewram-in-headers
GriffinRichards Aug 11, 2023
f026b51
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
AsparagusEduardo Aug 11, 2023
c3a8eda
Sprites and fixes
kittenchilly Aug 11, 2023
063d83b
Fix build
kittenchilly Aug 11, 2023
b248791
Merge pull request #1904 from GriffinRichards/temp-alias
GriffinRichards Aug 11, 2023
59da940
Refactor damage formula to match Gen5+ (#3196)
SBird1337 Aug 11, 2023
33b16cb
2nd pass
AsparagusEduardo Aug 11, 2023
952bacd
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Aug 11, 2023
2b27b0b
Constants
kittenchilly Aug 12, 2023
5e8caa8
Merge branch 'upcoming' into ultraburst
kittenchilly Aug 12, 2023
09fc484
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Aug 12, 2023
f493ae8
Fixed item sprites with palette errors (#3222)
gruxor Aug 12, 2023
3435c59
Merge branch 'upcoming' into ultraburst
kittenchilly Aug 12, 2023
c5fb5fb
Merge pull request #1906 from AsparagusEduardo/pret/pr2/butItFailed
GriffinRichards Aug 13, 2023
344fe4d
Stop double-counting EOS in assert
GriffinRichards Aug 13, 2023
4c2b125
Merge pull request #1908 from GriffinRichards/name-buffer
GriffinRichards Aug 13, 2023
b8a22eb
Remove soundMove from Steam Eruption and replace it with sheerForceBo…
PCG06 Aug 13, 2023
32c3c33
Missing master merge organization
AsparagusEduardo Aug 13, 2023
c414a01
Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit'…
LOuroboros Aug 14, 2023
0c27db1
Review mon sprites 0001-0080
CyanSMP64 Aug 15, 2023
10a10e9
Merge pull request #1910 from GriffinRichards/misc-constants
GriffinRichards Aug 15, 2023
74de0ef
set background colour
CyanSMP64 Aug 16, 2023
aca7998
Add missing use of ALL_MOVES_MASK
GriffinRichards May 23, 2023
0579284
Document ChooseMoveAndTargetInBattlePalace
GriffinRichards Aug 16, 2023
bdc0ea1
Add MOD to match mod with powers of 2
GriffinRichards Aug 16, 2023
a6dbb68
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Aug 17, 2023
f95b4fd
Merge branch 'upcoming' into ultraburst
kittenchilly Aug 17, 2023
4e0e70a
Fix memory corruption when handling the ultra burst trigger sprite
kittenchilly Aug 17, 2023
4ca4b2d
Update battle_interface.c
kittenchilly Aug 17, 2023
d333381
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
AsparagusEduardo Aug 17, 2023
5b885a4
Convert vanilla trainer data to only use the full custom trainer mon …
AsparagusEduardo Aug 17, 2023
ec24754
fix arcanine, change bg colour of green pokemon
CyanSMP64 Aug 18, 2023
c33660e
fix arcanine and zard
CyanSMP64 Aug 19, 2023
63f3913
Added newer decomp projects to readme
AnonymousRandomPerson Aug 19, 2023
4f30684
Merge pull request #1914 from AnonymousRandomPerson/master
GriffinRichards Aug 19, 2023
60a2878
tweak growlithe, slowbro, poliwag
CyanSMP64 Aug 19, 2023
0ad3919
Fix overworld snow weather
kittenchilly Aug 19, 2023
4e5809a
tweak graveler, pikachu
CyanSMP64 Aug 20, 2023
5e98891
Snow doesn't cause shade anymore
kittenchilly Aug 20, 2023
4941e26
Merge pull request #1909 from GriffinRichards/stat-anim
GriffinRichards Aug 20, 2023
a79898f
Make fog cause misty terrain
kittenchilly Aug 20, 2023
e70577d
Add missing sizeof in trainer_see
GriffinRichards Aug 20, 2023
9cf5376
use GetBattlerParty in LoadMonSprite
DizzyEggg Aug 21, 2023
9d6953c
Removed the sTMHMMoves array and made TMs/HMs read moves from their s…
LOuroboros Aug 21, 2023
fd37946
resize golduck
CyanSMP64 Aug 22, 2023
9d170c7
gbagfx to respect user CC setting
grunt-lucas Aug 22, 2023
8438303
Merge pull request #1916 from grunt-lucas/gbagfx-cc
GriffinRichards Aug 22, 2023
905fc6f
Fixed Metronome Item damage multiplier (#3246)
SBird1337 Aug 23, 2023
ef69021
some more tweaks by mrds
CyanSMP64 Aug 24, 2023
9c937a9
Pokemon sprite review pt.1 (#3235)
AsparagusEduardo Aug 24, 2023
2a2cd77
Allow Cycling Through Balls in the Last Ball Used Menu (#3039)
voloved Aug 24, 2023
1f72e6a
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Aug 25, 2023
76075ff
Revert unneeded sprite changes from 3051 (#3205)
AsparagusEduardo Aug 25, 2023
2784f70
Poké Ball shortcut tweaks (#3254)
voloved Aug 26, 2023
48d6fe2
Merge branch 'upcoming' into ultraburst
kittenchilly Aug 26, 2023
2e1b137
Ultra Burst tests
kittenchilly Aug 26, 2023
ac67900
Fix test speed
kittenchilly Aug 26, 2023
96e39cd
Update ultra_burst.c
kittenchilly Aug 26, 2023
7ffd31f
Update ultra_burst.c
kittenchilly Aug 26, 2023
5abeb67
Correct KEY_INTR_ENABLE
WhenGryphonsFly Aug 27, 2023
37f6685
Merge branch 'upcoming' into overworldsnow
kittenchilly Aug 27, 2023
dcaf03e
Merge pull request #1918 from WhenGryphonsFly/key_intr_enable
GriffinRichards Aug 27, 2023
d67914e
Merge pull request #1912 from GriffinRichards/moves-mask
GriffinRichards Aug 27, 2023
906ea4a
Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove (#…
Pawkkie Aug 28, 2023
6ae1ba1
fix conflicts
DizzyEggg Aug 28, 2023
ee8d930
Simplify/Clean battle controllers code (#3202)
ghoulslash Aug 28, 2023
4490e98
Prevent certain status moves when item is known + Fake Out changes (#…
ghoulslash Aug 28, 2023
326fb26
Some gActiveBattler Fixes (#3259)
ghoulslash Aug 29, 2023
44acd28
solve conflicts
DizzyEggg Aug 29, 2023
00e1542
Merge branch 'ai_switch_mon_fix' of https://github.com/DizzyEggg/poke…
DizzyEggg Aug 29, 2023
156aa59
start removing gActiveBattler in controller emitters
DizzyEggg Aug 29, 2023
0381ccd
remove more of gActiveBattler
DizzyEggg Aug 29, 2023
766a1a2
improve ai switching with bad moves (#3213)
ghoulslash Aug 29, 2023
d540ecc
Merge branch 'upcoming' into ultraburst
kittenchilly Aug 29, 2023
028536e
Spaces
kittenchilly Aug 29, 2023
c427d96
Better Ultra Burst animation
kittenchilly Aug 30, 2023
deb2055
Implement Ultra Burst (#3221)
AsparagusEduardo Aug 30, 2023
c8aac34
Merge branch 'upcoming' into overworldsnow
kittenchilly Aug 30, 2023
77dd515
remove gActiveBattler from battle_script_commands.c
DizzyEggg Aug 30, 2023
4683783
remove active battler from other files
DizzyEggg Aug 30, 2023
a7615f9
remove almost all usage of active battler
DizzyEggg Aug 30, 2023
c29f825
remove gActiveBattler entirely
DizzyEggg Aug 30, 2023
493c330
merge with upcoming
DizzyEggg Aug 30, 2023
aae4a09
merge with upcoming
DizzyEggg Aug 30, 2023
03f82a7
[Makefile] make -fanalyzer optional (#3265)
SBird1337 Aug 30, 2023
d143d50
Ai vs ai rhh (#3216)
ghoulslash Aug 31, 2023
82c65d3
Fixed 2v1 handling when debug menu is enabled (#3223)
AsparagusEduardo Aug 31, 2023
9fcb1a8
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
kittenchilly Aug 31, 2023
0d5b00a
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_…
AsparagusEduardo Aug 31, 2023
842b9dc
Incorporated bugfixes from upstream
AsparagusEduardo Aug 31, 2023
c4e8876
Pret merge (2023/08/31) (#3268)
AsparagusEduardo Aug 31, 2023
35d7201
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 1, 2023
1513443
Fixed Ultra Burst + Mega Evolution test
AsparagusEduardo Sep 1, 2023
4ac61ad
handleultraburst, handleprimalreversion, handlemegaevo
AsparagusEduardo Sep 1, 2023
c4553c7
5 more callnatives
AsparagusEduardo Sep 1, 2023
66710ac
Updated various defines
AsparagusEduardo Sep 1, 2023
0a78121
Merge branch 'upcoming' into overworldsnow
kittenchilly Sep 2, 2023
4439253
Add include guards for assembly constants files
GriffinRichards Sep 4, 2023
7c2ad31
merge with upcoming
DizzyEggg Sep 4, 2023
d967776
remove gActiveBattler replacement
DizzyEggg Sep 4, 2023
b907029
Get rid of the gActiveBattler variable (#3262)
ghoulslash Sep 4, 2023
2fa4206
Add new Substitute doll sprites (#3263)
kittenchilly Sep 4, 2023
1e10bbe
Merge branch 'upcoming' into overworldsnow
kittenchilly Sep 4, 2023
675aa5d
fix GetBattleAnimMoveTargets logic (#3278)
ghoulslash Sep 5, 2023
d31b168
Add `blockBoxRS` field to `struct BoxPokemon`
citrusbolt Sep 5, 2023
820113d
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 7, 2023
3333395
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
AsparagusEduardo Sep 7, 2023
e20383b
Merge branch 'upcoming' into overworldsnow
kittenchilly Sep 7, 2023
75d06bb
Generation 6 Experience Share (#3276)
pkmnsnfrn Sep 8, 2023
6332870
Crabominable can now evolve via Ice Stone
AsparagusEduardo Sep 8, 2023
7a24167
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
kittenchilly Sep 8, 2023
b114baa
Updated Nosepass evolution with PLA's
AsparagusEduardo Sep 9, 2023
e75ed11
Added missing FONT_* labels in ItemUseOutOfBattle_ExpShare (#3291)
LOuroboros Sep 10, 2023
2642b81
Merge branch 'upcoming' into overworldsnow
kittenchilly Sep 10, 2023
755e260
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 10, 2023
4dff036
Fix ai vs ai battles switch issue (#3283)
DizzyEggg Sep 10, 2023
6a70b06
Removed unused itemId field
AsparagusEduardo Sep 10, 2023
3298312
add script context to callnative functions
Sep 11, 2023
bfcbd37
Updated Big Nugget's Fling power to Gen 8+
AsparagusEduardo Sep 11, 2023
327fda7
Callnative functions take ScriptContext argument (#3294)
mrgriffin Sep 11, 2023
ccdf72a
Updated Big Nugget's Fling power to Gen 8+ (#3296)
ghoulslash Sep 11, 2023
181a0b3
Removed unused itemId field (#3293)
ghoulslash Sep 11, 2023
582cfb0
Convert various to callnatives - Part 1 (#3269)
ghoulslash Sep 11, 2023
8279ec3
Added missing Evolution data (#3287)
ghoulslash Sep 11, 2023
b861f6d
Fix overworld snow weather + make overworld fog cause misty terrain (…
ghoulslash Sep 11, 2023
bd48cca
ai delay timer
DizzyEggg Sep 12, 2023
b897225
Fixed Mr. Mime capitalization
AsparagusEduardo Sep 12, 2023
16c0a24
Merge pull request #1922 from AsparagusEduardo/pret/pr2/MrMime
GriffinRichards Sep 12, 2023
2d9cbef
exclude wild battles from ai lag meter
DizzyEggg Sep 12, 2023
44bd830
optimize dmg calc and ai dmg calc to reduce lag
DizzyEggg Sep 12, 2023
9778587
optimize battle util and item functions by setting u32 variables
DizzyEggg Sep 12, 2023
de3493f
Merge pull request #1921 from citrusbolt/blockboxrs
GriffinRichards Sep 12, 2023
406209f
score to s32
DizzyEggg Sep 13, 2023
1a64938
optimize dmg move result and ai who is faster
DizzyEggg Sep 13, 2023
623015b
Add ai delay timer (#3302)
ghoulslash Sep 13, 2023
9031f5a
get battlers' speed only once
DizzyEggg Sep 13, 2023
94a3e80
Remove redundant side macros/funcs (#3299)
DizzyEggg Sep 13, 2023
0081c3a
small improvement
DizzyEggg Sep 13, 2023
b7d0d37
fix conflicts
DizzyEggg Sep 13, 2023
38dcb3c
ai weather optimization
DizzyEggg Sep 13, 2023
5ea66f3
more optimizations
DizzyEggg Sep 13, 2023
bb95014
final ai optimizations
DizzyEggg Sep 14, 2023
2545907
ai lag fixes ready
DizzyEggg Sep 14, 2023
db039ee
Tera Shards Icons (#3307)
AlexOn1ine Sep 14, 2023
2ce3f4d
Implement Enigma Berry's hold effect + tests (#3300)
kittenchilly Sep 14, 2023
c9b2a8a
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 14, 2023
f3217c1
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 14, 2023
4fb0b55
Bug bite/Fling enigma berry interaction & tests (#3311)
DizzyEggg Sep 14, 2023
80ec674
Bitter Blade and Double Shock animations (#3310)
AlexOn1ine Sep 14, 2023
4a3ee0d
Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes…
kittenchilly Sep 14, 2023
a073e7b
Adds Gigaton Hammer and Salt Cure (#3297)
AlexOn1ine Sep 15, 2023
4ed4b69
[BUGFIX] for abilities affecting wild encounter tables
Sep 15, 2023
74fd561
merge with upcoming
DizzyEggg Sep 17, 2023
136ea39
Fix tests breaking on modern (#3319)
DizzyEggg Sep 19, 2023
415d6e9
Fix Toxic Debris after user faints (#3323)
AlexOn1ine Sep 19, 2023
003d7d7
Merge pull request #1923 from SBird1337/bugfix/ability-wild-mons
GriffinRichards Sep 19, 2023
d421773
Add type boosting held item power config (#3326)
kittenchilly Sep 21, 2023
5b498e9
Fix no return in isbattlergrounded (#3328)
DizzyEggg Sep 21, 2023
b673738
Add config for pressing B in the PC
Bassoonian Sep 21, 2023
8bf8c9e
Fix flag debug screen corrupting subsequent message boxes (#3317)
DizzyEggg Sep 21, 2023
f564d44
GetBattlerHoldEffect usage optimizations (#3330)
AsparagusEduardo Sep 21, 2023
662dd7d
Fix give daycare egg option giving buggy eggs (#3335)
DizzyEggg Sep 22, 2023
b77dec1
Transform updates AI_PARTY data (#3295)
ghoulslash Sep 23, 2023
6eb6282
add missing constant usage in m4a_1
Kurausukun Sep 23, 2023
7cc75eb
Merge pull request #1927 from Kurausukun/m4asym
GriffinRichards Sep 24, 2023
5d77123
merge with master
DizzyEggg Sep 24, 2023
7d9555d
change some more variables to u32
DizzyEggg Sep 24, 2023
996bc6b
Fix order of messages in gen6 exp share (#3339)
DizzyEggg Sep 24, 2023
566ec93
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 24, 2023
0b9f12e
Adds support for placing Pokémon in the PC with the B button (#3329)
ghoulslash Sep 25, 2023
de577f9
Greatly reduce AI lag (#3308)
AsparagusEduardo Sep 26, 2023
9144b36
Merge remote-tracking branch 'pret/master' into RHH/upcoming
AsparagusEduardo Sep 26, 2023
2d39703
Incorporate upstream fixes
AsparagusEduardo Sep 26, 2023
f35c5e2
Pret merge 2023/09/26 (#3347)
AsparagusEduardo Sep 26, 2023
f3a65c0
Merge branch 'RHH/master' into RHH/upcoming
AsparagusEduardo Sep 26, 2023
e1d1236
Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming
AsparagusEduardo Sep 26, 2023
baca050
Allow Sliggoo to evolve during overworld fog (#3343)
kittenchilly Sep 26, 2023
9f60202
Merge branch 'RHH/upcoming' into RHH/pr/version/1.6.0
AsparagusEduardo Sep 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ MAKER_CODE := 01
REVISION := 0
MODERN ?= 0
TEST ?= 0
ANALYZE ?= 0

ifeq (modern,$(MAKECMDGOALS))
MODERN := 1
Expand Down Expand Up @@ -118,7 +119,10 @@ LIBPATH := -L ../../tools/agbcc/lib
LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
else
CC1 = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -std=gnu17
ifeq ($(ANALYZE),1)
override CFLAGS += -fanalyzer
endif
ROM := $(MODERN_ROM_NAME)
OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
Expand Down
2 changes: 1 addition & 1 deletion asm/macros/battle_frontier/frontier_util.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@ Get the status (CHALLENGE_STATUS_*) of the current challenge and store the result in VAR_TEMP_0
@ Get the status (CHALLENGE_STATUS_*) of the current challenge and store the result in VAR_TEMP_CHALLENGE_STATUS
.macro frontier_getstatus
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_GET_STATUS
special CallFrontierUtilFunc
Expand Down
103 changes: 65 additions & 38 deletions asm/macros/battle_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1187,11 +1187,11 @@
.byte 0xe5
.endm

.macro doweatherformchangeanimation
.macro unused3
.byte 0xe6
.endm

.macro tryweatherformdatachange
.macro unused4
.byte 0xe7
.endm

Expand Down Expand Up @@ -1311,7 +1311,7 @@
callnative BS_CalcMetalBurstDmg
.4byte \failInstr
.endm

.macro jumpifcantfling battler:req, jumpInstr:req
callnative BS_JumpIfCantFling
.byte \battler
Expand Down Expand Up @@ -1361,6 +1361,11 @@
callnative BS_SetSnow
.endm

.macro applysaltcure battler:req
callnative BS_ApplySaltCure
.byte \battler
.endm

.macro setzeffect
callnative BS_SetZEffect
.endm
Expand All @@ -1382,6 +1387,57 @@
.4byte \ptr
.endm

.macro jumpifcantloseitem battler:req, ptr:req
callnative BS_JumpIfCantLoseItem
.byte \battler
.4byte \ptr
.endm

.macro handlemegaevo battler:req, case:req
callnative BS_HandleMegaEvolution
.byte \battler
.byte \case
.endm

.macro handleprimalreversion battler:req, case:req
callnative BS_HandlePrimalReversion
.byte \battler
.byte \case
.endm

.macro handleultraburst battler:req, case:req
callnative BS_HandleUltraBurst
.byte \battler
.byte \case
.endm

.macro jumpifshelltrap battler:req, jumpInstr:req
callnative BS_JumpIfShellTrap
.byte \battler
.4byte \jumpInstr
.endm

.macro jumpifemergencyexited battler:req, jumpInstr:req
callnative BS_JumpIfEmergencyExited
.byte \battler
.4byte \jumpInstr
.endm

.macro jumpifrodaffected battler:req, jumpInstr:req
callnative BS_JumpIfRod
.4byte \jumpInstr
.endm

.macro jumpifabsorbaffected battler:req, jumpInstr:req
callnative BS_JumpIfAbsorb
.4byte \jumpInstr
.endm

.macro jumpifmotoraffected battler:req, jumpInstr:req
callnative BS_JumpIfMotor
.4byte \jumpInstr
.endm

.macro jumpifargument argument:req, jumpInstr:req
callnative BS_JumpIfArgument
.byte \argument
Expand Down Expand Up @@ -1640,16 +1696,6 @@
.4byte \failInstr
.endm

.macro handlemegaevo battler:req, case:req
various \battler, VARIOUS_HANDLE_MEGA_EVO
.byte \case
.endm

.macro handleprimalreversion battler:req, case:req
various \battler, VARIOUS_HANDLE_PRIMAL_REVERSION
.byte \case
.endm

.macro handleformchange battler:req, case:req
various \battler, VARIOUS_HANDLE_FORM_CHANGE
.byte \case
Expand Down Expand Up @@ -2016,21 +2062,6 @@
various BS_ATTACKER, VARIOUS_SHELL_SIDE_ARM_CHECK
.endm

.macro jumpifrodaffected battler:req, jumpInstr:req
various \battler, VARIOUS_JUMP_IF_ROD
.4byte \jumpInstr
.endm

.macro jumpifabsorbaffected battler:req, jumpInstr:req
various \battler, VARIOUS_JUMP_IF_ABSORB
.4byte \jumpInstr
.endm

.macro jumpifmotoraffected battler:req, jumpInstr:req
various \battler, VARIOUS_JUMP_IF_MOTOR
.4byte \jumpInstr
.endm

.macro jumpifteanoberry jumpInstr:req
various BS_ATTACKER, VARIOUS_TEATIME_TARGETS
.4byte \jumpInstr
Expand Down Expand Up @@ -2295,16 +2326,6 @@
waitmessage B_WAIT_TIME_LONG
.endm

.macro jumpifemergencyexited battler:req, jumpInstr:req
various \battler, VARIOUS_JUMP_IF_EMERGENCY_EXITED
.4byte \jumpInstr
.endm

.macro jumpifshelltrap battler:req, ptr:req
various \battler, VARIOUS_JUMP_IF_SHELL_TRAP
.4byte \ptr
.endm

.macro hitswitchtargetfailed
various 0, VARIOUS_HIT_SWITCH_TARGET_FAILED
.endm
Expand All @@ -2313,3 +2334,9 @@
various 0, VARIOUS_TRY_REVIVAL_BLESSING
.4byte \jumpInstr
.endm

@ Will jump to script pointer if the specified battler has or has not fainted.
.macro jumpiffainted battler:req, value:req, ptr:req
getbattlerfainted \battler
jumpifbyte CMP_EQUAL, gBattleCommunication, \value, \ptr
.endm
7 changes: 7 additions & 0 deletions asm/macros/event.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2018,3 +2018,10 @@
setvar VAR_0x8002, \tryMultiple
special TrySpecialOverworldEvo
.endm

.macro ai_vs_ai_battle trainer1:req, trainer2:req
setflag B_FLAG_AI_VS_AI_BATTLE
setvar VAR_0x8004, \trainer1
callnative CreateTrainerPartyForPlayer
trainerbattle_no_intro \trainer2, NULL
.endm
6 changes: 3 additions & 3 deletions charmap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ B_ATK_PARTNER_NAME = FD 0E
B_ATK_NAME_WITH_PREFIX = FD 0F
B_DEF_NAME_WITH_PREFIX = FD 10
B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBattler
B_ACTIVE_NAME_WITH_PREFIX = FD 12
@ FD 12 - preiously gActiveBattler with prefix
B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13
B_CURRENT_MOVE = FD 14
B_LAST_MOVE = FD 15
Expand Down Expand Up @@ -409,8 +409,8 @@ B_ATK_TEAM2 = FD 38
B_DEF_NAME = FD 39
B_DEF_TEAM1 = FD 3A
B_DEF_TEAM2 = FD 3B
B_ACTIVE_NAME = FD 3C
B_ACTIVE_NAME2 = FD 3D @ no Illusion check
@ FD 3C - preiously gActiveBattler
@ FD 3D - preiously gActiveBattler without Illusion Check

@ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00
Expand Down
3 changes: 3 additions & 0 deletions common_syms/battle_controllers.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
gBattlerControllerFuncs
gBattleControllerData
gBattlerControllerEndFuncs
2 changes: 0 additions & 2 deletions common_syms/battle_main.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ gPreBattleCallback1
gBattleMainFunc
gBattleResults
gLeveledUpInBattle
gBattlerControllerFuncs
gHealthboxSpriteIds
gMultiUsePlayerCursor
gNumberOfMovesToChoose
gBattleControllerData
1 change: 1 addition & 0 deletions constants/constants.inc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.include "constants/gba_constants.inc"
.include "constants/global.inc"
.include "constants/tms_hms.inc"
5 changes: 5 additions & 0 deletions constants/gba_constants.inc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef GUARD_CONSTANTS_GBA_CONSTANTS_INC
#define GUARD_CONSTANTS_GBA_CONSTANTS_INC

.set PSR_USR_MODE, 0x00000010
.set PSR_FIQ_MODE, 0x00000011
.set PSR_IRQ_MODE, 0x00000012
Expand Down Expand Up @@ -511,3 +514,5 @@
.set BLDCNT_TGT2_OBJ, 1 << 12
.set BLDCNT_TGT2_BD, 1 << 13
.set BLDCNT_TGT2_ALL, BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD

#endif @ GUARD_CONSTANTS_GBA_CONSTANTS_INC
5 changes: 5 additions & 0 deletions constants/global.inc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef GUARD_CONSTANTS_GLOBAL_INC
#define GUARD_CONSTANTS_GLOBAL_INC

.set TRUE, 1
.set FALSE, 0

Expand All @@ -20,3 +23,5 @@

.set OBJ_IMAGE_ANIM_H_FLIP, 1 << 6
.set OBJ_IMAGE_ANIM_V_FLIP, 1 << 7

#endif @ GUARD_CONSTANTS_GLOBAL_INC
5 changes: 5 additions & 0 deletions constants/m4a_constants.inc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef GUARD_CONSTANTS_M4A_CONSTANTS_INC
#define GUARD_CONSTANTS_M4A_CONSTANTS_INC

.equiv ID_NUMBER, 0x68736d53

.equiv PCM_DMA_BUF_SIZE, 1584
Expand Down Expand Up @@ -250,3 +253,5 @@
struct_field o_CgbChannel_nextChannelPointer, 4
struct_field o_CgbChannel_dummy4, 8
struct_field CgbChannel_size, 0

#endif @ GUARD_CONSTANTS_M4A_CONSTANTS_INC
22 changes: 22 additions & 0 deletions constants/tms_hms.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef GUARD_CONSTANTS_TMS_HMS_INC
#define GUARD_CONSTANTS_TMS_HMS_INC

#include "constants/tms_hms.h"

/* Expands to:
* enum_start ITEM_TM01
* enum ITEM_TM_FOCUS_PUNCH
* ...
* enum_start ITEM_HM01
* enum ITEM_HM_CUT
* ... */
#define EQUIV_TM(id) enum ITEM_TM_ ## id;
#define EQUIV_HM(id) enum ITEM_HM_ ## id;
enum_start ITEM_TM01
FOREACH_TM(EQUIV_TM)
enum_start ITEM_HM01
FOREACH_HM(EQUIV_HM)
#undef EQUIV_TM
#undef EQUIV_HM

#endif @ GUARD_CONSTANTS_TMS_HMS_INC
Loading
Loading