pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Blind wram labels part 3.

Browse Source
This commit is contained in:
yenatch 2015-02-10 15:14:21 -08:00
parent 80b0d8cd2d
commit 62b473d6c6
8 changed files with 340 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
battle/anim_commands.asm
View File

@ -685,7 +685,7 @@ BattleAnimCmd_D5: ; cc485 (33:4485)
ld a, [BattleAnimByte]
and $f
ld c, a
ld hl, wd300
ld hl, w5_d300
xor a
ld [BattleAnimTemps], a
.asm_cc492
@ -792,7 +792,7 @@ BattleAnimCmd_D7: ; cc506 (33:4506)
BattleAnimCmd_D9: ; cc52c (33:452c)
ld hl, wd300
ld hl, w5_d300
.asm_cc52f
ld a, [hl]
and a
@ -847,7 +847,7 @@ Functioncc561: ; cc561 (33:4561)
BattleAnimCmd_DA: ; cc57e (33:457e)
ld hl, wd300
ld hl, w5_d300
.asm_cc581
ld a, [hl]
and a
@ -1470,7 +1470,7 @@ Functioncc94b: ; cc94b
Functioncc96e: ; cc96e
ld a, $0
ld [wd418], a
ld [w5_d418], a
ld hl, OTPartyMon3HP
ld e, $a
.asm_cc978
@ -1492,7 +1492,7 @@ Functioncc96e: ; cc96e
add hl, bc
dec e
jr nz, .asm_cc978
ld a, [wd418]
ld a, [w5_d418]
ld l, a
ld h, $c4
.asm_cc997

10
battle/anim_objects.asm
View File

@ -17,7 +17,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
.asm_cc9b3
ld c, l
ld b, h
ld hl, wd40e
ld hl, w5_d40e
inc [hl]
call Functioncc9c4
ret
@ -46,7 +46,7 @@ Functioncc9c4: ; cc9c4 (33:49c4)
ld d, h
ld hl, $0
add hl, bc
ld a, [wd40e]
ld a, [w5_d40e]
ld [hli], a
ld a, [de]
inc de
@ -111,7 +111,7 @@ Functioncca09: ; cca09
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [wd418]
ld a, [w5_d418]
ld e, a
ld d, $c4
.asm_cca3c
@ -178,7 +178,7 @@ Functioncca09: ; cca09
inc hl
inc de
ld a, e
ld [wd418], a
ld [w5_d418], a
cp $a0
jr nc, .asm_ccaa7
dec c
@ -287,7 +287,7 @@ Functionccaaa: ; ccaaa
Functionccb31: ; ccb31 (33:4b31)
push hl
push bc
ld hl, wd300
ld hl, w5_d300
ld b, a
ld c, $5
.asm_ccb39

12
battle/bg_effects.asm
View File

@ -399,7 +399,7 @@ Jumptable_c8217: ; c8217 (32:4217)
Functionc8223: ; c8223 (32:4223)
call Functionc9042
jr z, .asm_c8230
ld hl, wd40e
ld hl, w5_d40e
inc [hl]
call EndBattleBGEffect
ret
@ -465,7 +465,7 @@ Jumptable_c8284: ; c8284 (32:4284)
Functionc8290: ; c8290 (32:4290)
call Functionc9042
jr z, .asm_c829d
ld hl, wd40e
ld hl, w5_d40e
inc [hl]
call EndBattleBGEffect
ret
@ -912,8 +912,8 @@ Functionc8561: ; c8561 (32:4561)
ret
Functionc8565: ; c8565 (32:4565)
ld hl, wd422
ld de, wd422 + 1
ld hl, w5_d422
ld de, w5_d422 + 1
ld c, $3f
ld a, [hl]
push af
@ -926,7 +926,7 @@ Functionc8565: ; c8565 (32:4565)
pop af
ld [hl], a
ld de, LYOverridesBackup
ld hl, wd422
ld hl, w5_d422
ld bc, $0
.asm_c8580
ld a, [$ffc7]
@ -2749,7 +2749,7 @@ Functionc8f69: ; c8f69 (32:4f69)
ld [BattleAnimTemps + 2], a
ld a, $40
ld [BattleAnimTemps + 3], a
ld bc, wd422
ld bc, w5_d422
.asm_c8f7e
ld a, [BattleAnimTemps + 2]
ld d, a

4
engine/phone_scripts.asm
View File

