thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-09 23:11:10 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fewer underscores in constants

Browse source
This commit is contained in:
dannye 2015-12-14 22:09:30 -06:00
parent 4c5c791264
commit 351146024b
39 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
constants/item_constants.asm
View file

@ -56,7 +56,7 @@ SAFARI_ROCK EQU $16 ; overload
const FULL_HEAL ; $34 const FULL_HEAL ; $34
const REVIVE ; $35 const REVIVE ; $35
const MAX_REVIVE ; $36 const MAX_REVIVE ; $36
const GUARD_SPEC_ ; $37 const GUARD_SPEC ; $37
const SUPER_REPEL ; $38 const SUPER_REPEL ; $38
const MAX_REPEL ; $39 const MAX_REPEL ; $39
const DIRE_HIT ; $3A const DIRE_HIT ; $3A
@ -64,7 +64,7 @@ SAFARI_ROCK EQU $16 ; overload
const FRESH_WATER ; $3C const FRESH_WATER ; $3C
const SODA_POP ; $3D const SODA_POP ; $3D
const LEMONADE ; $3E const LEMONADE ; $3E
const S_S__TICKET ; $3F const S_S_TICKET ; $3F
const GOLD_TEETH ; $40 const GOLD_TEETH ; $40
const X_ATTACK ; $41 const X_ATTACK ; $41
const X_DEFEND ; $42 const X_DEFEND ; $42
@ -76,7 +76,7 @@ SAFARI_ROCK EQU $16 ; overload
const SILPH_SCOPE ; $48 const SILPH_SCOPE ; $48
const POKE_FLUTE ; $49 const POKE_FLUTE ; $49
const LIFT_KEY ; $4A const LIFT_KEY ; $4A
const EXP__ALL ; $4B const EXP_ALL ; $4B
const OLD_ROD ; $4C const OLD_ROD ; $4C
const GOOD_ROD ; $4D const GOOD_ROD ; $4D
const SUPER_ROD ; $4E const SUPER_ROD ; $4E

2
constants/pokedex_constants.asm
View file

@ -82,7 +82,7 @@ const_value = 1
const DEX_SLOWBRO ; 80 const DEX_SLOWBRO ; 80
const DEX_MAGNEMITE ; 81 const DEX_MAGNEMITE ; 81
const DEX_MAGNETON ; 82 const DEX_MAGNETON ; 82
const DEX_FARFETCH_D ; 83 const DEX_FARFETCHD ; 83
const DEX_DODUO ; 84 const DEX_DODUO ; 84
const DEX_DODRIO ; 85 const DEX_DODRIO ; 85
const DEX_SEEL ; 86 const DEX_SEEL ; 86

2
constants/pokemon_constants.asm
View file

@ -63,7 +63,7 @@ const_value = 1
const MISSINGNO_3D ; $3D const MISSINGNO_3D ; $3D
const MISSINGNO_3E ; $3E const MISSINGNO_3E ; $3E
const MISSINGNO_3F ; $3F const MISSINGNO_3F ; $3F
const FARFETCH_D ; $40 const FARFETCHD ; $40
const VENONAT ; $41 const VENONAT ; $41
const DRAGONITE ; $42 const DRAGONITE ; $42
const MISSINGNO_43 ; $43 const MISSINGNO_43 ; $43

6
constants/trainer_constants.asm
View file

@ -10,8 +10,8 @@ const_value = 1
trainer_const BUG_CATCHER ; $02 trainer_const BUG_CATCHER ; $02
trainer_const LASS ; $03 trainer_const LASS ; $03
trainer_const SAILOR ; $04 trainer_const SAILOR ; $04
trainer_const JR__TRAINER_M ; $05 trainer_const JR_TRAINER_M ; $05
trainer_const JR__TRAINER_F ; $06 trainer_const JR_TRAINER_F ; $06
trainer_const POKEMANIAC ; $07 trainer_const POKEMANIAC ; $07
trainer_const SUPER_NERD ; $08 trainer_const SUPER_NERD ; $08
trainer_const HIKER ; $09 trainer_const HIKER ; $09
@ -41,7 +41,7 @@ const_value = 1
trainer_const BRUNO ; $21 trainer_const BRUNO ; $21
trainer_const BROCK ; $22 trainer_const BROCK ; $22
trainer_const MISTY ; $23 trainer_const MISTY ; $23
trainer_const LT__SURGE ; $24 trainer_const LT_SURGE ; $24
trainer_const ERIKA ; $25 trainer_const ERIKA ; $25
trainer_const KOGA ; $26 trainer_const KOGA ; $26
trainer_const BLAINE ; $27 trainer_const BLAINE ; $27

