summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/event_constants.asm4
-rwxr-xr-xconstants/trainer_constants.asm94
-rwxr-xr-xdata/mapObjects/oakslab.asm2
-rwxr-xr-xdata/mapObjects/viridianforest.asm26
-rw-r--r--engine/bank3c.asm16
-rw-r--r--engine/bank3f.asm274
-rwxr-xr-xmain.asm10
-rwxr-xr-xscripts/oakslab2.asm28
-rwxr-xr-xscripts/school2.asm17
-rwxr-xr-xscripts/viridianforest.asm102
-rwxr-xr-xscripts/viridianforest2.asm45
-rwxr-xr-xwram.asm6
12 files changed, 427 insertions, 197 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 7fc3b509..49050dd3 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -1381,8 +1381,8 @@ const_value = 0
const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 ; 562, (D7F3, bit 2)
const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 ; 563, (D7F3, bit 3)
const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 ; 564, (D7F3, bit 4)
- const EVENT_565 ; 565, (D7F3, bit 5)
- const EVENT_566 ; 566, (D7F3, bit 6)
+ const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3 ; 565, (D7F3, bit 5)
+ const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4 ; 566, (D7F3, bit 6)
const EVENT_567 ; 567, (D7F3, bit 7)
const EVENT_568 ; 568, (D7F4, bit 0)
const EVENT_569 ; 569, (D7F4, bit 1)
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index fde4d42a..e11cc4aa 100755
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -6,50 +6,50 @@ ENDM
const_value = 1
- trainer_const YOUNGSTER ; $01
- trainer_const BUG_CATCHER ; $02
- trainer_const LASS ; $03
- trainer_const SAILOR ; $04
- trainer_const JR_TRAINER_M ; $05
- trainer_const JR_TRAINER_F ; $06
- trainer_const POKEMANIAC ; $07
- trainer_const SUPER_NERD ; $08
- trainer_const HIKER ; $09
- trainer_const BIKER ; $0A
- trainer_const BURGLAR ; $0B
- trainer_const ENGINEER ; $0C
- trainer_const JUGGLER_X ; $0D
- trainer_const FISHER ; $0E
- trainer_const SWIMMER ; $0F
- trainer_const CUE_BALL ; $10
- trainer_const GAMBLER ; $11
- trainer_const BEAUTY ; $12
- trainer_const PSYCHIC_TR ; $13
- trainer_const ROCKER ; $14
- trainer_const JUGGLER ; $15
- trainer_const TAMER ; $16
- trainer_const BIRD_KEEPER ; $17
- trainer_const BLACKBELT ; $18
- trainer_const SONY1 ; $19
- trainer_const PROF_OAK ; $1A
- trainer_const CHIEF ; $1B
- trainer_const SCIENTIST ; $1C
- trainer_const GIOVANNI ; $1D
- trainer_const ROCKET ; $1E
- trainer_const COOLTRAINER_M ; $1F
- trainer_const COOLTRAINER_F ; $20
- trainer_const BRUNO ; $21
- trainer_const BROCK ; $22
- trainer_const MISTY ; $23
- trainer_const LT_SURGE ; $24
- trainer_const ERIKA ; $25
- trainer_const KOGA ; $26
- trainer_const BLAINE ; $27
- trainer_const SABRINA ; $28
- trainer_const GENTLEMAN ; $29
- trainer_const SONY2 ; $2A
- trainer_const SONY3 ; $2B
- trainer_const LORELEI ; $2C
- trainer_const CHANNELER ; $2D
- trainer_const AGATHA ; $2E
- trainer_const LANCE ; $2F
+ trainer_const YOUNGSTER ; $01 | OPP = $C9
+ trainer_const BUG_CATCHER ; $02 | OPP = $CA
+ trainer_const LASS ; $03 | OPP = $CB
+ trainer_const SAILOR ; $04 | OPP = $CC
+ trainer_const JR_TRAINER_M ; $05 | OPP = $CD
+ trainer_const JR_TRAINER_F ; $06 | OPP = $CE
+ trainer_const POKEMANIAC ; $07 | OPP = $CF
+ trainer_const SUPER_NERD ; $08 | OPP = $D0
+ trainer_const HIKER ; $09 | OPP = $D1
+ trainer_const BIKER ; $0A | OPP = $D2
+ trainer_const BURGLAR ; $0B | OPP = $D3
+ trainer_const ENGINEER ; $0C | OPP = $D4
+ trainer_const JUGGLER_X ; $0D | OPP = $D5
+ trainer_const FISHER ; $0E | OPP = $D6
+ trainer_const SWIMMER ; $0F | OPP = $D7
+ trainer_const CUE_BALL ; $10 | OPP = $D8
+ trainer_const GAMBLER ; $11 | OPP = $D9
+ trainer_const BEAUTY ; $12 | OPP = $DA
+ trainer_const PSYCHIC_TR ; $13 | OPP = $DB
+ trainer_const ROCKER ; $14 | OPP = $DC
+ trainer_const JUGGLER ; $15 | OPP = $DD
+ trainer_const TAMER ; $16 | OPP = $DE
+ trainer_const BIRD_KEEPER ; $17 | OPP = $DF
+ trainer_const BLACKBELT ; $18 | OPP = $E0
+ trainer_const SONY1 ; $19 | OPP = $E1
+ trainer_const PROF_OAK ; $1A | OPP = $E2
+ trainer_const CHIEF ; $1B | OPP = $E3
+ trainer_const SCIENTIST ; $1C | OPP = $E4
+ trainer_const GIOVANNI ; $1D | OPP = $E5
+ trainer_const ROCKET ; $1E | OPP = $E6
+ trainer_const COOLTRAINER_M ; $1F | OPP = $E7
+ trainer_const COOLTRAINER_F ; $20 | OPP = $E8
+ trainer_const BRUNO ; $21 | OPP = $E9
+ trainer_const BROCK ; $22 | OPP = $EA
+ trainer_const MISTY ; $23 | OPP = $EB
+ trainer_const LT_SURGE ; $24 | OPP = $EC
+ trainer_const ERIKA ; $25 | OPP = $ED
+ trainer_const KOGA ; $26 | OPP = $EE
+ trainer_const BLAINE ; $27 | OPP = $EF
+ trainer_const SABRINA ; $28 | OPP = $F0
+ trainer_const GENTLEMAN ; $29 | OPP = $F1
+ trainer_const SONY2 ; $2A | OPP = $F2
+ trainer_const SONY3 ; $2B | OPP = $F3
+ trainer_const LORELEI ; $2C | OPP = $F4
+ trainer_const CHANNELER ; $2D | OPP = $F5
+ trainer_const AGATHA ; $2E | OPP = $F6
+ trainer_const LANCE ; $2F | OPP = $F7
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 779b458f..5b9a01d5 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -8,7 +8,7 @@ OaksLabObject: ; 0x1d40a (size=88)
db $0 ; signs
db $9 ; objects
- object SPRITE_BLUE, $4, $3, STAY, NONE, $41, OPP_SONY1, $1
+ object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1
object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person
object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person
object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm
index a1d52cfe..8f5d6b0b 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -3,29 +3,31 @@ ViridianForestObject: ; 0x611da (size=127)
db $6 ; warps
db $0, $1, $2, VIRIDIAN_FOREST_EXIT
- db $0, $2, $3, VIRIDIAN_FOREST_EXIT
+ db $0, $2, $2, VIRIDIAN_FOREST_EXIT
db $2f, $f, $1, VIRIDIAN_FOREST_ENTRANCE
db $2f, $10, $1, VIRIDIAN_FOREST_ENTRANCE
db $2f, $11, $1, VIRIDIAN_FOREST_ENTRANCE
db $2f, $12, $1, VIRIDIAN_FOREST_ENTRANCE
db $6 ; signs
- db $28, $18, $9 ; ViridianForestText9
- db $20, $10, $a ; ViridianForestText10
- db $11, $1a, $b ; ViridianForestText11
- db $18, $4, $c ; ViridianForestText12
- db $2d, $12, $d ; ViridianForestText13
- db $1, $2, $e ; ViridianForestText14
+ db $28, $18, $b ; ViridianForestText9
+ db $20, $10, $c ; ViridianForestText10
+ db $11, $1a, $d ; ViridianForestText11
+ db $18, $4, $e ; ViridianForestText12
+ db $2d, $12, $f ; ViridianForestText13
+ db $1, $2, $10 ; ViridianForestText14
- db $8 ; objects
+ db $a ; objects
object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person
object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1
object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2
object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3
- object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE
- object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION
- object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL
- object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person
+ object SPRITE_LASS, $2, $29, STAY, NONE, $5, OPP_LASS, $13
+ object SPRITE_BUG_CATCHER, $d, $11, STAY, RIGHT, $6, OPP_BUG_CATCHER, $f
+ object SPRITE_BALL, $19, $b, STAY, NONE, $7, POTION
+ object SPRITE_BALL, $c, $1d, STAY, NONE, $8, POTION
+ object SPRITE_BALL, $1, $1f, STAY, NONE, $9, POKE_BALL
+ object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $a ; person
; warp-to
EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index 6f949238..964cc0bd 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -302,7 +302,7 @@ Func_f0a82: ; f0a82
ret nz
push hl
push bc
- callab Func_fcb4d ; get Pikachu's position with respect to you?
+ callab GetPikachuFacingDirectionAndReturnToE
pop bc
pop hl
ld a, b
@@ -349,12 +349,9 @@ INCLUDE "scripts/celadoncity2.asm"
INCLUDE "scripts/route1_2.asm"
INCLUDE "scripts/route22_2.asm"
INCLUDE "scripts/redshouse1f2.asm"
-Func_f1be0:
- dr $f1be0, $f1c03
-Func_f1c03:
- dr $f1c03, $f1c0f
-Func_f1c0f:
- dr $f1c0f, $f220e
+INCLUDE "scripts/oakslab2.asm"
+INCLUDE "scripts/school2.asm"
+ dr $f1c1b, $f220e
INCLUDE "data/mapHeaders/beach_house.asm"
INCLUDE "scripts/beach_house.asm"
@@ -365,7 +362,10 @@ INCLUDE "data/mapObjects/beach_house.asm"
Func_f23d0: ; f23d0
dr $f23d0, $f24ae
Func_f24ae: ; f24ae
- dr $f24ae, $f25f8
+ dr $f24ae, $f2528
+
+INCLUDE "scripts/viridianforest2.asm"
+ dr $f2564, $f25f8
INCLUDE "engine/overworld/hidden_objects.asm"
diff --git a/engine/bank3f.asm b/engine/bank3f.asm
index 8f01097e..5cab9357 100644
--- a/engine/bank3f.asm
+++ b/engine/bank3f.asm
@@ -17,10 +17,11 @@ Func_fc4dd:: ; fc4dd (3f:44dd)
jr nz, .asm_fc4f8
scf
ret
+
.asm_fc4f8
and a
ret
-
+
Func_fc4fa:: ; fc4fa (3f:44fa)
ld hl, wd430
bit 4, [hl]
@@ -30,10 +31,10 @@ Func_fc4fa:: ; fc4fa (3f:44fa)
call Func_fc523
ld a, $ff
ld [wSpriteStateData1 + $f2], a
- call Func_fcb84
+ call ClearPikachuFollowCommandBuffer
call Func_fc5bc
ret
-
+
.asm_fc515
call Func_fc53f
xor a
@@ -41,7 +42,7 @@ Func_fc4fa:: ; fc4fa (3f:44fa)
ld a, [wSpriteStateData1 + $9]
ld [wSpriteStateData1 + $f9], a
ret
-
+
Func_fc523:: ; fc523 (3f:4523)
ld hl, wSpriteStateData1 + $f0
call Func_fc52c
@@ -58,7 +59,7 @@ Func_fc534:: ; fc534 (3f:4534)
xor a
ld [wd431], a
ret
-
+
Func_fc53f:: ; fc53f (3f:453f)
ld bc, wSpriteStateData1 + $f0
ld a, [wYCoord]
@@ -85,12 +86,12 @@ Func_fc53f:: ; fc53f (3f:453f)
cp $7
jr z, .asm_fc572
jr .asm_fc59e
-
+
.asm_fc572
ld a, [wSpriteStateData1 + $9]
and a ; SPRITE_FACING_DOWN
jr z, .asm_fc5a4
- cp SPRITE_FACING_UP
+ cp SPRITE_FACING_UP
jr z, .asm_fc5a7
cp SPRITE_FACING_LEFT
jr z, .asm_fc5a1
@@ -102,28 +103,35 @@ Func_fc53f:: ; fc53f (3f:453f)
jr nz, .asm_fc58d
dec e
jr .asm_fc5aa
+
.asm_fc58d
cp SPRITE_FACING_UP
jr nz, .asm_fc594
inc e
jr .asm_fc5aa
+
.asm_fc594
cp SPRITE_FACING_LEFT
jr nz, .asm_fc59b
inc d
jr .asm_fc5aa
+
.asm_fc59b
dec d
jr .asm_fc5aa
+
.asm_fc59e
inc d
jr .asm_fc5aa
+
.asm_fc5a1
dec d
jr .asm_fc5aa
+
.asm_fc5a4
inc e
jr .asm_fc5aa
+
.asm_fc5a7
dec e
jr .asm_fc5aa ; useless jr
@@ -141,7 +149,7 @@ Func_fc4b2:: ; fc4b2 (3f:44b2)
set 5, [hl]
pop hl
ret
-
+
Func_fc5bc:: ; fc5bc (3f:45bc)
ld a, $49
ld [wSpriteStateData1 + $f0], a
@@ -162,15 +170,17 @@ Func_fc5bc:: ; fc5bc (3f:45bc)
jr z, .asm_fc5f1
call Func_fccb2
ret
-
+
.asm_fc5e4
ld a, [wSpriteStateData1 + $9]
ld [wSpriteStateData1 + $f9], a
ret
+
.asm_fc5eb
ld a, $0
ld [wSpriteStateData1 + $f9], a
ret
+
.asm_fc5f1
ld a, [wSpriteStateData1 + $9]
xor $4
@@ -200,24 +210,29 @@ Func_fc5fa:: ; fc5fa (3f:45fa)
jr nz, .asm_fc641
ld a, $3
jr .asm_fc647
-
+
.asm_fc62d
ld a, [wSpriteStateData1 + $9]
and a
jr z, .asm_fc645
jr .asm_fc641
+
.asm_fc635
ld a, $3
jr .asm_fc647
+
.asm_fc639
ld a, $4
jr .asm_fc647
+
.asm_fc63d
ld a, $6
jr .asm_fc647
+
.asm_fc641
ld a, $1
jr .asm_fc647
+
.asm_fc645
ld a, $3
.asm_fc647
@@ -226,7 +241,7 @@ Func_fc5fa:: ; fc5fa (3f:45fa)
Pointer_fc64b:: ; fc64b (3f:464b)
db $c2, $4c, $4f, $ba, $be, $b8, $54, $ff
-
+
Pointer_fc653:: ; fc653 (3f:4653)
db $2f, $e6, $3e, $5e, $80, $31, $a4, $ff
@@ -241,28 +256,32 @@ Func_fc65b:: ; fc65b (3f:465b)
call Func_1568
jr c, .asm_fc688
jr .asm_fc684
+
.asm_fc673
ld a, [wSpriteStateData1 + $9]
cp SPRITE_FACING_UP
jr z, .asm_fc688
jr .asm_fc684
+
.asm_fc67c
ld a, [wSpriteStateData1 + $9]
and a ; SPRITE_FACING_DOWN
jr z, .asm_fc684
jr .asm_fc688
+
.asm_fc684
ld a, $0
jr .asm_fc68a
+
.asm_fc688
ld a, $1
.asm_fc68a
ld [wd431], a
ret
-
+
Pointer_fc68e:: ; fc68e (3f:468e)
db $33, $dd, $df, $e0, $e1, $de, $ec, $7f, $a8, $a9, $aa, $ff
-
+
Func_fc69a:: ; fc69a (3f:469a)
ld a, [wCurMap]
cp ROUTE_22_GATE
@@ -270,22 +289,27 @@ Func_fc69a:: ; fc69a (3f:469a)
cp ROUTE_2_GATE
jr z, .asm_fc6b0
jr .asm_fc6bd
+
.asm_fc6a7
ld a, [wSpriteStateData1 + $9]
cp SPRITE_FACING_UP
jr z, .asm_fc6b9
jr .asm_fc6bd
+
.asm_fc6b0
ld a, [wSpriteStateData1 + $9]
cp SPRITE_FACING_UP
jr z, .asm_fc6b9
jr .asm_fc6bd
+
.asm_fc6b9
ld a, $1
jr .asm_fc6c1
+
.asm_fc6bd
ld a, $3
jr .asm_fc6c1
+
.asm_fc6c1
ld [wd431], a
ret
@@ -337,7 +361,7 @@ Func_fc6d5:: ; fc6d5 (3f:46d5)
ld h, [hl]
ld l, a
jp hl
-
+
PointerTable_fc710: ; fc710 (3f:4710)
dw Func_fc793
dw Func_fc7aa
@@ -350,7 +374,7 @@ PointerTable_fc710: ; fc710 (3f:4710)
dw asm_fc937
dw asm_fc969
dw Func_fc726
-
+
Func_fc726: ; fc726 (3f:4726)
ret
@@ -368,6 +392,7 @@ Func_fc727: ; fc727 (3f:4727)
.asm_fc739
scf
ret
+
.asm_fc73b
ld hl, wSpriteStateData1 + $f2
ld [hl], $ff
@@ -375,6 +400,7 @@ Func_fc727: ; fc727 (3f:4727)
ld [hl], $0
xor a
ret
+
asm_fc745: ; fc745 (3f:4745)
ld hl, $1
add hl, bc
@@ -397,6 +423,7 @@ asm_fc745: ; fc745 (3f:4745)
ld [hl], a
call Func_fca99
ret
+
asm_fc76a: ; fc76a (3f:476a)
xor a
ld hl, $7
@@ -485,7 +512,7 @@ Pointer_fc7e3: ; fc7e3 (3f:47e3)
db $0, $4
db $c, $1
db $0, $4
-
+
Func_fc803: ; fc803 (3f:4803)
call Func_fcae2
ret c
@@ -528,7 +555,7 @@ Func_fc835: ; fc835 (3f:4835)
add hl, bc
ld [hl], $1
ret
-
+
Func_fc842: ; fc842 (3f:4842)
ld hl, $0
push af
@@ -545,13 +572,13 @@ Func_fc842: ; fc842 (3f:4842)
ld l, a
pop af
jp hl
-
+
PointerTable_fc85a: ; fc85a (3f:485a)
dw Func_fc862
dw Func_fc8f8
dw Func_fc92b
dw Func_fc95d
-
+
Func_fc862: ; fc862 (3f:4862)
dec a
add a
@@ -616,7 +643,7 @@ asm_fc87f: ; fc87f (3f:487f)
dec [hl]
ret nz
jp Func_fc835
-
+
Func_fc8c7: ; fc8c7 (3f:48c7)
ld hl, $4
add hl, bc
@@ -638,7 +665,7 @@ Pointer_fc8d6: ; fc8d6 (3f:48d6)
db $fc, $fe, $fe, $fd, $0
db $fc, $fe, $fd, $fc, $fe
db $fe, $ff, $00, $00
-
+
Func_fc8f8: ; fc8f8 (3f:48f8)
ld hl, $1
add hl, bc
@@ -670,7 +697,7 @@ asm_fc904: ; fc904 (3f:4904)
dec [hl]
ret nz
jp Func_fc835
-
+
Func_fc92b: ; fc92b (3f:492b)
ld hl, wSpriteStateData2 - wSpriteStateData1
add hl, bc
@@ -701,7 +728,7 @@ asm_fc937: ; fc937 (3f:4937)
dec [hl]
ret nz
jp Func_fc835
-
+
Func_fc95d: ; fc95d (3f:495d)
ld hl, wSpriteStateData2 - wSpriteStateData1
add hl, bc
@@ -734,7 +761,7 @@ asm_fc969: ; fc969 (3f:4969)
dec [hl]
ret nz
jp Func_fc835
-
+
Func_fc994: ; fc994 (3f:4994)
push hl
ld hl, Pointer_fc9ac
@@ -746,7 +773,7 @@ Func_fc994: ; fc994 (3f:4994)
ld a, [hl]
pop hl
ret
-
+
Func_fc9a0: ; fc9a0 (3f:49a0)
push hl
ld hl, Pointer_fc9ac_End
@@ -758,7 +785,7 @@ Func_fc9a0: ; fc9a0 (3f:49a0)
ld a, [hl]
pop hl
ret
-
+
Pointer_fc9ac: ; fc9ac (3f:49ac)
db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT
db SPRITE_FACING_DOWN, SPRITE_FACING_LEFT, SPRITE_FACING_UP, SPRITE_FACING_RIGHT
@@ -785,7 +812,7 @@ asm_fc9c3: ; fc9c3 (3f:49c3)
add hl, bc
ld [hl], $1
ret
-
+
Func_fc9df: ; fc9df (3f:49df)
ld hl, wSpriteStateData2 - wSpriteStateData1
add hl, bc
@@ -808,7 +835,7 @@ asm_fc9ee: ; fc9ee (3f:49ee)
add hl, bc
ld [hl], $1
ret
-
+
Func_fca0a: ; fca0a (3f:4a0a)
ld hl, wSpriteStateData2 - wSpriteStateData1
add hl, bc
@@ -832,7 +859,7 @@ asm_fca1c: ; fca1c (3f:4a1c)
add hl, bc
ld [hl], $1
ret
-
+
Func_fca38: ; fca38 (3f:4a38)
ld hl, $3
add hl, bc
@@ -849,7 +876,7 @@ Func_fca38: ; fca38 (3f:4a38)
add d
ld [hl], a
ret
-
+
Func_fca4b: ; fca4b (3f:4a4b)
ld a, [wWalkBikeSurfState]
cp $1
@@ -871,7 +898,7 @@ asm_fca59: ; fca59 (3f:4a59)
add [hl]
ld [hl], a
ret
-
+
Func_fca68: ; fca68 (3f:4a68)
ld hl, $3
add hl, bc
@@ -884,7 +911,7 @@ Func_fca68: ; fca68 (3f:4a68)
add [hl]
ld [hli], a
ret
-
+
Func_fca75: ; fca75 (3f:4a75)
ld hl, $3
add hl, bc
@@ -893,7 +920,7 @@ Func_fca75: ; fca75 (3f:4a75)
inc hl
ld [hl], a
ret
-
+
Func_fca7e: ; fca7e (3f:4a7e)
call Func_fcdad
ld d, $2
@@ -915,7 +942,7 @@ Func_fca7e: ; fca7e (3f:4a7e)
and $3
ld [hl], a
ret
-
+
Func_fca99: ; fca99 (3f:4a99)
ld a, [wd430]
bit 3, a
@@ -940,6 +967,7 @@ Func_fca99: ; fca99 (3f:4a99)
call Func_fcae2
ret c
jr .asm_fcacb
+
.asm_fcac4
ld hl, $8
add hl, bc
@@ -951,18 +979,20 @@ Func_fca99: ; fca99 (3f:4a99)
add hl, bc
ld [hl], d
ret
+
.asm_fcad1
ld hl, $2
add hl, bc
ld [hl], $ff
ret
+
.asm_fcad8
ld a, [wSpriteStateData1 + $2]
and $f
or d
ld [wSpriteStateData1 + $f2], a
ret
-
+
Func_fcae2: ; fcae2 (3f:4ae2)
ld hl, $104
add hl, bc
@@ -980,6 +1010,7 @@ Func_fcae2: ; fcae2 (3f:4ae2)
ld [hl], $ff
scf
ret
+
.asm_fcaff
and a
ret
@@ -1006,6 +1037,7 @@ Func_fcb01: ; fcb01 (3f:4b01)
cp $1
jr z, .asm_fcb26
jr .asm_fcb48
+
.asm_fcb26
ld hl, $105
add hl, bc
@@ -1013,6 +1045,7 @@ Func_fcb01: ; fcb01 (3f:4b01)
sub d
jr z, .asm_fcb43
jr .asm_fcb48
+
.asm_fcb30
ld hl, $105
add hl, bc
@@ -1025,12 +1058,14 @@ Func_fcb01: ; fcb01 (3f:4b01)
and a
jr z, .asm_fcb43
jr .asm_fcb48
+
.asm_fcb43
pop hl
pop de
pop bc
scf
ret
+
.asm_fcb48
pop hl
pop de
@@ -1038,12 +1073,12 @@ Func_fcb01: ; fcb01 (3f:4b01)
xor a
ret
-Func_fcb4d: ; fcb4d (3f:4b4d)
- call Func_fcb52
+GetPikachuFacingDirectionAndReturnToE: ; fcb4d (3f:4b4d)
+ call GetPikachuFacingDirection
ld e, a
ret
-
-Func_fcb52: ; fcb52 (3f:4b52)
+
+GetPikachuFacingDirection: ; fcb52 (3f:4b52)
ld bc, wSpriteStateData1 + $f0
ld a, [wXCoord]
add $4
@@ -1055,7 +1090,7 @@ Func_fcb52: ; fcb52 (3f:4b52)
add hl, bc
ld a, [hl]
cp e
- jr z, Func_fcb71
+ jr z, .asm_fcb71
jr nc, .asm_fcb6e
ld a, SPRITE_FACING_UP
ret
@@ -1063,8 +1098,8 @@ Func_fcb52: ; fcb52 (3f:4b52)
.asm_fcb6e
ld a, SPRITE_FACING_DOWN
ret
-
-Func_fcb71: ; fcb71 (3f:4b71)
+
+.asm_fcb71
ld hl, wSpriteStateData2 - wSpriteStateData1 + 5
add hl, bc
ld a, [hl]
@@ -1082,9 +1117,9 @@ Func_fcb71: ; fcb71 (3f:4b71)
ld a, $ff ; standing
ret
-Func_fcb84: ; fcb84 (3f:4b84)
+ClearPikachuFollowCommandBuffer: ; fcb84 (3f:4b84)
push bc
- ld hl, wd437
+ ld hl, wPikachuFollowCommandBufferSize
ld [hl], $ff
inc hl
ld bc, $10
@@ -1092,91 +1127,99 @@ Func_fcb84: ; fcb84 (3f:4b84)
call FillMemory
pop bc
ret
-
-Func_fcb94: ; fcb94 (3f:4b94)
- ld hl, wd437
+
+AppendPikachuFollowCommandToBuffer: ; fcb94 (3f:4b94)
+ ld hl, wPikachuFollowCommandBufferSize
inc [hl]
ld e, [hl]
ld d, 0
- ld hl, wd438
+ ld hl, wPikachuFollowCommandBuffer
add hl, de
ld [hl], a
ret
-
+
Func_fcba1: ; fcba1 (3f:4ba1)
- call Func_fcb84
- call Func_fcbac
+ call ClearPikachuFollowCommandBuffer
+ call GetPikachuFollowCommand
ret c
- call Func_fcb94
+ call AppendPikachuFollowCommandToBuffer
ret
-
-Func_fcbac: ; fcbac (3f:4bac)
+
+GetPikachuFollowCommand: ; fcbac (3f:4bac)
ld bc, wSpriteStateData1 + $f0
- ld hl, $104
+ ld hl, wSpriteStateData2 - wSpriteStateData1 + 4
add hl, bc
ld a, [wYCoord]
add $4
sub [hl]
- jr z, .asm_fcbd7
- jr c, .asm_fcbca
- call Func_fcc01
- jr c, .asm_fcbc6
+ jr z, .checkXCoord
+ jr c, .pikaAbovePlayer
+ call CheckAbsoluteValueLessThan2
+ jr c, .return1
ld a, $5
and a
ret
-.asm_fcbc6
+
+.return1
ld a, $1
and a
ret
-.asm_fcbca
- call Func_fcc01
- jr c, .asm_fcbd3
+
+.pikaAbovePlayer
+ call CheckAbsoluteValueLessThan2
+ jr c, .return2
ld a, $6
and a
ret
-.asm_fcbd3
+
+.return2
ld a, $2
and a
ret
-.asm_fcbd7
- ld hl, $105
+
+.checkXCoord
+ ld hl, wSpriteStateData2 - wSpriteStateData1 + 5
add hl, bc
ld a, [wXCoord]
add $4
sub [hl]
- jr z, .asm_fcbff
- jr c, .asm_fcbf2
- call Func_fcc01
- jr c, .asm_fcbee
+ jr z, .pikachuOnTopOfPlayer
+ jr c, .pikaToLeftOfPlayer
+ call CheckAbsoluteValueLessThan2
+ jr c, .return4
ld a, $8
and a
ret
-.asm_fcbee
+
+.return4
ld a, $4
and a
ret
-.asm_fcbf2
- call Func_fcc01
- jr c, .asm_fcbfb
+
+.pikaToLeftOfPlayer
+ call CheckAbsoluteValueLessThan2
+ jr c, .return3
ld a, $7
and a
ret
-.asm_fcbfb
+
+.return3
ld a, $3
and a
ret
-.asm_fcbff
+
+.pikachuOnTopOfPlayer
scf
ret
-
-Func_fcc01: ; fcc01 (3f:4c01)
- jr nc, .asm_fcc05
+
+CheckAbsoluteValueLessThan2: ; fcc01 (3f:4c01)
+ jr nc, .positive
cpl
inc a
-.asm_fcc05
+.positive
cp $2
ret
-
+
Func_fcc08:: ; fcc08 (3f:4c08)
call Func_fcc23
ret nc
@@ -1185,14 +1228,15 @@ Func_fcc08:: ; fcc08 (3f:4c08)
jr nz, .asm_fcc1b
call Func_fcc42
ret c
- call Func_fcb94
+ call AppendPikachuFollowCommandToBuffer
ret
+
.asm_fcc1b
call Func_fcc64
ret c
- call Func_fcb94
+ call AppendPikachuFollowCommandToBuffer
ret
-
+
Func_fcc23: ; fcc23 (3f:4c28)
ld a, [wd430]
bit 5, a
@@ -1208,10 +1252,11 @@ Func_fcc23: ; fcc23 (3f:4c28)
jr nz, .asm_fcc40
scf
ret
+
.asm_fcc40
and a
ret
-
+
Func_fcc42: ; fcc42 (3f:4c42)
xor a
ld a, [wPlayerDirection]
@@ -1225,25 +1270,30 @@ Func_fcc42: ; fcc42 (3f:4c42)
jr nz, .asm_fcc61
scf
ret
+
.asm_fcc58
ld a, $2
ret
+
.asm_fcc5b
ld a, $1
ret
+
.asm_fcc5e
ld a, $3
ret
+
.asm_fcc61
ld a, $4
ret
-
+
Func_fcc64: ; fcc64 (3f:4c64)
ld hl, wd430
bit 6, [hl]
jr z, .asm_fcc6e
res 6, [hl]
ret
+
.asm_fcc6e
set 6, [hl]
xor a
@@ -1258,21 +1308,25 @@ Func_fcc64: ; fcc64 (3f:4c64)
jr nz, .asm_fcc8f
scf
ret
+
.asm_fcc86
ld a, $6
ret
+
.asm_fcc89
ld a, $5
ret
+
.asm_fcc8c
ld a, $7
ret
+
.asm_fcc8f
ld a, $8
ret
Func_fcc92: ; fcc92 (3f:4c92)
- ld hl, wd437
+ ld hl, wPikachuFollowCommandBufferSize
ld a, [hl]
cp $ff
jr z, .asm_fccb0
@@ -1281,7 +1335,7 @@ Func_fcc92: ; fcc92 (3f:4c92)
dec [hl]
ld e, a
ld d, 0
- ld hl, wd438
+ ld hl, wPikachuFollowCommandBuffer
add hl, de
inc e
ld a, $ff
@@ -1293,6 +1347,7 @@ Func_fcc92: ; fcc92 (3f:4c92)
jr nz, .asm_fcca8
and a
ret
+
.asm_fccb0
scf
ret
@@ -1306,6 +1361,7 @@ Func_fccb2:: ; fccb2 (3f:4cb2)
add a
add a
jr .asm_fccea
+
.asm_fccbf
ld a, [wYCoord]
add $4
@@ -1320,6 +1376,7 @@ Func_fccb2:: ; fccb2 (3f:4cb2)
jr c, .asm_fccea
ld a, SPRITE_FACING_UP
jr .asm_fccea
+
.asm_fccd9
ld a, [wSpriteStateData2 + $f5]
cp e
@@ -1328,29 +1385,31 @@ Func_fccb2:: ; fccb2 (3f:4cb2)
jr c, .asm_fccea
ld a, SPRITE_FACING_LEFT
jr .asm_fccea
+
.asm_fcce7
ld a, [wSpriteStateData1 + $9]
.asm_fccea
ld [wSpriteStateData1 + $f9], a
ret
-
+
Func_fccee: ; fccee (3f:4cee)
- ld hl, wd437
+ ld hl, wPikachuFollowCommandBufferSize
ld a, [hl]
cp $ff
jr z, .asm_fccff
ld e, a
ld d, 0
- ld hl, wd438
+ ld hl, wPikachuFollowCommandBuffer
add hl, de
ld a, [hl]
ret
+
.asm_fccff
xor a
ret
-
+
Func_fcd01: ; fcd01 (3f:4d01)
- ld hl, wd437
+ ld hl, wPikachuFollowCommandBufferSize
ld a, [hl]
cp $ff
jr z, .asm_fcd15
@@ -1358,26 +1417,28 @@ Func_fcd01: ; fcd01 (3f:4d01)
jr z, .asm_fcd15
ld e, a
ld d, 0
- ld hl, wd438
+ ld hl, wPikachuFollowCommandBuffer
add hl, de
ld a, [hl]
ret
+
.asm_fcd15
xor a
ret
-
+
Func_fcd17: ; fcd17 (3f:4d17)
- ld a, [wd437]
+ ld a, [wPikachuFollowCommandBufferSize]
cp $ff
ret z
cp $2
jr nc, .asm_fcd23
and a
ret
+
.asm_fcd23
scf
ret
-
+
Func_fcd25: ; fcd25 (3f:4d25)
ld h, wSpriteStateData2 / $100
ld a, [H_CURRENTSPRITEOFFSET]
@@ -1427,6 +1488,7 @@ Func_fcd25: ; fcd25 (3f:4d25)
ld [hl], $ff
scf
jr .asm_fcd82
+
.asm_fcd6f
ld h, wSpriteStateData2 / $100
ld a, [H_CURRENTSPRITEOFFSET]
@@ -1442,7 +1504,7 @@ Func_fcd25: ; fcd25 (3f:4d25)
and a
.asm_fcd82
ret
-
+
Func_fcd83: ; fcd83 (3f:4d83)
ld h, wSpriteStateData1 / $100
ld a, [H_CURRENTSPRITEOFFSET]
@@ -1469,7 +1531,7 @@ Func_fcd83: ; fcd83 (3f:4d83)
endr
add hl, de
ret
-
+
Func_fcdad: ; fcdad (3f:4dad)
push bc
push af
@@ -1526,6 +1588,7 @@ IsStarterPikachuInOurParty:: ; fcdb8 (3f:4db8)
ld b, h
ld c, l
jr .loop
+
.sameOT
pop bc
pop de
@@ -1539,6 +1602,7 @@ IsStarterPikachuInOurParty:: ; fcdb8 (3f:4db8)
pop hl
scf
ret
+
.noPlayerPikachu
pop hl
and a
@@ -1588,10 +1652,11 @@ asm_fce21: ; fce21 (3f:4e21)
.notPlayerPikachu
and a
ret
+
.isPlayerPikachu
scf
ret
-
+
Func_fce5a:: ; fce5a (3f:4e5a)
push de
call IsStarterPikachuInOurParty
@@ -1604,6 +1669,7 @@ Func_fce5a:: ; fce5a (3f:4e5a)
cp d
jr c, .asm_fce6e
ret
+
.asm_fce6c
cp d
ret c
@@ -1639,14 +1705,17 @@ Func_fce73:: ; fce73 (3f:4e73)
and a
jr nz, .asm_fcea7
jr .asm_fcea9
+
.asm_fce9e
ld a, [wWhichPokemon]
inc a
ld [wWhichPokemon], a
jr .loop
+
.asm_fcea7
scf
ret
+
.asm_fcea9
and a
ret
@@ -1678,6 +1747,7 @@ IsSurfingPikachuInThePlayersParty:: ; fceab (3f:4eab)
pop bc
pop hl
jr .curMonNotSurfingPlayerPikachu
+
.foundSurfingPikachu
pop bc
pop hl
@@ -1716,17 +1786,19 @@ IsSurfingPikachuInThePlayersParty:: ; fceab (3f:4eab)
ld b, h
ld c, l
jr .loop
+
.foundSurfingPlayerPikachu
pop bc
pop de
pop hl
scf
ret
+
.noSurfingPlayerPikachu
pop hl
and a
ret
-
+
INCLUDE "engine/pikachu_pic_animation.asm"
Func_fe66e:
diff --git a/main.asm b/main.asm
index 457c0e23..0d13baf2 100755
--- a/main.asm
+++ b/main.asm
@@ -1077,8 +1077,14 @@ INCLUDE "engine/evolution.asm"
INCLUDE "engine/hidden_object_functions17.asm"
SECTION "bank18",ROMX,BANK[$18]
-
- dr $60000,$625e8
+ViridianForestBlocks:
+INCBIN "maps/viridianforest.blk"
+ dr $60198,$610ed
+
+INCLUDE "data/mapHeaders/viridianforest.asm"
+INCLUDE "scripts/viridianforest.asm"
+INCLUDE "data/mapObjects/viridianforest.asm"
+ dr $612a4,$625e8
INCLUDE "engine/hidden_object_functions18.asm"
SECTION "bank19",ROMX,BANK[$19]
diff --git a/scripts/oakslab2.asm b/scripts/oakslab2.asm
new file mode 100755
index 00000000..fef72470
--- /dev/null
+++ b/scripts/oakslab2.asm
@@ -0,0 +1,28 @@
+Func_f1be0:
+ ld a, [wYCoord]
+ cp 3
+ jr z, .asm_f1bf0
+ ld b, SPRITE_FACING_DOWN
+ ld hl, Data_f1bf9
+ call Func_f0a82
+ ret
+
+.asm_f1bf0
+ ld b, SPRITE_FACING_LEFT
+ ld hl, Data_f1bfe
+ call Func_f0a82
+ ret
+
+Data_f1bf9:
+ db $00
+ db $1f
+ db $1e
+ db $38
+ db $3f
+
+Data_f1bfe:
+ db $00
+ db $1d
+ db $20
+ db $36
+ db $3f
diff --git a/scripts/school2.asm b/scripts/school2.asm
new file mode 100755
index 00000000..677a43ec
--- /dev/null
+++ b/scripts/school2.asm
@@ -0,0 +1,17 @@
+Func_f1c03:
+ ld hl, SchoolText_f1c0a
+ call PrintText
+ ret
+
+SchoolText_f1c0a:
+ TX_FAR _SchoolText3
+ db "@"
+
+Func_f1c0f:
+ ld hl, SchoolText_f1c16
+ call PrintText
+ ret
+
+SchoolText_f1c16:
+ TX_FAR _SchoolText2
+ db "@"
diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm
index 892eeef2..8ac0d8a8 100755
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@@ -17,16 +17,18 @@ ViridianForestTextPointers: ; 61126 (18:5126)
dw ViridianForestText2
dw ViridianForestText3
dw ViridianForestText4
+ dw ViridianForestText5
+ dw ViridianForestText6
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
- dw ViridianForestText8
- dw ViridianForestText9
dw ViridianForestText10
dw ViridianForestText11
dw ViridianForestText12
dw ViridianForestText13
dw ViridianForestText14
+ dw ViridianForestText15
+ dw ViridianForestText16
ViridianForestTrainerHeaders: ; 61142 (18:5142)
ViridianForestTrainerHeader0: ; 61142 (18:5142)
@@ -56,6 +58,24 @@ ViridianForestTrainerHeader2: ; 6115a (18:515a)
dw ViridianForestEndBattleText3 ; TextEndBattle
dw ViridianForestEndBattleText3 ; TextEndBattle
+ViridianForestTrainerHeader3:
+ dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3
+ db ($0 << 4) ; trainer's view range
+ dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3
+ dw ViridianForestBattleText4 ; TextBeforeBattle
+ dw ViridianForestAfterBattleText4 ; TextAfterBattle
+ dw ViridianForestEndBattleText4 ; TextEndBattle
+ dw ViridianForestEndBattleText4 ; TextEndBattle
+
+ViridianForestTrainerHeader4:
+ dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4
+ db ($4 << 4) ; trainer's view range
+ dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4
+ dw ViridianForestBattleText5 ; TextBeforeBattle
+ dw ViridianForestAfterBattleText5 ; TextAfterBattle
+ dw ViridianForestEndBattleText5 ; TextEndBattle
+ dw ViridianForestEndBattleText5 ; TextEndBattle
+
db $ff
ViridianForestText1: ; 61167 (18:5167)
@@ -65,18 +85,27 @@ ViridianForestText1: ; 61167 (18:5167)
ViridianForestText2: ; 6116c (18:516c)
TX_ASM
ld hl, ViridianForestTrainerHeader0
- call TalkToTrainer
- jp TextScriptEnd
+ jr ViridianForestTalkToTrainer
ViridianForestText3: ; 61176 (18:5176)
TX_ASM
ld hl, ViridianForestTrainerHeader1
- call TalkToTrainer
- jp TextScriptEnd
+ jr ViridianForestTalkToTrainer
ViridianForestText4: ; 61180 (18:5180)
TX_ASM
ld hl, ViridianForestTrainerHeader2
+ jr ViridianForestTalkToTrainer
+
+ViridianForestText5:
+ TX_ASM
+ ld hl, ViridianForestTrainerHeader3
+ jr ViridianForestTalkToTrainer
+
+ViridianForestText6:
+ TX_ASM
+ ld hl, ViridianForestTrainerHeader4
+ViridianForestTalkToTrainer:
call TalkToTrainer
jp TextScriptEnd
@@ -116,30 +145,63 @@ ViridianForestAfterBattleText3: ; 611b2 (18:51b2)
TX_FAR _ViridianFrstAfterBattleText3
db "@"
-ViridianForestText8: ; 611b7 (18:51b7)
- TX_FAR _ViridianForestText8
+ViridianForestBattleText4: ; 611a8 (18:51a8)
+ TX_FAR _ViridianForestBattleTextPikaGirl
db "@"
-ViridianForestText9: ; 611bc (18:51bc)
- TX_FAR _ViridianForestText9
+ViridianForestEndBattleText4: ; 611ad (18:51ad)
+ TX_FAR _ViridianForestEndBattleTextPikaGirl
db "@"
-ViridianForestText10: ; 611c1 (18:51c1)
- TX_FAR _ViridianForestText10
+ViridianForestAfterBattleText4: ; 611b2 (18:51b2)
+ TX_FAR _ViridianForestAfterBattleTextPikaGirl
db "@"
-ViridianForestText11: ; 611c6 (18:51c6)
- TX_FAR _ViridianForestText11
+ViridianForestBattleText5: ; 611a8 (18:51a8)
+ TX_FAR _ViridianForestBattleTextSamurai
db "@"
-ViridianForestText12: ; 611cb (18:51cb)
- TX_FAR _ViridianForestText12
+ViridianForestEndBattleText5: ; 611ad (18:51ad)
+ TX_FAR _ViridianForestEndBattleTextSamurai
db "@"
-ViridianForestText13: ; 611d0 (18:51d0)
- TX_FAR _ViridianForestText13
+ViridianForestAfterBattleText5: ; 611b2 (18:51b2)
+ TX_FAR _ViridianForestAfterBattleTextSamurai
db "@"
-ViridianForestText14: ; 611d5 (18:51d5)
- TX_FAR _ViridianForestText14
+ViridianForestText10: ; 611b7 (18:51b7)
+ TX_FAR _ViridianForestText8
db "@"
+
+ViridianForestText11: ; 611bc (18:51bc)
+ TX_ASM
+ ld hl, Func_f2528
+ jp ViridianForestScript_6120d
+
+ViridianForestText12: ; 611c1 (18:51c1)
+ TX_ASM
+ ld hl, Func_f2534
+ jp ViridianForestScript_6120d
+
+ViridianForestText13: ; 611c6 (18:51c6)
+ TX_ASM
+ ld hl, Func_f2540
+ jp ViridianForestScript_6120d
+
+ViridianForestText14: ; 611cb (18:51cb)
+ TX_ASM
+ ld hl, Func_f254c
+ jp ViridianForestScript_6120d
+
+ViridianForestText15: ; 611d0 (18:51d0)
+ TX_ASM
+ ld hl, Func_f2558
+ jp ViridianForestScript_6120d
+
+ViridianForestText16: ; 611d5 (18:51d5)
+ TX_ASM
+ ld hl, Func_f2528
+ViridianForestScript_6120d
+ ld b, BANK(Func_f2528)
+ call Bankswitch
+ jp TextScriptEnd
diff --git a/scripts/viridianforest2.asm b/scripts/viridianforest2.asm
new file mode 100755
index 00000000..41c81218
--- /dev/null
+++ b/scripts/viridianforest2.asm
@@ -0,0 +1,45 @@
+Func_f2528:
+ ld hl, Text_f252f
+ call PrintText
+ ret
+
+Text_f252f:
+ TX_FAR _ViridianForestText9
+ db "@"
+
+Func_f2534:
+ ld hl, Text_f253b
+ call PrintText
+ ret
+
+Text_f253b:
+ TX_FAR _ViridianForestText10
+ db "@"
+
+Func_f2540:
+ ld hl, Text_f254a
+ call PrintText
+ ret
+
+Text_f254a:
+ TX_FAR _ViridianForestText11
+ db "@"
+
+Func_f254c:
+ ld hl, Text_f2553
+ call PrintText
+ ret
+
+Text_f2553:
+ TX_FAR _ViridianForestText12
+ db "@"
+
+Func_f2558:
+ ld hl, Text_f255f
+ call PrintText
+ ret
+
+Text_f255f:
+ TX_FAR _ViridianForestText13
+ db "@"
+
diff --git a/wram.asm b/wram.asm
index 346b8389..2c9b3d4e 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2530,10 +2530,8 @@ wd433:: ds 1 ; d432
wd434:: ds 1
wd435:: ds 1
wd436:: ds 1
-wd437:: ds 1
-wd438:: ds 1
-
- ds 15
+wPikachuFollowCommandBufferSize:: ds 1
+wPikachuFollowCommandBuffer:: ds 16
wExpressionNumber:: ; d447
ds 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 10:28:35 +0000