@ -3118,7 +3118,7 @@ UnknownScript_0xbe675:: ; 0xbe675
playrammusic
showemote $0, $fe, 30
callasm Function831e
applymovement2 $d007
applymovement2 MovementBuffer
writepersonxy $fe
faceperson $0, $fe
jump UnknownScript_0xbe68a
@ -3133,7 +3133,7 @@ UnknownScript_0xbe68a: ; 0xbe68a
startbattle
returnafterbattle
trainerstatus $1
loadvar $d04d, $ff
loadvar wd04d, $ff
UnknownScript_0xbe698:
scripttalkafter

200
engine/scripting.asm
View File

File diff suppressed because it is too large Load Diff

50
event/poke_seer.asm
View File

@ -44,7 +44,7 @@ SpecialPokeSeer: ; 4f0bc
SeerAction: ; 4f0ee
ld a, [$d002]
ld a, [wd002]
ld hl, SeerActions
rst JumpTable
ret
@ -100,14 +100,14 @@ ReadCaughtData: ; 4f134
ld a, PartyMon1CaughtData - PartyMon1
call GetPartyParamLocation
ld a, [hli]
ld [$d03b], a
ld [wd03b], a
ld a, [hld]
ld [$d03c], a
ld [wd03b + 1], a
or [hl]
jr z, .asm_4f170
ld a, 1
ld [$d002], a
ld [wd002], a
ld a, PartyMon1ID - PartyMon1
call GetPartyParamLocation
@ -120,7 +120,7 @@ ReadCaughtData: ; 4f134
jr nz, .asm_4f15f
ld a, 0
ld [$d002], a
ld [wd002], a
.asm_4f15f
call GetCaughtLevel
@ -133,7 +133,7 @@ ReadCaughtData: ; 4f134
.asm_4f170
ld a, 2
ld [$d002], a
ld [wd002], a
ret
; 4f176
@ -142,7 +142,7 @@ GetCaughtName: ; 4f176
ld hl, PartyMonNicknames
ld bc, PKMN_NAME_LENGTH
call AddNTimes
ld de, $d003
ld de, wd003
ld bc, PKMN_NAME_LENGTH
call CopyBytes
ret
@ -150,12 +150,12 @@ GetCaughtName: ; 4f176
GetCaughtLevel: ; 4f18c
ld a, "@"
ld hl, $d036
ld hl, wd036
ld bc, 4
call ByteFill
; caught level
ld a, [$d03b]
ld a, [wd03b]
and $3f
jr z, .unknown
cp 1 ; hatched from an egg
@ -163,15 +163,15 @@ GetCaughtLevel: ; 4f18c
ld a, 5 ; egg hatch level
.print
ld [$d03a], a
ld hl, $d036
ld de, $d03a
ld [wd038 + 2], a
ld hl, wd036
ld de, wd038 + 2
ld bc, $4103
call PrintNum
ret
.unknown
ld de, $d036
ld de, wd036
ld hl, .unknown_level
ld bc, 4
call CopyBytes
@ -183,7 +183,7 @@ GetCaughtLevel: ; 4f18c
; 4f1c5
GetCaughtTime: ; 4f1c5
ld a, [$d03b]
ld a, [wd03b]
and $c0
jr z, .none
@ -194,13 +194,13 @@ GetCaughtTime: ; 4f1c5
call GetNthString
ld d, h
ld e, l
ld hl, $d01f
ld hl, wd01f
call CopyName2
and a
ret
.none
ld de, $d01f
ld de, wd01f
call UnknownCaughtData
ret
; 4f1e6
@ -223,7 +223,7 @@ UnknownCaughtData: ; 4f1f8
; 4f20a
GetCaughtLocation: ; 4f20a
ld a, [$d03c]
ld a, [wd03b + 1]
and $7f
jr z, .asm_4f22e
cp $7f
@ -233,25 +233,25 @@ GetCaughtLocation: ; 4f20a
ld e, a
callba GetLandmarkName
ld hl, StringBuffer1
ld de, $d00e
ld de, wd00e
ld bc, $0011
call CopyBytes
and a
ret
.asm_4f22e
ld de, $d00e
ld de, wd00e
jp UnknownCaughtData
.asm_4f234
ld a, $4
ld [$d002], a
ld [wd002], a
scf
ret
.asm_4f23b
ld a, $3
ld [$d002], a
ld [wd002], a
scf
ret
; 4f242
@ -261,17 +261,17 @@ GetCaughtOT: ; 4f242
ld hl, PartyMonOT
ld bc, NAME_LENGTH
call AddNTimes
ld de, $d02a
ld de, wd02a
ld bc, $000b
call CopyBytes
ld hl, .male
ld a, [$d03c]
ld a, [wd03b + 1]
bit 7, a
jr z, .asm_4f264
ld hl, .female
.asm_4f264
ld de, $d035
ld de, wd034 + 1
ld a, "@"
ld [de], a
ret
@ -359,7 +359,7 @@ SeerCancelText: ; 0x4f2af
SeerAdvice: ; 4f2b4
ld a, PartyMon1Level - PartyMon1
call GetPartyParamLocation
ld a, [$d03a]
ld a, [wd038 + 2]
ld c, a
ld a, [hl]
sub c