2
data/baseStats/farfetchd.asm
View file

@ -1,5 +1,5 @@
FarfetchdBaseStats: ; 38cd6 (e:4cd6) FarfetchdBaseStats: ; 38cd6 (e:4cd6)
db DEX_FARFETCH_D ; pokedex id db DEX_FARFETCHD ; pokedex id
db 52 ; base hp db 52 ; base hp
db 65 ; base attack db 65 ; base attack
db 55 ; base defense db 55 ; base defense

2
data/evos_moves.asm
View file

@ -943,7 +943,7 @@ Mon159_EvosMoves: ; 3b4e1 (e:74e1)
db 0 db 0
Mon083_EvosMoves: ; 3b4e3 (e:74e3) Mon083_EvosMoves: ; 3b4e3 (e:74e3)
;FARFETCH_D ;FARFETCHD
;Evolutions ;Evolutions
db 0 db 0
;Learnset ;Learnset

6
data/item_prices.asm
View file

@ -53,7 +53,7 @@ ItemPrices: ; 4608 (1:4608)
money 600 ; FULL_HEAL money 600 ; FULL_HEAL
money 1500 ; REVIVE money 1500 ; REVIVE
money 4000 ; MAX_REVIVE money 4000 ; MAX_REVIVE
money 700 ; GUARD_SPEC_ money 700 ; GUARD_SPEC
money 500 ; SUPER_REPEL money 500 ; SUPER_REPEL
money 700 ; MAX_REPEL money 700 ; MAX_REPEL
money 650 ; DIRE_HIT money 650 ; DIRE_HIT
@ -61,7 +61,7 @@ ItemPrices: ; 4608 (1:4608)
money 200 ; FRESH_WATER money 200 ; FRESH_WATER
money 300 ; SODA_POP money 300 ; SODA_POP
money 350 ; LEMONADE money 350 ; LEMONADE
money 0 ; S_S__TICKET money 0 ; S_S_TICKET
money 0 ; GOLD_TEETH money 0 ; GOLD_TEETH
money 500 ; X_ATTACK money 500 ; X_ATTACK
money 550 ; X_DEFEND money 550 ; X_DEFEND
@ -73,7 +73,7 @@ ItemPrices: ; 4608 (1:4608)
money 0 ; SILPH_SCOPE money 0 ; SILPH_SCOPE
money 0 ; POKE_FLUTE money 0 ; POKE_FLUTE
money 0 ; LIFT_KEY money 0 ; LIFT_KEY
money 0 ; EXP__ALL money 0 ; EXP_ALL
money 0 ; OLD_ROD money 0 ; OLD_ROD
money 0 ; GOOD_ROD money 0 ; GOOD_ROD
money 0 ; SUPER_ROD money 0 ; SUPER_ROD

2
data/mapObjects/celadongym.asm
View file

@ -11,7 +11,7 @@ CeladonGymObject: ; 0x48b30 (size=84)
object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1 object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, OPP_ERIKA, $1
object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11 object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, OPP_LASS, $11
object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1 object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, OPP_BEAUTY, $1
object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR__TRAINER_F, $b object SPRITE_LASS, $9, $5, STAY, DOWN, $4, OPP_JR_TRAINER_F, $b
object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2 object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, OPP_BEAUTY, $2
object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12 object SPRITE_LASS, $6, $3, STAY, DOWN, $6, OPP_LASS, $12
object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3 object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, OPP_BEAUTY, $3

2
data/mapObjects/ceruleangym.asm
View file

@ -9,7 +9,7 @@ CeruleanGymObject: ; 0x5c834 (size=50)
db $4 ; objects db $4 ; objects
object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1 object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, OPP_MISTY, $1
object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR__TRAINER_F, $1 object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, OPP_JR_TRAINER_F, $1
object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1 object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, OPP_SWIMMER, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person

2
data/mapObjects/pewtergym.asm
View file

