Change unused battle command and unused tileset anims labels to match pokegold-spaceworld (#1262)

This commit is contained in:
Rangi
2026-06-28 13:02:18 -04:00
committed by GitHub
parent 06ec23ccee
commit cb752f33fd
3 changed files with 16 additions and 11 deletions

View File

@@ -64,7 +64,7 @@ BattleCommandPointers:
dw BattleCommand_Charge
dw BattleCommand_CheckCharge
dw BattleCommand_TrapTarget
dw BattleCommand_Unused3C
dw BattleCommand_Dummy_SkipToTrapTarget
dw BattleCommand_Rampage
dw BattleCommand_CheckRampage
dw BattleCommand_ConstantDamage
@@ -97,7 +97,7 @@ BattleCommandPointers:
dw BattleCommand_Endure
dw BattleCommand_CheckRollout
dw BattleCommand_RolloutPower
dw BattleCommand_Unused5D
dw BattleCommand_Dummy_Swagger
dw BattleCommand_FuryCutter
dw BattleCommand_Attract
dw BattleCommand_HappinessPower

View File

@@ -64,7 +64,8 @@ TilesetJohtoAnim:
tileframe StandingTileFrame8
tileframe DoneTileAnimation
UnusedTilesetAnim1: ; unreferenced
UnusedTilesetFlowerAnim: ; unreferenced
; Leftover from pokegold-spaceworld.
; Scrolls tile $03 like cave water, but also has the standard $03 flower tile.
tileframe ReadTileToAnimBuffer, vTiles2 tile $03
tileframe ScrollTileRightLeft, wTileAnimBuffer
@@ -78,7 +79,8 @@ UnusedTilesetAnim1: ; unreferenced
tileframe WaitTileAnimation
tileframe DoneTileAnimation
UnusedTilesetAnim2: ; unreferenced
UnusedTilesetWaterAnim: ; unreferenced
; Leftover from pokegold-spaceworld.
; Scrolls tile $14 like cave water.
tileframe ReadTileToAnimBuffer, vTiles2 tile $14
tileframe ScrollTileRightLeft, wTileAnimBuffer
@@ -116,7 +118,8 @@ TilesetEliteFourRoomAnim:
tileframe StandingTileFrame8
tileframe DoneTileAnimation
UnusedTilesetAnim3: ; unreferenced
UnusedTilesetGenericAnim: ; unreferenced
; Leftover from pokegold-spaceworld.
; Scrolls tile $53 like a waterfall; scrolls tile $03 like cave water.
tileframe ReadTileToAnimBuffer, vTiles2 tile $53
tileframe ScrollTileDown, wTileAnimBuffer
@@ -131,7 +134,8 @@ UnusedTilesetAnim3: ; unreferenced
tileframe WriteTileFromAnimBuffer, vTiles2 tile $53
tileframe DoneTileAnimation
UnusedTilesetAnim4: ; unreferenced
UnusedTilesetFontAnim: ; unreferenced
; Leftover from pokegold-spaceworld.
; Scrolls tile $54 like a waterfall; scrolls tile $03 like cave water.
tileframe ReadTileToAnimBuffer, vTiles2 tile $54
tileframe ScrollTileDown, wTileAnimBuffer
@@ -209,7 +213,8 @@ TilesetTowerAnim:
tileframe WaitTileAnimation
tileframe DoneTileAnimation
UnusedTilesetAnim5: ; unreferenced
UnusedTilesetRocketHouseAnim: ; unreferenced
; Leftover from pokegold-spaceworld.
; Scrolls tile $4f like cave water.
tileframe ReadTileToAnimBuffer, vTiles2 tile $4f
tileframe ScrollTileRightLeft, wTileAnimBuffer

View File

@@ -5605,8 +5605,8 @@ BattleCommand_Charge:
text_far _BattleDugText
text_end
BattleCommand_Unused3C:
; effect0x3c
BattleCommand_Dummy_SkipToTrapTarget:
; Dummied out from pokegold-spaceworld.
ret
BattleCommand_TrapTarget:
@@ -6353,8 +6353,8 @@ INCLUDE "engine/battle/move_effects/sandstorm.asm"
INCLUDE "engine/battle/move_effects/rollout.asm"
BattleCommand_Unused5D:
; effect0x5d
BattleCommand_Dummy_Swagger:
; Dummied out from pokegold-spaceworld.
ret
INCLUDE "engine/battle/move_effects/fury_cutter.asm"