summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-06-16 11:37:36 -0700
committeryenatch <yenatch@gmail.com>2014-06-16 11:37:36 -0700
commit38ac74f22285974bda6a0ed537958def8415076e (patch)
tree6f51ebf68314d1ee712841c32ee45633d135057a /scripts
parent81bbab85ac7d7f4c2efe794a4b3cc1e51c0b2689 (diff)
Remove generated "indirect jump" comments.
The destination is obvious when using the predef macro.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/agatha.asm2
-rwxr-xr-xscripts/bruno.asm2
-rwxr-xr-xscripts/celadonmartroof.asm2
-rwxr-xr-xscripts/lab4.asm2
-rwxr-xr-xscripts/lance.asm2
-rwxr-xr-xscripts/lorelei.asm2
-rwxr-xr-xscripts/mansion1.asm2
-rwxr-xr-xscripts/mansion2.asm2
-rwxr-xr-xscripts/mtmoon3.asm2
-rwxr-xr-xscripts/pewtergym.asm4
-rwxr-xr-xscripts/pokemontower5.asm2
-rwxr-xr-xscripts/pokemontower7.asm4
-rwxr-xr-xscripts/route12.asm2
-rwxr-xr-xscripts/route16.asm2
-rwxr-xr-xscripts/route20.asm4
-rwxr-xr-xscripts/route22.asm4
-rwxr-xr-xscripts/route23.asm4
-rwxr-xr-xscripts/route25.asm8
-rwxr-xr-xscripts/silphco10.asm2
-rwxr-xr-xscripts/silphco11.asm6
-rwxr-xr-xscripts/silphco3.asm4
-rwxr-xr-xscripts/silphco7.asm8
-rwxr-xr-xscripts/silphco8.asm2
-rwxr-xr-xscripts/silphco9.asm8
-rwxr-xr-xscripts/vermiliongym.asm2
-rwxr-xr-xscripts/victoryroad1.asm2
-rwxr-xr-xscripts/victoryroad2.asm2
-rwxr-xr-xscripts/victoryroad3.asm6
-rwxr-xr-xscripts/viridiangym.asm2
29 files changed, 48 insertions, 48 deletions
diff --git a/scripts/agatha.asm b/scripts/agatha.asm
index ec6f35c6..e80e7d32 100755
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -25,7 +25,7 @@ AgathaScript_76459: ; 76459 (1d:6459)
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
diff --git a/scripts/bruno.asm b/scripts/bruno.asm
index 9d10c568..7f9dd1b6 100755
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -25,7 +25,7 @@ BrunoScript_76302: ; 76302 (1d:6302)
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
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm
index 73895736..1eb02dc2 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -15,7 +15,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8)
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
diff --git a/scripts/lab4.asm b/scripts/lab4.asm
index a98e8e34..6a025f03 100755
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -19,7 +19,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
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
diff --git a/scripts/lance.asm b/scripts/lance.asm
index 1694704c..26d42788 100755
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -35,7 +35,7 @@ LanceScript_5a2de: ; 5a2de (16:62de)
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
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index b6387fec..fb10a17d 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -26,7 +26,7 @@ LoreleiScript_76191: ; 76191 (1d:6191)
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
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm
index fe595094..7f314634 100755
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -44,7 +44,7 @@ Mansion1Script_4430b: ; 4430b (11:430b)
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)
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm
index 4d6a11a9..679dd70a 100755
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -41,7 +41,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee)
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]
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm
index c9ac851e..732294cc 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -152,7 +152,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
.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
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm
index e718538f..4d148906 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -70,11 +70,11 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
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]
diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm
index 0f164ab4..ff084349 100755
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@@ -33,7 +33,7 @@ PokemonTower5Script0: ; 6094b (18:494b)
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
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index 5a51e468..381d1c64 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -53,7 +53,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
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 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
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
diff --git a/scripts/route12.asm b/scripts/route12.asm
index db743662..e722f15d 100755
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -37,7 +37,7 @@ Route12Script0: ; 59619 (16:5619)
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
diff --git a/scripts/route16.asm b/scripts/route16.asm
index 39c3f477..afae25c9 100755
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -37,7 +37,7 @@ Route16Script0: ; 59959 (16:5959)
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
diff --git a/scripts/route20.asm b/scripts/route20.asm
index ef2652c0..376d7da9 100755
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@@ -51,12 +51,12 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6)
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
diff --git a/scripts/route22.asm b/scripts/route22.asm
index f9f38e79..d9fce630 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -224,7 +224,7 @@ Route22Script_5104e: ; 5104e (14:504e)
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 @@ Route22Script6: ; 51151 (14:5151)
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]
diff --git a/scripts/route23.asm b/scripts/route23.asm
index b5e0c0f8..507db5ce 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -19,11 +19,11 @@ Route23Script_511e9: ; 511e9 (14:51e9)
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
diff --git a/scripts/route25.asm b/scripts/route25.asm
index 04035065..609205ec 100755
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -22,7 +22,7 @@ Route25Script_515e1: ; 515e1 (14:55e1)
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 @@ Route25Script_515e1: ; 515e1 (14:55e1)
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
diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm
index 3b541391..b3264520 100755
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -23,7 +23,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f)
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
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index 5d1186da..44918bea 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -23,7 +23,7 @@ SilphCo11Script_62110: ; 62110 (18:6110)
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 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
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 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
push hl
ld [wcc4d], a
ld a, $15
- call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
+ call Predef
pop hl
jr .asm_62184
diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm
index b63b59d6..4ea577a5 100755
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -24,7 +24,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
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 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
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
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 0854242b..6f2b306c 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -24,7 +24,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
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 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
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 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
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 @@ SilphCo7Script5: ; 51d25 (14:5d25)
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
diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm
index 5a954cbb..a1d05fd6 100755
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@@ -23,7 +23,7 @@ SilphCo8Script_5651a: ; 5651a (15:651a)
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
diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm
index e93e8601..2247a00f 100755
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -24,7 +24,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
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 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
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 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
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 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
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
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index f1cb42ff..a76d34d8 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -41,7 +41,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
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
diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm
index 1dc62af8..21b87faa 100755
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -18,7 +18,7 @@ VictoryRoad1Script: ; 5da0a (17:5a0a)
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
diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm
index 071af611..034c7545 100755
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -37,7 +37,7 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9)
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)
diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm
index 9c27ebc1..ea04671c 100755
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -20,7 +20,7 @@ VictoryRoad3Script_44996: ; 44996 (11:4996)
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 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
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
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 9034cc06..e0c59e61 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -178,7 +178,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995)
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]