@ -9,7 +9,7 @@ PewterGymObject: ; 0x5c52e (size=42)
db $3 ; objects db $3 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1 object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, OPP_BROCK, $1
object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR__TRAINER_M, $1 object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, OPP_JR_TRAINER_M, $1
object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person
; warp-to ; warp-to

6
data/mapObjects/rocktunnel1.asm
View file

@ -19,9 +19,9 @@ RockTunnel1Object: ; 0x445f6 (size=127)
object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, OPP_HIKER, $d
object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, OPP_HIKER, $e
object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7 object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, OPP_POKEMANIAC, $7
object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR__TRAINER_F, $11 object SPRITE_LASS, $25, $15, STAY, LEFT, $5, OPP_JR_TRAINER_F, $11
object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR__TRAINER_F, $12 object SPRITE_LASS, $16, $18, STAY, DOWN, $6, OPP_JR_TRAINER_F, $12
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR__TRAINER_F, $13 object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13
; warp-to ; warp-to
EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f

4
data/mapObjects/rocktunnel2.asm
View file

@ -10,12 +10,12 @@ RockTunnel2Object: ; 0x4613d (size=100)
db $0 ; signs db $0 ; signs
db $8 ; objects db $8 ; objects
object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR__TRAINER_F, $9 object SPRITE_LASS, $b, $d, STAY, DOWN, $1, OPP_JR_TRAINER_F, $9
object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9 object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, OPP_HIKER, $9
object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3 object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, OPP_POKEMANIAC, $3
object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4 object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, OPP_POKEMANIAC, $4
object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, OPP_HIKER, $a
object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR__TRAINER_F, $a object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, OPP_JR_TRAINER_F, $a
object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, OPP_HIKER, $b
object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5

4
data/mapObjects/route10.asm
View file

@ -17,9 +17,9 @@ Route10Object: ; 0x582f6 (size=96)
object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1
object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7 object SPRITE_HIKER, $3, $39, STAY, UP, $2, OPP_HIKER, $7
object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2 object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, OPP_POKEMANIAC, $2
object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR__TRAINER_F, $7 object SPRITE_LASS, $7, $19, STAY, LEFT, $4, OPP_JR_TRAINER_F, $7
object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8 object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, OPP_HIKER, $8
object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR__TRAINER_F, $8 object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8
; warp-to ; warp-to
EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER

2
data/mapObjects/route12.asm
View file

@ -15,7 +15,7 @@ Route12Object: ; 0x5869a (size=118)
object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person
object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3 object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, OPP_FISHER, $3
object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4 object SPRITE_FISHER2, $5, $27, STAY, UP, $3, OPP_FISHER, $4
object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR__TRAINER_M, $9 object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, OPP_JR_TRAINER_M, $9
object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2 object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, OPP_ROCKER, $2
object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5 object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, OPP_FISHER, $5
object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6 object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, OPP_FISHER, $6

8
data/mapObjects/route13.asm
View file

@ -10,10 +10,10 @@ Route13Object: ; 0x5482e (size=93)
db $a ; objects db $a ; objects
object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1
object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR__TRAINER_F, $c object SPRITE_LASS, $30, $a, STAY, DOWN, $2, OPP_JR_TRAINER_F, $c
object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR__TRAINER_F, $d object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, OPP_JR_TRAINER_F, $d
object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR__TRAINER_F, $e object SPRITE_LASS, $17, $a, STAY, LEFT, $4, OPP_JR_TRAINER_F, $e
object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR__TRAINER_F, $f object SPRITE_LASS, $32, $5, STAY, DOWN, $5, OPP_JR_TRAINER_F, $f
object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2 object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, OPP_BIRD_KEEPER, $2
object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4 object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, OPP_BEAUTY, $4
object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5 object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, OPP_BEAUTY, $5

8
data/mapObjects/route15.asm
View file

@ -11,16 +11,16 @@ Route15Object: ; 0x5894e (size=126)
db $9, $27, $c ; Route15Text12 db $9, $27, $c ; Route15Text12
db $b ; objects db $b ; objects
object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR__TRAINER_F, $14 object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14
object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR__TRAINER_F, $15 object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15
object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6
object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7
object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9
object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a
object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3
object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4
object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR__TRAINER_F, $16 object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16
object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR__TRAINER_F, $17 object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17
object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20
; warp-to ; warp-to

