summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-02-07 17:39:42 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-02-07 17:39:42 +0100
commitb633a7a18c8bc2f0de043902d793bfc038fd6276 (patch)
tree1032fad3e010cb0b8310d1d85477db94a44f307f /src
parentacc23e78e00b131efcddac17b55dceed9a199ff2 (diff)
Label some hardcoded home function calls
Diffstat (limited to 'src')
-rwxr-xr-xsrc/engine/bank1.asm10
-rwxr-xr-xsrc/engine/bank3.asm14
-rwxr-xr-xsrc/engine/bank5.asm2
-rwxr-xr-xsrc/engine/bank7.asm4
-rwxr-xr-xsrc/engine/bank8.asm4
-rwxr-xr-xsrc/engine/home.asm3
6 files changed, 19 insertions, 18 deletions
diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm
index a524905..a48f0d7 100755
--- a/src/engine/bank1.asm
+++ b/src/engine/bank1.asm
@@ -516,7 +516,7 @@ PlayerUseEnergyCard: ; 4477 (1:4477)
.alreadyPlayedEnergy
text_hl OnlyOneEnergyCardText
call DrawWideTextBox_WaitForInput
- call $123b
+ call CreateHandCardBuffer
call $55be
jp $4447
; 0x44db
@@ -994,7 +994,7 @@ Func_4b60: ; 4b60 (1:4b60)
call Func_4cd5
call SwapTurn
jp c, $4c77
- call $311d
+ call Func_311d
ld hl, $0072
call DrawWideTextBox_WaitForInput
call Func_0f58
@@ -1117,7 +1117,7 @@ Func_4cd5: ; 4cd5 (1:4cd5)
call $51e7
jr c, .asm_4d28
ld a, [$ff98]
- call $1485
+ call Func_1485
ld a, [$ff98]
ld hl, $0062
call $4b31
@@ -1141,7 +1141,7 @@ Func_4cd5: ; 4cd5 (1:4cd5)
cp $6
jr nc, .asm_4d86
ld a, [$ff98]
- call $1485
+ call Func_1485
ld a, [$ff98]
ld hl, $0061
call $4b31
@@ -1391,7 +1391,7 @@ _TossCoin: ; 71ad (1:71ad)
xor a
ld [wcd9f], a
call Func_04a2
- call $210f
+ call Func_210f
.asm_71c1
ld a, [wcd9f]
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index ab9999b..535da18 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -1181,7 +1181,7 @@ Func_c8ed: ; c8ed (3:c8ed)
jr .asm_c911
.asm_c90e
- call $2af3
+ call Func_2af3
.asm_c911
pop de
@@ -1590,7 +1590,7 @@ RST20: ; cc42 (3:4c42)
ld [wBreakOWScriptLoop], a
.asm_cc4f
call RunOverworldScript
- ld a, [wBreakOWScriptLoop] ; if you break out, it jumps
+ ld a, [wBreakOWScriptLoop] ; if you break out, it jumps
or a
jr z, .asm_cc4f
ld hl, wOWScriptPointer
@@ -2032,7 +2032,7 @@ Func_cf0c: ; cf0c (3:4f0c)
Func_cf12: ; cf12 (3:4f12)
ld a, c
- call $1d1d
+ call Func_1d1d
asm_cf16
or a
@@ -2236,7 +2236,7 @@ Func_d025: ; d025 (3:5025)
Func_d032: ; d032 (3:5032)
call Func_ca69
dec hl
- call $1d1d
+ call Func_1d1d
jp c, Func_cf67
jp Func_cf6d
@@ -2876,7 +2876,7 @@ Func_d4ae: ; d4ae (3:54ae)
cp c
jr c, Func_d490 ; 0xd4b2 $dc
jr Func_d48a ; 0xd4b4 $d4
-
+
Func_d4b6: ; d4b6 (3:54b6)
ld a, c
ld c, b
@@ -2962,7 +2962,7 @@ OWSequence_d753: ; d753 (3:5753)
db $80
db $58
db $02
-
+
; there's more to this script but it hasn't been disassembled yet
INCROM $d77e, $e13f
@@ -3113,7 +3113,7 @@ OWSequence_Joshua:
run_script Func_d484
db $33
db $01
-
+
INCROM $e23f, $e52c
FindEndOfBattleScript: ; e52c (3:652c)
diff --git a/src/engine/bank5.asm b/src/engine/bank5.asm
index 1104b86..0b373d3 100755
--- a/src/engine/bank5.asm
+++ b/src/engine/bank5.asm
@@ -73,7 +73,7 @@ Func_14226: ; 14226 (5:4226)
jr nz, .checkForNextPokemon
push hl
ld a, [$ff98]
- call $1485
+ call Func_1485
pop hl
jr .checkForNextPokemon
; 0x1424b
diff --git a/src/engine/bank7.asm b/src/engine/bank7.asm
index 6dd7fe7..6e91991 100755
--- a/src/engine/bank7.asm
+++ b/src/engine/bank7.asm
@@ -135,7 +135,7 @@ Func_1c50a: ; 1c50a (7:450a)
push hl
call Func_1c719
ld a, [wd3aa]
- call $39a7
+ call Func_39a7
ld a, [hl]
or a
jr z, .asm_1c52c
@@ -265,7 +265,7 @@ Func_1c768: ; 1c768 (7:4768)
ld a, $02
farcall Func_c29b
ld a, [wd3aa]
- call $39a7
+ call Func_39a7
ld a, [hl]
farcall Func_1187d
pop hl
diff --git a/src/engine/bank8.asm b/src/engine/bank8.asm
index 478714b..aa47756 100755
--- a/src/engine/bank8.asm
+++ b/src/engine/bank8.asm
@@ -48,7 +48,7 @@ Func_200e5: ; 200e5 (8:40e5)
ld [$ff9f], a
bank1call $35a9
jp c, $41a8
- call $1944
+ call Func_1944
ld a, $1
call TryExecuteEffectCommandFunction
jp c, $41a8
@@ -85,7 +85,7 @@ Func_200e5: ; 200e5 (8:40e5)
pop hl
and $8
jp z, $40f7
- call $123b
+ call CreateHandCardBuffer
ld hl, wDuelCardOrAttackList
ld de, $cf68
call $697b
diff --git a/src/engine/home.asm b/src/engine/home.asm
index d2ed134..dbef4ae 100755
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -5327,7 +5327,8 @@ WideTextBoxPromptCursorData: ; 2ac8 (0:2ac8)
INCROM $2ad0, $2af0
Func_2af0: ; 2af0 (0:2af0)
- call DrawWideTextBox_PrintText
+ call DrawWideTextBox_PrintText
+Func_2af3: ; 2af3 (0:2af3)
ld de, $0710
call Func_2b66
ld de, $0610