You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Blind wram part 5.
starting to go smoothly
This commit is contained in:
@@ -22,7 +22,7 @@ NameRater: ; fb6ed
|
|||||||
xor a
|
xor a
|
||||||
ld [MonType], a
|
ld [MonType], a
|
||||||
ld a, [CurPartySpecies]
|
ld a, [CurPartySpecies]
|
||||||
ld [$d265], a
|
ld [wd265], a
|
||||||
ld [CurSpecies], a
|
ld [CurSpecies], a
|
||||||
call GetBaseData
|
call GetBaseData
|
||||||
ld b, 0
|
ld b, 0
|
||||||
|
@@ -9,7 +9,7 @@ PrintItemDescription: ; 0x1c8955
|
|||||||
push de
|
push de
|
||||||
callba GetTMHMItemMove
|
callba GetTMHMItemMove
|
||||||
pop hl
|
pop hl
|
||||||
ld a, [$d265]
|
ld a, [wd265]
|
||||||
ld [CurSpecies], a
|
ld [CurSpecies], a
|
||||||
predef PrintMoveDesc
|
predef PrintMoveDesc
|
||||||
ret
|
ret
|
||||||
|
File diff suppressed because it is too large
Load Diff
107
text/battle.asm
107
text/battle.asm
@@ -1,15 +1,15 @@
|
|||||||
BattleText_0x80730: ; 0x80730
|
BattleText_0x80730: ; 0x80730
|
||||||
text $52, " picked up"
|
text $52, " picked up"
|
||||||
line "¥@"
|
line "¥@"
|
||||||
deciram $c6ec, $36
|
deciram wPayDayMoney, $36
|
||||||
text "!"
|
text "!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80746
|
; 0x80746
|
||||||
|
|
||||||
WildPokemonAppearedText: ; 0x80746
|
WildPokemonAppearedText: ; 0x80746
|
||||||
text "Wild @"
|
text "Wild @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "appeared!"
|
line "appeared!"
|
||||||
prompt
|
prompt
|
||||||
; 0x8075c
|
; 0x8075c
|
||||||
@@ -17,14 +17,14 @@ WildPokemonAppearedText: ; 0x80746
|
|||||||
HookedPokemonAttackedText: ; 0x8075c
|
HookedPokemonAttackedText: ; 0x8075c
|
||||||
text "The hooked"
|
text "The hooked"
|
||||||
line "@"
|
line "@"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
text $55
|
text $55
|
||||||
db "attacked!"
|
db "attacked!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80778
|
; 0x80778
|
||||||
|
|
||||||
PokemonFellFromTreeText: ; 0x80778
|
PokemonFellFromTreeText: ; 0x80778
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
text " fell"
|
text " fell"
|
||||||
line "out of the tree!"
|
line "out of the tree!"
|
||||||
prompt
|
prompt
|
||||||
@@ -32,8 +32,8 @@ PokemonFellFromTreeText: ; 0x80778
|
|||||||
|
|
||||||
WildCelebiAppearedText: ; 0x80793
|
WildCelebiAppearedText: ; 0x80793
|
||||||
text "Wild @"
|
text "Wild @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "appeared!"
|
line "appeared!"
|
||||||
prompt
|
prompt
|
||||||
; 0x807a9
|
; 0x807a9
|
||||||
@@ -46,16 +46,16 @@ WantsToBattleText:: ; 0x807a9
|
|||||||
|
|
||||||
BattleText_0x807bd: ; 0x807bd
|
BattleText_0x807bd: ; 0x807bd
|
||||||
text "Wild @"
|
text "Wild @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "fled!"
|
line "fled!"
|
||||||
prompt
|
prompt
|
||||||
; 0x807cf
|
; 0x807cf
|
||||||
|
|
||||||
BattleText_0x807cf: ; 0x807cf
|
BattleText_0x807cf: ; 0x807cf
|
||||||
text "Enemy @"
|
text "Enemy @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "fled!"
|
line "fled!"
|
||||||
prompt
|
prompt
|
||||||
; 0x807e2
|
; 0x807e2
|
||||||
@@ -99,7 +99,7 @@ SandstormHitsText: ; 0x8084d
|
|||||||
PerishCountText: ; 0x80864
|
PerishCountText: ; 0x80864
|
||||||
text $5a, "'s"
|
text $5a, "'s"
|
||||||
line "PERISH count is @"
|
line "PERISH count is @"
|
||||||
deciram $d265, $11
|
deciram wd265, $11
|
||||||
text "!"
|
text "!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80880
|
; 0x80880
|
||||||
@@ -186,16 +186,16 @@ BattleText_0x8098f: ; 0x8098f
|
|||||||
|
|
||||||
BattleText_0x809a8: ; 0x809a8
|
BattleText_0x809a8: ; 0x809a8
|
||||||
text "Enemy @"
|
text "Enemy @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "fainted!"
|
line "fainted!"
|
||||||
prompt
|
prompt
|
||||||
; 0x809be
|
; 0x809be
|
||||||
|
|
||||||
BattleText_0x809be: ; 0x809be
|
BattleText_0x809be: ; 0x809be
|
||||||
text $52, " got ¥@"
|
text $52, " got ¥@"
|
||||||
deciram $c686, $36
|
deciram wc686, $36
|
||||||
db $0
|
text ""
|
||||||
line "for winning!"
|
line "for winning!"
|
||||||
prompt
|
prompt
|
||||||
; 0x809da
|
; 0x809da
|
||||||
@@ -214,8 +214,8 @@ TiedAgainstText: ; 0x809eb
|
|||||||
|
|
||||||
BattleText_0x809fc: ; 0x809fc
|
BattleText_0x809fc: ; 0x809fc
|
||||||
text $52, " got ¥@"
|
text $52, " got ¥@"
|
||||||
deciram $c686, $36
|
deciram wc686, $36
|
||||||
db $0
|
text ""
|
||||||
line "for winning!"
|
line "for winning!"
|
||||||
cont "Sent some to MOM!"
|
cont "Sent some to MOM!"
|
||||||
prompt
|
prompt
|
||||||
@@ -239,8 +239,8 @@ BattleText_0x80a4f: ; 0x80a4f
|
|||||||
; 0x80a75
|
; 0x80a75
|
||||||
|
|
||||||
BattleText_0x80a75: ; 0x80a75
|
BattleText_0x80a75: ; 0x80a75
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
db $0
|
text ""
|
||||||
line "fainted!"
|
line "fainted!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80a83
|
; 0x80a83
|
||||||
@@ -267,7 +267,7 @@ BattleText_0x80aca: ; 0x80aca
|
|||||||
text $3f
|
text $3f
|
||||||
line "is about to use"
|
line "is about to use"
|
||||||
cont "@"
|
cont "@"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
text "."
|
text "."
|
||||||
|
|
||||||
para "Will ", $52
|
para "Will ", $52
|
||||||
@@ -279,7 +279,7 @@ BattleText_0x80af8: ; 0x80af8
|
|||||||
text $3f
|
text $3f
|
||||||
line "sent out"
|
line "sent out"
|
||||||
cont "@"
|
cont "@"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
text "!"
|
text "!"
|
||||||
done
|
done
|
||||||
; 0x80b0b
|
; 0x80b0b
|
||||||
@@ -358,15 +358,15 @@ BattleText_0x80bf3: ; 0x80bf3
|
|||||||
; 0x80c0d
|
; 0x80c0d
|
||||||
|
|
||||||
BattleText_0x80c0d: ; 0x80c0d
|
BattleText_0x80c0d: ; 0x80c0d
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
db $0
|
text ""
|
||||||
line "is already out."
|
line "is already out."
|
||||||
prompt
|
prompt
|
||||||
; 0x80c22
|
; 0x80c22
|
||||||
|
|
||||||
BattleText_0x80c22: ; 0x80c22
|
BattleText_0x80c22: ; 0x80c22
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
db $0
|
text ""
|
||||||
line "can't be recalled!"
|
line "can't be recalled!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80c39
|
; 0x80c39
|
||||||
@@ -384,8 +384,8 @@ BattleText_0x80c5b: ; 0x80c5b
|
|||||||
; 0x80c72
|
; 0x80c72
|
||||||
|
|
||||||
BattleText_0x80c72: ; 0x80c72
|
BattleText_0x80c72: ; 0x80c72
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
db $0
|
text ""
|
||||||
line "has no moves left!"
|
line "has no moves left!"
|
||||||
done
|
done
|
||||||
; 0x80c8a
|
; 0x80c8a
|
||||||
@@ -398,30 +398,30 @@ BattleText_0x80c8a: ; 0x80c8a
|
|||||||
|
|
||||||
BattleText_0x80c9c: ; 0x80c9c
|
BattleText_0x80c9c: ; 0x80c9c
|
||||||
text_from_ram StringBuffer1
|
text_from_ram StringBuffer1
|
||||||
db $0, " grew to", $4f
|
text " grew to"
|
||||||
db "level @"
|
line "level @"
|
||||||
deciram $d143, $13
|
deciram CurPartyLevel, $13
|
||||||
db $0, "!@"
|
text "!@"
|
||||||
sound0
|
sound0
|
||||||
db $50
|
db "@"
|
||||||
; 0x80cb9
|
; 0x80cb9
|
||||||
|
|
||||||
BattleText_0x80cb9: ; 0x80cb9
|
BattleText_0x80cb9: ; 0x80cb9
|
||||||
db $50
|
db "@"
|
||||||
; 0x80cba
|
; 0x80cba
|
||||||
|
|
||||||
BattleText_0x80cba: ; 0x80cba
|
BattleText_0x80cba: ; 0x80cba
|
||||||
text "Wild @"
|
text "Wild @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "is eating!"
|
line "is eating!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80cd1
|
; 0x80cd1
|
||||||
|
|
||||||
BattleText_0x80cd1: ; 0x80cd1
|
BattleText_0x80cd1: ; 0x80cd1
|
||||||
text "Wild @"
|
text "Wild @"
|
||||||
text_from_ram $c616
|
text_from_ram EnemyMonNick
|
||||||
db $0
|
text ""
|
||||||
line "is angry!"
|
line "is angry!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80ce7
|
; 0x80ce7
|
||||||
@@ -603,42 +603,42 @@ DisabledMoveText: ; 0x80f02
|
|||||||
; 0x80f19
|
; 0x80f19
|
||||||
|
|
||||||
LoafingAroundText: ; 0x80f19
|
LoafingAroundText: ; 0x80f19
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
text " is"
|
text " is"
|
||||||
line "loafing around."
|
line "loafing around."
|
||||||
prompt
|
prompt
|
||||||
; 0x80f31
|
; 0x80f31
|
||||||
|
|
||||||
BeganToNapText: ; 0x80f31
|
BeganToNapText: ; 0x80f31
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
text " began"
|
text " began"
|
||||||
line "to nap!"
|
line "to nap!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80f44
|
; 0x80f44
|
||||||
|
|
||||||
WontObeyText: ; 0x80f44
|
WontObeyText: ; 0x80f44
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
text " won't"
|
text " won't"
|
||||||
line "obey!"
|
line "obey!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80f54
|
; 0x80f54
|
||||||
|
|
||||||
TurnedAwayText: ; 0x80f54
|
TurnedAwayText: ; 0x80f54
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
text " turned"
|
text " turned"
|
||||||
line "away!"
|
line "away!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80f66
|
; 0x80f66
|
||||||
|
|
||||||
IgnoredOrdersText: ; 0x80f66
|
IgnoredOrdersText: ; 0x80f66
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
text " ignored"
|
text " ignored"
|
||||||
line "orders!"
|
line "orders!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80f7b
|
; 0x80f7b
|
||||||
|
|
||||||
IgnoredSleepingText: ; 0x80f7b
|
IgnoredSleepingText: ; 0x80f7b
|
||||||
text_from_ram $c621
|
text_from_ram BattleMonNick
|
||||||
text " ignored"
|
text " ignored"
|
||||||
line "orders…sleeping!"
|
line "orders…sleeping!"
|
||||||
prompt
|
prompt
|
||||||
@@ -654,7 +654,7 @@ HasNoPPLeftText: ; 0x80fba
|
|||||||
text $5a
|
text $5a
|
||||||
line "has no PP left for"
|
line "has no PP left for"
|
||||||
cont "@"
|
cont "@"
|
||||||
text_from_ram $d086
|
text_from_ram StringBuffer2
|
||||||
text "!"
|
text "!"
|
||||||
prompt
|
prompt
|
||||||
; 0x80fd7
|
; 0x80fd7
|
||||||
@@ -784,14 +784,15 @@ SpiteEffectText: ; 0x8117f
|
|||||||
text_from_ram StringBuffer1
|
text_from_ram StringBuffer1
|
||||||
text " was"
|
text " was"
|
||||||
cont "reduced by @"
|
cont "reduced by @"
|
||||||
deciram $d265, $11
|
deciram wd265, $11
|
||||||
text "!"
|
text "!"
|
||||||
prompt
|
prompt
|
||||||
; 0x811a0
|
; 0x811a0
|
||||||
|
|
||||||
BellChimedText: ; 0x811a0
|
BellChimedText: ; 0x811a0
|
||||||
db $0, "A bell chimed!", $4f
|
text "A bell chimed!"
|
||||||
db $58
|
line ""
|
||||||
|
prompt
|
||||||
; 0x811b1
|
; 0x811b1
|
||||||
|
|
||||||
FellAsleepText: ; 0x811b1
|
FellAsleepText: ; 0x811b1
|
||||||
@@ -857,7 +858,7 @@ WasFrozenText: ; 0x8125d
|
|||||||
WontRiseAnymoreText: ; 0x81272
|
WontRiseAnymoreText: ; 0x81272
|
||||||
text $5a, "'s"
|
text $5a, "'s"
|
||||||
line "@"
|
line "@"
|
||||||
text_from_ram $d086
|
text_from_ram StringBuffer2
|
||||||
text " won't"
|
text " won't"
|
||||||
cont "rise anymore!"
|
cont "rise anymore!"
|
||||||
prompt
|
prompt
|
||||||
@@ -866,7 +867,7 @@ WontRiseAnymoreText: ; 0x81272
|
|||||||
WontDropAnymoreText: ; 0x8128f
|
WontDropAnymoreText: ; 0x8128f
|
||||||
text $59, "'s"
|
text $59, "'s"
|
||||||
line "@"
|
line "@"
|
||||||
text_from_ram $d086
|
text_from_ram StringBuffer2
|
||||||
text " won't"
|
text " won't"
|
||||||
cont "drop anymore!"
|
cont "drop anymore!"
|
||||||
prompt
|
prompt
|
||||||
@@ -892,14 +893,14 @@ BlownAwayText: ; 0x812d2
|
|||||||
|
|
||||||
PlayerHitTimesText: ; 0x812e5
|
PlayerHitTimesText: ; 0x812e5
|
||||||
text "Hit @"
|
text "Hit @"
|
||||||
deciram $c682, $11
|
deciram PlayerDamageTaken, $11
|
||||||
text " times!"
|
text " times!"
|
||||||
prompt
|
prompt
|
||||||
; 0x812f8
|
; 0x812f8
|
||||||
|
|
||||||
EnemyHitTimesText: ; 0x812f8
|
EnemyHitTimesText: ; 0x812f8
|
||||||
text "Hit @"
|
text "Hit @"
|
||||||
deciram $c684, $11
|
deciram EnemyDamageTaken, $11
|
||||||
text " times!"
|
text " times!"
|
||||||
prompt
|
prompt
|
||||||
; 0x8130b
|
; 0x8130b
|
||||||
@@ -1207,7 +1208,7 @@ SafeguardProtectText: ; 0x81733
|
|||||||
|
|
||||||
MagnitudeText: ; 0x81751
|
MagnitudeText: ; 0x81751
|
||||||
text "Magnitude @"
|
text "Magnitude @"
|
||||||
deciram $d265, $11
|
deciram wd265, $11
|
||||||
text "!"
|
text "!"
|
||||||
prompt
|
prompt
|
||||||
; 0x81764
|
; 0x81764
|
||||||
|
@@ -79,9 +79,9 @@ PrintType: ; 50953
|
|||||||
|
|
||||||
|
|
||||||
GetTypeName: ; 50964
|
GetTypeName: ; 50964
|
||||||
; Copy the name of type [$d265] to StringBuffer1.
|
; Copy the name of type [wd265] to StringBuffer1.
|
||||||
|
|
||||||
ld a, [$d265]
|
ld a, [wd265]
|
||||||
ld hl, TypeNames
|
ld hl, TypeNames
|
||||||
ld e, a
|
ld e, a
|
||||||
ld d, 0
|
ld d, 0
|
||||||
|
@@ -518,7 +518,7 @@ ForestTreeLeftAnimation: ; fc45c
|
|||||||
ld c, l
|
ld c, l
|
||||||
|
|
||||||
; Only during the Celebi event.
|
; Only during the Celebi event.
|
||||||
ld a, [$dbf3]
|
ld a, [wdbf3]
|
||||||
bit 2, a
|
bit 2, a
|
||||||
jr nz, .asm_fc46c
|
jr nz, .asm_fc46c
|
||||||
ld hl, ForestTreeLeftFrames
|
ld hl, ForestTreeLeftFrames
|
||||||
@@ -560,7 +560,7 @@ ForestTreeRightAnimation: ; fc4c4
|
|||||||
ld c, l
|
ld c, l
|
||||||
|
|
||||||
; Only during the Celebi event.
|
; Only during the Celebi event.
|
||||||
ld a, [$dbf3]
|
ld a, [wdbf3]
|
||||||
bit 2, a
|
bit 2, a
|
||||||
jr nz, .asm_fc4d4
|
jr nz, .asm_fc4d4
|
||||||
ld hl, ForestTreeRightFrames
|
ld hl, ForestTreeRightFrames
|
||||||
@@ -595,7 +595,7 @@ ForestTreeLeftAnimation2: ; fc4f2
|
|||||||
ld c, l
|
ld c, l
|
||||||
|
|
||||||
; Only during the Celebi event.
|
; Only during the Celebi event.
|
||||||
ld a, [$dbf3]
|
ld a, [wdbf3]
|
||||||
bit 2, a
|
bit 2, a
|
||||||
jr nz, .asm_fc502
|
jr nz, .asm_fc502
|
||||||
ld hl, ForestTreeLeftFrames
|
ld hl, ForestTreeLeftFrames
|
||||||
@@ -627,7 +627,7 @@ ForestTreeRightAnimation2: ; fc51c
|
|||||||
ld c, l
|
ld c, l
|
||||||
|
|
||||||
; Only during the Celebi event.
|
; Only during the Celebi event.
|
||||||
ld a, [$dbf3]
|
ld a, [wdbf3]
|
||||||
bit 2, a
|
bit 2, a
|
||||||
jr nz, .asm_fc52c
|
jr nz, .asm_fc52c
|
||||||
ld hl, ForestTreeRightFrames
|
ld hl, ForestTreeRightFrames
|
||||||
@@ -1009,7 +1009,7 @@ Functionfc71e: ; fc71e
|
|||||||
cp $e4
|
cp $e4
|
||||||
ret nz
|
ret nz
|
||||||
|
|
||||||
ld a, [$d847]
|
ld a, [wd847]
|
||||||
cp $ff
|
cp $ff
|
||||||
ret nz
|
ret nz
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user