4
data/mapObjects/route20.asm
View file

@ -13,12 +13,12 @@ Route20Object: ; 0x50113 (size=106)
object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9
object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f
object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6
object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $18 object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $18
object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a
object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b
object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b
object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7
object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR__TRAINER_F, $10 object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR_TRAINER_F, $10
object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8
; warp-to ; warp-to

4
data/mapObjects/route24.asm
View file

@ -7,8 +7,8 @@ Route24Object: ; 0x506a4 (size=67)
db $8 ; objects db $8 ; objects
object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6 object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6
object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR__TRAINER_M, $2 object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2
object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR__TRAINER_M, $3 object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3
object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7 object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, OPP_LASS, $7
object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4 object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, OPP_YOUNGSTER, $4
object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8 object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8

2
data/mapObjects/route25.asm
View file

@ -10,7 +10,7 @@ Route25Object: ; 0x507b2 (size=94)
db $a ; objects db $a ; objects
object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5
object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6 object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, OPP_YOUNGSTER, $6
object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR__TRAINER_M, $2 object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, OPP_JR_TRAINER_M, $2
object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9 object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, OPP_LASS, $9
object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7 object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, OPP_YOUNGSTER, $7
object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a object SPRITE_LASS, $25, $4, STAY, DOWN, $6, OPP_LASS, $a

8
data/mapObjects/route6.asm
View file

@ -11,11 +11,11 @@ Route6Object: ; 0x58022 (size=87)
db $f, $13, $7 ; Route6Text7 db $f, $13, $7 ; Route6Text7
db $6 ; objects db $6 ; objects
object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR__TRAINER_M, $4 object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4
object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR__TRAINER_F, $2 object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2
object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a
object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR__TRAINER_M, $5 object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5
object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR__TRAINER_F, $3 object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3
object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b
; warp-to ; warp-to

8
data/mapObjects/route9.asm
View file

@ -7,10 +7,10 @@ Route9Object: ; 0x546a8 (size=86)
db $7, $19, $b ; Route9Text11 db $7, $19, $b ; Route9Text11
db $a ; objects db $a ; objects
object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR__TRAINER_F, $5 object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5
object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR__TRAINER_M, $7 object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7
object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR__TRAINER_M, $8 object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8
object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR__TRAINER_F, $6 object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6
object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b
object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6 object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, OPP_HIKER, $6
object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, OPP_BUG_CATCHER, $d

2
data/mapObjects/vermiliongym.asm
View file

@ -8,7 +8,7 @@ VermilionGymObject: ; 0x5cbfe (size=58)
db $0 ; signs db $0 ; signs
db $5 ; objects db $5 ; objects
object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT__SURGE, $1 object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, OPP_LT_SURGE, $1
object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3 object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, OPP_GENTLEMAN, $3
object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1 object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, OPP_ROCKER, $1
object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8 object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, OPP_SAILOR, $8

2
data/mapObjects/victoryroad2.asm
View file

@ -22,7 +22,7 @@ VictoryRoad2Object: ; 0x51915 (size=154)
object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17
object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL
object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05
object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_ object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC
object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person
object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person
object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person

2
data/mart_inventories.asm
View file

@ -44,7 +44,7 @@ CeladonMart4Text1:: ; 248e (0:248e)
; Celadon Dept. Store 5F (1) ; Celadon Dept. Store 5F (1)
CeladonMart5Text3:: ; 2496 (0:2496) CeladonMart5Text3:: ; 2496 (0:2496)
db $FE,7,X_ACCURACY,GUARD_SPEC_,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
db X_SPECIAL,$FF db X_SPECIAL,$FF
; Celadon Dept. Store 5F (2) ; Celadon Dept. Store 5F (2)

2
data/mon_palettes.asm
View file

@ -82,7 +82,7 @@ MonsterPalettes: ; 725c8 (1c:65c8)
db PAL_PINKMON ; SLOWBRO db PAL_PINKMON ; SLOWBRO
db PAL_GREYMON ; MAGNEMITE db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETON db PAL_GREYMON ; MAGNETON
db PAL_BROWNMON ; FARFETCH_D db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO db PAL_BROWNMON ; DODRIO
db PAL_BLUEMON ; SEEL db PAL_BLUEMON ; SEEL

2
data/pokedex_order.asm
View file

