pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

rename Function0x{} labels to Function{} for consistency

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
battle/ai/scoring.asm
View File

@ -162,7 +162,7 @@ AIScoring_RedSuperEffective: ; 38635
push de
ld a, 1
ld [hBattleTurn], a
callab Function0x347c8
callab Function347c8
pop de
pop bc
pop hl
@ -412,7 +412,7 @@ AIScoring_LeechHit: ; 387f7
push hl
ld a, 1
ld [hBattleTurn], a
callab Function0x347c8
callab Function347c8
pop hl
ld a, [$d265]
@ -559,7 +559,7 @@ AIScoring_LockOn: ; 3881d
AIScoring_Explosion: ; 388a6
push hl
callba Function0x349f4
callba Function349f4
pop hl
jr nc, .asm_388b7
@ -904,7 +904,7 @@ AIScoring_Bide: ; 38a1e
AIScoring_Whirlwind: ; 38a2a
push hl
callab Function0x3484e
callab Function3484e
ld a, [$c716]
cp $a
pop hl
@ -1760,7 +1760,7 @@ AIScoring_MeanLook: ; 38dfb
jr nz, .asm_38e26
push hl
callab Function0x3484e
callab Function3484e
ld a, [$c716]
cp $b
pop hl
@ -1874,7 +1874,7 @@ AIScoring_Curse: ; 38e5c
jp nz, AIDiscourageMove
push hl
callba Function0x349f4
callba Function349f4
pop hl
jr nc, .asm_38eb0
@ -2003,7 +2003,7 @@ AIScoring_Foresight: ; 38f1d
AIScoring_PerishSong: ; 38f4a
push hl
callab Function0x349f4
callab Function349f4
pop hl
jr c, .asm_38f75
@ -2012,7 +2012,7 @@ AIScoring_PerishSong: ; 38f4a
jr nz, .asm_38f6f
push hl
callab Function0x3484e
callab Function3484e
ld a, [$c716]
cp 10 ; 1.0
pop hl
@ -2242,7 +2242,7 @@ AIScoring_Earthquake: ; 39044
AIScoring_BatonPass: ; 39062
push hl
callab Function0x3484e
callab Function3484e
ld a, [$c716]
cp 10 ; 1.0
pop hl
@ -2299,7 +2299,7 @@ AIScoring_HiddenPower: ; 3909e
ld hl, $7ced
ld a, $3e
rst FarCall
callab Function0x347c8
callab Function347c8
pop hl
ld a, [$d265]
@ -3223,7 +3223,7 @@ AIScoring_StatusImmunity: ; 39453
push de
ld a, 1
ld [hBattleTurn], a
callab Function0x347c8
callab Function347c8
pop de
pop bc
pop hl

12
battle/core.asm
View File

@ -3421,7 +3421,7 @@ Function3d5d7: ; 3d5d7
ld a, BANK(Moves)
call FarCopyBytes
call SetEnemyTurn
callab Function0x347c8
callab Function347c8
pop bc
pop de
pop hl
@ -3456,13 +3456,13 @@ Function3d618: ; 3d618
ld a, [BattleMonType1]
ld [PlayerMoveType], a
call SetPlayerTurn
callab Function0x347c8
callab Function347c8
ld a, [$d265]
cp $b
jr nc, .asm_3d663
ld a, [BattleMonType2]
ld [PlayerMoveType], a
callab Function0x347c8
callab Function347c8
ld a, [$d265]
cp $b
jr nc, .asm_3d663
@ -4554,15 +4554,15 @@ Function3dde9: ; 3dde9
res 7, [hl]
.asm_3de26
ld hl, Function0x365fd
ld hl, Function365fd
ld a, [hBattleTurn]
and a
jr z, .asm_3de31
ld hl, Function0x365d7
ld hl, Function365d7
.asm_3de31
call Function3c8e4
ld a, BANK(Function0x365fd)
ld a, BANK(Function365fd)
rst FarCall
call Function3c8e4
call Function3ddc8

750
battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

10
battle/effects/curse.asm
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

2
battle/effects/endure.asm
View File

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

4
battle/effects/foresight.asm
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

6
battle/effects/metronome.asm
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

6
battle/effects/mirror_move.asm
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]

4
battle/effects/nightmare.asm
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

4
battle/effects/perish_song.asm
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

6
battle/effects/protect.asm
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

4
battle/effects/sandstorm.asm
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

4
battle/effects/spikes.asm
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

4
items/item_effects.asm
View File

@ -1542,7 +1542,7 @@ Functionf030: ; f030 (3:7030)
res 7, [hl]
.asm_f04f
push bc
callba Function0x365d7
callba Function365d7
pop bc
ret
@ -2343,7 +2343,7 @@ XSpecial: ; f4c5
ld [hBattleTurn], a
ld [AttackMissed], a
ld [$c70d], a
callba Function0x361ef
callba Function361ef
call WaitSFX
callba BattleCommand8c

20
main.asm
View File

@ -7793,7 +7793,7 @@ PredefPointers: ; 856b
dwb Function5108b, BANK(Function5108b)
dwb Function5120d, BANK(Function5120d)
dwb DecompressPredef, BANK(DecompressPredef) ; $40
dwb Function0x347d3, BANK(Function0x347d3)
dwb Function347d3, BANK(Function347d3)
dwb Functionfb908, BANK(Functionfb908)
dwb Functionfb877, BANK(Functionfb877)
dwb Functiond0000, BANK(Functiond0000)
@ -11050,7 +11050,7 @@ _CheckTossableItem: ; d427
ld a, 4
call GetItemAttr
bit 7, a
jr nz, Function0xd47f
jr nz, Functiond47f
and a
ret
; d432
@ -11060,7 +11060,7 @@ CheckSelectableItem: ; d432
ld a, 4
call GetItemAttr
bit 6, a
jr nz, Function0xd47f
jr nz, Functiond47f
and a
ret
; d43d
@ -11120,7 +11120,7 @@ GetItemAttr: ; d460
ret
; d47f
Function0xd47f: ; d47f
Functiond47f: ; d47f
ld a, 1
ld [$d142], a
scf
@ -35591,7 +35591,7 @@ INCBIN "baserom.gbc",$2c4d7,$2c4e3 - $2c4d7
cp $3
jr z, .asm_2c541
jr Function2c545
callba Function0x377f5
callba Function377f5
jr c, .asm_2c541
ld a, [PlayerSubStatus1] ; $c668
bit 7, a
@ -36913,7 +36913,7 @@ Function38041: ; 38041
; 38045
Function38045: ; 38045
callab Function0x34941
callab Function34941
ld a, [$c717]
and $f0
jp z, Function38041
@ -36946,7 +36946,7 @@ Function38045: ; 38045
; 38083
Function38083: ; 38083
callab Function0x34941
callab Function34941
ld a, [$c717]
and $f0
jp z, Function38041
@ -36979,7 +36979,7 @@ Function38083: ; 38083
; 380c1
Function380c1: ; 380c1
callab Function0x34941
callab Function34941
ld a, [$c717]
and $f0
jp z, Function38041
@ -37555,7 +37555,7 @@ Function38557
push bc
call Function38571
pop bc
callba Function0x361ef
callba Function361ef
jp Function38387
; 38568
@ -86704,7 +86704,7 @@ UsedMoveText: ; 105db9
; check actor ????
push hl
callba Function0x34548
callba Function34548
pop hl
jr nz, .grammar