ref: 38ac74f22285974bda6a0ed537958def8415076e
parent: 81bbab85ac7d7f4c2efe794a4b3cc1e51c0b2689
author: yenatch <yenatch@gmail.com>
date: Mon Jun 16 07:37:36 EDT 2014
Remove generated "indirect jump" comments. The destination is obvious when using the predef macro.
--- a/engine/battle/1.asm
+++ b/engine/battle/1.asm
@@ -77,11 +77,11 @@
.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
--- a/engine/battle/15.asm
+++ b/engine/battle/15.asm
@@ -246,7 +246,7 @@
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
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -44,7 +44,7 @@
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
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -44,7 +44,7 @@
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 @@
.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)
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -1228,7 +1228,7 @@
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 @@
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 @@
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
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -174,7 +174,7 @@
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 @@
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_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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
.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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
push de
push bc
ld a, $8
- call Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e))
+ call Predef
pop bc
pop de
pop hl
--- a/engine/battle/e_2.asm
+++ b/engine/battle/e_2.asm
@@ -95,7 +95,7 @@
.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
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -274,9 +274,9 @@
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 @@
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
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -153,7 +153,7 @@
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 @@
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 @@
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
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -53,7 +53,7 @@
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
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -118,7 +118,7 @@
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 @@
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 @@
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 @@
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
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -80,7 +80,7 @@
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
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -294,7 +294,7 @@
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
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -265,11 +265,11 @@
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
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -2675,7 +2675,7 @@
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
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -467,9 +467,9 @@
.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
--- a/engine/menu/oaks_pc.asm
+++ b/engine/menu/oaks_pc.asm
@@ -9,7 +9,7 @@
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
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -378,7 +378,7 @@
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
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -42,7 +42,7 @@
call LoadTextBoxTilePatterns
call SetDefaultNames
ld a,$18
- call Predef ; indirect jump to InitializePlayerData
+ call Predef
ld hl,wNumBoxItems
ld a,POTION
ld [wcf91],a
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -9,7 +9,7 @@
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 @@
.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
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -6,7 +6,7 @@
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
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -459,7 +459,7 @@
; 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
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -146,7 +146,7 @@
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
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -422,7 +422,7 @@
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
--- a/engine/predefs17.asm
+++ b/engine/predefs17.asm
@@ -4,7 +4,7 @@
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
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -275,12 +275,12 @@
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
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -767,4 +767,4 @@
xor a
ld [wcc5b], a
ld a, $8
- jp Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e))
+ jp Predef
--- a/home.asm
+++ b/home.asm
@@ -276,7 +276,7 @@
ld a, [wcf91]
ld [wd11e], a
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
ld hl, wd11e
ld a, [hl]
pop bc
@@ -2961,7 +2961,7 @@
ld a, [hl]
ld [wcc4d], a ; load corresponding missable object index and remove it
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
.skipRemoveSprite
ld hl, wd730
bit 4, [hl]
@@ -3049,7 +3049,7 @@
swap a
ld [wTrainerSpriteOffset], a ; wWhichTrade
ld a, $39
- call Predef ; indirect jump to CheckEngagePlayer (5690f (15:690f))
+ call Predef
pop de
pop hl
ld a, [wTrainerSpriteOffset] ; wWhichTrade
@@ -4012,7 +4012,7 @@
pop hl
call JoypadLowSensitivity
ld a, $2d
- call Predef ; indirect jump to Func_5a5f (5a5f (1:5a5f))
+ call Predef
ld a, [$ffb5]
and A_BUTTON | B_BUTTON
jr z, .asm_3872
--- a/main.asm
+++ b/main.asm
@@ -2533,12 +2533,12 @@
jr z, .asm_c733
ld b, $2
ld a, $1f
- call Predef ; indirect jump to Func_480eb (480eb (12:40eb))
+ call Predef
ld a, (SFX_02_43 - SFX_Headers_02) / 3
call PlaySound
.asm_c733
ld a, $14
- call Predef ; indirect jump to AnyPlayerPokemonAliveCheck (3ca83 (f:4a83))
+ call Predef
ld a, d
and a
jr nz, .asm_c74f
@@ -3379,7 +3379,7 @@
and $f0
ret z
ld a, $5a
- call Predef ; indirect jump to Func_c60b (c60b (3:460b))
+ call Predef
ld a, [wd71c]
and a
jp nz, Func_f2dd
@@ -3500,7 +3500,7 @@
ld a, $2
ld [wd07d], a
ld a, $4e
- call Predef ; indirect jump to Func_64eb (64eb (1:64eb))
+ call Predef
.asm_f33f
ld hl, wPartyMons
ld a, [wcc49]
@@ -3533,7 +3533,7 @@
ld [wd11e], a
push de
ld a, $3a
- call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
+ call Predef
pop de
ld a, [wd11e]
dec a
@@ -3636,7 +3636,7 @@
xor a
ld [wHPBarMaxHP], a
ld a, $3e
- call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8))
+ call Predef
pop de
ld a, [wPlayerID] ; set trainer ID to player ID
inc de
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -25,7 +25,7 @@
ld [wd09f], a
ld bc, $2
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
AgathaScript_76464: ; 76464 (1d:6464)
xor a
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -25,7 +25,7 @@
ld [wd09f], a
ld bc, $2
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
BrunoScript_7630d: ; 7630d (1d:630d)
xor a
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -15,7 +15,7 @@
ld [wd11e], a
ld b, a
ld a, $1c
- call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5))
+ call Predef
pop de
pop hl
ld a, b
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -19,7 +19,7 @@
ld [wd11e], a
ld b, a
ld a, $1c
- call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5))
+ call Predef
pop de
pop hl
ld a, b
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -35,7 +35,7 @@
LanceScript_5a2f0: ; 5a2f0 (16:62f0)
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
LanceScript_5a2f5: ; 5a2f5 (16:62f5)
xor a
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -26,7 +26,7 @@
ld [wd09f], a
ld bc, $2
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
LoreleiScript_761b6: ; 761b6 (1d:61b6)
xor a
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -44,7 +44,7 @@
ld [wd09f], a
asm_44310: ; 44310 (11:4310)
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
ret
Mansion1Script_Switches: ; 44316 (11:4316)
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -41,7 +41,7 @@
Mansion2Script_5202f: ; 5202f (14:602f)
ld [wd09f], a
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
Mansion2Script_Switches: ; 52037 (14:6037)
ld a, [wSpriteStateData1 + 9]
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -152,7 +152,7 @@
.asm_49e1f
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
xor a
ld [wJoyIgnore], a
ld a, $0
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -70,11 +70,11 @@
ld a, $4
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld a, $22
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld hl, wd7eb
res 0, [hl]
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@@ -33,7 +33,7 @@
ld hl, wd72e
set 4, [hl]
ld a, $7
- call Predef ; indirect jump to HealParty (f6a5 (3:76a5))
+ call Predef
call GBFadeOut2
call Delay3
call Delay3
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -53,7 +53,7 @@
jr nz, .missableObjectsListLoop
ld [wcc4d], a ; remove missable object
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
xor a
ld [wJoyIgnore], a
ld [wcf13], a
@@ -70,7 +70,7 @@
ld a, $43
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld a, $4
ld [wSpriteStateData1 + 9], a
ld a, $95
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -37,7 +37,7 @@
ld a, $1d
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld a, $3
ld [W_ROUTE12CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -37,7 +37,7 @@
ld a, $21
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
call UpdateSprites
ld a, $3
ld [W_ROUTE16CURSCRIPT], a
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@@ -51,12 +51,12 @@
Route20Script_50d0c: ; 50d0c (14:4d0c)
ld [wcc4d], a
ld a, $15
- jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ jp Predef
Route20Script_50d14: ; 50d14 (14:4d14)
ld [wcc4d], a
ld a, $11
- jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ jp Predef
Route20ScriptPointers: ; 50d1c (14:4d1c)
dw CheckFightingMapTrainers
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -224,7 +224,7 @@
xor a
ld [wcd50], a
ld a, $4c
- call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47))
+ call Predef
ld a, [wd700]
and a
jr z, .skipYVisibilityTesta
@@ -356,7 +356,7 @@
ld a, $23
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
call Func_2307
ld hl, wd7eb
res 1, [hl]
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -19,11 +19,11 @@
ld a, $7a
ld [wcc4d], a
ld a, $15
- call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ call Predef
ld a, $60
ld [wcc4d], a
ld a, $11
- jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ jp Predef
Route23ScriptPointers: ; 51213 (14:5213)
dw Route23Script0
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -22,7 +22,7 @@
ld a, $61
ld [wcc4d], a
ld a, $15
- jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ jp Predef
.asm_515ff
bit 4, [hl]
ret z
@@ -30,15 +30,15 @@
ld a, $24
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld a, $62
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld a, $63
ld [wcc4d], a
ld a, $15
- jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ jp Predef
Route25ScriptPointers: ; 51622 (14:5622)
dw CheckFightingMapTrainers
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -23,7 +23,7 @@
ld [wd09f], a
ld bc, $405
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
DataTable_5a173: ; 5a173 (16:6173)
db $04,$05,$FF
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -23,7 +23,7 @@
ld [wd09f], a
ld bc, $603
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
DataTable_62134: ; 62134 (18:6134)
db $06,$03,$FF
@@ -81,7 +81,7 @@
push hl
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
pop hl
jr .asm_62170
.asm_62181
@@ -93,7 +93,7 @@
push hl
ld [wcc4d], a
ld a, $15
- call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ call Predef
pop hl
jr .asm_62184
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -24,7 +24,7 @@
ld [wd09f], a
ld bc, $404
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
pop af
.asm_59f98
bit 1, a
@@ -33,7 +33,7 @@
ld [wd09f], a
ld bc, $408
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
DataTable_59fa8: ; 59fa8 (16:5fa8)
db $04,$04,$04,$08,$FF
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -24,7 +24,7 @@
ld [wd09f], a
ld bc, $305
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
pop af
.asm_51b9e
bit 5, a
@@ -34,7 +34,7 @@
ld [wd09f], a
ld bc, $20a
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
pop af
.asm_51bb1
bit 6, a
@@ -43,7 +43,7 @@
ld [wd09f], a
ld bc, $60a
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
DataTable_51bc1: ; 51bc1 (14:5bc1)
db $03,$05,$02,$0A,$06,$0A,$FF
@@ -247,7 +247,7 @@
ld a, $a7
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
call Func_2307
xor a
ld [wJoyIgnore], a
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@@ -23,7 +23,7 @@
ld [wd09f], a
ld bc, $403
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
DataTable_5653e: ; 5653e (15:653e)
db $04,$03,$FF
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -24,7 +24,7 @@
ld [wd09f], a
ld bc, $401
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
pop af
.asm_5d7f8
bit 1, a
@@ -34,7 +34,7 @@
ld [wd09f], a
ld bc, $209
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
pop af
.asm_5d80b
bit 2, a
@@ -44,7 +44,7 @@
ld [wd09f], a
ld bc, $509
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
pop af
.asm_5d81e
bit 3, a
@@ -53,7 +53,7 @@
ld [wd09f], a
ld bc, $605
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
DataTable_5d82e: ; 5d82e (17:582e)
db $04,$01,$02,$09,$05,$09,$06,$05,$FF
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -41,7 +41,7 @@
ld [wd09f], a
ld bc, $202
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
xor a
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -18,7 +18,7 @@
ld [wd09f], a
ld bc, $604
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a)
dw VictoryRoad1Script0
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -37,7 +37,7 @@
VictoryRoad2Script_517e2: ; 517e2 (14:57e2)
ld [wd09f], a
ld a, $17
- call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ call Predef
ret
VictoryRoad2ScriptPointers: ; 517eb (14:57eb)
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -20,7 +20,7 @@
ld [wd09f], a
ld bc, $503
ld a, $17
- jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
+ jp Predef
VictoryRoad3ScriptPointers: ; 449b1 (11:49b1)
dw VictoryRoad3Script0
@@ -51,11 +51,11 @@
ld a, $7a
ld [wcc4d], a
ld a, $11
- call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
+ call Predef
ld a, $60
ld [wcc4d], a
ld a, $15
- jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ jp Predef
.coordsData_449f9: ; 449f9 (11:49f9)
db $05,$03
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -178,7 +178,7 @@
ld a, $23
ld [wcc4d], a
ld a, $15
- call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ call Predef
ld hl, wd7eb
set 1, [hl]
set 7, [hl]