summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/battle/1.asm6
-rwxr-xr-xengine/battle/15.asm2
-rwxr-xr-xengine/battle/4.asm2
-rwxr-xr-xengine/battle/4_2.asm4
-rwxr-xr-xengine/battle/animations.asm6
-rwxr-xr-xengine/battle/core.asm46
-rwxr-xr-xengine/battle/e_2.asm2
-rwxr-xr-xengine/cable_club.asm6
-rwxr-xr-xengine/evos_moves.asm8
-rwxr-xr-xengine/give_pokemon.asm2
-rwxr-xr-xengine/hall_of_fame.asm10
-rwxr-xr-xengine/hidden_object_functions17.asm2
-rwxr-xr-xengine/hidden_object_functions7.asm2
-rwxr-xr-xengine/intro.asm4
-rwxr-xr-xengine/items/items.asm2
-rw-r--r--engine/menu/bills_pc.asm4
-rwxr-xr-xengine/menu/oaks_pc.asm2
-rwxr-xr-xengine/mon_party_sprites.asm2
-rwxr-xr-xengine/oak_speech.asm2
-rwxr-xr-xengine/overworld/card_key.asm4
-rwxr-xr-xengine/overworld/ledges.asm2
-rw-r--r--engine/overworld/movement.asm2
-rwxr-xr-xengine/overworld/npc_movement.asm2
-rwxr-xr-xengine/overworld/player_animations.asm2
-rwxr-xr-xengine/predefs17.asm2
-rwxr-xr-xengine/titlescreen.asm4
-rwxr-xr-xengine/trade.asm2
27 files changed, 67 insertions, 67 deletions
diff --git a/engine/battle/1.asm b/engine/battle/1.asm
index 8c0466d4..ace29477 100755
--- a/engine/battle/1.asm
+++ b/engine/battle/1.asm
@@ -77,11 +77,11 @@ Func_7861: ; 7861 (1:7861)
.asm_78aa
ld [wListMenuID], a ; wListMenuID
ld a, $48
- call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
+ call Predef
ld a, $0
- call Predef ; indirect jump to Func_3cd60 (3cd60 (f:4d60))
+ call Predef
ld a, $49
- call Predef ; indirect jump to Func_3cdec (3cdec (f:4dec))
+ call Predef
callab ReadPlayerMonCurHPAndStatus
ld hl, SuckedHealthText ; $78dc
ld a, [H_WHOSETURN] ; $fff3
diff --git a/engine/battle/15.asm b/engine/battle/15.asm
index d6d59d5f..ba79d77e 100755
--- a/engine/battle/15.asm
+++ b/engine/battle/15.asm
@@ -246,7 +246,7 @@ Func_5525f: ; 5525f (15:525f)
ld a, [wd0b5]
ld [wd11e], a
ld a, $1a
- call Predef ; indirect jump to Func_3af5b (3af5b (e:6f5b))
+ call Predef
ld hl, wccd3
ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
diff --git a/engine/battle/4.asm b/engine/battle/4.asm
index f41e7018..6e2bad34 100755
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -44,7 +44,7 @@ asm_128fb: ; 128fb (4:68fb)
ld a, [wcfbb]
ld e, a
ld a, $26
- call Predef ; indirect jump to UpdateHPBar_LoadRegisters (f9dc (3:79dc))
+ call Predef
ld a, $6
ld d, a
ld c, a
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm
index d7625a59..d96fb87c 100755
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -44,7 +44,7 @@ Func_137aa: ; 137aa (4:77aa)
xor a
ld [wccd4], a
ld a, $2a
- call Predef ; indirect jump to Func_3ad1c (3ad1c (e:6d1c))
+ call Predef
.asm_13813
xor a
ld [wd083], a
@@ -264,7 +264,7 @@ RecoilEffect_: ; 1392c (4:792c)
.asm_13990
ld [wListMenuID], a ; wListMenuID
ld a, $48
- call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
+ call Predef
ld hl, HitWithRecoilText ; $799e
jp PrintText
HitWithRecoilText: ; 1399e (4:799e)
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 6e5e9903..a5fb0253 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1228,7 +1228,7 @@ Func_791fc: ; 791fc (1e:51fc)
Func_79209: ; 79209 (1e:5209)
ld a, $21
- jp Predef ; indirect jump to Func_480ff (480ff (12:40ff))
+ jp Predef
AnimationShakeScreen: ; 7920e (1e:520e)
; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations.
@@ -1236,7 +1236,7 @@ AnimationShakeScreen: ; 7920e (1e:520e)
Func_79210: ; 79210 (1e:5210)
ld a, $24
- jp Predef ; indirect jump to Func_48125 (48125 (12:4125))
+ jp Predef
AnimationWaterDropletsEverywhere: ; 79215 (1e:5215)
; Draws water droplets all over the screen and makes them
@@ -2144,7 +2144,7 @@ Func_79793: ; 79793 (1e:5793)
ld [wd0b5], a
call GetMonHeader
ld a, $4
- call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103))
+ call Predef
xor a
call Func_79842
call Func_79820
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index a9f681de..15102340 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -174,7 +174,7 @@ Func_3c04c: ; 3c04c (f:404c)
FuncCoord 1, 5
ld hl, Coord
ld a, $1
- call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
+ call Predef
xor a
ld [$ffb0], a
ld [rWY], a ; $ff4a
@@ -752,7 +752,7 @@ UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
push bc
ld [wListMenuID], a ; wListMenuID
ld a, $48
- call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
+ call Predef
pop bc
ret
@@ -1760,7 +1760,7 @@ Func_3cc91: ; 3cc91 (f:4c91)
Func_3cca4: ; 3cca4 (f:4ca4)
call Func_3cd60
ld a, $4
- call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103))
+ call Predef
xor a
ld [$ffe1], a
ld hl, wcc2d
@@ -1792,7 +1792,7 @@ Func_3cca4: ; 3cca4 (f:4ca4)
FuncCoord 4, 11
ld hl, Coord
ld a, $2
- call Predef ; indirect jump to Func_3f073 (3f073 (f:7073))
+ call Predef
ld a, [wcf91]
call PlayCry
call Func_3ee94
@@ -1810,7 +1810,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
ld [wcd6c], a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $5
- call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
+ call Predef
ld c, $4
call DelayFrames
call Func_3cd3a
@@ -1822,7 +1822,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
xor a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $5
- call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
+ call Predef
call Delay3
call Func_3cd3a
ld a, $4c
@@ -1890,7 +1890,7 @@ Func_3cd60: ; 3cd60 (f:4d60)
FuncCoord 10, 9
ld hl, Coord
ld a, $5f
- call Predef ; indirect jump to Func_128ef (128ef (4:68ef))
+ call Predef
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld hl, wcf1d
@@ -2385,9 +2385,9 @@ Func_3d119: ; 3d119 (f:5119)
ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1)
call ClearSprites
ld a, $36
- call Predef ; indirect jump to StatusScreen (12953 (4:6953))
+ call Predef
ld a, $37
- call Predef ; indirect jump to StatusScreen2 (12b57 (4:6b57))
+ call Predef
ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
bit 4, a
ld hl, AnimationSubstitute
@@ -2923,7 +2923,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
FuncCoord 2, 10
ld hl, Coord
ld a, $5d
- call Predef ; indirect jump to Func_27d98 (27d98 (9:7d98))
+ call Predef
.asm_3d54e
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -3873,7 +3873,7 @@ PrintMoveFailureText: ; 3dbe2 (f:5be2)
call PrintText
ld b, $4
ld a, $24
- call Predef ; indirect jump to Func_48125 (48125 (12:4125))
+ call Predef
ld a, [H_WHOSETURN] ; $fff3
and a
jr nz, .asm_3dc3f
@@ -6148,12 +6148,12 @@ Func_3eb01: ; 3eb01 (f:6b01)
xor a
ld [wHPBarMaxHP], a
ld a, $3e
- call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8))
+ call Predef
.asm_3ebca
ld hl, wEnemyMonMoves
ld de, wEnemyMonSpecial + 1
ld a, $5e
- call Predef ; indirect jump to LoadMovePPs (f473 (3:7473))
+ call Predef
ld hl, W_MONHBASESTATS
ld de, wd002
ld b, $5
@@ -6179,7 +6179,7 @@ Func_3eb01: ; 3eb01 (f:6b01)
ld a, [wEnemyMonSpecies2]
ld [wd11e], a
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
ld a, [wd11e]
dec a
ld c, a
@@ -6213,7 +6213,7 @@ Func_3ec32: ; 3ec32 (f:6c32)
.asm_3ec4d
call DelayFrame
ld a, $30
- call Predef ; indirect jump to BattleTransition (7096d (1c:496d))
+ call Predef
callab Func_3ee58
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -6256,7 +6256,7 @@ Func_3ec92: ; 3ec92 (f:6c92)
ld a, BANK(RedPicBack)
call UncompressSpriteFromDE
ld a, $3
- call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40))
+ call Predef
ld hl, wOAMBuffer
xor a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
@@ -6307,7 +6307,7 @@ Func_3ec92: ; 3ec92 (f:6c92)
FuncCoord 1, 5
ld hl, Coord
ld a, $1
- jp Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
+ jp Predef
Func_3ed02: ; 3ed02 (f:6d02)
callab Func_39680
@@ -6710,7 +6710,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d)
FuncCoord 12, 0
ld hl, Coord
ld a, $1
- call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
+ call Predef
ld a, $ff
ld [wEnemyMonPartyPos], a
ld a, $2
@@ -6766,7 +6766,7 @@ InitWildBattle: ; 3ef8b (f:6f8b)
FuncCoord 12, 0
ld hl, Coord
ld a, $1
- call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
+ call Predef
Func_3efeb: ; 3efeb (f:6feb)
ld b, $0
@@ -6856,7 +6856,7 @@ Func_3f073: ; 3f073 (f:7073)
ld [wcd6c], a
ld bc, $303
ld a, $5
- call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
+ call Predef
ld c, $4
call DelayFrames
ld bc, $ffd7
@@ -6865,7 +6865,7 @@ Func_3f073: ; 3f073 (f:7073)
ld [wcd6c], a
ld bc, $505
ld a, $5
- call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
+ call Predef
ld c, $5
call DelayFrames
ld bc, $ffd7
@@ -6943,7 +6943,7 @@ LoadMonBackSprite:
ld hl, W_MONHBACKSPRITE - W_MONHEADER
call UncompressMonSprite
ld a, $3
- call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40))
+ call Predef
ld de, vBackPic
call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite
ld hl, vSprites
@@ -8547,7 +8547,7 @@ Func_3fbbc: ; 3fbbc (f:7bbc)
push de
push bc
ld a, $8
- call Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e))
+ call Predef
pop bc
pop de
pop hl
diff --git a/engine/battle/e_2.asm b/engine/battle/e_2.asm
index 37b6a0a3..f35b4e3a 100755
--- a/engine/battle/e_2.asm
+++ b/engine/battle/e_2.asm
@@ -95,7 +95,7 @@ HealEffect_: ; 3b9ec (e:79ec)
.asm_3ba83
ld [wListMenuID], a ; wListMenuID
ld a, $48
- call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
+ call Predef
ld hl, Func_3cd5a ; $4d5a
call BankswitchEtoF
ld hl, RegainedHealthText ; $7aac
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index afca9392..1762d2be 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -274,9 +274,9 @@ Func_5345: ; 5345
ld hl, W_OPTIONS ; W_OPTIONS
res 7, [hl]
ld a, $2c
- call Predef ; indirect jump to InitOpponent (3ef18 (f:6f18))
+ call Predef
ld a, $7
- call Predef ; indirect jump to HealParty (f6a5 (3:76a5))
+ call Predef
jp Func_577d
.asm_5506
ld c, BANK(Music_GameCorner)
@@ -886,7 +886,7 @@ Func_5a5f: ; 5a5f (1:5a5f)
cp $5
ret nz
ld a, $4d
- call Predef ; indirect jump to Func_5aaf (5aaf (1:5aaf))
+ call Predef
jp Init
.asm_5a75
call Func_5317
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
index 432e488f..9cd2612b 100755
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -153,7 +153,7 @@ Func_3ad71: ; 3ad71 (e:6d71)
ld a, [wd0b5]
ld [wd11e], a
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
ld a, [wd11e]
dec a
ld hl, BaseStats
@@ -206,12 +206,12 @@ Func_3ad71: ; 3ad71 (e:6d71)
call Func_3af5b
pop hl
ld a, $42
- call Predef ; indirect jump to SetPartyMonTypes (5db5e (17:5b5e))
+ call Predef
ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
call z, Func_3af52
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
ld a, [wd11e]
dec a
ld c, a
@@ -362,7 +362,7 @@ Func_3af5b: ; 3af5b (e:6f5b)
call GetMoveName
call CopyStringToCF4B
ld a, $1b
- call Predef ; indirect jump to LearnMove (6e43 (1:6e43))
+ call Predef
.asm_3afb1
ld a, [wcf91]
ld [wd11e], a
diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm
index 14d75472..3bda4729 100755
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -53,7 +53,7 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11)
push af
ld [wd11e], a
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
ld a, [wd11e]
dec a
ld c, a
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 28705901..de0ff19a 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -118,7 +118,7 @@ Func_70278: ; 70278 (1c:4278)
call GetMonHeader
call LoadFrontSpriteByMonIndex
ld a, $4
- call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103))
+ call Predef
.asm_702ab
ld b, $b
ld c, $0
@@ -180,7 +180,7 @@ Func_702f0: ; 702f0 (1c:42f0)
FuncCoord 3, 9
ld hl, Coord
ld a, $4b
- call Predef ; indirect jump to Func_27d6b (27d6b (9:7d6b))
+ call Predef
ld a, [wWhichTrade] ; wWhichTrade
jp PlayCry
@@ -203,7 +203,7 @@ Func_7033e: ; 7033e (1c:433e)
ld a, BANK(RedPicBack)
call UncompressSpriteFromDE
ld a, $3
- call Predef ; indirect jump to ScaleSpriteByTwo (2fe40 (b:7e40))
+ call Predef
ld de, vBackPic
call InterlaceMergeSpriteBuffers
ld c, $1
@@ -213,13 +213,13 @@ Func_7036d: ; 7036d (1c:436d)
FuncCoord 12, 5
ld hl, Coord
ld a, $31
- jp Predef ; indirect jump to Func_79dda (79dda (1e:5dda))
+ jp Predef
Func_70377: ; 70377 (1c:4377)
ld hl, wd747
set 3, [hl]
ld a, $56
- call Predef ; indirect jump to DisplayDexRating (44169 (11:4169))
+ call Predef
FuncCoord 0, 4
ld hl, Coord
ld b, $6
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index bdda042c..8c0b6a0a 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -80,7 +80,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
FuncCoord 10, 11
ld hl, Coord
ld a, $2
- call Predef ; indirect jump to Func_3f073 (3f073 (f:7073))
+ call Predef
call WaitForTextScrollButtonPress
call LoadScreenTilesFromBuffer1
call Delay3
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 034185fc..4d1e0339 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -294,7 +294,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a)
pop bc
ld [wd09f], a
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
ld hl, $ffdb
dec [hl]
jr nz, .asm_1eb0e
diff --git a/engine/intro.asm b/engine/intro.asm
index 00907065..c3449c0b 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -265,11 +265,11 @@ Func_4183f: ; 4183f (10:583f)
Func_41842: ; 41842 (10:5842)
ld c, $0
ld a, $31
- jp Predef ; indirect jump to Func_79dda
+ jp Predef
Func_41849: ; 41849 (10:5849)
ld a, $33
- call Predef ; indirect jump to Func_79869
+ call Predef
ld a, b
jp PlaySound
diff --git a/engine/items/items.asm b/engine/items/items.asm
index fbf013c4..194b7733 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -2675,7 +2675,7 @@ Func_e7a4: ; e7a4 (3:67a4)
ld a, $2
ld [wd07d], a
ld a, $4e
- call Predef ; indirect jump to Func_64eb (64eb (1:64eb))
+ call Predef
ld a, [W_NUMINBOX] ; wda80
dec a
jr z, .asm_e867
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index e48f6bd3..3c813861 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -467,9 +467,9 @@ Func_2174b: ; 2174b (8:574b)
.asm_217b0
ld [wcc49], a
ld a, $36
- call Predef ; indirect jump to StatusScreen (12953 (4:6953))
+ call Predef
ld a, $37
- call Predef ; indirect jump to StatusScreen2 (12b57 (4:6b57))
+ call Predef
call LoadScreenTilesFromBuffer1
call ReloadTilesetTilePatterns
call GoPAL_SET_CF1C
diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm
index b32ffe7f..1d591d1d 100755
--- a/engine/menu/oaks_pc.asm
+++ b/engine/menu/oaks_pc.asm
@@ -9,7 +9,7 @@ OpenOaksPC: ; 1e915 (7:6915)
and a
jr nz, .asm_1e932
ld a, $56
- call Predef ; indirect jump to DisplayDexRating (44169 (11:4169))
+ call Predef
.asm_1e932
ld hl, ClosedOaksPCText
call PrintText
diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm
index 5b6a11a3..c27c65b5 100755
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -378,7 +378,7 @@ Func_718c3: ; 718c3 (1c:58c3)
GetPartyMonSpriteID: ; 718e9 (1c:58e9)
ld [wd11e], a
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
ld a, [wd11e]
ld c, a
dec a
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm
index 8ca82b0b..c7f2abf7 100755
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -42,7 +42,7 @@ OakSpeech: ; 6115 (1:6115)
call LoadTextBoxTilePatterns
call SetDefaultNames
ld a,$18
- call Predef ; indirect jump to InitializePlayerData
+ call Predef
ld hl,wNumBoxItems
ld a,POTION
ld [wcf91],a
diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm
index 0dbbb665..991512bb 100755
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -9,7 +9,7 @@ PrintCardKeyText: ; 52673 (14:6673)
cp b
jr nz, .asm_5267a
ld a, $35
- call Predef ; indirect jump to Func_c586 (c586 (3:4586))
+ call Predef
ld a, [wcfc6]
cp $18
jr z, .asm_5269c
@@ -50,7 +50,7 @@ PrintCardKeyText: ; 52673 (14:6673)
.asm_526ca
ld [wd09f], a
ld a, $17
- call Predef ; indirect jump to Func_ee9e
+ call Predef
ld hl, wd126
set 5, [hl]
ld a, (SFX_1f_57 - SFX_Headers_1f) / 3
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index 1da91880..c1db3d43 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -6,7 +6,7 @@ HandleLedges: ; 1a672 (6:6672)
and a ; OVERWORLD
ret nz
ld a, $35
- call Predef ; indirect jump to Func_c586 (c586 (3:4586))
+ call Predef
ld a, [wSpriteStateData1 + 9]
ld b, a
FuncCoord 8, 9
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index a01a5d0a..374b8ea6 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -459,7 +459,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd)
; tests if sprite is off screen or otherwise unable to do anything
CheckSpriteAvailability: ; 50dc (1:50dc)
ld a, $12
- call Predef ; indirect jump to IsMissableObjectHidden (f1a6 (3:71a6))
+ call Predef
ld a, [$ffe5]
and a
jp nz, .spriteInvisible
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 260dafd9..d228df76 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -146,7 +146,7 @@ Func_1a4f4: ; 1a4f4 (6:64f4)
ld a, $0
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld hl, wd730
res 7, [hl]
ld hl, wd72e
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 45051531..68a6b170 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -422,7 +422,7 @@ Func_707b6: ; 707b6 (1c:47b6)
ld [hli], a
ld [hl], a
ld a, $4c
- call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47))
+ call Predef
ld a, [wSpriteStateData1 + 2]
cp $4
jr nz, .asm_70833
diff --git a/engine/predefs17.asm b/engine/predefs17.asm
index 1802f08d..91a6f7fe 100755
--- a/engine/predefs17.asm
+++ b/engine/predefs17.asm
@@ -4,7 +4,7 @@ DisplayStarterMonDex: ; 5c0dc (17:40dc)
ld a, %01001011 ; set starter flags
ld [wPokedexOwned], a ; wPokedexOwned
ld a, $3d
- call Predef ; indirect jump to ShowPokedexData (402d1 (10:42d1))
+ call Predef
xor a ; unset starter flags
ld [wPokedexOwned], a ; wPokedexOwned
ret
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index d8a00e6f..9698da56 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -275,12 +275,12 @@ Func_4496: ; 4496 (1:4496)
ld a, $90
ld [$ffb0], a
ld d, 1 ; scroll out
- callba TitleScroll ; indirect jump to TitleScroll (37258 (d:7258))
+ callba TitleScroll
ret
Func_44c1: ; 44c1 (1:44c1)
ld d, 0 ; scroll in
- callba TitleScroll ; indirect jump to TitleScroll (37258 (d:7258))
+ callba TitleScroll
xor a
ld [$ffb0], a
ret
diff --git a/engine/trade.asm b/engine/trade.asm
index 1a984ceb..977656b5 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -767,4 +767,4 @@ Func_41676: ; 41676 (10:5676)
xor a
ld [wcc5b], a
ld a, $8
- jp Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e))
+ jp Predef
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 15:45:43 +0000