284
gfx/pics/animation.asm
View File

File diff suppressed because it is too large Load Diff

64
wram.asm
View File

@ -281,7 +281,8 @@ AutoInputLength:: ; c2cb
wc2cc:: ds 1
wc2cd:: ds 1
wc2ce:: ds 2
wc2ce:: ds 1
wc2cf:: ds 1
wc2d0:: ds 4
wc2d4:: ds 1
wc2d5:: ds 1
@ -1357,7 +1358,8 @@ wd032:: ds 1
wd033:: ds 1
wd034:: ds 2
wd036:: ds 2
wd038:: ds 6
wd038:: ds 3
wd03b:: ds 3
MenuItemsList::
CurFruitTree::
@ -1389,7 +1391,9 @@ WalkingY:: ; d046
WalkingTile:: ; d047
ds 1
wd048:: ds 6
wd048:: ds 3
wd04b:: ds 2
wd04d:: ds 1
wd04e:: ds 2
wd050:: ds 10
wd05a:: ds 12
@ -1853,12 +1857,16 @@ ScriptBank:: ; d439
ScriptPos:: ; d43a
ds 2
ds 17
wd43c:: ds 1
wd43d:: ds 16
ScriptDelay:: ; d44d
ds 1
ds 4
wd44e:: ds 1
wd44f:: ds 1
wd450:: ds 1
wd451:: ds 1
wd452:: ds 1
wd453:: ds 1
wd454:: ds 1
@ -2479,6 +2487,44 @@ wdfec:: ds 1
wdff5::
SECTION "Pic Animations", WRAMX, BANK [2]
w2_d000:: ds $168
w2_d168:: ds 1
w2_d169:: ds 1
w2_d16a:: ds 1
w2_d16b:: ds 1
w2_d16c:: ds 1
w2_d16d:: ds 1
w2_d16e:: ds 1
w2_d16f:: ds 1
w2_d170:: ds 1
w2_d171:: ds 1
w2_d172:: ds 1
w2_d173:: ds 1
w2_d174:: ds 1
w2_d175:: ds 1
w2_d176:: ds 1
w2_d177:: ds 1
w2_d178:: ds 1
w2_d179:: ds 1
w2_d17a:: ds 1
w2_d17b:: ds 1
w2_d17c:: ds 1
w2_d17d:: ds 1
w2_d17e:: ds 1
w2_d17f:: ds 1
w2_d180:: ds 1
w2_d181:: ds 1
w2_d182:: ds 1
w2_d183:: ds 1
w2_d184:: ds 1
w2_d185:: ds 1
w2_d186:: ds 1
w2_d187:: ds 1
w2_d188:: ds 1
SECTION "GBC Video", WRAMX, BANK [5]
@ -2503,7 +2549,7 @@ LYOverridesBackupEnd::
SECTION "Battle Animations", WRAMX, BANK [5]
wd300:: ds 10
w5_d300:: ds 10
ActiveAnimObjects:: ; d30a
ds 4 * 40
@ -2513,7 +2559,7 @@ ActiveAnimObjects:: ; d30a
ActiveBGEffects:: ; d3fa
ds 4 * 5
wd40e:: ds 1
w5_d40e:: ds 1
BattleAnimFlags:: ; d40f
ds 1
@ -2529,11 +2575,11 @@ BattleAnimVar:: ; d416
ds 1
BattleAnimByte:: ; d417
ds 1
wd418:: ds 1
w5_d418:: ds 1
BattleAnimTemps:: ; d419
ds 8
ds 1
wd422:: ds $40
w5_d422:: ds $40
SECTION "Scratch", SRAM, BANK [0]