@ -62,7 +62,7 @@ PokedexOrder: ; 41024 (10:5024)
db 0 ; MISSINGNO. db 0 ; MISSINGNO.
db 0 ; MISSINGNO. db 0 ; MISSINGNO.
db 0 ; MISSINGNO. db 0 ; MISSINGNO.
db DEX_FARFETCH_D db DEX_FARFETCHD
db DEX_VENONAT db DEX_VENONAT
db DEX_DRAGONITE db DEX_DRAGONITE
db 0 ; MISSINGNO. db 0 ; MISSINGNO.

40
data/trades.asm
View file

@ -1,25 +1,25 @@
TradeMons: ; 71b7b (1c:5b7b) TradeMons: ; 71b7b (1c:5b7b)
; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
IF DEF(_YELLOW) IF DEF(_YELLOW)
db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@"
db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@" db BUTTERFREE,BEEDRILL, 2,"STINGER@@@@"
db KANGASKHAN,MUK, 0,"STICKY@@@@@" db KANGASKHAN,MUK, 0,"STICKY@@@@@"
db MEW, MEW, 2,"BART@@@@@@@" db MEW, MEW, 2,"BART@@@@@@@"
db TANGELA, PARASECT, 0,"SPIKE@@@@@@" db TANGELA, PARASECT, 0,"SPIKE@@@@@@"
db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@" db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@" db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@" db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
db CUBONE, MACHOKE, 2,"RICKY@@@@@@" db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
ELSE ELSE
db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" db NIDORINO, NIDORINA, 0,"TERRY@@@@@@"
db ABRA, MR_MIME, 0,"MARCEL@@@@@" db ABRA, MR_MIME, 0,"MARCEL@@@@@"
db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@"
db PONYTA, SEEL, 0,"SAILOR@@@@@" db PONYTA, SEEL, 0,"SAILOR@@@@@"
db SPEAROW, FARFETCH_D,2,"DUX@@@@@@@@" db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@"
db SLOWBRO, LICKITUNG, 0,"MARC@@@@@@@" db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@"
db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@"
db RAICHU, ELECTRODE, 1,"DORIS@@@@@@" db RAICHU, ELECTRODE,1,"DORIS@@@@@@"
db VENONAT, TANGELA, 2,"CRINKLES@@@" db VENONAT, TANGELA, 2,"CRINKLES@@@"
db NIDORAN_M, NIDORAN_F, 2,"SPOT@@@@@@@" db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@"
ENDC ENDC

2
data/trainer_moves.asm
View file

@ -58,7 +58,7 @@ TeamMoves:
db 2,4,BUBBLEBEAM db 2,4,BUBBLEBEAM
db 0 db 0
db LT__SURGE,$1 db LT_SURGE,$1
db 1,1,THUNDERBOLT db 1,1,THUNDERBOLT
db 1,2,MEGA_PUNCH db 1,2,MEGA_PUNCH
db 1,3,MEGA_KICK db 1,3,MEGA_KICK

6
data/trainer_parties.asm
View file

@ -306,16 +306,16 @@ BirdKeeperData:
db 29,PIDGEY,PIDGEOTTO,0 db 29,PIDGEY,PIDGEOTTO,0
db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0
db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0
db 33,FARFETCH_D,0 db 33,FARFETCHD,0
db 29,SPEAROW,FEAROW,0 db 29,SPEAROW,FEAROW,0
db 26,PIDGEOTTO,FARFETCH_D,DODUO,PIDGEY,0 db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0
db 28,DODRIO,DODUO,DODUO,0 db 28,DODRIO,DODUO,DODUO,0
db 29,SPEAROW,FEAROW,0 db 29,SPEAROW,FEAROW,0
db 34,DODRIO,0 db 34,DODRIO,0
db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0
db 30,FEAROW,FEAROW,PIDGEOTTO,0 db 30,FEAROW,FEAROW,PIDGEOTTO,0
db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0
db 42,FARFETCH_D,FEAROW,0 db 42,FARFETCHD,FEAROW,0
db 28,PIDGEY,DODUO,PIDGEOTTO,0 db 28,PIDGEY,DODUO,PIDGEOTTO,0
db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0
db 29,PIDGEOTTO,FEAROW,0 db 29,PIDGEOTTO,FEAROW,0

2
data/trainer_types.asm
View file

