Blindly use wram labels for everything except mobile, part 1.

Wram banks and mobile make this tough, since any address can secretly be a ghost.

As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
This commit is contained in:
yenatch
2015-02-08 00:03:32 -08:00
parent 0683bc8770
commit 8e03321069
21 changed files with 10879 additions and 10151 deletions

View File

@@ -16,12 +16,12 @@ Function38000: ; 38000
bit SUBSTATUS_CANT_RUN, a
jr nz, DontSwitch
ld a, [$c731]
ld a, [wc731]
and a
jr nz, DontSwitch
ld hl, TrainerClassAttributes + 5
ld a, [$cfc0]
ld a, [wcfc0]
and a
jr nz, .ok
ld a, [TrainerClass]
@@ -44,7 +44,7 @@ DontSwitch: ; 38041
SwitchOften: ; 38045
callab Function34941
ld a, [$c717]
ld a, [wc717]
and $f0
jp z, DontSwitch
@@ -70,16 +70,16 @@ SwitchOften: ; 38045
jp c, DontSwitch
.switch
ld a, [$c717]
ld a, [wc717]
and $f
inc a
ld [$c718], a
ld [wc718], a
jp AI_TrySwitch
; 38083
SwitchRarely: ; 38083
callab Function34941
ld a, [$c717]
ld a, [wc717]
and $f0
jp z, DontSwitch
@@ -105,16 +105,16 @@ SwitchRarely: ; 38083
jp c, DontSwitch
.switch
ld a, [$c717]
ld a, [wc717]
and $f
inc a
ld [$c718], a
ld [wc718], a
jp AI_TrySwitch
; 380c1
SwitchSometimes: ; 380c1
callab Function34941
ld a, [$c717]
ld a, [wc717]
and $f0
jp z, DontSwitch
@@ -140,10 +140,10 @@ SwitchSometimes: ; 380c1
jp c, DontSwitch
.switch
ld a, [$c717]
ld a, [wc717]
and $f
inc a
ld [$c718], a
ld [wc718], a
jp AI_TrySwitch
; 380ff
@@ -156,13 +156,13 @@ Function380ff: ; 380ff
AI_TryItem: ; 38105
ld a, [$cfc0]
ld a, [wcfc0]
and a
ret nz
ld a, [$c650]
ld a, [wc650]
ld b, a
ld a, [$c651]
ld a, [wc651]
or b
ret z
@@ -177,7 +177,7 @@ AI_TryItem: ; 38105
ld b, h
ld c, l
ld hl, AI_Items
ld de, $c650
ld de, wc650
.loop
ld a, [hl]
and a
@@ -221,15 +221,15 @@ AI_TryItem: ; 38105
xor a
ld [de], a
inc a
ld [$c70f], a
ld [wc70f], a
ld hl, EnemySubStatus3
res SUBSTATUS_BIDE, [hl]
xor a
ld [EnemyFuryCutterCount], a
ld [$c681], a
ld [$c72c], a
ld [EnemyProtectCount], a
ld [wc72c], a
ld hl, EnemySubStatus4
res SUBSTATUS_RAGE, [hl]
@@ -545,7 +545,7 @@ AIUpdateHUD: ; 38387
callba UpdateEnemyHUD
ld a, $1
ld [hBGMapMode], a
ld hl, $c6e6
ld hl, wc6e6
dec [hl]
scf
ret
@@ -568,20 +568,20 @@ Function383a3: ; 383a3 (e:43a3)
Function383ae: ; 383ae (e:43ae)
ld a, MAX_POTION
ld [$d1f1], a
ld [wd1f1], a
jr asm_383c6
Function383b5: ; 383b5 (e:43b5)
call AI_HealStatus
ld a, FULL_RESTORE
ld [$d1f1], a
ld [wd1f1], a
ld hl, EnemySubStatus3
res SUBSTATUS_CONFUSED, [hl]
xor a
ld [EnemyConfuseCount], a
asm_383c6: ; 383c6
ld de, $d1ec
ld de, wd1ec
ld hl, EnemyMonHP + 1
ld a, [hld]
ld [de], a
@@ -617,20 +617,20 @@ Function383f4: ; 383f4 (e:43f4)
ld b, 200
Function383f8: ; 383f8
ld [$d1f1], a
ld [wd1f1], a
ld hl, EnemyMonHP + 1
ld a, [hl]
ld [$d1ec], a
ld [wd1ec], a
add b
ld [hld], a
ld [$d1ee], a
ld [wd1ee], a
ld a, [hl]
ld [$d1ec + 1], a
ld [$d1ee + 1], a
ld [wd1ec + 1], a
ld [wd1ee + 1], a
jr nc, .asm_38415
inc a
ld [hl], a
ld [$d1ee + 1], a
ld [wd1ee + 1], a
.asm_38415
inc hl
ld a, [hld]
@@ -650,17 +650,17 @@ Function383f8: ; 383f8
ld a, [de]
dec de
ld [hld], a
ld [$d1ee], a
ld [wd1ee], a
ld a, [de]
ld [hl], a
ld [$d1ef], a
ld [wd1ef], a
.asm_38436
Function38436: ; 38436
call Function38571
hlcoord 2, 2
xor a
ld [$d10a], a
ld [wd10a], a
call AIUsedItemSound
predef Functionc6e0
jp AIUpdateHUD
@@ -695,8 +695,8 @@ AI_TrySwitch: ; 3844b
AI_Switch: ; 3846c
ld a, $1
ld [$c711], a
ld [$c70f], a
ld [wEnemyIsSwitching], a
ld [wc70f], a
ld hl, EnemySubStatus4
res SUBSTATUS_RAGE, [hl]
xor a
@@ -718,7 +718,7 @@ AI_Switch: ; 3846c
call PrintText
.asm_384a3
ld a, $1
ld [$d264], a
ld [wd264], a
callab NewEnemyMonStatus
callab ResetEnemyStatLevels
ld hl, PlayerSubStatus1
@@ -726,7 +726,7 @@ AI_Switch: ; 3846c
callba Function3d4e1
callba Function3d57a
xor a
ld [$d264], a
ld [wd264], a
ld a, [InLinkBattle]
and a
ret nz
@@ -832,7 +832,7 @@ Function38553: ; 38553
ld a, X_SPECIAL
Function38557:
ld [$d1f1], a
ld [wd1f1], a
push bc
call Function38571
pop bc
@@ -842,17 +842,17 @@ Function38557:
Function38568: ; 38568
ld [$d1f1], a
ld [wd1f1], a
call Function38571
jp AIUpdateHUD
; 38571
Function38571: ; 38571
ld a, [$d1f1]
ld [$d265], a
ld a, [wd1f1]
ld [wd265], a
call GetItemName
ld hl, StringBuffer1
ld de, $d050
ld de, wd050
ld bc, ITEM_NAME_LENGTH
call CopyBytes
ld hl, UnknownText_0x3858c

