rename Function0x{} labels to Function{} for consistency

This commit is contained in:
yenatch
2013-12-31 04:10:49 -05:00
parent 1ab4b59d86
commit a18cab495d
15 changed files with 429 additions and 429 deletions

View File

@@ -41,9 +41,9 @@ BattleCommand54: ; 37588
ld a, $1
ld [$c689], a
call Function0x37e01
call Function37e01
ld a, $2
call Function0x36532
call Function36532
call SwitchTurn
call BattleCommand8d
call ResetMiss
@@ -71,7 +71,7 @@ BattleCommand54: ; 37588
jr nz, .failed
set 1, [hl]
call Function0x37e01
call Function37e01
ld hl, GetHalfMaxHP
call CallBattleCore
ld hl, Function3cc3f
@@ -81,7 +81,7 @@ BattleCommand54: ; 37588
jp StdBattleTextBox
.failed
call Function0x37e77
call Function37e77
jp PrintButItFailed
@@ -91,7 +91,7 @@ BattleCommand54: ; 37588
ld b, $8 ; ABILITY
call GetStatName
call Function0x37e77
call Function37e77
ld hl, WontRiseAnymoreText
jp StdBattleTextBox
; 37618

View File

@@ -10,7 +10,7 @@ BattleCommand5a: ; 3766f
call _GetBattleVar
set SUBSTATUS_ENDURE, [hl]
call Function0x37e01
call Function37e01
ld hl, BracedItselfText
jp StdBattleTextBox

View File

@@ -14,11 +14,11 @@ BattleCommand57: ; 376a0
jr nz, .failed
set SUBSTATUS_IDENTIFIED, [hl]
call Function0x37e01
call Function37e01
ld hl, IdentifiedText
jp StdBattleTextBox
.failed
jp Function0x37354
jp Function37354
; 376c2

View File

@@ -1,8 +1,8 @@
BattleCommand34: ; 37418
; metronome
call Function0x372d8
call Function0x34548
call Function372d8
call Function34548
jr nz, .asm_3742b
ld a, [$c689]
@@ -12,7 +12,7 @@ BattleCommand34: ; 37418
ld [$c689], a
.asm_3742b
call Function0x37e36
call Function37e36
.GetMove
call BattleRandom

View File

@@ -1,7 +1,7 @@
BattleCommand1b: ; 373c9
; mirrormove
call Function0x372d8
call Function372d8
ld a, BATTLE_VARS_MOVE
call _GetBattleVar
@@ -15,7 +15,7 @@ BattleCommand1b: ; 373c9
jr nz, .use
.failed
call Function0x37e77
call Function37e77
ld hl, MirrorMoveFailedText
call StdBattleTextBox
@@ -37,7 +37,7 @@ BattleCommand1b: ; 373c9
call GetMoveData
call GetMoveName
call CopyName1
call Function0x34548
call Function34548
jr nz, .done
ld a, [$c689]

View File

@@ -28,12 +28,12 @@ BattleCommand52: ; 37536
; Otherwise give the opponent a nightmare.
set SUBSTATUS_NIGHTMARE, [hl]
call Function0x37e01
call Function37e01
ld hl, StartedNightmareText
jp StdBattleTextBox
.failed
call Function0x37e77
call Function37e77
jp PrintButItFailed
; 37563

View File

@@ -30,12 +30,12 @@ BattleCommand58: ; 376c2
ld [EnemyPerishCount], a
.done
call Function0x37e01
call Function37e01
ld hl, StartPerishText
jp StdBattleTextBox
.failed
call Function0x37e77
call Function37e77
jp PrintButItFailed
; 376f8

View File

@@ -7,7 +7,7 @@ BattleCommand55: ; 37618
call _GetBattleVar
set SUBSTATUS_PROTECT, [hl]
call Function0x37e01
call Function37e01
ld hl, ProtectedItselfText
jp StdBattleTextBox
@@ -23,7 +23,7 @@ ProtectChance: ; 3762c
ld de, EnemyProtectCount
.asm_37637
call Function0x36abf
call Function36abf
jr nz, .failed
; Can't have a substitute.
@@ -73,7 +73,7 @@ ProtectChance: ; 3762c
.failed
xor a
ld [de], a
call Function0x37e77
call Function37e77
call PrintButItFailed
scf
ret

View File

@@ -9,12 +9,12 @@ BattleCommand59: ; 376f8
ld [Weather], a
ld a, 5
ld [WeatherCount], a
call Function0x37e01
call Function37e01
ld hl, SandstormBrewedText
jp StdBattleTextBox
.failed
call Function0x37e77
call Function37e77
jp PrintButItFailed
; 37718

View File

@@ -17,12 +17,12 @@ BattleCommand56: ; 37683
set SCREENS_SPIKES, [hl]
call Function0x37e01
call Function37e01
ld hl, SpikesText
jp StdBattleTextBox
.failed
jp Function0x37354
jp Function37354
; 376a0