Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix bugs
Some checks failed
CI / build (push) Failing after 1m18s
Details

Browse Source
This commit is contained in:
Giulia Sanguineti
2025-10-01 10:11:42 +02:00
parent d138ed1bd4
commit 4c8d3e962f
44 changed files with 236 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle/ai/sunny_day_moves.asm
View File

@@ -1,13 +1,15 @@
; AI_SMART encourages Sunny Day if it also knows these moves.
SunnyDayMoves:
; BUG: "Smart" AI does not encourage Sunny Day when it knows Solar Beam, Flame Wheel, or Moonlight (see docs/bugs_and_glitches.md)
db FIRE_PUNCH
db EMBER
db FLAMETHROWER
db SOLARBEAM
db FIRE_SPIN
db FIRE_BLAST
db FLAME_WHEEL
db SACRED_FIRE
db MORNING_SUN
db SYNTHESIS
db MOONLIGHT
db -1 ; end

10
data/maps/maps.asm
View File

@@ -92,11 +92,11 @@ MapGroup_Dungeons:
map BurnedTowerB1F, TILESET_CAVE, CAVE, LANDMARK_BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE
map NationalPark, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map NationalParkBugContest, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND
map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

3
data/moves/animations.asm
View File

@@ -2082,9 +2082,8 @@ BattleAnim_Headbutt:
anim_ret
BattleAnim_Tackle:
; BUG: Tackle is missing part of its hit animation (see docs/bugs_and_glitches.md)
anim_1gfx BATTLE_ANIM_GFX_HIT
anim_call BattleAnim_TargetObj_2Row
anim_call BattleAnim_TargetObj_1Row
anim_bgeffect BATTLE_BG_EFFECT_TACKLE, $0, BG_EFFECT_USER, $0
anim_wait 4
anim_sound 0, 1, SFX_TACKLE

6
data/text/common_2.asm
View File

@@ -100,19 +100,17 @@ Text_Gained::
text_end
_BoostedExpPointsText::
; BUG: Five-digit experience gain is printed incorrectly (see docs/bugs_and_glitches.md)
text_start
line "a boosted"
cont "@"
text_decimal wStringBuffer2, 2, 4
text_decimal wStringBuffer2, 2, 5
text " EXP. Points!"
prompt
_ExpPointsText::
; BUG: Five-digit experience gain is printed incorrectly (see docs/bugs_and_glitches.md)
text_start
line "@"
text_decimal wStringBuffer2, 2, 4
text_decimal wStringBuffer2, 2, 5
text " EXP. Points!"
prompt

3
data/trainers/dvs.asm
View File

@@ -43,8 +43,7 @@ TrainerClassDVs:
dn 7, 8, 8, 8 ; SWIMMERF
dn 9, 8, 8, 8 ; SAILOR
dn 9, 8, 8, 8 ; SUPER_NERD
; BUG: RIVAL2 has lower DVs than RIVAL1 (see docs/bugs_and_glitches.md)
dn 9, 8, 8, 8 ; RIVAL2
dn 13, 13, 13, 13 ; RIVAL2
dn 9, 8, 8, 8 ; GUITARIST
dn 10, 8, 8, 8 ; HIKER
dn 9, 8, 8, 8 ; BIKER