mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
More battle core labels
This commit is contained in:
PikalaxALT
parent
c34264ddd8
commit
ac824f62fc
@ -16,7 +16,7 @@ AI_SwitchOrTryItem: ; 38000
|
||||
bit SUBSTATUS_CANT_RUN, a
|
||||
jr nz, DontSwitch
|
||||
|
||||
ld a, [wc731]
|
||||
ld a, [wEnemyWrapCount]
|
||||
and a
|
||||
jr nz, DontSwitch
|
||||
|
||||
|
||||
@ -1062,7 +1062,7 @@ AI_Smart_Bind: ; 38a71
|
||||
; Bind, Wrap, Fire Spin, Clamp
|
||||
|
||||
; 50% chance to discourage this move if the player is already trapped.
|
||||
ld a, [wc730]
|
||||
ld a, [wPlayerWrapCount]
|
||||
and a
|
||||
jr nz, .asm_38a8b
|
||||
|
||||
@ -2466,7 +2466,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, [wc731]
|
||||
ld a, [wEnemyWrapCount]
|
||||
and a
|
||||
jr nz, .asm_39097
|
||||
|
||||
|
||||
357
battle/core.asm
357
battle/core.asm
File diff suppressed because it is too large
Load Diff
@ -7247,13 +7247,13 @@ BattleCommand_TrapTarget: ; 36c2d
|
||||
ld a, [AttackMissed]
|
||||
and a
|
||||
ret nz
|
||||
ld hl, wc731
|
||||
ld de, wc72f
|
||||
ld hl, wEnemyWrapCount
|
||||
ld de, wEnemyTrappingMove
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_36c43
|
||||
ld hl, wc730
|
||||
ld de, wc72e
|
||||
ld hl, wPlayerWrapCount
|
||||
ld de, wPlayerTrappingMove
|
||||
|
||||
.asm_36c43
|
||||
ld a, [hl]
|
||||
@ -7494,7 +7494,7 @@ endr
|
||||
cp HELD_HEAL_CONFUSION
|
||||
ret nz
|
||||
.asm_36db0
|
||||
ld hl, Function3de51
|
||||
ld hl, HandleStatusHealingItem
|
||||
jp CallBattleCore
|
||||
; 36db6
|
||||
|
||||
@ -7674,13 +7674,13 @@ endr
|
||||
call GetBattleVarAddr
|
||||
set SUBSTATUS_SUBSTITUTE, [hl]
|
||||
|
||||
ld hl, wc730
|
||||
ld de, wc72e
|
||||
ld hl, wPlayerWrapCount
|
||||
ld de, wPlayerTrappingMove
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .player
|
||||
ld hl, wc731
|
||||
ld de, wc72f
|
||||
ld hl, wEnemyWrapCount
|
||||
ld de, wEnemyTrappingMove
|
||||
.player
|
||||
|
||||
xor a
|
||||
@ -9077,8 +9077,8 @@ ResetBatonPassStatus: ; 37ab1
|
||||
ld [hl], 0
|
||||
|
||||
xor a
|
||||
ld [wc730], a
|
||||
ld [wc731], a
|
||||
ld [wPlayerWrapCount], a
|
||||
ld [wEnemyWrapCount], a
|
||||
ret
|
||||
; 37ae9
|
||||
|
||||
@ -9181,12 +9181,12 @@ BattleCommand_ClearHazards: ; 37b39
|
||||
.asm_37b4a
|
||||
|
||||
ld hl, PlayerScreens
|
||||
ld de, wc730
|
||||
ld de, wPlayerWrapCount
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_37b5b ; 37b53 $6
|
||||
ld hl, EnemyScreens
|
||||
ld de, wc731
|
||||
ld de, wEnemyWrapCount
|
||||
.asm_37b5b
|
||||
bit SCREENS_SPIKES, [hl]
|
||||
jr z, .asm_37b69 ; 37b5d $a
|
||||
@ -9526,12 +9526,12 @@ BattleCommand_SkipSunCharge: ; 37d02
|
||||
BattleCommand_CheckFutureSight: ; 37d0d
|
||||
; checkfuturesight
|
||||
|
||||
ld hl, wc71d
|
||||
ld hl, wPlayerFutureSightCount
|
||||
ld de, wc727
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .ok
|
||||
ld hl, wc71e
|
||||
ld hl, wEnemyFutureSightCount
|
||||
ld de, wc729
|
||||
.ok
|
||||
|
||||
@ -9566,11 +9566,11 @@ BattleCommand_FutureSight: ; 37d34
|
||||
call GetBattleVarAddr
|
||||
ld [hl], b
|
||||
.asm_37d4b
|
||||
ld hl, wc71d
|
||||
ld hl, wPlayerFutureSightCount
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_37d56 ; 37d51 $3
|
||||
ld hl, wc71e
|
||||
ld hl, wEnemyFutureSightCount
|
||||
.asm_37d56
|
||||
ld a, [hl]
|
||||
and a
|
||||
|
||||
@ -98,6 +98,8 @@ const_value SET 3
|
||||
const PAR
|
||||
const SLP ; 7 turns
|
||||
|
||||
ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
|
||||
|
||||
; substatus
|
||||
enum_start 7, -1
|
||||
enum SUBSTATUS_IN_LOVE
|
||||
|
||||
@ -219,7 +219,7 @@ NUM_SPRITEHEADER_FIELDS EQU const_value
|
||||
const SPRITEMOVEDATA_SUDOWOODO
|
||||
const SPRITEMOVEDATA_SMASHABLE_ROCK
|
||||
const SPRITEMOVEDATA_STRENGTH_BOULDER
|
||||
const SPRITEMOVEDATA_1A
|
||||
const SPRITEMOVEDATA_FOLLOWNOTEXACT
|
||||
const SPRITEMOVEDATA_1B
|
||||
const SPRITEMOVEDATA_1C
|
||||
const SPRITEMOVEDATA_1D
|
||||
@ -254,7 +254,7 @@ SPRITEMOVEDATA_FIELDS EQU 6
|
||||
const SPRITEMOVEFN_FOLLOW
|
||||
const SPRITEMOVEFN_SCRIPTED
|
||||
const SPRITEMOVEFN_STRENGTH
|
||||
const SPRITEMOVEFN_12
|
||||
const SPRITEMOVEFN_FOLLOWNOTEXACT
|
||||
const SPRITEMOVEFN_13
|
||||
const SPRITEMOVEFN_14
|
||||
const SPRITEMOVEFN_BIG_SNORLAX
|
||||
|
||||
@ -29,7 +29,7 @@ SpriteMovementData:: ; 4273
|
||||
db SPRITEMOVEFN_STANDING, DOWN, $01, $0c, $00, $00 ; 17
|
||||
db SPRITEMOVEFN_STANDING, DOWN, $01, $2e, $10, $00 ; 18
|
||||
db SPRITEMOVEFN_STRENGTH, DOWN, $01, $2e, $00, $40 ; 19
|
||||
db SPRITEMOVEFN_12, DOWN, $01, $02, $00, $00 ; 1a
|
||||
db SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, $01, $02, $00, $00 ; 1a
|
||||
db SPRITEMOVEFN_13, DOWN, $00, $8e, $01, $00 ; 1b
|
||||
db SPRITEMOVEFN_14, DOWN, $08, $8e, $02, $00 ; 1c
|
||||
db SPRITEMOVEFN_17, DOWN, $00, $82, $00, $00 ; 1d
|
||||
@ -963,7 +963,7 @@ Function47dd: ; 47dd
|
||||
dw .Follow ; 0f
|
||||
dw .Script ; 10
|
||||
dw .Strength ; 11
|
||||
dw .Movement12 ; 12
|
||||
dw .FollowNotExact ; 12
|
||||
dw .Movement13 ; 13
|
||||
dw .Movement14 ; 14
|
||||
dw .MovementBigStanding ; 15
|
||||
@ -1145,7 +1145,7 @@ Function47dd: ; 47dd
|
||||
ret
|
||||
; 48ff
|
||||
|
||||
.Movement12: ; 48ff
|
||||
.FollowNotExact: ; 48ff
|
||||
ld hl, OBJECT_MAP_X
|
||||
add hl, bc
|
||||
ld d, [hl]
|
||||
|
||||
@ -3154,38 +3154,3 @@ String_be657: db "Dad@"
|
||||
String_be65b: db "Sister@"
|
||||
String_be662: db "Brother@"
|
||||
|
||||
|
||||
TalkToTrainerScript:: ; 0xbe66a
|
||||
faceplayer
|
||||
trainerstatus $2
|
||||
iftrue AlreadyBeatenTrainerScript
|
||||
loadtrainerdata
|
||||
playrammusic
|
||||
jump StartBattleWithMapTrainerScript
|
||||
; 0xbe675
|
||||
|
||||
SeenByTrainerScript:: ; 0xbe675
|
||||
loadtrainerdata
|
||||
playrammusic
|
||||
showemote EMOTE_SHOCK, LAST_TALKED, 30
|
||||
callasm Function831e
|
||||
applymovement2 MovementBuffer
|
||||
writepersonxy LAST_TALKED
|
||||
faceperson PLAYER, LAST_TALKED
|
||||
jump StartBattleWithMapTrainerScript
|
||||
; 0xbe68a
|
||||
|
||||
StartBattleWithMapTrainerScript: ; 0xbe68a
|
||||
loadfont
|
||||
trainertext $0
|
||||
closetext
|
||||
loadmovesprites
|
||||
loadtrainerdata
|
||||
startbattle
|
||||
returnafterbattle
|
||||
trainerstatus 1
|
||||
loadvar wd04d, -1
|
||||
|
||||
AlreadyBeatenTrainerScript:
|
||||
scripttalkafter
|
||||
; 0xbe699
|
||||
|
||||
@ -1360,7 +1360,7 @@ Script_writepersonxy: ; 0x9735b
|
||||
ld a, [hLastTalked]
|
||||
.ok
|
||||
ld b, a
|
||||
callba Function80a1
|
||||
callba WritePersonXY
|
||||
ret
|
||||
; 0x9736f
|
||||
|
||||
@ -1376,7 +1376,7 @@ Script_follownotexact: ; 0x9736f
|
||||
call GetScriptByte
|
||||
call GetScriptPerson
|
||||
ld c, a
|
||||
callba Function839e
|
||||
callba FollowNotExact
|
||||
ret
|
||||
; 0x97384
|
||||
|
||||
@ -1546,7 +1546,7 @@ Script_catchtutorial: ; 0x97447
|
||||
call GetScriptByte
|
||||
ld [BattleType], a
|
||||
call BufferScreen
|
||||
callba Function4e554
|
||||
callba CatchTutorial
|
||||
jp Script_reloadmap
|
||||
; 0x97459
|
||||
|
||||
|
||||
@ -724,7 +724,7 @@ endr
|
||||
jp TossItem
|
||||
|
||||
.used_park_ball
|
||||
ld hl, wdc79
|
||||
ld hl, wParkBallsRemaining
|
||||
dec [hl]
|
||||
ret
|
||||
; ec0a
|
||||
|
||||
@ -6382,7 +6382,7 @@ Function102a3b: ; 102a3b
|
||||
ld hl, OTPartyMon1ID
|
||||
call GetPartyLocation
|
||||
ld a, [hli]
|
||||
ld [wc731], a
|
||||
ld [wEnemyWrapCount], a
|
||||
ld a, [hl]
|
||||
ld [wPlayerCharging], a
|
||||
ld a, [wcd4d]
|
||||
@ -6390,9 +6390,9 @@ Function102a3b: ; 102a3b
|
||||
ld hl, OTPartyMon1DVs
|
||||
call GetPartyLocation
|
||||
ld a, [hli]
|
||||
ld [wc72f], a
|
||||
ld [wEnemyTrappingMove], a
|
||||
ld a, [hl]
|
||||
ld [wc730], a
|
||||
ld [wPlayerWrapCount], a
|
||||
ld a, [wcd4d]
|
||||
dec a
|
||||
ld hl, OTPartyMon1Species
|
||||
|
||||
@ -170,7 +170,7 @@ Function1080b7: ; 1080b7
|
||||
ld de, VTiles0 tile $30
|
||||
call Function1081e9
|
||||
ld a, [wc702]
|
||||
ld hl, wc72f
|
||||
ld hl, wEnemyTrappingMove
|
||||
ld de, VTiles2 tile $31
|
||||
call Function1081e9
|
||||
ld a, [$c6d0]
|
||||
@ -515,7 +515,7 @@ Function10839b: ; 10839b
|
||||
call Function1081ca
|
||||
ld a, [wc702]
|
||||
ld [CurPartySpecies], a
|
||||
ld hl, wc72f
|
||||
ld hl, wEnemyTrappingMove
|
||||
ld de, VTiles2
|
||||
call Function108201
|
||||
call EnableLCD
|
||||
@ -548,9 +548,9 @@ Function10839b: ; 10839b
|
||||
ld [hWY], a
|
||||
ld a, [wc702]
|
||||
ld [CurPartySpecies], a
|
||||
ld a, [wc72f]
|
||||
ld a, [wEnemyTrappingMove]
|
||||
ld [TempMonDVs], a
|
||||
ld a, [wc730]
|
||||
ld a, [wPlayerWrapCount]
|
||||
ld [TempMonDVs + 1], a
|
||||
ld b, $1a
|
||||
call GetSGBLayout
|
||||
@ -650,7 +650,7 @@ Function1084d7: ; 1084d7
|
||||
call Function1081ca
|
||||
ld a, [wc702]
|
||||
ld [CurPartySpecies], a
|
||||
ld hl, wc72f
|
||||
ld hl, wEnemyTrappingMove
|
||||
ld de, VTiles2
|
||||
call Function108201
|
||||
call EnableLCD
|
||||
@ -692,16 +692,16 @@ Function1084d7: ; 1084d7
|
||||
ld [hWY], a
|
||||
ld a, [wc702]
|
||||
ld [CurPartySpecies], a
|
||||
ld a, [wc72f]
|
||||
ld a, [wEnemyTrappingMove]
|
||||
ld [TempMonDVs], a
|
||||
ld a, [wc730]
|
||||
ld a, [wPlayerWrapCount]
|
||||
ld [TempMonDVs + 1], a
|
||||
ld b, $1a
|
||||
call GetSGBLayout
|
||||
ld a, $e4
|
||||
call DmgToCgbBGPals
|
||||
ld a, [wc702]
|
||||
ld hl, wc72f
|
||||
ld hl, wEnemyTrappingMove
|
||||
call Function10898a
|
||||
ld a, [wc702]
|
||||
call Function108229
|
||||
@ -719,7 +719,7 @@ Function108589: ; 108589
|
||||
call Function1081ca
|
||||
ld a, [wc702]
|
||||
ld [CurPartySpecies], a
|
||||
ld hl, wc72f
|
||||
ld hl, wEnemyTrappingMove
|
||||
ld de, VTiles2
|
||||
call Function108201
|
||||
call EnableLCD
|
||||
@ -761,16 +761,16 @@ Function108589: ; 108589
|
||||
ld [hWY], a
|
||||
ld a, [wc702]
|
||||
ld [CurPartySpecies], a
|
||||
ld a, [wc72f]
|
||||
ld a, [wEnemyTrappingMove]
|
||||
ld [TempMonDVs], a
|
||||
ld a, [wc730]
|
||||
ld a, [wPlayerWrapCount]
|
||||
ld [TempMonDVs + 1], a
|
||||
ld b, $1a
|
||||
call GetSGBLayout
|
||||
ld a, $e4
|
||||
call DmgToCgbBGPals
|
||||
ld a, [wc702]
|
||||
ld hl, wc72f
|
||||
ld hl, wEnemyTrappingMove
|
||||
call Function10898a
|
||||
ld a, [wc702]
|
||||
call Function108229
|
||||
@ -1262,7 +1262,7 @@ Function1089d2:
|
||||
ld a, [wEnemyCharging]
|
||||
ld de, wc724
|
||||
call Function108aa3
|
||||
ld de, wc731
|
||||
ld de, wEnemyWrapCount
|
||||
call Function108abe
|
||||
call Function108a87
|
||||
ret
|
||||
@ -1737,7 +1737,7 @@ Function108c9b: ; 108c9b
|
||||
dec c
|
||||
jr nz, .asm_108ccc
|
||||
|
||||
ld de, wc731
|
||||
ld de, wEnemyWrapCount
|
||||
ld c, $2
|
||||
.asm_108cd7
|
||||
ld a, [hli]
|
||||
|
||||
@ -7656,14 +7656,14 @@ Function11b7e5: ; 11b7e5
|
||||
ld a, $50
|
||||
ld [de], a
|
||||
ld a, [$c608 + 11]
|
||||
ld [wc731], a
|
||||
ld [wEnemyWrapCount], a
|
||||
ld a, [$c608 + 12]
|
||||
ld [wPlayerCharging], a
|
||||
ld hl, $c608 + 26
|
||||
ld a, [hli]
|
||||
ld [wc72f], a
|
||||
ld [wEnemyTrappingMove], a
|
||||
ld a, [hl]
|
||||
ld [wc730], a
|
||||
ld [wPlayerWrapCount], a
|
||||
ld bc, $c608 + 5
|
||||
callba GetCaughtGender
|
||||
ld a, c
|
||||
|
||||
@ -55,12 +55,12 @@ Function17005a: ; 17005a
|
||||
ld [de], a
|
||||
ld hl, $a841
|
||||
ld a, [hli]
|
||||
ld [wc72f], a
|
||||
ld [wEnemyTrappingMove], a
|
||||
ld a, [hl]
|
||||
ld [wc730], a
|
||||
ld [wPlayerWrapCount], a
|
||||
ld hl, $a832
|
||||
ld a, [hli]
|
||||
ld [wc731], a
|
||||
ld [wEnemyWrapCount], a
|
||||
ld a, [hl]
|
||||
ld [wPlayerCharging], a
|
||||
ld bc, $a82c
|
||||
@ -177,7 +177,7 @@ Function170139: ; 170139
|
||||
ld e, l
|
||||
ld d, h
|
||||
ld hl, PlayerName
|
||||
ld bc, $0005
|
||||
ld bc, $0005 ; Japanese name length
|
||||
call CopyBytes
|
||||
ld bc, PlayerID
|
||||
ld de, PlayerGender
|
||||
|
||||
@ -283,14 +283,14 @@ Function17d0f3: ; 17d0f3
|
||||
ld a, $50
|
||||
ld [de], a
|
||||
ld a, [$c608 + 11]
|
||||
ld [wc731], a
|
||||
ld [wEnemyWrapCount], a
|
||||
ld a, [$c608 + 12]
|
||||
ld [wPlayerCharging], a
|
||||
ld hl, $c608 + 26
|
||||
ld a, [hli]
|
||||
ld [wc72f], a
|
||||
ld [wEnemyTrappingMove], a
|
||||
ld a, [hl]
|
||||
ld [wc730], a
|
||||
ld [wPlayerWrapCount], a
|
||||
ld bc, $c608 + 5
|
||||
callba GetCaughtGender
|
||||
ld a, c
|
||||
|
||||
22
wram.asm
22
wram.asm
@ -841,8 +841,8 @@ LastPlayerMove:: ; c71b
|
||||
LastEnemyMove:: ; c71c
|
||||
ds 1
|
||||
|
||||
wc71d:: ds 1
|
||||
wc71e:: ds 1
|
||||
wPlayerFutureSightCount:: ds 1
|
||||
wEnemyFutureSightCount:: ds 1
|
||||
wc71f:: ds 1
|
||||
wc720:: ds 4 ; copy from/to EnemyMonBaseStats, length=7
|
||||
wc724:: ds 3
|
||||
@ -851,10 +851,10 @@ wc729:: ds 2
|
||||
wPlayerRageCounter:: ds 1
|
||||
wEnemyRageCounter:: ds 1
|
||||
wc72d:: ds 1 ; if 0 then PrintButItFailed
|
||||
wc72e:: ds 1
|
||||
wc72f:: ds 1
|
||||
wc730:: ds 1
|
||||
wc731:: ds 1
|
||||
wPlayerTrappingMove:: ds 1
|
||||
wEnemyTrappingMove:: ds 1
|
||||
wPlayerWrapCount:: ds 1
|
||||
wEnemyWrapCount:: ds 1
|
||||
wPlayerCharging:: ds 1
|
||||
wEnemyCharging:: ds 1
|
||||
wc734::
|
||||
@ -1636,8 +1636,8 @@ wd148:: ds 1
|
||||
wd149:: ds 1
|
||||
wd14a:: ds 1
|
||||
wd14b:: ds 1
|
||||
wd14c:: ds 1
|
||||
wd14d:: ds 1
|
||||
wd14c:: ds 1 ; used in FollowNotExact
|
||||
wd14d:: ds 1 ; used in FollowNotExact
|
||||
wd14e:: ds 1
|
||||
wd14f:: ds 1
|
||||
wd150:: ds 1
|
||||
@ -2512,8 +2512,10 @@ PoisonStepCount:: ; dc74
|
||||
|
||||
ds 2
|
||||
wdc77:: ds 2
|
||||
wdc79:: ds 1
|
||||
wdc7a:: ds 2
|
||||
wdc79::
|
||||
wParkBallsRemaining::
|
||||
wSafariBallsRemaining:: ds 1
|
||||
wSafariTimeRemaining:: ds 2
|
||||
wPhoneList:: ds CONTACT_LIST_SIZE
|
||||
ds 23
|
||||
wLuckyNumberShowFlag:: ds 2 ; dc9d
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user