View File

@@ -179,7 +179,7 @@ AI_Types: ; 38635
pop bc
pop hl
ld a, [$d265]
ld a, [wd265]
and a
jr z, .immune
cp 10 ; 1.0
@@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7
pop hl
; 60% chance to discourage this move if not very effective.
ld a, [$d265]
ld a, [wd265]
cp 10 ; 1.0
jr c, .asm_38815
@@ -509,7 +509,7 @@ AI_Smart_LockOn: ; 3881d
push hl
push bc
callba Function347c8
ld a, [$d265]
ld a, [wd265]
cp $a
pop bc
pop hl
@@ -969,7 +969,7 @@ AI_Smart_Whirlwind: ; 38a2a
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp 10 ; neutral
pop hl
ret c
@@ -1048,7 +1048,7 @@ AI_Smart_Bind: ; 38a71
; Bind, Wrap, Fire Spin, Clamp
; 50% chance to discourage this move if the player is already trapped.
ld a, [$c730]
ld a, [wc730]
and a
jr nz, .asm_38a8b
@@ -1325,11 +1325,11 @@ AI_Smart_Rage: ; 38b7f
; Encourage this move based on Rage's counter.
.asm_38b8c
ld a, [$c72c]
ld a, [wc72c]
cp $2
ret c
dec [hl]
ld a, [$c72c]
ld a, [wc72c]
cp $3
ret c
dec [hl]
@@ -1368,7 +1368,7 @@ AI_Smart_Mimic: ; 38ba8
ld [hBattleTurn], a
callab Function347c8
ld a, [$d265]
ld a, [wd265]
cp $a
pop hl
jr c, .asm_38bef
@@ -1489,7 +1489,7 @@ AI_Smart_Encore: ; 38c3b
predef Function347d3
pop hl
ld a, [$d265]
ld a, [wd265]
cp $a
jr nc, .asm_38c68
@@ -1811,7 +1811,7 @@ AI_Smart_Conversion2: ; 38d98
callab Function347c8
ld a, [$d265]
ld a, [wd265]
cp $a
pop hl
jr c, .asm_38dc9
@@ -1888,7 +1888,7 @@ AI_Smart_MeanLook: ; 38dfb
; Otherwise, discourage this move unless the player only has not very effective moves against the enemy.
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp $b ; not very effective
pop hl
ret nc
@@ -2051,7 +2051,7 @@ AI_Smart_Curse: ; 38e5c
AI_Smart_Protect: ; 38ed2
ld a, [$c681]
ld a, [EnemyProtectCount]
and a
jr nz, .asm_38f13
@@ -2146,7 +2146,7 @@ AI_Smart_PerishSong: ; 38f4a
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp 10 ; 1.0
pop hl
ret c
@@ -2218,7 +2218,7 @@ AI_Smart_Sandstorm: ; 38f7a
AI_Smart_Endure: ; 38fac
ld a, [$c681]
ld a, [EnemyProtectCount]
and a
jr nz, .asm_38fd8
@@ -2404,7 +2404,7 @@ AI_Smart_BatonPass: ; 39062
push hl
callab Function3484e
ld a, [$c716]
ld a, [wc716]
cp 10 ; neutral
pop hl
ret c
@@ -2437,7 +2437,7 @@ AI_Smart_RapidSpin: ; 39084
; 80% chance to greatly encourage this move if the enemy is
; trapped (Bind effect), seeded, or scattered with spikes.
ld a, [$c731]
ld a, [wc731]
and a
jr nz, .asm_39097
@@ -2470,7 +2470,7 @@ AI_Smart_HiddenPower: ; 3909e
pop hl
; Discourage Hidden Power if not very effective.
ld a, [$d265]
ld a, [wd265]
cp 10
jr c, .bad
@@ -2480,7 +2480,7 @@ AI_Smart_HiddenPower: ; 3909e
jr c, .bad
; Encourage Hidden Power if super-effective.
ld a, [$d265]
ld a, [wd265]
cp 11
jr nc, .good
@@ -2825,7 +2825,7 @@ AI_Smart_FutureSight: ; 391f3
AI_Smart_Stomp: ; 39200
; 80% chance to encourage this move if the player has used Minimize.
ld a, [$c6fe]
ld a, [wc6fe]
and a
ret z
@@ -3463,7 +3463,7 @@ AI_Status: ; 39453
pop bc
pop hl
ld a, [$d265]
ld a, [wd265]
and a
jr nz, .checkmove