@ -1,6 +1,6 @@
FemaleTrainerList:: ; 3434 (0:3434) FemaleTrainerList:: ; 3434 (0:3434)
db OPP_LASS db OPP_LASS
db OPP_JR__TRAINER_F db OPP_JR_TRAINER_F
db OPP_BEAUTY db OPP_BEAUTY
db OPP_COOLTRAINER_F db OPP_COOLTRAINER_F
db $FF db $FF

4
data/wildPokemon/route12.asm
View file

@ -38,8 +38,8 @@ Route12Mons:
db 27,BELLSPROUT db 27,BELLSPROUT
db 29,GLOOM db 29,GLOOM
db 29,WEEPINBELL db 29,WEEPINBELL
db 26,FARFETCH_D db 26,FARFETCHD
db 31,FARFETCH_D db 31,FARFETCHD
db $03 db $03
db 15,SLOWPOKE db 15,SLOWPOKE

4
data/wildPokemon/route13.asm
View file

@ -39,8 +39,8 @@ Route13Mons:
db 27,BELLSPROUT db 27,BELLSPROUT
db 29,GLOOM db 29,GLOOM
db 29,WEEPINBELL db 29,WEEPINBELL
db 26,FARFETCH_D db 26,FARFETCHD
db 31,FARFETCH_D db 31,FARFETCHD
db $03 db $03
db 15,SLOWPOKE db 15,SLOWPOKE

2
engine/battle/core.asm
View file

@ -903,7 +903,7 @@ FaintEnemyPokemon: ; 0x3c567
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
xor a xor a
ld [wBattleResult], a ld [wBattleResult], a
ld b, EXP__ALL ld b, EXP_ALL
call IsItemInBag call IsItemInBag
push af push af
jr z, .giveExpToMonsThatFought ; if no exp all, then jump jr z, .giveExpToMonsThatFought ; if no exp all, then jump

2
engine/battle/moveEffects/pay_day_effect.asm
View file

@ -1,4 +1,4 @@
PayDayEffect_ ; 2feb8 (b:7eb8) PayDayEffect_: ; 2feb8 (b:7eb8)
xor a xor a
ld hl, wcd6d ld hl, wcd6d
ld [hli], a ld [hli], a

8
engine/battle/trainer_ai.asm
View file

@ -280,8 +280,8 @@ TrainerClassMoveChoiceModifications: ; 3989b (e:589b)
db 1,0 ; BUG CATCHER db 1,0 ; BUG CATCHER
db 1,0 ; LASS db 1,0 ; LASS
db 1,3,0 ; SAILOR db 1,3,0 ; SAILOR
db 1,0 ; JR__TRAINER_M db 1,0 ; JR_TRAINER_M
db 1,0 ; JR__TRAINER_F db 1,0 ; JR_TRAINER_F
db 1,2,3,0; POKEMANIAC db 1,2,3,0; POKEMANIAC
db 1,2,0 ; SUPER_NERD db 1,2,0 ; SUPER_NERD
db 1,0 ; HIKER db 1,0 ; HIKER
@ -311,7 +311,7 @@ TrainerClassMoveChoiceModifications: ; 3989b (e:589b)
db 1,0 ; BRUNO db 1,0 ; BRUNO
db 1,0 ; BROCK db 1,0 ; BROCK
db 1,3,0 ; MISTY db 1,3,0 ; MISTY
db 1,3,0 ; LT__SURGE db 1,3,0 ; LT_SURGE
db 1,3,0 ; ERIKA db 1,3,0 ; ERIKA
db 1,3,0 ; KOGA db 1,3,0 ; KOGA
db 1,3,0 ; BLAINE db 1,3,0 ; BLAINE
@ -742,7 +742,7 @@ AIUseGuardSpec: ; 3a7b5 (e:67b5)
call AIPlayRestoringSFX call AIPlayRestoringSFX
ld hl,wEnemyBattleStatus2 ld hl,wEnemyBattleStatus2
set 1,[hl] set 1,[hl]
ld a,GUARD_SPEC_ ld a,GUARD_SPEC
jp AIPrintItemUse jp AIPrintItemUse
AIUseDireHit: ; 0x3a7c2 unused AIUseDireHit: ; 0x3a7c2 unused

6
engine/items/items.asm
View file

