summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engine/battle_anims/bg_effects.asm106
-rw-r--r--engine/events/diploma.asm5
-rw-r--r--engine/games/card_flip.asm6
-rw-r--r--engine/games/dummy_game.asm8
-rw-r--r--engine/gfx/sprite_anims.asm657
-rw-r--r--engine/overworld/cmd_queue.asm10
-rw-r--r--engine/overworld/map_objects.asm392
7 files changed, 589 insertions, 595 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 411b6347..b587be2b 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -163,7 +163,7 @@ DummyPredef2F::
ld l, a
jp hl
-BattleBGEffects_IncrementJumptable:
+BattleBGEffects_IncAnonJumptableIndex:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
inc [hl]
@@ -342,13 +342,13 @@ BattleBGEffect_HideMon:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
dw .four
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side
@@ -406,9 +406,9 @@ BattleBGEffect_BattlerObj_1Row:
.anon_dw
dw .zero
dw .one
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
dw .five
.zero
@@ -420,7 +420,7 @@ BattleBGEffect_BattlerObj_1Row:
ret
.not_flying_digging
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side
@@ -444,7 +444,7 @@ BattleBGEffect_BattlerObj_1Row:
ret
.one
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side_2
@@ -473,9 +473,9 @@ BattleBGEffect_BattlerObj_2Row:
.anon_dw
dw .zero
dw .one
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
dw .five
.zero
@@ -487,7 +487,7 @@ BattleBGEffect_BattlerObj_2Row:
ret
.not_flying_digging
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side
@@ -511,7 +511,7 @@ BattleBGEffect_BattlerObj_2Row:
ret
.one
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_side_2
@@ -545,12 +545,12 @@ BattleBGEffect_RemoveMon:
.anon_dw
dw .zero
dw .one
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
dw .four
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BGEffect_CheckBattleTurn
ld [hl], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
@@ -617,7 +617,7 @@ BattleBGEffect_RemoveMon:
ldh [hBGMapThird], a
ld a, $1
ldh [hBGMapMode], a
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
dec [hl]
@@ -706,8 +706,8 @@ BattleBGEffect_RunPicResizeScript:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
- dw BattleBGEffects_IncrementJumptable
- dw BattleBGEffects_IncrementJumptable
+ dw BattleBGEffects_IncAnonJumptableIndex
+ dw BattleBGEffects_IncAnonJumptableIndex
dw .restart
dw .end
@@ -733,7 +733,7 @@ BattleBGEffect_RunPicResizeScript:
jr z, .skip
call .PlaceGraphic
.skip
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld a, $1
ldh [hBGMapMode], a
ret
@@ -909,7 +909,7 @@ BattleBGEffect_Surf:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
lb de, 2, 2
call InitSurfWaves
@@ -975,7 +975,7 @@ BattleBGEffect_Whirlpool:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCY)
ldh [hLCDCPointer], a
@@ -1050,7 +1050,7 @@ BattleBGEffect_Psychic:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
ldh [hLCDCPointer], a
@@ -1087,7 +1087,7 @@ BattleBGEffect_Teleport:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1111,7 +1111,7 @@ BattleBGEffect_NightShade:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1141,7 +1141,7 @@ BattleBGEffect_DoubleTeam:
dw .five
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1174,7 +1174,7 @@ BattleBGEffect_DoubleTeam:
ret
.next
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ret
.two
@@ -1232,7 +1232,7 @@ BattleBGEffect_AcidArmor:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1294,7 +1294,7 @@ BattleBGEffect_Withdraw:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1343,7 +1343,7 @@ BattleBGEffect_Dig:
dw .three
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1369,7 +1369,7 @@ BattleBGEffect_Dig:
.next
ld [hl], $10
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
.two
ldh a, [hLYOverrideStart]
ld l, a
@@ -1412,7 +1412,7 @@ BattleBGEffect_Tackle:
; Prepares mon to move forward (player moves right, enemy moves left)
; BG_EFFECT_STRUCT_03 will keep track of distance moved, so it's reset to 0 here
; BG_EFFECT_STRUCT_BATTLE_TURN is set to 2 or -2 depending on target
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1449,7 +1449,7 @@ Tackle_MoveForward:
cp 8
jr nz, .finish
.reached_limit
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
.finish
call Rollout_FillLYOverridesBackup
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
@@ -1470,7 +1470,7 @@ Tackle_ReturnMove:
ld a, [hl]
and a
jr nz, .move_back
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
.move_back
call Rollout_FillLYOverridesBackup
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
@@ -1551,7 +1551,7 @@ BattleBGEffect_BetaPursuit: ; unused
VitalThrow_MoveBackwards:
; Prepares mon to move back back (player moves left, enemy moves right)
; BG_EFFECT_STRUCT_03: keeps track of distance moved, so it's reset to 0 here
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1595,7 +1595,7 @@ BattleBGEffect_WobbleMon:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1633,7 +1633,7 @@ BattleBGEffect_Flail:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1687,7 +1687,7 @@ BattleBGEffect_WaveDeformMon:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1729,7 +1729,7 @@ BattleBGEffect_BounceDown:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCY)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1782,7 +1782,7 @@ BattleBGEffect_BetaSendOutMon1: ; unused
dw .five
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, $47
@@ -1822,7 +1822,7 @@ BattleBGEffect_BetaSendOutMon1: ; unused
ldh a, [hLYOverrideStart]
inc a
ldh [hLYOverrideStart], a
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ret
.three
@@ -1836,7 +1836,7 @@ BattleBGEffect_BetaSendOutMon1: ; unused
ret
.finish
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ret
.SetLYOverridesBackup:
@@ -1886,7 +1886,7 @@ BattleBGEffect_BetaSendOutMon2: ; unused
dw .one
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -1926,7 +1926,7 @@ BattleBGEffect_FadeMonsToBlackRepeating:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, LOW(rBGP)
@@ -2010,7 +2010,7 @@ BattleBGEffect_FadeMonsToBlackRepeating:
dw .cgb_two
.cgb_zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -2162,7 +2162,7 @@ BattleBGEffect_VibrateMon:
dw .one
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
call BattleBGEffect_SetLCDStatCustoms1
@@ -2208,7 +2208,7 @@ BattleBGEffect_WobblePlayer:
dw .two
.zero
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
call BattleBGEffects_ClearLYOverrides
ld a, LOW(rSCX)
ldh [hLCDCPointer], a
@@ -2373,7 +2373,7 @@ BGEffect_RapidCyclePals:
dw .two_dmg
.zero_dmg
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, $47
@@ -2439,10 +2439,10 @@ BGEffect_RapidCyclePals:
.zero_cgb
call BGEffect_CheckBattleTurn
jr nz, .player_turn_cgb
- call BattleBGEffects_IncrementJumptable
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
+ call BattleBGEffects_IncAnonJumptableIndex
.player_turn_cgb
- call BattleBGEffects_IncrementJumptable
+ call BattleBGEffects_IncAnonJumptableIndex
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm
index 22cbcdd7..9147015c 100644
--- a/engine/events/diploma.asm
+++ b/engine/events/diploma.asm
@@ -1,7 +1,8 @@
-ret_e0000:
+AnimateUnusedPikachu:
ret
- ret ; unused
+AnimateUnusedPikachu2: ; unreferenced
+ ret
_Diploma:
call PlaceDiplomaOnScreen
diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm
index 0e879ff0..ba73f202 100644
--- a/engine/games/card_flip.asm
+++ b/engine/games/card_flip.asm
@@ -3,11 +3,11 @@ CARDFLIP_LIGHT_ON EQU "♀" ; $f5
CARDFLIP_DECK_SIZE EQU 4 * 6
-; two labels below called from inside ./dummy_game.asm
-Unknown_e0908:
+DummyGameGFX:
; Graphics for an unused Game Corner
; game were meant to be here.
-ret_e0908:
+
+UnusedCursor_InterpretJoypad_AnimateCursor:
ret
_CardFlip:
diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm
index 55c74407..a1ab49f2 100644
--- a/engine/games/dummy_game.asm
+++ b/engine/games/dummy_game.asm
@@ -14,10 +14,10 @@ _DummyGame:
ld hl, DummyGameLZ
ld de, vTiles2 tile $00
call Decompress
- ld hl, Unknown_e0908
+ ld hl, DummyGameGFX
ld de, vTiles0 tile $00
ld bc, 4 tiles
- ld a, BANK(Unknown_e0908)
+ ld a, BANK(DummyGameGFX)
call FarCopyBytes
ld a, $8
ld hl, wc508
@@ -77,7 +77,7 @@ _DummyGame:
ret
.ResetBoard:
- call ret_e0908
+ call UnusedCursor_InterpretJoypad_AnimateCursor
jr nc, .proceed
ld hl, wJumptableIndex
set 7, [hl]
@@ -232,7 +232,7 @@ endr
ld hl, wJumptableIndex
inc [hl]
.AskPlayAgain:
- call ret_e0908
+ call UnusedCursor_InterpretJoypad_AnimateCursor
jr nc, .restart
ld hl, wJumptableIndex
set 7, [hl]
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 8abad293..ae33a2e8 100644
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -13,59 +13,59 @@ DoAnimFrame:
.Jumptable:
; entries correspond to SPRITE_ANIM_SEQ_* constants
- dw .Null
- dw .PartyMon
- dw .PartyMonSwitch
- dw .PartyMonSelected
- dw .GSIntroBubble
- dw .GSIntroShellder
- dw .GSIntroMagikarp
- dw .UnusedLapras
- dw .GSIntroLapras
- dw .GSIntroNote
- dw .GSIntroJigglypuff
- dw .GSIntroPikachu
- dw .GSIntroPikachuTail
- dw .GSIntroFireball
- dw .GSIntroChikoritaTotodile
- dw .GSIntroCyndaquil
- dw .GSTitleTrail
- dw .UnusedPikachu
- dw .UnusedPikachuTail
- dw .UnusedNote
- dw .UnusedJigglypuff
- dw .NamingScreenCursor
- dw .GameFreakLogo
- dw .GSGameFreakLogoStar
- dw .GSGameFreakLogoSparkle
- dw .SlotsGolem
- dw .SlotsChansey
- dw .SlotsChanseyEgg
- dw .MailCursor
- dw .UnusedCursor
- dw .DummyGameCursor
- dw .PokegearArrow
- dw .TradePokeBall
- dw .TradeTubeBulge
- dw .TrademonInTube
- dw .RevealNewMon
- dw .RadioTuningKnob
- dw .CutLeaves
- dw .FlyFrom
- dw .FlyLeaf
- dw .FlyTo
- dw .GSIntroHoOhLugia
-
-.Null:
- ret
-
-.PartyMon
+ dw AnimSeq_Null
+ dw AnimSeq_PartyMon
+ dw AnimSeq_PartyMonSwitch
+ dw AnimSeq_PartyMonSelected
+ dw AnimSeq_GSIntroBubble
+ dw AnimSeq_GSIntroShellder
+ dw AnimSeq_GSIntroMagikarp
+ dw AnimSeq_UnusedLapras
+ dw AnimSeq_GSIntroLapras
+ dw AnimSeq_GSIntroNote
+ dw AnimSeq_GSIntroJigglypuff
+ dw AnimSeq_GSIntroPikachu
+ dw AnimSeq_GSIntroPikachuTail
+ dw AnimSeq_GSIntroFireball
+ dw AnimSeq_GSIntroChikoritaTotodile
+ dw AnimSeq_GSIntroCyndaquil
+ dw AnimSeq_GSTitleTrail
+ dw AnimSeq_UnusedPikachu
+ dw AnimSeq_UnusedPikachuTail
+ dw AnimSeq_UnusedNote
+ dw AnimSeq_UnusedJigglypuff
+ dw AnimSeq_NamingScreenCursor
+ dw AnimSeq_GameFreakLogo
+ dw AnimSeq_GSGameFreakLogoStar
+ dw AnimSeq_GSGameFreakLogoSparkle
+ dw AnimSeq_SlotsGolem
+ dw AnimSeq_SlotsChansey
+ dw AnimSeq_SlotsChanseyEgg
+ dw AnimSeq_MailCursor
+ dw AnimSeq_UnusedCursor
+ dw AnimSeq_DummyGameCursor
+ dw AnimSeq_PokegearArrow
+ dw AnimSeq_TradePokeBall
+ dw AnimSeq_TradeTubeBulge
+ dw AnimSeq_TrademonInTube
+ dw AnimSeq_RevealNewMon
+ dw AnimSeq_RadioTuningKnob
+ dw AnimSeq_CutLeaves
+ dw AnimSeq_FlyFrom
+ dw AnimSeq_FlyLeaf
+ dw AnimSeq_FlyTo
+ dw AnimSeq_GSIntroHoOhLugia
+
+AnimSeq_Null:
+ ret
+
+AnimSeq_PartyMon:
ld a, [wMenuCursorY]
ld hl, SPRITEANIMSTRUCT_INDEX
add hl, bc
cp [hl]
- jr z, .PartyMonSwitch
+ jr z, AnimSeq_PartyMonSwitch
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -76,7 +76,7 @@ DoAnimFrame:
ld [hl], 0
ret
-.PartyMonSwitch
+AnimSeq_PartyMonSwitch:
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld [hl], 8 * 3
@@ -118,7 +118,7 @@ DoAnimFrame:
ld [hl], a
ret
-.PartyMonSelected
+AnimSeq_PartyMonSelected:
ld a, [wMenuCursorY]
ld hl, SPRITEANIMSTRUCT_INDEX
@@ -137,13 +137,13 @@ DoAnimFrame:
ld [hl], 8 * 3
ret
-.GSIntroBubble
+AnimSeq_GSIntroBubble:
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
inc [hl]
cp $40
- jr nc, .asm_8d54a
+ jr nc, .delete
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
@@ -151,20 +151,20 @@ DoAnimFrame:
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
- add $02
+ add 2
ld [hl], a
- ld d, $08
- call .Sprites_Sine
+ ld d, 8
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-.asm_8d54a
+.delete
call DeinitializeSprite
ret
-.GSIntroShellder
+AnimSeq_GSIntroShellder:
ld a, [wGlobalAnimYOffset]
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
@@ -174,40 +174,38 @@ DoAnimFrame:
call DeinitializeSprite
ret
-.GSIntroMagikarp
- call .AnonymousJumptable
+AnimSeq_GSIntroMagikarp:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
-; Anonymous dw (see .AnonymousJumptable)
- dw .Function8d565
- dw .Function8d576
-
-.Function8d565
- call .IncrementJumptableIndex
+.zero
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_INDEX
add hl, bc
ld a, [hl]
- and $03
+ and $3
swap a
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
-.Function8d576
- ld de, $0201
+.one
+ lb de, 2, 1
ldh a, [hSGB]
and a
- jr z, .asm_8d581
- ld de, $0402
-
-.asm_8d581
+ jr z, .sgb
+ lb de, 4, 2
+.sgb
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld a, [hl]
cp $f0
- jr nc, .asm_8d59e
+ jr nc, .delete
add d
ld [hl], a
@@ -216,23 +214,23 @@ DoAnimFrame:
ld a, [hl]
add e
ld [hl], a
- ld d, $08
- call .Sprites_Sine
+ ld d, 8
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ret
-.asm_8d59e
+.delete
call DeinitializeSprite
ret
-.UnusedLapras
+AnimSeq_UnusedLapras:
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $b0
- jr nc, .asm_8d5bb
+ jr nc, .delete
inc [hl]
ld hl, SPRITEANIMSTRUCT_VAR1
@@ -247,79 +245,77 @@ DoAnimFrame:
inc [hl]
ret
-.asm_8d5bb
+.delete
call DeinitializeSprite
ret
-.GSIntroLapras
- call .AnonymousJumptable
+AnimSeq_GSIntroLapras:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
+ dw .two
-; anonymous jumptable
- dw .Function8d5c9
- dw .Function8d5e2
- dw .Function8d5f3
-
-.Function8d5c9
- call .Function8d60b
+.zero
+ call .update_y_offset
ret z
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $58
- jr c, .asm_8d5d8
+ jr c, .next1
dec [hl]
ret
-
-.asm_8d5d8
- call .IncrementJumptableIndex
+.next1
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], $b0
ret
-.Function8d5e2
- call .Function8d60b
+.one
+ call .update_y_offset
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
- jr z, .asm_8d5ef
+ jr z, .next2
dec [hl]
ret
-.asm_8d5ef
- call .IncrementJumptableIndex
+.next2
+ call AnimSeqs_IncAnonJumptableIndex
ret
-.Function8d5f3
- call .Function8d60b
+.two
+ call .update_y_offset
ret z
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $d0
- jr z, .asm_8d602
+ jr z, .delete
dec [hl]
ret
-.asm_8d602
+.delete
call DeinitializeSprite
ld a, 1
ld [wcb19], a
ret
-.Function8d60b
+.update_y_offset
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
inc [hl]
ld d, 4
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
@@ -329,16 +325,15 @@ DoAnimFrame:
and $1
ret
-.GSIntroNote
- call .AnonymousJumptable
+AnimSeq_GSIntroNote:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
-; anonymous jumptable
- dw .Function8d62b
- dw .Function8d63e
-
-.Function8d62b
- call .IncrementJumptableIndex
+.zero
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, 0
add hl, bc
ld a, [hl]
@@ -349,21 +344,22 @@ DoAnimFrame:
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], a
-.Function8d63e
+
+.one
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld a, [hl]
cp $80
- jr nc, .asm_8d667
+ jr nc, .delete
inc [hl]
- ld d, $04
+ ld d, 4
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
- add $02
+ add 2
ld [hl], a
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
@@ -379,60 +375,59 @@ DoAnimFrame:
dec [hl]
ret
-.asm_8d667
+.delete
call DeinitializeSprite
ret
-.GSIntroJigglypuff
- call .AnonymousJumptable
+AnimSeq_GSIntroJigglypuff:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
-; anonymous jumptable
- dw .Function8d673
- dw .Function8d680
-
-.Function8d673
+.zero
ld a, [wcb19]
and a
ret z
- call .IncrementJumptableIndex
+ call AnimSeqs_IncAnonJumptableIndex
ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF_2
call _ReinitSpriteAnimFrame
-.Function8d680
+
+.one
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $d0
- jr z, .asm_8d68c
+ jr z, .delete
dec [hl]
dec [hl]
ret
-.asm_8d68c
+.delete
call DeinitializeSprite
ret
-.GSIntroPikachu
- call .AnonymousJumptable
+AnimSeq_GSIntroPikachu:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
+ dw .two
+ dw .three
-; anonymous jumptable
- dw .Function8d69c
- dw .Function8d6b6
- dw .Function8d6c9
- dw .Function8d6f2
-
-.Function8d69c
+.zero
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $80
- jr z, .asm_8d6a7
+ jr z, .next1
dec [hl]
ret
-.asm_8d6a7
- call .IncrementJumptableIndex
+.next1
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld [hl], $30
@@ -440,29 +435,29 @@ DoAnimFrame:
call _ReinitSpriteAnimFrame
ret
-.Function8d6b6
+.one
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
- jr z, .asm_8d6c0
+ jr z, .next2
dec [hl]
ret
-.asm_8d6c0
- call .IncrementJumptableIndex
+.next2
+ call AnimSeqs_IncAnonJumptableIndex
ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_3
call _ReinitSpriteAnimFrame
ret
-.Function8d6c9
+.two
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
- add $04
+ add 4
ld [hl], a
- ld d, $04
- call .Sprites_Sine
+ ld d, 4
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
@@ -470,53 +465,52 @@ DoAnimFrame:
add hl, bc
ld a, [hl]
cp $50
- jr z, .asm_8d6e9
+ jr z, .next3
dec [hl]
dec [hl]
dec [hl]
dec [hl]
ret
-.asm_8d6e9
+.next3
ld a, 1
ld [wcb19], a
- call .IncrementJumptableIndex
+ call AnimSeqs_IncAnonJumptableIndex
ret
-.Function8d6f2
+.three
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $d0
- jr z, .asm_8d6fe
+ jr z, .delete
dec [hl]
dec [hl]
ret
-.asm_8d6fe
+.delete
call DeinitializeSprite
ret
-.GSIntroPikachuTail
- call .AnonymousJumptable
+AnimSeq_GSIntroPikachuTail:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
+ dw .two
-; anonymous jumptable
- dw .Function8d70c
- dw .Function8d726
- dw .Function8d73c
-
-.Function8d70c
+.zero
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $80
- jr z, .asm_8d717
+ jr z, .next1
dec [hl]
ret
-.asm_8d717
- call .IncrementJumptableIndex
+.next1
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
@@ -525,12 +519,12 @@ DoAnimFrame:
call _ReinitSpriteAnimFrame
ret
-.Function8d726
+.one
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
- jr z, .asm_8d738
+ jr z, .next2
dec [hl]
cp $20
ret nz
@@ -538,18 +532,18 @@ DoAnimFrame:
call _ReinitSpriteAnimFrame
ret
-.asm_8d738
- call .IncrementJumptableIndex
+.next2
+ call AnimSeqs_IncAnonJumptableIndex
ret
-.Function8d73c
+.two
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
- add $04
+ add 4
ld [hl], a
- ld d, $04
- call .Sprites_Sine
+ ld d, 4
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
@@ -559,7 +553,7 @@ DoAnimFrame:
add hl, bc
ld a, [hl]
cp $d0
- jr z, .asm_8d761
+ jr z, .delete
dec [hl]
dec [hl]
ld a, [wcb19]
@@ -569,20 +563,19 @@ DoAnimFrame:
dec [hl]
ret
-.asm_8d761
+.delete
call DeinitializeSprite
ret
-.GSIntroFireball
- call .AnonymousJumptable
+AnimSeq_GSIntroFireball:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
-; anonymous jumptable
- dw .Function8d76d
- dw .Function8d786
-
-.Function8d76d
- call .IncrementJumptableIndex
+.zero
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, 0
add hl, bc
ld a, [hl]
@@ -598,7 +591,7 @@ DoAnimFrame:
ld [hl], a
ret
-.Function8d786
+.one
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
dec [hl]
@@ -610,7 +603,7 @@ DoAnimFrame:
add hl, bc
ld a, [hl]
ld d, a
- add $8
+ add 8
ld [hl], a
ld hl, SPRITEANIMSTRUCT_VAR1
@@ -618,31 +611,29 @@ DoAnimFrame:
ld a, [hl]
push af
push de
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
pop de
pop af
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-; flash down/right
-.GSIntroChikoritaTotodile
- call .AnonymousJumptable
+AnimSeq_GSIntroChikoritaTotodile:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
-; anonymous jumptable
- dw .Function8d7b9
- dw .Function8d7c9
-
-.Function8d7b9
- call .IncrementJumptableIndex
+.zero
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $30
@@ -651,7 +642,8 @@ DoAnimFrame:
ld [hl], $30
ret
-.Function8d7c9
+.one
+; flash down/right
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
@@ -661,7 +653,7 @@ DoAnimFrame:
inc [hl]
inc [hl]
ld d, $90
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
@@ -673,24 +665,22 @@ DoAnimFrame:
inc [hl]
inc [hl]
ld d, $90
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-; flash down/left
-.GSIntroCyndaquil
- call .AnonymousJumptable
+AnimSeq_GSIntroCyndaquil:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
-; anonymous jumptable
- dw .Function8d7f7
- dw .Function8d807
-
-.Function8d7f7
- call .IncrementJumptableIndex
+.zero
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $30
@@ -699,7 +689,8 @@ DoAnimFrame:
ld [hl], $10
ret
-.Function8d807
+.one
+; flash down/left
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
@@ -708,7 +699,7 @@ DoAnimFrame:
inc [hl]
inc [hl]
ld d, $90
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
@@ -718,23 +709,22 @@ DoAnimFrame:
inc [hl]
inc [hl]
ld d, $90
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-.GSTitleTrail
- call .AnonymousJumptable
+AnimSeq_GSTitleTrail:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .one
IF DEF(_GOLD)
-; anonymous jumptable
- dw .Function8d835
- dw .Function8d84c
-
-.Function8d835
- call .IncrementJumptableIndex
+.zero
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_INDEX
add hl, bc
@@ -751,16 +741,16 @@ IF DEF(_GOLD)
add hl, bc
ld [hl], a
-.Function8d84c
+.one
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $a4
- jr nc, .asm_8d881
+ jr nc, .delete
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
- add $4
+ add 4
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -782,58 +772,50 @@ IF DEF(_GOLD)
ld a, [hl]
add 3
ld [hl], a
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ret
-.asm_8d881
- call DeinitializeSprite
- ret
-
ELIF DEF(_SILVER)
-; anonymous jumptable
- dw .Function8d835
- dw .Function8d856
-
-.Function8d835
+.zero
ld a, [wIntroSceneTimer]
and $30
swap a
- add $3
+ add 3
ld d, a
-
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [wIntroSceneTimer]
and $30
swap a
- add $07
+ add 7
add [hl]
ld [hl], a
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
-.Function8d856
+
+.one
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
cp $a4
- jr nc, .asm_8d863
- add $4
+ jr nc, .delete
+ add 4
ld [hl], a
ret
+ENDC
-.asm_8d863
+.delete
call DeinitializeSprite
ret
-ENDC
-.GSIntroHoOhLugia
+AnimSeq_GSIntroHoOhLugia:
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
@@ -846,16 +828,16 @@ ELIF DEF(_SILVER)
ld [hl], a
ld d, 8
ENDC
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ret
-.UnusedPikachu
+AnimSeq_UnusedPikachu:
push bc
- farcall ret_e0000
+ farcall AnimateUnusedPikachu
pop bc
ld hl, wc704
ld a, [hl]
@@ -864,32 +846,31 @@ ENDC
ld [hl], 0
ld e, a
ld d, 0
- ld hl, .Data_8d8b4
+ ld hl, .pikachu_framesets
add hl, de
ld a, [hl]
call _ReinitSpriteAnimFrame
ret
-.Data_8d8b4
+.pikachu_framesets
db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU
db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2
db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU
db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3
-.UnusedPikachuTail
- farcall ret_e0000
+AnimSeq_UnusedPikachuTail:
+ farcall AnimateUnusedPikachu
ret
-.UnusedNote
- call .AnonymousJumptable
+AnimSeq_UnusedNote:
+ call AnimSeqs_AnonJumptable
jp hl
+.anon_dw
+ dw .zero
+ dw .delete
-; anonymous jumptable
- dw .Function8d8c7
- dw .Function8d8d9
-
-.Function8d8c7
- call .Function8d8e1
+.zero
+ call .initialize
ld a, [wc717]
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@@ -899,13 +880,14 @@ ENDC
ret nc
cp $a8
ret c
-.Function8d8d9
+
+.delete
call DeinitializeSprite
ld hl, wSpriteAnimCount
dec [hl]
ret
-.Function8d8e1
+.initialize
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
@@ -914,7 +896,7 @@ ENDC
srl a
ld e, a
ld d, 0
- ld hl, .Data_8d8f9
+ ld hl, .y_offsets
add hl, de
ld a, [hl]
ld hl, SPRITEANIMSTRUCT_YOFFSET
@@ -922,13 +904,12 @@ ENDC
ld [hl], a
ret
-.Data_8d8f9
+.y_offsets
db 4, 7, 9, 10, 9, 7, 4, 0
db -4, -7, -9, -10, -9, -7, -4, 0
-.UnusedJigglypuff
+AnimSeq_UnusedJigglypuff:
ld a, [wc717]
-
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
add [hl]
@@ -939,47 +920,48 @@ ENDC
ld [wc717], a
ret
-.NamingScreenCursor
+AnimSeq_NamingScreenCursor:
callfar NamingScreen_AnimateCursor
ret
-.MailCursor
+AnimSeq_MailCursor:
callfar ComposeMail_AnimateCursor
ret
-.GameFreakLogo
+AnimSeq_GameFreakLogo:
callfar GameFreakPresents_UpdateLogoPal
ret
-.GSGameFreakLogoStar
+AnimSeq_GSGameFreakLogoStar:
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
and a
- jr z, .asm_8d968
+ jr z, .delete
+
dec [hl]
dec [hl]
ld d, a
and $1f
- jr nz, .asm_8d943
-
+ jr nz, .stay
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
dec [hl]
-.asm_8d943
+
+.stay
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
ld a, [hl]
push af
push de
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
pop de
pop af
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
@@ -995,18 +977,18 @@ ENDC
ld [hl], a
ret
-.asm_8d968
+.delete
ld a, 1
ld [wIntroSceneFrameCounter], a
call DeinitializeSprite
ret
-.GSGameFreakLogoSparkle
+AnimSeq_GSGameFreakLogoSparkle:
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hli]
or [hl]
- jr z, .asm_8d9cc
+ jr z, .delete
ld hl, SPRITEANIMSTRUCT_VAR4
add hl, bc
@@ -1017,14 +999,14 @@ ENDC
ld a, [hl]
push af
push de
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
pop de
pop af
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
@@ -1074,15 +1056,15 @@ ENDC
ld [hl], a
ret
-.asm_8d9cc
+.delete
call DeinitializeSprite
ret
-.SlotsGolem:
+AnimSeq_SlotsGolem:
callfar Slots_AnimateGolem
ret
-.SlotsChansey:
+AnimSeq_SlotsChansey:
callfar Slots_AnimateChansey
ld hl, wce64
ld a, [hl]
@@ -1093,7 +1075,7 @@ ENDC
call _ReinitSpriteAnimFrame
ret
-.SlotsChanseyEgg:
+AnimSeq_SlotsChanseyEgg:
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
ld a, [hl]
@@ -1119,87 +1101,86 @@ ENDC
.move_vertical
ld a, e
ld d, 32
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ret
-.UnusedCursor
- callfar ret_e0908
+AnimSeq_UnusedCursor:
+ callfar UnusedCursor_InterpretJoypad_AnimateCursor
ret
-.PokegearArrow
+AnimSeq_PokegearArrow:
callfar AnimatePokegearModeIndicatorArrow
ret
-.DummyGameCursor
+AnimSeq_DummyGameCursor:
callfar DummyGame_InterpretJoypad_AnimateCursor
ret
-.TradePokeBall
- call .AnonymousJumptable
+AnimSeq_TradePokeBall:
+ call AnimSeqs_AnonJumptable
jp hl
-
-; Anonymous dw (see .AnonymousJumptable)
- dw .TradePokeBall_zero
- dw .TradePokeBall_one
- dw .TradePokeBall_two
- dw .TradePokeBall_three
- dw .TradePokeBall_four
- dw .TradePokeBall_five
-
-.TradePokeBall_zero
+.anon_dw
+ dw .zero
+ dw .one
+ dw .two
+ dw .three
+ dw .four
+ dw .delete
+
+.zero
ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE
call _ReinitSpriteAnimFrame
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
- ld [hl], $2
+ ld [hl], 2 ; .two
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $20
ret
-.TradePokeBall_two
+.two
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
and a
- jr z, .asm_8da5d
+ jr z, .next
dec [hl]
ret
-.asm_8da5d
- call .IncrementJumptableIndex
+.next
+ call AnimSeqs_IncAnonJumptableIndex
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld [hl], $40
-.TradePokeBall_three
+.three
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp 48
- jr c, .asm_8da7b
+ jr c, .done
dec [hl]
ld d, 40
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ret
-.asm_8da7b
+.done
ld de, SFX_GOT_SAFARI_BALLS
call PlaySFX
- jr .TradePokeBall_five
+ jr .delete
-.TradePokeBall_one
+.one
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
ld [hl], $4
@@ -1213,12 +1194,12 @@ ENDC
ld [hl], $24
ret
-.TradePokeBall_four
+.four
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld a, [hl]
and a
- jr z, .asm_8daca
+ jr z, .done2
ld d, a
ld hl, SPRITEANIMSTRUCT_VAR1
@@ -1250,20 +1231,20 @@ ENDC
call PlaySFX
ret
-.asm_8daca
+.done2
xor a
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
- call .IncrementJumptableIndex
+ call AnimSeqs_IncAnonJumptableIndex
ret
-.TradePokeBall_five
+.delete
call DeinitializeSprite
ret
-.TradeTubeBulge
+AnimSeq_TradeTubeBulge:
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1280,18 +1261,18 @@ ENDC
call DeinitializeSprite
ret
-.TrademonInTube
+AnimSeq_TrademonInTube:
callfar TradeAnim_AnimateTrademonInTube
ret
-.RevealNewMon:
+AnimSeq_RevealNewMon:
ld hl, SPRITEANIMSTRUCT_VAR1
add hl, bc
ld a, [hl]
cp $80
jr nc, .finish_EggShell
ld d, a
- add $8
+ add 8
ld [hl], a
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
@@ -1302,7 +1283,7 @@ ENDC
push af
push de
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
@@ -1310,7 +1291,7 @@ ENDC
pop de
pop af
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
@@ -1321,11 +1302,11 @@ ENDC
call DeinitializeSprite
ret
-.RadioTuningKnob:
+AnimSeq_RadioTuningKnob:
callfar AnimateTuningKnob
ret
-.CutLeaves
+AnimSeq_CutLeaves:
ld hl, SPRITEANIMSTRUCT_VAR2
add hl, bc
ld e, [hl]
@@ -1350,21 +1331,21 @@ ENDC
inc [hl]
push af
push de
- call .Sprites_Sine
+ call AnimSeqs_Sine
ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
pop de
pop af
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-.FlyFrom:
+AnimSeq_FlyFrom:
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
ld a, [hl]
@@ -1389,21 +1370,21 @@ ENDC
ld d, a
cp $40
jr nc, .skip
- add $8
+ add 8
ld [hl], a
.skip
ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld a, [hl]
inc [hl]
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-.FlyLeaf:
+AnimSeq_FlyLeaf:
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hl]
@@ -1421,7 +1402,7 @@ ENDC
add hl, bc
ld a, [hl]
inc [hl]
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
@@ -1432,7 +1413,7 @@ ENDC
call DeinitializeSprite
ret
-.FlyTo:
+AnimSeq_FlyTo:
ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc
ld a, [hl]
@@ -1449,22 +1430,22 @@ ENDC
ld a, [hl]
ld d, a
and a
- jr z, .asm_8dbce
+ jr z, .stay
sub $2
ld [hl], a
-.asm_8dbce
+.stay
ld hl, SPRITEANIMSTRUCT_VAR3
add hl, bc
ld a, [hl]
inc [hl]
- call .Sprites_Cosine
+ call AnimSeqs_Cosine
ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ret
-.AnonymousJumptable:
+AnimSeqs_AnonJumptable:
ld hl, sp+0
ld e, [hl]
inc hl
@@ -1482,16 +1463,16 @@ ENDC
ld l, a
ret
-.IncrementJumptableIndex:
+AnimSeqs_IncAnonJumptableIndex:
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
inc [hl]
ret
-.Sprites_Sine:
+AnimSeqs_Sine:
call Sprites_Sine
ret
-.Sprites_Cosine:
+AnimSeqs_Cosine:
call Sprites_Cosine
ret
diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm
index 3b8d3ed2..6a598438 100644
--- a/engine/overworld/cmd_queue.asm
+++ b/engine/overworld/cmd_queue.asm
@@ -134,7 +134,7 @@ HandleQueuedCommand:
dba CmdQueue_Type3
dba CmdQueue_Type4
-CmdQueueAnonymousJumptable:
+CmdQueues_AnonJumptable:
ld hl, CMDQUEUE_05
add hl, bc
ld a, [hl]
@@ -142,13 +142,13 @@ CmdQueueAnonymousJumptable:
rst JumpTable
ret
-CmdQueueAnonJT_Increment:
+CmdQueues_IncAnonJumptableIndex:
ld hl, CMDQUEUE_05
add hl, bc
inc [hl]
ret
-CmdQueueAnonJT_Decrement:
+CmdQueues_DecAnonJumptableIndex:
ld hl, CMDQUEUE_05
add hl, bc
dec [hl]
@@ -162,7 +162,7 @@ CmdQueue_Type1:
ret
CmdQueue_Type4:
- call CmdQueueAnonymousJumptable
+ call CmdQueues_AnonJumptable
; anonymous dw
dw .zero
dw .one
@@ -172,7 +172,7 @@ CmdQueue_Type4:
ld hl, CMDQUEUE_04
add hl, bc
ld [hl], a
- call CmdQueueAnonJT_Increment
+ call CmdQueues_IncAnonJumptableIndex
.one
ld hl, CMDQUEUE_ADDR
add hl, bc
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 307fd5f1..ec691881 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -433,25 +433,25 @@ RestoreDefaultMovement:
ld a, SPRITEMOVEDATA_STANDING_DOWN
ret
-ClearObjectMovementByteIndex:
+ObjectMovementByte_ZeroAnonJumptableIndex: ; unreferenced
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
add hl, bc
ld [hl], 0
ret
-IncrementObjectMovementByteIndex:
+ObjectMovementByte_IncAnonJumptableIndex:
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
add hl, bc
inc [hl]
ret
-DecrementObjectMovementByteIndex:
+ObjectMovementByte_DecAnonJumptableIndex:
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
add hl, bc
dec [hl]
ret
-MovementAnonymousJumptable:
+ObjectMovementByte_AnonJumptable:
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
add hl, bc
ld a, [hl]
@@ -459,19 +459,19 @@ MovementAnonymousJumptable:
rst JumpTable
ret
-ClearObjectStructField1c:
+Field1c_ZeroAnonJumptableIndex:
ld hl, OBJECT_1C
add hl, bc
ld [hl], 0
ret
-IncrementObjectStructField1c:
+Field1c_IncAnonJumptableIndex:
ld hl, OBJECT_1C
add hl, bc
inc [hl]
ret
-Field1cAnonymousJumptable:
+Field1c_AnonJumptable:
ld hl, OBJECT_1C
add hl, bc
ld a, [hl]
@@ -479,13 +479,13 @@ Field1cAnonymousJumptable:
rst JumpTable
ret
-GetValueObjectStructField1c:
+Field1c_GetAnonJumptableIndex: ; unreferenced
ld hl, OBJECT_1C
add hl, bc
ld a, [hl]
ret
-SetValueObjectStructField1c:
+Field1c_SetAnonJumptableIndex: ; unreferenced
ld hl, OBJECT_1C
add hl, bc
ld [hl], a
@@ -512,7 +512,7 @@ ObjectMovementReset:
ret
MapObjectMovementPattern:
- call ClearObjectStructField1c
+ call Field1c_ZeroAnonJumptableIndex
call GetSpriteMovementFunction
ld a, [hl]
ld hl, .Pointers
@@ -521,58 +521,58 @@ MapObjectMovementPattern:
.Pointers:
; entries correspond to SPRITEMOVEFN_* constants
- dw .Null_00 ; 00
- dw .RandomWalkY ; 01
- dw .RandomWalkX ; 02
- dw .RandomWalkXY ; 03
- dw .RandomSpin1 ; 04
- dw .RandomSpin2 ; 05
- dw .Standing ; 06
- dw .ObeyDPad ; 07
- dw .Movement08 ; 08
- dw .Movement09 ; 09
- dw .Movement0a ; 0a
- dw .Movement0b ; 0b
- dw .Movement0c ; 0c
- dw .Movement0d ; 0d
- dw .Movement0e ; 0e
- dw .Follow ; 0f
- dw .Script ; 10
- dw .Strength ; 11
- dw .FollowNotExact ; 12
- dw .MovementShadow ; 13
- dw .MovementEmote ; 14
- dw .MovementBigStanding ; 15
- dw .MovementBouncing ; 16
- dw .MovementScreenShake ; 17
- dw .MovementSpinClockwise ; 18
- dw .MovementSpinCounterclockwise ; 19
- dw .MovementBoulderDust ; 1a
- dw .MovementShakingGrass ; 1b
-
-.Null_00:
- ret
-
-.RandomWalkY:
+ dw MovementFunction_Null ; 00
+ dw MovementFunction_RandomWalkY ; 01
+ dw MovementFunction_RandomWalkX ; 02
+ dw MovementFunction_RandomWalkXY ; 03
+ dw MovementFunction_RandomSpinSlow ; 04
+ dw MovementFunction_RandomSpinFast ; 05
+ dw MovementFunction_Standing ; 06
+ dw MovementFunction_ObeyDPad ; 07
+ dw MovementFunction_08 ; 08
+ dw MovementFunction_09 ; 09
+ dw MovementFunction_0a ; 0a
+ dw MovementFunction_0b ; 0b
+ dw MovementFunction_0c ; 0c
+ dw MovementFunction_0d ; 0d
+ dw MovementFunction_0e ; 0e
+ dw MovementFunction_Follow ; 0f
+ dw MovementFunction_Script ; 10
+ dw MovementFunction_Strength ; 11
+ dw MovementFunction_FollowNotExact ; 12
+ dw MovementFunction_Shadow ; 13
+ dw MovementFunction_Emote ; 14
+ dw MovementFunction_BigStanding ; 15
+ dw MovementFunction_Bouncing ; 16
+ dw MovementFunction_ScreenShake ; 17
+ dw MovementFunction_SpinClockwise ; 18
+ dw MovementFunction_SpinCounterclockwise ; 19
+ dw MovementFunction_BoulderDust ; 1a
+ dw MovementFunction_ShakingGrass ; 1b
+
+MovementFunction_Null:
+ ret
+
+MovementFunction_RandomWalkY:
call Random
ldh a, [hRandomAdd]
and %00000001
- jp .RandomWalkContinue
+ jp _RandomWalkContinue
-.RandomWalkX:
+MovementFunction_RandomWalkX:
call Random
ldh a, [hRandomAdd]
and %00000001
or %00000010
- jp .RandomWalkContinue
+ jp _RandomWalkContinue
-.RandomWalkXY:
+MovementFunction_RandomWalkXY:
call Random
ldh a, [hRandomAdd]
and %00000011
- jp .RandomWalkContinue
+ jp _RandomWalkContinue
-.RandomSpin1:
+MovementFunction_RandomSpinSlow:
call Random
ldh a, [hRandomAdd]
and %00001100
@@ -581,7 +581,7 @@ MapObjectMovementPattern:
ld [hl], a
jp RandomStepDuration_Slow
-.RandomSpin2:
+MovementFunction_RandomSpinFast:
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
@@ -597,7 +597,7 @@ MapObjectMovementPattern:
ld [hl], a
jp RandomStepDuration_Fast
-.Standing:
+MovementFunction_Standing:
call Function4603
call EndSpriteMovement
ld hl, OBJECT_ACTION
@@ -608,48 +608,49 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_05
ret
-.ObeyDPad:
+MovementFunction_ObeyDPad:
ld hl, ApplyPlayerMovementByte
jp HandleMovementData
-.Movement08:
+MovementFunction_08:
ld hl, Function4fbd
jp HandleMovementData
-.Movement09:
+MovementFunction_09:
ld hl, Function4fce
jp HandleMovementData
-.Movement0a:
+MovementFunction_0a:
jp _GetMovementObject
-.Movement0b:
+MovementFunction_0b:
jp _GetMovementObject
-.Movement0c:
+MovementFunction_0c:
jp _GetMovementObject
-.Movement0d:
+MovementFunction_0d:
ld hl, ApplyPlayerMovementByte
jp HandleMovementData
-.Movement0e:
+MovementFunction_0e:
jp _GetMovementObject
-.Follow:
+MovementFunction_Follow:
ld hl, GetFollowerNextMovementByte
jp HandleMovementData
-.Script:
+MovementFunction_Script:
ld hl, GetMovementByte
jp HandleMovementData
-.Strength:
- call MovementAnonymousJumptable
- dw .Strength_Start
- dw .Strength_Stop
+MovementFunction_Strength:
+ call ObjectMovementByte_AnonJumptable
+.anon_dw
+ dw .start
+ dw .stop
-.Strength_Start:
+.start:
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
@@ -686,14 +687,14 @@ MapObjectMovementPattern:
ret
.on_pit
- call IncrementObjectMovementByteIndex
-.Strength_Stop:
+ call ObjectMovementByte_IncAnonJumptableIndex
+.stop:
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
ret
-.FollowNotExact:
+MovementFunction_FollowNotExact:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld d, [hl]
@@ -755,7 +756,7 @@ MapObjectMovementPattern:
ld [hl], OBJECT_ACTION_STAND
ret
-.MovementBigStanding:
+MovementFunction_BigStanding:
call EndSpriteMovement
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@@ -768,7 +769,7 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_04
ret
-.MovementBouncing:
+MovementFunction_Bouncing:
call EndSpriteMovement
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@@ -781,22 +782,24 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_04
ret
-.MovementSpinCounterclockwise:
- call MovementAnonymousJumptable
- dw .MovementSpinInit
- dw .MovementSpinRepeat
- dw .MovementSpinTurnLeft
+MovementFunction_SpinCounterclockwise:
+ call ObjectMovementByte_AnonJumptable
+.anon_dw
+ dw _MovementSpinInit
+ dw _MovementSpinRepeat
+ dw _MovementSpinTurnLeft
-.MovementSpinClockwise:
- call MovementAnonymousJumptable
- dw .MovementSpinInit
- dw .MovementSpinRepeat
- dw .MovementSpinTurnRight
+MovementFunction_SpinClockwise:
+ call ObjectMovementByte_AnonJumptable
+.anon_dw
+ dw _MovementSpinInit
+ dw _MovementSpinRepeat
+ dw _MovementSpinTurnRight
-.MovementSpinInit:
+_MovementSpinInit:
call EndSpriteMovement
- call IncrementObjectMovementByteIndex
-.MovementSpinRepeat:
+ call ObjectMovementByte_IncAnonJumptableIndex
+_MovementSpinRepeat:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], OBJECT_ACTION_STAND
@@ -810,26 +813,32 @@ MapObjectMovementPattern:
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_03
- call IncrementObjectMovementByteIndex
+ call ObjectMovementByte_IncAnonJumptableIndex
ret
-.MovementSpinTurnLeft:
- ld de, .DirectionData_Counterclockwise
- call .MovementSpinNextFacing
- jr .MovementSpinCounterclockwise
+_MovementSpinTurnLeft:
+ ld de, .facings_counterclockwise
+ call _MovementSpinNextFacing
+ jr MovementFunction_SpinCounterclockwise
-.DirectionData_Counterclockwise:
- db OW_RIGHT, OW_LEFT, OW_DOWN, OW_UP
+.facings_counterclockwise:
+ db OW_RIGHT
+ db OW_LEFT
+ db OW_DOWN
+ db OW_UP
-.MovementSpinTurnRight:
- ld de, .DirectionData_Clockwise
- call .MovementSpinNextFacing
- jr .MovementSpinClockwise
+_MovementSpinTurnRight:
+ ld de, .facings_clockwise
+ call _MovementSpinNextFacing
+ jr MovementFunction_SpinClockwise
-.DirectionData_Clockwise:
- db OW_LEFT, OW_RIGHT, OW_UP, OW_DOWN
+.facings_clockwise:
+ db OW_LEFT
+ db OW_RIGHT
+ db OW_UP
+ db OW_DOWN
-.MovementSpinNextFacing:
+_MovementSpinNextFacing:
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
@@ -843,11 +852,11 @@ MapObjectMovementPattern:
ld a, [hl]
pop hl
ld [hl], a
- call DecrementObjectMovementByteIndex
+ call ObjectMovementByte_DecAnonJumptableIndex
ret
-.MovementShadow:
- call ._MovementShadow_Grass_Emote_BoulderDust
+MovementFunction_Shadow:
+ call InitMovementField1dField1e
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], OBJECT_ACTION_SHADOW
@@ -866,11 +875,11 @@ MapObjectMovementPattern:
maskbits NUM_DIRECTIONS
ld d, 1 * 8 + 6
cp DOWN
- jr z, .ok_13
+ jr z, .ok
cp UP
- jr z, .ok_13
+ jr z, .ok
ld d, 1 * 8 + 4
-.ok_13
+.ok
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], d
@@ -882,9 +891,9 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_TRACKING_OBJECT
ret
-.MovementEmote:
+MovementFunction_Emote:
call EndSpriteMovement
- call ._MovementShadow_Grass_Emote_BoulderDust
+ call InitMovementField1dField1e
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], OBJECT_ACTION_EMOTE
@@ -902,9 +911,9 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_TRACKING_OBJECT
ret
-.MovementBoulderDust:
+MovementFunction_BoulderDust:
call EndSpriteMovement
- call ._MovementShadow_Grass_Emote_BoulderDust
+ call InitMovementField1dField1e
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], OBJECT_ACTION_BOULDER_DUST
@@ -922,7 +931,7 @@ MapObjectMovementPattern:
and %00000011
ld e, a
ld d, 0
- ld hl, .data_4a5a
+ ld hl, .dust_coords
add hl, de
add hl, de
ld d, [hl]
@@ -939,16 +948,16 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_TRACKING_OBJECT
ret
-.data_4a5a
+.dust_coords:
; x, y
db 0, -4
db 0, 8
db 6, 2
db -6, 2
-.MovementShakingGrass:
+MovementFunction_ShakingGrass:
call EndSpriteMovement
- call ._MovementShadow_Grass_Emote_BoulderDust
+ call InitMovementField1dField1e
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], OBJECT_ACTION_GRASS_SHAKE
@@ -964,7 +973,7 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_TRACKING_OBJECT
ret
-._MovementShadow_Grass_Emote_BoulderDust:
+InitMovementField1dField1e:
ld hl, OBJECT_RANGE
add hl, bc
ld a, [hl]
@@ -980,7 +989,7 @@ MapObjectMovementPattern:
ld [hl], d
ret
-.MovementScreenShake:
+MovementFunction_ScreenShake:
call EndSpriteMovement
ld hl, OBJECT_ACTION
add hl, bc
@@ -988,7 +997,7 @@ MapObjectMovementPattern:
ld hl, OBJECT_RANGE
add hl, bc
ld a, [hl]
- call ._MovementScreenShake
+ call .GetDurationAndField1e
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], e
@@ -1000,7 +1009,7 @@ MapObjectMovementPattern:
ld [hl], STEP_TYPE_15
ret
-._MovementScreenShake:
+.GetDurationAndField1e:
ld d, a
and %00111111
ld e, a
@@ -1017,10 +1026,10 @@ MapObjectMovementPattern:
add a
jr .loop
-.RandomWalkContinue:
+_RandomWalkContinue:
call InitStep
call CanObjectMoveInDirection ; check whether the object can move in that direction
- jr c, .NewDuration
+ jr c, .new_duration
call UpdateTallGrassFlags
ld hl, OBJECT_ACTION
add hl, bc
@@ -1028,21 +1037,23 @@ MapObjectMovementPattern:
ld hl, wCenteredObject
ldh a, [hMapObjectIndexBuffer]
cp [hl]
- jr z, .load_6
+ jr z, .centered
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_07
ret
-.load_6
+.centered
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_PLAYER_WALK
ret
-.NewDuration:
+.new_duration:
call EndSpriteMovement
call Function4603
+ ; fallthrough
+
RandomStepDuration_Slow:
call Random
ldh a, [hRandomAdd]
@@ -1070,31 +1081,31 @@ SetRandomStepDuration:
StepTypesJumptable:
; entries correspond to STEP_TYPE_* constants
- dw ObjectMovementReset ; 00
+ dw ObjectMovementReset ; 00
dw MapObjectMovementPattern ; 01
- dw NPCStep ; 02
- dw StepType03 ; 03
- dw StepType04 ; 04
- dw StepType05 ; 05
- dw PlayerStep ; 06
- dw StepType07 ; 07
- dw NPCJump ; 08
- dw PlayerJump ; 09
- dw PlayerOrNPCTurnStep ; 0a
- dw StepTypeBump ; 0b
- dw TeleportFrom ; 0c
- dw TeleportTo ; 0d
- dw Skyfall ; 0e
- dw StepType0f ; 0f
- dw GotBiteStep ; 10
- dw RockSmashStep ; 11
- dw ReturnDigStep ; 12
- dw StepTypeTrackingObject ; 13
- dw StepType14 ; 14
- dw StepType15 ; 15
- dw StepType16 ; 16
- dw StepType17 ; 17
- dw StepType18 ; 18
+ dw NPCStep ; 02
+ dw StepType03 ; 03
+ dw StepType04 ; 04
+ dw StepType05 ; 05
+ dw PlayerStep ; 06
+ dw StepType07 ; 07
+ dw NPCJump ; 08
+ dw PlayerJump ; 09
+ dw PlayerOrNPCTurnStep ; 0a
+ dw StepTypeBump ; 0b
+ dw TeleportFrom ; 0c
+ dw TeleportTo ; 0d
+ dw Skyfall ; 0e
+ dw StepType0f ; 0f
+ dw GotBiteStep ; 10
+ dw RockSmashStep ; 11
+ dw ReturnDigStep ; 12
+ dw StepTypeTrackingObject ; 13
+ dw StepType14 ; 14
+ dw StepType15 ; 15
+ dw StepType16 ; 16
+ dw StepType17 ; 17
+ dw StepType18 ; 18
WaitStep_InPlace:
ld hl, OBJECT_STEP_DURATION
@@ -1107,8 +1118,8 @@ WaitStep_InPlace:
ret
NPCJump:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .Jump
dw .Land
@@ -1124,7 +1135,7 @@ NPCJump:
ld hl, OBJECT_FLAGS2
add hl, bc
res OVERHEAD_F, [hl]
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
ret
.Land:
@@ -1141,8 +1152,8 @@ NPCJump:
ret
PlayerJump:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .initjump
dw .stepjump
dw .initland
@@ -1151,7 +1162,7 @@ PlayerJump:
.initjump
ld hl, wPlayerStepFlags
set PLAYERSTEP_START_F, [hl]
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.stepjump
call UpdateJumpPosition
call UpdatePlayerStep
@@ -1166,14 +1177,14 @@ PlayerJump:
ld hl, wPlayerStepFlags
set PLAYERSTEP_STOP_F, [hl]
set PLAYERSTEP_MIDAIR_F, [hl]
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
ret
.initland
call GetNextTile
ld hl, wPlayerStepFlags
set PLAYERSTEP_START_F, [hl]
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.stepland
call UpdateJumpPosition
call UpdatePlayerStep
@@ -1190,8 +1201,8 @@ PlayerJump:
ret
TeleportFrom:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .InitSpin
dw .DoSpin
dw .InitSpinRise
@@ -1204,7 +1215,7 @@ TeleportFrom:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.DoSpin:
ld hl, OBJECT_ACTION
add hl, bc
@@ -1213,7 +1224,7 @@ TeleportFrom:
add hl, bc
dec [hl]
ret nz
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
ret
.InitSpinRise:
@@ -1229,7 +1240,7 @@ TeleportFrom:
ld hl, OBJECT_FLAGS2
add hl, bc
res OVERHEAD_F, [hl]
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.DoSpinRise:
ld hl, OBJECT_ACTION
add hl, bc
@@ -1258,8 +1269,8 @@ TeleportFrom:
ret
TeleportTo:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .InitWait
dw .DoWait
dw .InitDescent
@@ -1275,7 +1286,7 @@ TeleportTo:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
ret
.DoWait:
@@ -1283,7 +1294,7 @@ TeleportTo:
add hl, bc
dec [hl]
ret nz
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.InitDescent:
ld hl, OBJECT_STEP_FRAME
add hl, bc
@@ -1294,7 +1305,7 @@ TeleportTo:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
ret
.DoDescent:
@@ -1316,12 +1327,12 @@ TeleportTo:
add hl, bc
dec [hl]
ret nz
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.InitFinalSpin:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
ret
.DoFinalSpin:
@@ -1345,8 +1356,8 @@ TeleportTo:
ret
Skyfall:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .Init
dw .Step
dw .Fall
@@ -1359,7 +1370,7 @@ Skyfall:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.Step:
ld hl, OBJECT_STEP_DURATION
add hl, bc
@@ -1377,7 +1388,7 @@ Skyfall:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.Fall:
ld hl, OBJECT_1F
add hl, bc
@@ -1394,7 +1405,7 @@ Skyfall:
add hl, bc
dec [hl]
ret nz
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.Finish:
ld hl, OBJECT_STEP_FRAME
add hl, bc
@@ -1408,8 +1419,8 @@ Skyfall:
ret
GotBiteStep:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .Init
dw .Run
@@ -1420,7 +1431,7 @@ GotBiteStep:
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld [hl], 0
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.Run:
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
@@ -1505,8 +1516,8 @@ StepTypeBump:
ret
StepType05:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .Reset
dw StepType04
@@ -1516,7 +1527,7 @@ StepType05:
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
StepType04:
call Stubbed_Function4f5a
ld hl, OBJECT_DIRECTION_WALKING
@@ -1551,15 +1562,15 @@ StepType07:
PlayerStep:
; AnimateStep?
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .init
dw .step
.init
ld hl, wPlayerStepFlags
set PLAYERSTEP_START_F, [hl]
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.step
call UpdatePlayerStep
ld hl, OBJECT_STEP_DURATION
@@ -1578,8 +1589,8 @@ PlayerStep:
ret
PlayerOrNPCTurnStep:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .init1
dw .step1
dw .init2
@@ -1596,13 +1607,13 @@ PlayerOrNPCTurnStep:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 2
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.step1
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.init2
ld hl, OBJECT_1D ; new facing
add hl, bc
@@ -1613,7 +1624,7 @@ PlayerOrNPCTurnStep:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 2
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.step2
ld hl, OBJECT_STEP_DURATION
add hl, bc
@@ -1690,8 +1701,8 @@ StepTypeTrackingObject:
StepType14:
StepType15:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .Init
dw .Run
@@ -1700,7 +1711,7 @@ StepType15:
ld hl, OBJECT_1D
add hl, bc
ld [hl], a
- call IncrementObjectStructField1c
+ call Field1c_IncAnonJumptableIndex
.Run:
ld hl, OBJECT_1D
add hl, bc
@@ -1738,10 +1749,10 @@ StepType15:
ret
StepType16:
- call Field1cAnonymousJumptable ; ????
+ call Field1c_AnonJumptable ; ????
StepType17:
- call Field1cAnonymousJumptable
-; anonymous dw
+ call Field1c_AnonJumptable
+.anon_dw
dw .null
dw .null
dw .null
@@ -1768,6 +1779,7 @@ Stubbed_Function4f5a:
.y
db 0, -1, -2, -3, -4, -3, -2, -1
+
UpdateJumpPosition:
call GetStepVector
ld a, h
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 16:11:22 +0000