@ -70,7 +70,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1)
dw ItemUseMedicine ; FULL_HEAL dw ItemUseMedicine ; FULL_HEAL
dw ItemUseMedicine ; REVIVE dw ItemUseMedicine ; REVIVE
dw ItemUseMedicine ; MAX_REVIVE dw ItemUseMedicine ; MAX_REVIVE
dw ItemUseGuardSpec ; GUARD_SPEC_ dw ItemUseGuardSpec ; GUARD_SPEC
dw ItemUseSuperRepel ; SUPER_REPL dw ItemUseSuperRepel ; SUPER_REPL
dw ItemUseMaxRepel ; MAX_REPEL dw ItemUseMaxRepel ; MAX_REPEL
dw ItemUseDireHit ; DIRE_HIT dw ItemUseDireHit ; DIRE_HIT
@ -78,7 +78,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1)
dw ItemUseMedicine ; FRESH_WATER dw ItemUseMedicine ; FRESH_WATER
dw ItemUseMedicine ; SODA_POP dw ItemUseMedicine ; SODA_POP
dw ItemUseMedicine ; LEMONADE dw ItemUseMedicine ; LEMONADE
dw UnusableItem ; S_S__TICKET dw UnusableItem ; S_S_TICKET
dw UnusableItem ; GOLD_TEETH dw UnusableItem ; GOLD_TEETH
dw ItemUseXStat ; X_ATTACK dw ItemUseXStat ; X_ATTACK
dw ItemUseXStat ; X_DEFEND dw ItemUseXStat ; X_DEFEND
@ -90,7 +90,7 @@ ItemUsePtrTable: ; d5e1 (3:55e1)
dw UnusableItem ; SILPH_SCOPE dw UnusableItem ; SILPH_SCOPE
dw ItemUsePokeflute ; POKE_FLUTE dw ItemUsePokeflute ; POKE_FLUTE
dw UnusableItem ; LIFT_KEY dw UnusableItem ; LIFT_KEY
dw UnusableItem ; EXP__ALL dw UnusableItem ; EXP_ALL
dw ItemUseOldRod ; OLD_ROD dw ItemUseOldRod ; OLD_ROD
dw ItemUseGoodRod ; GOOD_ROD dw ItemUseGoodRod ; GOOD_ROD
dw ItemUseSuperRod ; SUPER_ROD dw ItemUseSuperRod ; SUPER_ROD

2
scripts/billshouse.asm
View file

@ -163,7 +163,7 @@ BillsHouseText2: ; 1e874 (7:6874)
jr nz, .asm_1e8a9 jr nz, .asm_1e8a9
ld hl, BillThankYouText ld hl, BillThankYouText
call PrintText call PrintText
lb bc, S_S__TICKET, 1 lb bc, S_S_TICKET, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld hl, SSTicketReceivedText ld hl, SSTicketReceivedText

2
scripts/route15gateupstairs.asm
View file

@ -11,7 +11,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
jr nz, .asm_49683 jr nz, .asm_49683
ld a, 50 ; pokemon needed ld a, 50 ; pokemon needed
ld [hOaksAideRequirement], a ld [hOaksAideRequirement], a
ld a, EXP__ALL ; oak's aide reward ld a, EXP_ALL ; oak's aide reward
ld [hOaksAideRewardItem], a ld [hOaksAideRewardItem], a
ld [wd11e], a ld [wd11e], a
call GetItemName call GetItemName

4
scripts/vermilioncity.asm
View file

@ -52,7 +52,7 @@ VermilionCityScript0: ; 197e6 (6:57e6)
call DisplayTextID call DisplayTextID
CheckEvent EVENT_SS_ANNE_LEFT CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .asm_19810 jr nz, .asm_19810
ld b, S_S__TICKET ld b, S_S_TICKET
predef GetQuantityOfItemInBag predef GetQuantityOfItemInBag
ld a, b ld a, b
and a and a
@ -170,7 +170,7 @@ VermilionCityText3: ; 198b1 (6:58b1)
.asm_198d0 .asm_198d0
ld hl, SSAnneWelcomeText9 ld hl, SSAnneWelcomeText9
call PrintText call PrintText
ld b, S_S__TICKET ld b, S_S_TICKET
predef GetQuantityOfItemInBag predef GetQuantityOfItemInBag
ld a, b ld a, b
and a and a