pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

No more NONE

Browse Source
This commit is contained in:
PikalaxALT 2015-11-02 14:37:02 -05:00
parent e0d6e9ca7a
commit 72af3337fd
185 changed files with 1343 additions and 1345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/cries.asm
View File

@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
unknownmusic0xde $52
sound $4, $f1, $0796
sound $4, $f1, $072d
sound $7, $0, NONE
sound $7, $0, 0
sound $10, $f1, $07a7
endchannel
; f3035
@ -381,7 +381,7 @@ Cry_2C_Ch6: ; f3038
Cry_2C_branch_f3038: ; f3038
callchannel Cry_2C_branch_f3022
loopchannel 2, Cry_2C_branch_f3038
sound $e, $0, NONE
sound $e, $0, 0
sound $8, $f2, $07c2
endchannel
; f3048
@ -398,7 +398,7 @@ Cry_27_Ch5: ; f3048
Cry_27_Ch6: ; f305b
unknownmusic0xde $2a
sound $3, $2c, $07c7
sound $1, $0, NONE
sound $1, $0, 0
sound $5, $59, $07be
sound $6, $b4, $07bd
endchannel
@ -621,7 +621,7 @@ Cry_36_Ch6: ; f3200
Cry_36_branch_f3202: ; f3202
sound $3, $f8, $0791
sound $3, $d8, $078d
sound $2, $0, NONE
sound $2, $0, 0
sound $1, $78, $06c1
sound $1, $f8, $0741
sound $4, $e1, $0751
@ -646,7 +646,7 @@ Cry_43_Ch5: ; f322e
sound $8, $ab, $0734
sound $4, $d6, $0716
sound $8, $d1, $0712
sound $8, $0, NONE
sound $8, $0, 0
endchannel
; f3249
@ -658,7 +658,7 @@ Cry_43_Ch6: ; f3249
sound $8, $cb, $0754
sound $4, $f6, $0736
sound $8, $f1, $0732
sound $8, $0, NONE
sound $8, $0, 0
endchannel
; f3264
@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
Cry_09_Ch6: ; f363c
unknownmusic0xde $5
sound $2, $8, NONE
sound $2, $8, 0
sound $f, $a7, $06a1
sound $6, $86, $06a2
sound $a, $74, $06a1
@ -1312,7 +1312,7 @@ Cry_11_Ch5: ; f3703
Cry_11_Ch6: ; f3722
unknownmusic0xde $a
sound $4, $8, NONE
sound $4, $8, 0
sound $6, $a7, $0741
sound $8, $86, $0743
sound $4, $76, $0741
@ -1587,7 +1587,7 @@ Cry_0B_Ch5: ; f394b
Cry_0B_Ch6: ; f3976
unknownmusic0xde $44
sound $c, $8, NONE
sound $c, $8, 0
sound $4, $f1, $0701
sound $4, $e1, $0782
sound $4, $d1, $0741
@ -1670,7 +1670,7 @@ Cry_0D_branch_f3a1a: ; f3a1a
Cry_0D_Ch6: ; f3a39
unknownmusic0xde $40
sound $4, $8, NONE
sound $4, $8, 0
sound $5, $f2, $0651
sound $9, $d1, $0661
sound $5, $e2, $0614
@ -1738,7 +1738,7 @@ Cry_0A_Ch5: ; f3aba
Cry_0A_Ch6: ; f3ad9
unknownmusic0xde $5
sound $3, $8, NONE
sound $3, $8, 0
sound $8, $a7, $06a1
sound $6, $86, $06a3
sound $3, $74, $06a1

2
audio/engine.asm
View File

@ -2773,7 +2773,7 @@ LoadMusicByte:: ; e8d76
; e8d80
FrequencyTable: ; e8d80
dw NONE ; filler
dw 0 ; filler
dw $f82c
dw $f89d
dw $f907

2
audio/music/battletowertheme.asm
View File

@ -242,7 +242,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970
note __, 1
note F_, 4
note __, 4
tone NONE
tone 0
intensity $b7
note G_, 2
octave 4

2
audio/music/lookkimonogirl.asm
View File

@ -14,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
notetype $6, $87
tone $0001
callchannel Music_LookKimonoGirl_branch_f7aa8
tone NONE
tone 0
Music_LookKimonoGirl_branch_f79d7: ; f79d7
notetype $c, $b2
callchannel Music_LookKimonoGirl_branch_f7a13

4
audio/music/titlescreen.asm
View File

@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
octave 4
note A_, 4
stereopanning $ff
tone NONE
tone 0
notetype $c, $b0
octave 3
note B_, 6
@ -775,7 +775,7 @@ Music_TitleScreen_Ch3: ; ebb01
note __, 1
stereopanning $ff
notetype $c, $16
tone NONE
tone 0
octave 4
note A_, 2
octave 5

114
audio/sfx.asm
View File

@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
Sfx_Save_Ch6: ; f09d5
dutycycle $2
sound $2, $8, NONE
sound $2, $8, 0
sound $2, $a1, $0701
sound $1, $91, $0601
sound $1, $91, $0681
@ -2291,7 +2291,7 @@ Sfx_Sketch_Ch5: ; f12f9
Sfx_Sketch_branch_f12fd: ; f12fd
sound $2, $f1, $06e0
sound $d, $af, $05b0
sound $4, $0, NONE
sound $4, $0, 0
sound $9, $f4, $0718
loopchannel 3, Sfx_Sketch_branch_f12fd
soundinput $8
@ -2490,15 +2490,15 @@ Sfx_Nightmare_Ch5: ; f1420
soundinput $34
Sfx_Nightmare_branch_f1424: ; f1424
sound $3, $ba, $0631
sound $2, $0, NONE
sound $2, $0, 0
sound $3, $f8, $0621
sound $2, $0, NONE
sound $2, $0, 0
sound $3, $f8, $0611
sound $2, $0, NONE
sound $2, $0, 0
sound $3, $e8, $0601
sound $2, $0, NONE
sound $2, $0, 0
sound $3, $e8, $05f1
sound $2, $0, NONE
sound $2, $0, 0
loopchannel 2, Sfx_Nightmare_branch_f1424
soundinput $8
endchannel
@ -2540,11 +2540,11 @@ Sfx_SweetKiss2_Ch5: ; f1482
dutycycle $0
soundinput $97
sound $2, $f4, $0772
sound $4, $0, NONE
sound $4, $0, 0
sound $2, $c4, $0772
sound $4, $0, NONE
sound $4, $0, 0
sound $2, $b4, $0772
sound $4, $0, NONE
sound $4, $0, 0
sound $2, $a1, $0772
soundinput $8
endchannel
@ -2591,7 +2591,7 @@ Sfx_SludgeBomb_Ch5: ; f14d6
dutycycle $2
soundinput $c5
sound $3, $f8, $0581
sound $1, $0, NONE
sound $1, $0, 0
soundinput $cb
sound $10, $f2, $05d1
soundinput $8
@ -2613,9 +2613,9 @@ Sfx_Foresight_Ch5: ; f14f8
sound $3, $f4, $07b5
sound $3, $f5, $07c8
sound $8, $f4, $07da
sound $2, $0, NONE
sound $2, $0, 0
sound $8, $c1, $07da
sound $2, $0, NONE
sound $2, $0, 0
sound $8, $91, $07da
endchannel
; f1515
@ -2811,7 +2811,7 @@ Sfx_Return_branch_f163c: ; f163c
sound $8, $f1, $0759
soundinput $57
sound $8, $f1, $0759
sound $10, $0, NONE
sound $10, $0, 0
loopchannel 2, Sfx_Return_branch_f163c
soundinput $8
endchannel
@ -2849,7 +2849,7 @@ Sfx_MilkDrink_branch_f1684: ; f1684
sound $d, $f7, $0290
soundinput $9e
sound $4, $c9, $05e1
sound $2, $0, NONE
sound $2, $0, 0
loopchannel 6, Sfx_MilkDrink_branch_f1684
soundinput $8
endchannel
@ -2864,7 +2864,7 @@ Sfx_Present_Ch5: ; f16a2
soundinput $d6
Sfx_Present_branch_f16a6: ; f16a6
sound $2, $f1, $0740
sound $1, $0, NONE
sound $1, $0, 0
loopchannel 3, Sfx_Present_branch_f16a6
sound $10, $f1, $0780
soundinput $8
@ -2882,9 +2882,9 @@ Sfx_MorningSun_branch_f16be: ; f16be
sound $2, $f1, $07e0
sound $5, $f2, $07e7
loopchannel 3, Sfx_MorningSun_branch_f16be
sound $1, $0, NONE
sound $1, $0, 0
sound $8, $c2, $07e7
sound $1, $0, NONE
sound $1, $0, 0
sound $8, $82, $07e7
endchannel
; f16df
@ -2913,10 +2913,10 @@ Sfx_Encore: ; f16fd
Sfx_Encore_Ch5: ; f1703
dutycycle $2
soundinput $ce
sound $10, $0, NONE
sound $10, $0, 0
Sfx_Encore_branch_f170b: ; f170b
sound $2, $f8, $0774
sound $24, $0, NONE
sound $24, $0, 0
loopchannel 2, Sfx_Encore_branch_f170b
soundinput $8
endchannel
@ -2966,9 +2966,9 @@ Sfx_BatonPass_Ch5: ; f1752
soundinput $f7
sound $20, $f2, $0680
sound $1, $f1, $0760
sound $20, $0, NONE
sound $20, $0, 0
sound $1, $f1, $0760
sound $1a, $0, NONE
sound $1a, $0, 0
sound $1, $f1, $0760
soundinput $8
endchannel
@ -3836,27 +3836,27 @@ Sfx_BallBounce: ; f1b63
Sfx_BallBounce_Ch5: ; f1b69
dutycycle $2
sound $8, $e1, $0740
sound $17, $0, NONE
sound $17, $0, 0
sound $8, $b1, $0740
sound $17, $0, NONE
sound $17, $0, 0
sound $8, $81, $0740
sound $17, $0, NONE
sound $17, $0, 0
sound $8, $51, $0740
sound $17, $0, NONE
sound $17, $0, 0
endchannel
; f1b8c
Sfx_BallBounce_Ch6: ; f1b8c
dutycycle $2
sound $2, $8, NONE
sound $2, $8, 0
sound $8, $b1, $0741
sound $17, $0, NONE
sound $17, $0, 0
sound $8, $81, $0741
sound $17, $0, NONE
sound $17, $0, 0
sound $8, $51, $0741
sound $17, $0, NONE
sound $17, $0, 0
sound $8, $21, $0741
sound $17, $0, NONE
sound $17, $0, 0
endchannel
; f1bb3
@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
; f1c13
Sfx_GiveTrademon_Ch5: ; f1c13
sound $20, $0, NONE
sound $20, $0, 0
dutycycle $1
soundinput $a7
sound $1b, $f4, $0750
@ -3936,7 +3936,7 @@ Sfx_GetTrademon: ; f1c3e
; f1c41
Sfx_GetTrademon_Ch5: ; f1c41
sound $20, $0, NONE
sound $20, $0, 0
dutycycle $2
soundinput $bf
sound $1b, $14, $07bc
@ -3959,7 +3959,7 @@ Sfx_TrainArrived: ; f1c6c
Sfx_TrainArrived_Ch6: ; f1c75
tone $0008
sound $8, $0, NONE
sound $8, $0, 0
Sfx_TrainArrived_Ch5: ; f1c7c
dutycycle $2
sound $4, $5f, $0691
@ -4060,7 +4060,7 @@ Sfx_SwitchPokemon_Ch5: ; f1d0f
Sfx_SwitchPokemon_Ch6: ; f1d16
dutycycle $2
sound $2, $8, NONE
sound $2, $8, 0
sound $8, $b1, $0741
endchannel
; f1d21
@ -4093,7 +4093,7 @@ Sfx_Tally_Ch5: ; f1d43
Sfx_Tally_Ch6: ; f1d4a
dutycycle $2
sound $1, $8, NONE
sound $1, $8, 0
sound $4, $a1, $0761
endchannel
; f1d55
@ -4107,7 +4107,7 @@ Sfx_Transaction_Ch5: ; f1d55
Sfx_Transaction_Ch6: ; f1d60
dutycycle $2
sound $1, $8, NONE
sound $1, $8, 0
sound $4, $91, $06c1
sound $18, $a2, $07a1
endchannel
@ -4183,7 +4183,7 @@ Sfx_GotSafariBalls_Ch5: ; f1dd4
Sfx_BootPc_Ch5: ; f1de3
dutycycle $2
sound $f, $f2, $07c0
sound $f, $0, NONE
sound $f, $0, 0
sound $3, $a1, $0780
sound $3, $a1, $0700
sound $3, $a1, $0740
@ -4200,16 +4200,16 @@ Sfx_ShutDownPc_Ch5: ; f1e0e
sound $4, $f0, $0600
sound $4, $f0, $0400
sound $4, $f0, $0200
sound $1, $0, NONE
sound $1, $0, 0
endchannel
; f1e21
Sfx_ChoosePcOption_Ch5: ; f1e21
dutycycle $2
sound $6, $f0, $0700
sound $4, $0, NONE
sound $4, $0, 0
sound $6, $f0, $0700
sound $1, $0, NONE
sound $1, $0, 0
endchannel
; f1e34
@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
Sfx_PushButton_Ch5: ; f1e4f
dutycycle $2
sound $4, $0, NONE
sound $4, $0, 0
sound $2, $f1, $0680
sound $1, $0, NONE
sound $1, $0, 0
sound $4, $f1, $0780
sound $4, $0, NONE
sound $4, $0, 0
endchannel
; f1e66
@ -4242,7 +4242,7 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
soundinput $22
sound $2, $f1, $0500
soundinput $8
sound $1, $0, NONE
sound $1, $0, 0
endchannel
; f1e7b
@ -4319,18 +4319,18 @@ Sfx_Wrong_Ch5: ; f1f05
soundinput $5a
sound $4, $f0, $0500
soundinput $8
sound $4, $0, NONE
sound $4, $0, 0
sound $f, $f0, $0500
sound $1, $0, NONE
sound $1, $0, 0
endchannel
; f1f1c
Sfx_Wrong_Ch6: ; f1f1c
dutycycle $3
sound $4, $f0, $0401
sound $4, $0, NONE
sound $4, $0, 0
sound $f, $f0, $0401
sound $1, $0, NONE
sound $1, $0, 0
endchannel
; f1f2f
@ -4357,7 +4357,7 @@ Sfx_Strength_Ch8: ; f1f3a
Sfx_Boat_Ch5: ; f1f53
dutycycle $2
sound $f, $f0, $0500
sound $4, $0, NONE
sound $4, $0, 0
sound $f, $f0, $0500
sound $f, $f0, $0500
sound $f, $f0, $0500
@ -4369,7 +4369,7 @@ Sfx_Boat_Ch5: ; f1f53
Sfx_Boat_Ch6: ; f1f72
dutycycle $3
sound $f, $f0, $0482
sound $4, $0, NONE
sound $4, $0, 0
sound $f, $f0, $0482
sound $f, $f0, $0482
sound $f, $f0, $0482
@ -4423,7 +4423,7 @@ Sfx_Shine_Ch5: ; f1fd9
sound $0, $d2, $0780
sound $0, $d2, $07c0
sound $a, $e1, $07e0
sound $1, $0, NONE
sound $1, $0, 0
endchannel
; f1ff4
@ -4493,7 +4493,7 @@ Sfx_Call_Ch5: ; f2052
sound $4, $f7, $07a0
sound $4, $f7, $07a0
soundinput $8
sound $4, $0, NONE
sound $4, $0, 0
endchannel
; f206f
@ -5483,13 +5483,13 @@ Sfx_HangUp_Ch5: ; f26f1
dutycycle $2
sound $4, $b8, $077b
sound $2, $21, $077b
sound $10, $0, NONE
sound $10, $0, 0
Sfx_HangUp_branch_f26ff: ; f26ff
Sfx_NoSignal_Ch5: ; f26ff
Sfx_NoSignal_branch_f26ff: ; f26ff
dutycycle $2
sound $14, $e8, $070b
sound $1c, $0, NONE
sound $1c, $0, 0
loopchannel 3, Sfx_HangUp_branch_f26ff
endchannel
; f270e
@ -5526,8 +5526,8 @@ Sfx_Elevator_branch_f2726: ; f2726
Sfx_Elevator_Ch6: ; f274b
Sfx_Elevator_Ch7: ; f274b
sound $60, $0, NONE
sound $53, $0, NONE
sound $60, $0, 0
sound $53, $0, 0
endchannel
; f2754

2
audio/sfx_crystal.asm
View File

@ -84,7 +84,7 @@ Sfx_IntroPichu_Ch5: ; 1798ad
dutycycle $3
soundinput $4d
sound $1, $88, $0770
sound $3, $0, NONE
sound $3, $0, 0
soundinput $17
sound $2, $88, $0776
endchannel

2
audio/trainer_encounters.asm
View File

@ -7,7 +7,7 @@ PlayTrainerEncounterMusic:: ; e900a
ld [MusicFade], a
; play nothing for one frame
push de
ld de, NONE ; id: Music_Nothing
ld de, 0 ; id: Music_Nothing
call PlayMusic
call DelayFrame
; play new song

2
battle/anim_objects.asm
View File

@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
Functioncc9bd: ; cc9bd
ld hl, NONE
ld hl, 0
add hl, bc
ld [hl], $0
ret

2
battle/effect_command_pointers.asm
View File

@ -1,5 +1,5 @@
dw NONE ; padding
dw 0 ; padding
BattleCommandPointers: ; 3fd28
dw BattleCommand01 ; 34084

1
constants/misc_constants.asm
View File

@ -1,4 +1,3 @@
NONE EQU 0
PARTY_LENGTH EQU 6
MAX_ITEMS EQU 20

2
data/battle_tower.asm
View File

@ -773,7 +773,7 @@ BattleTowerMons1:
db UNOWN
db BERRY
db HIDDEN_POWER, NONE, NONE, NONE
db HIDDEN_POWER, 0, 0, 0
dw 0 ; OT ID
dt 1000 ; Exp
; Stat exp

28
data/odd_eggs.asm
View File

@ -125,7 +125,7 @@ OddEggs: ; 1fb56e
OddEgg1:
db PICHU
db NO_ITEM
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
dw 02048 ; OT ID
dt 125 ; Exp
; Stat exp
@ -152,7 +152,7 @@ OddEgg1:
OddEgg2:
db PICHU
db NO_ITEM
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE
db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
dw 00256 ; OT ID
dt 125 ; Exp
; Stat exp
@ -178,7 +178,7 @@ OddEgg2:
db CLEFFA
db NO_ITEM
db POUND, CHARM, DIZZY_PUNCH, NONE
db POUND, CHARM, DIZZY_PUNCH, 0
dw 04096 ; OT ID
dt 125 ; Exp
; Stat exp
@ -204,7 +204,7 @@ OddEgg2:
db CLEFFA
db NO_ITEM
db POUND, CHARM, DIZZY_PUNCH, NONE
db POUND, CHARM, DIZZY_PUNCH, 0
dw 00768 ; OT ID
dt 125 ; Exp
; Stat exp
@ -230,7 +230,7 @@ OddEgg2:
db IGGLYBUFF
db NO_ITEM
db SING, CHARM, DIZZY_PUNCH, NONE
db SING, CHARM, DIZZY_PUNCH, 0
dw 04096 ; OT ID
dt 125 ; Exp
; Stat exp
@ -256,7 +256,7 @@ OddEgg2:
db IGGLYBUFF
db NO_ITEM
db SING, CHARM, DIZZY_PUNCH, NONE
db SING, CHARM, DIZZY_PUNCH, 0
dw 00768 ; OT ID
dt 125 ; Exp
; Stat exp
@ -282,7 +282,7 @@ OddEgg2:
db SMOOCHUM
db NO_ITEM
db POUND, LICK, DIZZY_PUNCH, NONE
db POUND, LICK, DIZZY_PUNCH, 0
dw 03584 ; OT ID
dt 125 ; Exp
; Stat exp
@ -308,7 +308,7 @@ OddEgg2:
db SMOOCHUM
db NO_ITEM
db POUND, LICK, DIZZY_PUNCH, NONE
db POUND, LICK, DIZZY_PUNCH, 0
dw 00512 ; OT ID
dt 125 ; Exp
; Stat exp
@ -334,7 +334,7 @@ OddEgg2:
db MAGBY
db NO_ITEM
db EMBER, DIZZY_PUNCH, NONE, NONE
db EMBER, DIZZY_PUNCH, 0, 0
dw 02560 ; OT ID
dt 125 ; Exp
; Stat exp
@ -360,7 +360,7 @@ OddEgg2:
db MAGBY
db NO_ITEM
db EMBER, DIZZY_PUNCH, NONE, NONE
db EMBER, DIZZY_PUNCH, 0, 0
dw 00512 ; OT ID
dt 125 ; Exp
; Stat exp
@ -386,7 +386,7 @@ OddEgg2:
db ELEKID
db NO_ITEM
db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE
db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
dw 03072 ; OT ID
dt 125 ; Exp
; Stat exp
@ -412,7 +412,7 @@ OddEgg2:
db ELEKID
db NO_ITEM
db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE
db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
dw 00512 ; OT ID
dt 125 ; Exp
; Stat exp
@ -438,7 +438,7 @@ OddEgg2:
db TYROGUE
db NO_ITEM
db TACKLE, DIZZY_PUNCH, NONE, NONE
db TACKLE, DIZZY_PUNCH, 0, 0
dw 02560 ; OT ID
dt 125 ; Exp
; Stat exp
@ -464,7 +464,7 @@ OddEgg2:
db TYROGUE
db NO_ITEM
db TACKLE, DIZZY_PUNCH, NONE, NONE
db TACKLE, DIZZY_PUNCH, 0, 0
dw 00256 ; OT ID
dt 125 ; Exp
; Stat exp

6
engine/events_2.asm
View File

@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
; 97e72
Function97e72: ; 97e72
ld hl, NONE
ld hl, 0
add hl, bc
ld [hl], 0
ret
; 97e79
Function97e79: ; 97e79
ld hl, NONE
ld hl, 0
add hl, bc
ld a, [hl]
cp 5
@ -620,7 +620,7 @@ Function97f42: ; 97f42
.asm_97f47
push af
ld hl, NONE
ld hl, 0
add hl, de
ld a, [hl]
and a

2
engine/map_objects.asm
View File

@ -3103,7 +3103,7 @@ Function57e2: ; 57e2
ld a, d
and %10000000
ret z
ld bc, NONE ; debug?
ld bc, 0 ; debug?
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]

2
event/battle_tower.asm
View File

@ -117,7 +117,7 @@ JumpText_YouCantTakeAnEgg: ; 0x8b256
; 0x8b25b
Function8b25b: ; 8b25b
ld bc, NONE
ld bc, 0
.asm_8b25e
call Function8b26c
call c, Function8b28e

2
gfx/pics/animation.asm
View File

@ -445,7 +445,7 @@ PokeAnim_End: ; d02a8
Functiond02ae: ; d02ae
ld c, a
ld b, $0
ld hl, NONE
ld hl, 0
ld a, [w2_d173]
call AddNTimes
ld a, h

2
home/map.asm
View File

@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29
GetAnyMapBank:: ; 2c31
push hl
push de
ld de, NONE
ld de, 0
call GetAnyMapHeaderMember
ld a, c
pop de

2
home/menu.asm
View File

@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75
db $40 ; tile backup
db 0, 0 ; start coords
db 17, 19 ; end coords
dw NONE
dw 0
db 1 ; default option
; 1d7d

434
items/item_attributes.asm
View File

@ -8,222 +8,222 @@ ENDM
Item1Attributes:
; MASTER BALL
item_attribute 0, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
Item2Attributes:
; ULTRA BALL
item_attribute 1200, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; BRIGHTPOWDER
item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; GREAT BALL
item_attribute 600, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; # BALL
item_attribute 200, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BICYCLE
item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; MOON STONE
item_attribute 0, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ANTIDOTE
item_attribute 100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; BURN HEAL
item_attribute 250, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; ICE HEAL
item_attribute 250, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; AWAKENING
item_attribute 250, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; PARLYZ HEAL
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; FULL RESTORE
item_attribute 3000, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 3000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; MAX POTION
item_attribute 2500, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 2500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; HYPER POTION
item_attribute 1200, NONE, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 1200, 0, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SUPER POTION
item_attribute 700, NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 700, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; POTION
item_attribute 300, NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; ESCAPE ROPE
item_attribute 550, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; REPEL
item_attribute 350, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; MAX ELIXER
item_attribute 4500, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 4500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; FIRE STONE
item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; THUNDERSTONE
item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; WATER STONE
item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; HP UP
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; PROTEIN
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; IRON
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; CARBOS
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; LUCKY PUNCH
item_attribute 10, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; CALCIUM
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; RARE CANDY
item_attribute 4800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 4800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; X ACCURACY
item_attribute 950, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 950, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; LEAF STONE
item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; METAL POWDER
item_attribute 10, HELD_METAL_POWDER, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; NUGGET
item_attribute 10000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 10000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; # DOLL
item_attribute 1000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; FULL HEAL
item_attribute 600, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 600, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; REVIVE
item_attribute 1500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 1500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; MAX REVIVE
item_attribute 4000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 4000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; GUARD SPEC.
item_attribute 700, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; SUPER REPEL
item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; MAX REPEL
item_attribute 700, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; DIRE HIT
item_attribute 650, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 650, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; FRESH WATER
item_attribute 200, NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 200, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SODA POP
item_attribute 300, NONE, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 300, 0, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; LEMONADE
item_attribute 350, NONE, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 350, 0, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; X ATTACK
item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; X DEFEND
item_attribute 550, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; X SPEED
item_attribute 350, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; X SPECIAL
item_attribute 350, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; COIN CASE
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; ITEMFINDER
item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; EXP.SHARE
item_attribute 3000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; OLD ROD
item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; GOOD ROD
item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; SILVER LEAF
item_attribute 1000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SUPER ROD
item_attribute 0, NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; PP UP
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ETHER
item_attribute 1200, NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 1200, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; MAX ETHER
item_attribute 2000, NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 2000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; ELIXER
item_attribute 3000, NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 3000, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; RED SCALE
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SECRETPOTION
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; S.S.TICKET
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MYSTERY EGG
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; CLEAR BELL
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SILVER WING
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MOOMOO MILK
item_attribute 500, NONE, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 500, 0, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; QUICK CLAW
item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
@ -232,7 +232,7 @@ Item2Attributes:
item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; GOLD LEAF
item_attribute 1000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SOFT SAND
item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
@ -262,31 +262,31 @@ Item2Attributes:
item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; RED APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TINYMUSHROOM
item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BIG MUSHROOM
item_attribute 5000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 5000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SILVERPOWDER
item_attribute 100, HELD_BUG_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLU APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; AMULET COIN
item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; YLW APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; GRN APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; CLEANSE TAG
item_attribute 200, HELD_CLEANSE_TAG, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
@ -298,31 +298,31 @@ Item2Attributes:
item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; WHT APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLACKBELT
item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLK APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; PNK APRICORN
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLACKGLASSES
item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SLOWPOKETAIL
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; PINK BOW
item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STICK
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SMOKE BALL
item_attribute 200, HELD_ESCAPE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
@ -337,88 +337,88 @@ Item2Attributes:
item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; PEARL
item_attribute 1400, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 1400, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BIG PEARL
item_attribute 7500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 7500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; EVERSTONE
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SPELL TAG
item_attribute 100, HELD_GHOST_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; RAGECANDYBAR
item_attribute 300, NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; GS BALL
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLUE CARD
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; MIRACLE SEED
item_attribute 100, HELD_GRASS_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; THICK CLUB
item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; FOCUS BAND
item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ENERGYPOWDER
item_attribute 500, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; ENERGY ROOT
item_attribute 800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; HEAL POWDER
item_attribute 450, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 450, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; REVIVAL HERB
item_attribute 2800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
item_attribute 2800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; HARD STONE
item_attribute 100, HELD_ROCK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LUCKY EGG
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; CARD KEY
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; MACHINE PART
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; EGG TICKET
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LOST ITEM
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STARDUST
item_attribute 2000, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STAR PIECE
item_attribute 9800, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BASEMENT KEY
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; PASS
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; CHARCOAL
item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
@ -430,31 +430,31 @@ Item2Attributes:
item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; METAL COAT
item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; DRAGON FANG
item_attribute 100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LEFTOVERS
item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MYSTERYBERRY
item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
@ -463,67 +463,67 @@ Item2Attributes:
item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERSERK GENE
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SACRED ASH
item_attribute 200, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; HEAVY BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; FLOWER MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LEVEL BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; LURE BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; FAST BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LIGHT BALL
item_attribute 100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; FRIEND BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; MOON BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; LOVE BALL
item_attribute 150, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; NORMAL BOX
item_attribute 10, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; GORGEOUS BOX
item_attribute 10, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE
; SUN STONE
item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; POLKADOT BOW
item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; UP-GRADE
item_attribute 2100, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERRY
item_attribute 10, HELD_BERRY, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
@ -532,247 +532,247 @@ Item2Attributes:
item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SQUIRTBOTTLE
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; PARK BALL
item_attribute 0, NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; RAINBOW WING
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BRICK PIECE
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SURF MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LITEBLUEMAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; PORTRAITMAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LOVELY MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; EON MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MORPH MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLUESKY MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MUSIC MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MIRAGE MAIL
item_attribute 50, NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM01
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM02
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM03
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM04
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM05
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM06
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM07
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM08
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM09
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM10
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM11
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM12
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM13
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM14
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM15
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM16
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM17
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM18
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM19
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM20
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM21
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM22
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM23
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM24
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM25
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM26
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM27
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM28
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM29
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM30
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM31
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM32
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM33
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM34
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM35
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM36
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM37
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM38
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM39
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM40
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM41
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM42
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM43
item_attribute 1000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM44
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM45
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM46
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM47
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM48
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM49
item_attribute 3000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM50
item_attribute 2000, NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM01
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM02
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM03
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM04
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM05
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM06
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; HM07
item_attribute 0, NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TERU-SAMA
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ?
item_attribute $9999, NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE

21
lib/mobile/main.asm
View File

@ -1,7 +1,6 @@
; A library included as part of the Mobile Adapter GB SDK.
INCLUDE "gbhw.asm"
NONE EQU 0
SECTION "Main", ROMX
@ -258,7 +257,7 @@ Function110115: ; 110115
cp $0
jr z, .asm_11015d
.asm_110158
ld hl, NONE
ld hl, 0
.asm_11015b
ld a, e
ret
@ -684,14 +683,14 @@ rept 2
inc de
endr
pop hl
ld bc, NONE
ld bc, 0
call Function110007
ld a, c
ld [$cb7a], a
ld [$c86b], a
push de
inc de
ld bc, NONE
ld bc, 0
ld a, $20
call Function11000f
ld l, e
@ -1021,7 +1020,7 @@ Function110615: ; 110615
push de
inc de
ld a, b
ld bc, NONE
ld bc, 0
call Function11000f
ld a, c
pop hl
@ -4810,7 +4809,7 @@ Function111f07: ; 111f07 (44:5f07)
Function111f63: ; 111f63
push de
ld hl, NONE
ld hl, 0
ld c, b
xor a
cp b
@ -5233,7 +5232,7 @@ Function112271: ; 112271
cp $41
jr nz, .asm_1122f5
ld b, $be
ld de, NONE
ld de, 0
.asm_1122b3
ld a, [hli]
add e
@ -6506,8 +6505,8 @@ Function112aac: ; 112aac
push af
ld a, [$c874]
push af
ld bc, NONE
ld de, NONE
ld bc, 0
ld de, 0
.asm_112abe
ld a, [hli]
cp $d
@ -6584,7 +6583,7 @@ Function112b11: ; 112b11
.asm_112b36
push hl
ld hl, $c872
ld de, NONE
ld de, 0
ld a, b
or a
jr z, .asm_112b49
@ -8226,7 +8225,7 @@ Function113519: ; 113519
cp $41
jr nz, .asm_113586
ld b, $be
ld de, NONE
ld de, 0
.asm_113551
ld a, [hli]
add e

76
main.asm
View File

@ -1421,12 +1421,12 @@ endr
; 63ca
Data63ca: ; 63ca
dw $505c, NONE
dw $505c, 0
dw $685c, $585c
dw $685c, $785c
dw $885c, $785c
dw NONE, $785c
dw NONE, $585c
dw 0, $785c
dw 0, $585c
; 63e2
Copyright: ; 63e2
@ -3236,7 +3236,7 @@ PlayerObjectTemplate: ; 8071
; A dummy map object used to initialize the player object.
; Shorter than the actual amount copied by two bytes.
; Said bytes seem to be unused.
person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_0B, 15, 15, -1, -1, 0, 0, 0, NONE, -1
person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_0B, 15, 15, -1, -1, 0, 0, 0, 0, -1
; 807e
CopyDECoordsToMapObject:: ; 807e
@ -5695,7 +5695,7 @@ Script_UsedStrength: ; 0xcd2d
callasm Functioncd12
writetext UnknownText_0xcd41
copybytetovar wd1ef
cry NONE
cry 0
pause 3
writetext UnknownText_0xcd46
loadmovesprites
@ -7872,7 +7872,7 @@ Functiond839: ; d839
ld a, [Buffer1]
ld c, a
ld b, $0
ld hl, NONE
ld hl, 0
ld a, [wd1f1]
cp $30
jr nc, .asm_d885
@ -10045,7 +10045,7 @@ Functione5d9: ; unreferenced
push hl
push bc
ld a, c
ld bc, NONE
ld bc, 0
add hl, bc
ld bc, $0020
call AddNTimes
@ -19940,7 +19940,7 @@ Function1686d: ; 1686d
ld de, StringBuffer1
ld bc, $000b
call CopyBytes
ld hl, NONE
ld hl, 0
ld bc, $0064
ld a, [StringBuffer2 + 1]
call AddNTimes
@ -24169,7 +24169,7 @@ MenuDataHeader_0x24d3f: ; 24d3f
db $40 ; tile backup
db 00, 06 ; start coords
db 17, 19 ; end coords
dw NONE
dw 0
db 1 ; default option
; 24d47
@ -24501,7 +24501,7 @@ MenuData_0x24f34: ; 0x24f34
dn 2, 2 ; rows, columns
db 6 ; spacing
dba Strings24f3d
dbw $09, NONE
dbw $09, 0
; 0x24f3d
Strings24f3d: ; 0x24f3d
@ -27842,7 +27842,7 @@ endr
jr nz, .asm_28457
ld hl, wc818
ld de, wc608 + 10
ld bc, NONE
ld bc, 0
.asm_28464
inc c
ld a, c
@ -32524,7 +32524,7 @@ Function2b995: ; 2b995
; 2b9a6
Function2b9a6: ; 2b9a6
ld de, NONE
ld de, 0
ld c, $3
.asm_2b9ab
ld a, [hli]
@ -43106,7 +43106,7 @@ ClockResetPassword: ; 4d41e
.CalculatePassword: ; 4d50f
ld a, BANK(sPlayerData)
call GetSRAMBank
ld de, NONE
ld de, 0
ld hl, sPlayerData + (PlayerID - wPlayerData)
ld c, $2
call .ComponentFromNumber
@ -55314,7 +55314,7 @@ rept 3
endr
ld e, l
ld d, h
ld hl, NONE
ld hl, 0
add hl, bc
ld a, [wc3b4]
ld [hli], a
@ -55359,7 +55359,7 @@ endr
; 8d036
Function8d036: ; 8d036
ld hl, NONE
ld hl, 0
add hl, bc
ld [hl], $0
ret
@ -55867,7 +55867,7 @@ endr
.four_zero: ; 8d30a
call Function8d6d8
ld hl, NONE
ld hl, 0
add hl, bc
ld a, [hl]
ld hl, $000d
@ -60013,7 +60013,7 @@ Function9102f: ; 9102f (24:502f)
Function9106a: ; 9106a
push af
ld de, NONE
ld de, 0
ld b, $a
ld a, [PlayerGender]
bit 0, a
@ -60042,7 +60042,7 @@ Function9106a: ; 9106a
Function91098: ; 91098
push af
ld de, NONE
ld de, 0
ld a, $d
call Function3b2a
ld hl, $0003
@ -61870,7 +61870,7 @@ TownMapMon: ; 91f7b
callba GetSpeciesIcon
; Animation/palette
ld de, NONE
ld de, 0
ld a, $0
call Function3b2a
@ -61905,7 +61905,7 @@ TownMapPlayerIcon: ; 91fa6
call Request2bpp
; Animation/palette
ld de, NONE
ld de, 0
ld b, $0a ; Male
ld a, [PlayerGender]
bit 0, a
@ -62954,7 +62954,7 @@ Function92c3a: ; 92c3a
ld hl, $0005
add hl, bc
ld [hl], $0
ld hl, NONE
ld hl, 0
add hl, bc
ld [hl], $1
ld hl, $000f
@ -62971,7 +62971,7 @@ Function92c4c: ; 92c4c
ret
.asm_92c56
ld hl, NONE
ld hl, 0
add hl, bc
ld a, $0
ld [hl], a
@ -63079,7 +63079,7 @@ Function92cd2: ; 92cd2
.asm_92ce1
ld a, SFX_STOP_SLOT
call Function9331e
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $000a
@ -63103,7 +63103,7 @@ Function92cf8: ; 92cf8
.asm_92d02
ld a, SFX_THROW_BALL
call Function9331e
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $0005
@ -63128,7 +63128,7 @@ Function92d20: ; 92d20
ld a, SFX_STOP_SLOT
call Function9331e
call Function93316
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $0005
@ -63162,7 +63162,7 @@ Function92d4f: ; 92d4f
ret
.asm_92d62
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $0005
@ -63174,7 +63174,7 @@ Function92d4f: ; 92d4f
Function92d6e: ; 92d6e
xor a
ld [wcf64], a
ld hl, NONE
ld hl, 0
add hl, bc
dec [hl]
ld hl, $0005
@ -63189,7 +63189,7 @@ Function92d7e: ; 92d7e
ld a, SFX_STOP_SLOT
call Function9331e
call Function93316
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $0005
@ -63209,7 +63209,7 @@ Function92da4: ; 92da4
ld a, [wcf64]
and a
ret z
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld a, $2
@ -63219,7 +63219,7 @@ Function92db3: ; 92db3
ld a, [wcf64]
cp $4
ret c
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $0005
@ -63252,7 +63252,7 @@ Function92dca: ; 92dca
ld hl, $0005
add hl, bc
ld [hl], $0
ld hl, NONE
ld hl, 0
add hl, bc
rept 2
dec [hl]
@ -63268,7 +63268,7 @@ Function92df7: ; 92df7
ld a, SFX_STOP_SLOT
call Function9331e
call Function93316
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
call Function92fc0
@ -63288,7 +63288,7 @@ Function92e10: ; 92e10
.asm_92e1f
dec [hl]
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $000b
@ -63308,7 +63308,7 @@ Function92e31: ; 92e31
ret
.asm_92e3b
ld hl, NONE
ld hl, 0
add hl, bc
dec [hl]
ld hl, $0005
@ -63326,7 +63326,7 @@ Function92e47: ; 92e47
ld hl, $0005
add hl, bc
ld [hl], $1
ld hl, NONE
ld hl, 0
add hl, bc
inc [hl]
ld hl, $000a
@ -66460,7 +66460,7 @@ Functione0000: ; e0000
xor a
call GetSRAMBank
ld hl, sScratch
ld bc, NONE
ld bc, 0
.asm_e000b
push bc
push hl
@ -66950,7 +66950,7 @@ Functione0366: ; e0366
; e0398
Functione0398: ; e0398
ld hl, NONE
ld hl, 0
ld bc, $0006
ld a, [wcf64]
call AddNTimes
@ -81004,7 +81004,7 @@ Function10616e: ; 10616e
ld hl, $a001
ld bc, $0080
xor a
ld de, NONE
ld de, 0
.asm_106179
ld a, e
add [hl]

12
maps/AzaleaGym.asm
View File

@ -13,7 +13,7 @@ BugsyScript:
writetext BugsyText_INeverLose
closetext
loadmovesprites
winlosstext BugsyText_ResearchIncomplete, NONE
winlosstext BugsyText_ResearchIncomplete, 0
loadtrainer BUGSY, 1
startbattle
returnafterbattle
@ -61,7 +61,7 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets
TrainerTwinsAmyandmay1:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, NONE, .AfterScript
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@ -72,7 +72,7 @@ TrainerTwinsAmyandmay1:
end
TrainerTwinsAmyandmay2:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, NONE, .AfterScript
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@ -83,7 +83,7 @@ TrainerTwinsAmyandmay2:
end
TrainerBug_catcherbenny:
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, NONE, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@ -94,7 +94,7 @@ TrainerBug_catcherbenny:
end
TrainerBug_catcherAl:
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, NONE, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@ -105,7 +105,7 @@ TrainerBug_catcherAl:
end
TrainerBug_catcherJosh:
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, NONE, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel

2
maps/AzaleaPokeCenter1F.asm
View File

@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x18db27, NONE
dw UnknownScript_0x18db27, 0
.MapCallbacks:
db 0

6
maps/AzaleaTown.asm
View File

@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader:
db 3
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger3, NONE
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks:
db 1

4
maps/BattleTower1F.asm
View File

@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9e39d, NONE
dw UnknownScript_0x9e3d3, NONE
dw UnknownScript_0x9e39d, 0
dw UnknownScript_0x9e3d3, 0
.MapCallbacks:
db 0

4
maps/BattleTowerBattleRoom.asm
View File

@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader:
db 2
; triggers
dw Script_EnterBattleRoom, NONE
dw UnknownScript_0x9f420, NONE
dw Script_EnterBattleRoom, 0
dw UnknownScript_0x9f420, 0
.MapCallbacks:
db 0

4
maps/BattleTowerElevator.asm
View File

@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f562, NONE
dw UnknownScript_0x9f567, NONE
dw UnknownScript_0x9f562, 0
dw UnknownScript_0x9f567, 0
.MapCallbacks:
db 0

4
maps/BattleTowerHallway.asm
View File

@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f5bb, NONE
dw UnknownScript_0x9f5c0, NONE
dw UnknownScript_0x9f5bb, 0
dw UnknownScript_0x9f5c0, 0
.MapCallbacks:
db 0

8
maps/BlackthornGym1F.asm
View File

@ -33,7 +33,7 @@ ClairScript_0x194e24:
writetext UnknownText_0x194efa
closetext
loadmovesprites
winlosstext UnknownText_0x194fd6, NONE
winlosstext UnknownText_0x194fd6, 0
loadtrainer CLAIR, 1
startbattle
returnafterbattle
@ -87,7 +87,7 @@ UnknownScript_0x194e94:
end
TrainerCooltrainermPaul:
trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, NONE, CooltrainermPaulScript
trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript
CooltrainermPaulScript:
talkaftercancel
@ -98,7 +98,7 @@ CooltrainermPaulScript:
end
TrainerCooltrainermMike:
trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, NONE, CooltrainermMikeScript
trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript
CooltrainermMikeScript:
talkaftercancel
@ -109,7 +109,7 @@ CooltrainermMikeScript:
end
TrainerCooltrainerfLola:
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, NONE, CooltrainerfLolaScript
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript
CooltrainerfLolaScript:
talkaftercancel

4
maps/BlackthornGym2F.asm
View File

@ -59,7 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder
TrainerCooltrainermCody:
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, NONE, CooltrainermCodyScript
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript
CooltrainermCodyScript:
talkaftercancel
@ -70,7 +70,7 @@ CooltrainermCodyScript:
end
TrainerCooltrainerfFran:
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, NONE, CooltrainerfFranScript
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript
CooltrainerfFranScript:
talkaftercancel

6
maps/BrunosRoom.asm
View File

@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x180993, NONE
dw UnknownScript_0x180997, NONE
dw UnknownScript_0x180993, 0
dw UnknownScript_0x180997, 0
.MapCallbacks:
db 1
@ -52,7 +52,7 @@ BrunoScript_0x1809c5:
writetext UnknownText_0x1809fe
closetext
loadmovesprites
winlosstext UnknownText_0x180b23, NONE
winlosstext UnknownText_0x180b23, 0
loadtrainer BRUNO, 1
startbattle
returnafterbattle

6
maps/BurnedTower1F.asm
View File

@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x185bf2, NONE
dw UnknownScript_0x185bf6, NONE
dw UnknownScript_0x185bf7, NONE
dw UnknownScript_0x185bf2, 0
dw UnknownScript_0x185bf6, 0
dw UnknownScript_0x185bf7, 0
.MapCallbacks:
db 1

4
maps/BurnedTowerB1F.asm
View File

@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x18615e, NONE
dw UnknownScript_0x18615f, NONE
dw UnknownScript_0x18615e, 0
dw UnknownScript_0x18615f, 0
.MapCallbacks:
db 1

12
maps/CeladonGym.asm
View File

@ -13,7 +13,7 @@ ErikaScript_0x72a6a:
writetext UnknownText_0x72b28
closetext
loadmovesprites
winlosstext UnknownText_0x72c3e, NONE
winlosstext UnknownText_0x72c3e, 0
loadtrainer ERIKA, 1
startbattle
returnafterbattle
@ -42,7 +42,7 @@ UnknownScript_0x72aae:
end
TrainerLassMichelle:
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, NONE, LassMichelleScript
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript
LassMichelleScript:
talkaftercancel
@ -53,7 +53,7 @@ LassMichelleScript:
end
TrainerPicnickerTanya:
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, NONE, PicnickerTanyaScript
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript
PicnickerTanyaScript:
talkaftercancel
@ -64,7 +64,7 @@ PicnickerTanyaScript:
end
TrainerBeautyJulia:
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, NONE, BeautyJuliaScript
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript
BeautyJuliaScript:
talkaftercancel
@ -75,7 +75,7 @@ BeautyJuliaScript:
end
TrainerTwinsJoandzoe1:
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, NONE, TwinsJoandzoe1Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script
TwinsJoandzoe1Script:
talkaftercancel
@ -86,7 +86,7 @@ TwinsJoandzoe1Script:
end
TrainerTwinsJoandzoe2:
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, NONE, TwinsJoandzoe2Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script
TwinsJoandzoe2Script:
talkaftercancel

12
maps/CeruleanGym.asm
View File

@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x1883d9, NONE
dw UnknownScript_0x1883da, NONE
dw UnknownScript_0x1883d9, 0
dw UnknownScript_0x1883da, 0
.MapCallbacks:
db 0
@ -60,7 +60,7 @@ MistyScript_0x188432:
writetext UnknownText_0x188674
closetext
loadmovesprites
winlosstext UnknownText_0x18870c, NONE
winlosstext UnknownText_0x18870c, 0
loadtrainer MISTY, 1
startbattle
returnafterbattle
@ -80,7 +80,7 @@ MistyScript_0x188432:
end
TrainerSwimmerfDiana:
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, NONE, SwimmerfDianaScript
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript
SwimmerfDianaScript:
talkaftercancel
@ -91,7 +91,7 @@ SwimmerfDianaScript:
end
TrainerSwimmerfBriana:
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, NONE, SwimmerfBrianaScript
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript
SwimmerfBrianaScript:
talkaftercancel
@ -102,7 +102,7 @@ SwimmerfBrianaScript:
end
TrainerSwimmermParker:
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, NONE, SwimmermParkerScript
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript
SwimmermParkerScript:
talkaftercancel

4
maps/CherrygroveCity.asm
View File

@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1

2
maps/CherrygroveMart.asm
View File

@ -9,7 +9,7 @@ ClerkScript_0x19680a:
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817
pokemart $0, NONE
pokemart $0, 0
loadmovesprites
end

6
maps/CianwoodCity.asm
View File

@ -3,8 +3,8 @@ CianwoodCity_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1
@ -52,7 +52,7 @@ UnknownScript_0x1a001e:
writetext UnknownText_0x1a0433
closetext
loadmovesprites
winlosstext UnknownText_0x1a05a1, NONE
winlosstext UnknownText_0x1a05a1, 0
setlasttalked $c
loadtrainer MYSTICALMAN, EUSINE
startbattle

10
maps/CianwoodGym.asm
View File

@ -28,7 +28,7 @@ ChuckScript_0x9d60f:
writetext UnknownText_0x9d78a
closetext
loadmovesprites
winlosstext UnknownText_0x9d7f6, NONE
winlosstext UnknownText_0x9d7f6, 0
loadtrainer CHUCK, 1
startbattle
returnafterbattle
@ -76,7 +76,7 @@ CianwoodGymTriggerRockets:
jumpstd radiotowerrockets
TrainerBlackbeltYoshi:
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, NONE, BlackbeltYoshiScript
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript
BlackbeltYoshiScript:
talkaftercancel
@ -87,7 +87,7 @@ BlackbeltYoshiScript:
end
TrainerBlackbeltLao:
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, NONE, BlackbeltLaoScript
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript
BlackbeltLaoScript:
talkaftercancel
@ -98,7 +98,7 @@ BlackbeltLaoScript:
end
TrainerBlackbeltNob:
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, NONE, BlackbeltNobScript
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript
BlackbeltNobScript:
talkaftercancel
@ -109,7 +109,7 @@ BlackbeltNobScript:
end
TrainerBlackbeltLung:
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, NONE, BlackbeltLungScript
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript
BlackbeltLungScript:
talkaftercancel

2
maps/CianwoodPharmacy.asm
View File

@ -3,7 +3,7 @@ CianwoodPharmacy_MapScriptHeader:
db 1
; triggers
dw CianwoodPharmacyTrigger, NONE
dw CianwoodPharmacyTrigger, 0
.MapCallbacks:
db 0

6
maps/Colosseum.asm
View File

@ -3,9 +3,9 @@ Colosseum_MapScriptHeader:
db 3
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger3, NONE
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks:
db 2

10
maps/DanceTheatre.asm
View File

@ -6,7 +6,7 @@ DanceTheatre_MapScriptHeader:
db 0
TrainerKimono_girlNaoko2:
trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, NONE, Kimono_girlNaoko2Script
trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script
Kimono_girlNaoko2Script:
talkaftercancel
@ -17,7 +17,7 @@ Kimono_girlNaoko2Script:
end
TrainerKimono_girlSayo:
trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, NONE, Kimono_girlSayoScript
trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript
Kimono_girlSayoScript:
talkaftercancel
@ -28,7 +28,7 @@ Kimono_girlSayoScript:
end
TrainerKimono_girlZuki:
trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, NONE, Kimono_girlZukiScript
trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript
Kimono_girlZukiScript:
talkaftercancel
@ -39,7 +39,7 @@ Kimono_girlZukiScript:
end
TrainerKimono_girlKuni:
trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, NONE, Kimono_girlKuniScript
trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript
Kimono_girlKuniScript:
talkaftercancel
@ -50,7 +50,7 @@ Kimono_girlKuniScript:
end
TrainerKimono_girlMiki:
trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, NONE, Kimono_girlMikiScript
trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript
Kimono_girlMikiScript:
talkaftercancel

4
maps/DragonShrine.asm
View File

@ -3,8 +3,8 @@ DragonShrine_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 0

12
maps/DragonsDenB1F.asm
View File

@ -3,8 +3,8 @@ DragonsDenB1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x18c89d, NONE
dw UnknownScript_0x18c89e, NONE
dw UnknownScript_0x18c89d, 0
dw UnknownScript_0x18c89e, 0
.MapCallbacks:
db 1
@ -78,7 +78,7 @@ UnknownScript_0x18c8f9:
end
TrainerCooltrainermDarin:
trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, NONE, CooltrainermDarinScript
trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript
CooltrainermDarinScript:
talkaftercancel
@ -89,7 +89,7 @@ CooltrainermDarinScript:
end
TrainerCooltrainerfCara:
trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, NONE, CooltrainerfCaraScript
trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript
CooltrainerfCaraScript:
talkaftercancel
@ -100,7 +100,7 @@ CooltrainerfCaraScript:
end
TrainerTwinsLeaandpia1:
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, NONE, TwinsLeaandpia1Script
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script
TwinsLeaandpia1Script:
talkaftercancel
@ -111,7 +111,7 @@ TwinsLeaandpia1Script:
end
TrainerTwinsLeaandpia2:
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, NONE, TwinsLeaandpia2Script
trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script
TwinsLeaandpia2Script:
talkaftercancel

2
maps/EarlsPokemonAcademy.asm
View File

@ -106,7 +106,7 @@ AcademyBlackboard:
dn 3, 2 ; rows, columns
db 5 ; spacing
dbw BANK(.Text), .Text
dbw $1a, NONE
dbw $1a, 0
.Text
db "PSN@"

14
maps/EcruteakGym.asm
View File

@ -3,8 +3,8 @@ EcruteakGym_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x99d53, NONE
dw UnknownScript_0x99d57, NONE
dw UnknownScript_0x99d53, 0
dw UnknownScript_0x99d57, 0
.MapCallbacks:
db 0
@ -24,7 +24,7 @@ MortyScript_0x99d58:
writetext UnknownText_0x99e65
closetext
loadmovesprites
winlosstext UnknownText_0x9a00a, NONE
winlosstext UnknownText_0x9a00a, 0
loadtrainer MORTY, 1
startbattle
returnafterbattle
@ -91,7 +91,7 @@ UnknownScript_0x99dc6:
end
TrainerSageJeffrey:
trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, NONE, SageJeffreyScript
trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript
SageJeffreyScript:
talkaftercancel
@ -102,7 +102,7 @@ SageJeffreyScript:
end
TrainerSagePing:
trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, NONE, SagePingScript
trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript
SagePingScript:
talkaftercancel
@ -113,7 +113,7 @@ SagePingScript:
end
TrainerMediumMartha:
trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, NONE, MediumMarthaScript
trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript
MediumMarthaScript:
talkaftercancel
@ -124,7 +124,7 @@ MediumMarthaScript:
end
TrainerMediumGrace:
trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, NONE, MediumGraceScript
trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript
MediumGraceScript:
talkaftercancel

4
maps/EcruteakHouse.asm
View File

@ -3,8 +3,8 @@ EcruteakHouse_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1

4
maps/EcruteakPokeCenter1F.asm
View File

@ -3,8 +3,8 @@ EcruteakPokeCenter1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x98e5f, NONE
dw UnknownScript_0x98e63, NONE
dw UnknownScript_0x98e5f, 0
dw UnknownScript_0x98e63, 0
.MapCallbacks:
db 0

12
maps/ElmsLab.asm
View File

@ -3,12 +3,12 @@ ElmsLab_MapScriptHeader:
db 6
; triggers
dw UnknownScript_0x78b7a, NONE
dw UnknownScript_0x78b7e, NONE
dw UnknownScript_0x78b7f, NONE
dw UnknownScript_0x78b80, NONE
dw UnknownScript_0x78b81, NONE
dw UnknownScript_0x78b82, NONE
dw UnknownScript_0x78b7a, 0
dw UnknownScript_0x78b7e, 0
dw UnknownScript_0x78b7f, 0
dw UnknownScript_0x78b80, 0
dw UnknownScript_0x78b81, 0
dw UnknownScript_0x78b82, 0
.MapCallbacks:
db 1

6
maps/FastShip1F.asm
View File

@ -3,9 +3,9 @@ FastShip1F_MapScriptHeader:
db 3
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger3, NONE
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks:
db 0

24
maps/FastShipB1F.asm
View File

@ -3,8 +3,8 @@ FastShipB1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x7673a, NONE
dw UnknownScript_0x7673b, NONE
dw UnknownScript_0x7673a, 0
dw UnknownScript_0x7673b, 0
.MapCallbacks:
db 0
@ -82,7 +82,7 @@ UnknownScript_0x767a0:
end
TrainerSailorJeff:
trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, NONE, SailorJeffScript
trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript
SailorJeffScript:
talkaftercancel
@ -93,7 +93,7 @@ SailorJeffScript:
end
TrainerPicnickerDebra:
trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, NONE, PicnickerDebraScript
trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript
PicnickerDebraScript:
talkaftercancel
@ -104,7 +104,7 @@ PicnickerDebraScript:
end
TrainerJugglerFritz:
trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, NONE, JugglerFritzScript
trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript
JugglerFritzScript:
talkaftercancel
@ -115,7 +115,7 @@ JugglerFritzScript:
end
TrainerSailorGarrett:
trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, NONE, SailorGarrettScript
trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript
SailorGarrettScript:
talkaftercancel
@ -126,7 +126,7 @@ SailorGarrettScript:
end
TrainerFisherJonah:
trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, NONE, FisherJonahScript
trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript
FisherJonahScript:
talkaftercancel
@ -137,7 +137,7 @@ FisherJonahScript:
end
TrainerBlackbeltWai:
trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, NONE, BlackbeltWaiScript
trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript
BlackbeltWaiScript:
talkaftercancel
@ -148,7 +148,7 @@ BlackbeltWaiScript:
end
TrainerSailorKenneth:
trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, NONE, SailorKennethScript
trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript
SailorKennethScript:
talkaftercancel
@ -159,7 +159,7 @@ SailorKennethScript:
end
TrainerTeacherShirley:
trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, NONE, TeacherShirleyScript
trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript
TeacherShirleyScript:
talkaftercancel
@ -170,7 +170,7 @@ TeacherShirleyScript:
end
TrainerSchoolboyNate:
trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, NONE, SchoolboyNateScript
trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript
SchoolboyNateScript:
talkaftercancel
@ -181,7 +181,7 @@ SchoolboyNateScript:
end
TrainerSchoolboyRicky:
trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, NONE, SchoolboyRickyScript
trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript
SchoolboyRickyScript:
talkaftercancel

14
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -6,7 +6,7 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader:
db 0
TrainerCooltrainermSean:
trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, NONE, CooltrainermSeanScript
trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript
CooltrainermSeanScript:
talkaftercancel
@ -17,7 +17,7 @@ CooltrainermSeanScript:
end
TrainerCooltrainerfCarol:
trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, NONE, CooltrainerfCarolScript
trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript
CooltrainerfCarolScript:
talkaftercancel
@ -28,7 +28,7 @@ CooltrainerfCarolScript:
end
TrainerPokemaniacEthan:
trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, NONE, PokemaniacEthanScript
trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript
PokemaniacEthanScript:
talkaftercancel
@ -39,7 +39,7 @@ PokemaniacEthanScript:
end
TrainerHikerNoland:
trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, NONE, HikerNolandScript
trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript
HikerNolandScript:
talkaftercancel
@ -50,7 +50,7 @@ HikerNolandScript:
end
TrainerGentlemanEdward:
trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, NONE, GentlemanEdwardScript
trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript
GentlemanEdwardScript:
talkaftercancel
@ -61,7 +61,7 @@ GentlemanEdwardScript:
end
TrainerBurglarCorey:
trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, NONE, BurglarCoreyScript
trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript
BurglarCoreyScript:
talkaftercancel
@ -78,7 +78,7 @@ SailorScript_0x755f1:
writetext UnknownText_0x75812
closetext
loadmovesprites
winlosstext UnknownText_0x75897, NONE
winlosstext UnknownText_0x75897, 0
loadtrainer SAILOR, STANLY
startbattle
reloadmap

14
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -128,7 +128,7 @@ TwinScript_0x75f6d:
end
TrainerPokefanmColin:
trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, NONE, PokefanmColinScript
trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript
PokefanmColinScript:
talkaftercancel
@ -139,7 +139,7 @@ PokefanmColinScript:
end
TrainerTwinsMegandpeg1:
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, NONE, TwinsMegandpeg1Script
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script
TwinsMegandpeg1Script:
talkaftercancel
@ -150,7 +150,7 @@ TwinsMegandpeg1Script:
end
TrainerTwinsMegandpeg2:
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, NONE, TwinsMegandpeg2Script
trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script
TwinsMegandpeg2Script:
talkaftercancel
@ -161,7 +161,7 @@ TwinsMegandpeg2Script:
end
TrainerPsychicRodney:
trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, NONE, PsychicRodneyScript
trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript
PsychicRodneyScript:
talkaftercancel
@ -172,7 +172,7 @@ PsychicRodneyScript:
end
TrainerPokefanmJeremy:
trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, NONE, PokefanmJeremyScript
trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript
PokefanmJeremyScript:
talkaftercancel
@ -183,7 +183,7 @@ PokefanmJeremyScript:
end
TrainerPokefanfGeorgia:
trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, NONE, PokefanfGeorgiaScript
trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript
PokefanfGeorgiaScript:
talkaftercancel
@ -194,7 +194,7 @@ PokefanfGeorgiaScript:
end
TrainerSupernerdShawn:
trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, NONE, SupernerdShawnScript
trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript
SupernerdShawnScript:
talkaftercancel

8
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -6,7 +6,7 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader:
db 0
TrainerFirebreatherLyle:
trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, NONE, FirebreatherLyleScript
trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript
FirebreatherLyleScript:
talkaftercancel
@ -17,7 +17,7 @@ FirebreatherLyleScript:
end
TrainerBug_catcherKen:
trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, NONE, Bug_catcherKenScript
trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript
Bug_catcherKenScript:
talkaftercancel
@ -28,7 +28,7 @@ Bug_catcherKenScript:
end
TrainerBeautyCassie:
trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, NONE, BeautyCassieScript
trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript
BeautyCassieScript:
talkaftercancel
@ -39,7 +39,7 @@ BeautyCassieScript:
end
TrainerGuitaristClyde:
trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, NONE, GuitaristClydeScript
trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript
GuitaristClydeScript:
talkaftercancel

10
maps/FuchsiaGym.asm
View File

@ -14,7 +14,7 @@ JanineScript_0x195db9:
writetext UnknownText_0x195f35
closetext
loadmovesprites
winlosstext UnknownText_0x195fa1, NONE
winlosstext UnknownText_0x195fa1, 0
loadtrainer JANINE, 1
startbattle
returnafterbattle
@ -66,7 +66,7 @@ UnknownScript_0x195e2c:
writetext UnknownText_0x1960e6
closetext
loadmovesprites
winlosstext UnknownText_0x196126, NONE
winlosstext UnknownText_0x196126, 0
loadtrainer LASS, ALICE
startbattle
iftrue UnknownScript_0x195e4a
@ -100,7 +100,7 @@ UnknownScript_0x195e66:
writetext UnknownText_0x196166
closetext
loadmovesprites
winlosstext UnknownText_0x19617b, NONE
winlosstext UnknownText_0x19617b, 0
loadtrainer LASS, LINDA
startbattle
iftrue UnknownScript_0x195e84
@ -134,7 +134,7 @@ UnknownScript_0x195ea0:
writetext UnknownText_0x1961bb
closetext
loadmovesprites
winlosstext UnknownText_0x1961f1, NONE
winlosstext UnknownText_0x1961f1, 0
loadtrainer PICNICKER, CINDY
startbattle
iftrue UnknownScript_0x195ebe
@ -168,7 +168,7 @@ UnknownScript_0x195eda:
writetext UnknownText_0x196228
closetext
loadmovesprites
winlosstext UnknownText_0x19624a, NONE
winlosstext UnknownText_0x19624a, 0
loadtrainer CAMPER, BARRY
startbattle
iftrue UnknownScript_0x195ef8

2
maps/FuchsiaPokeCenter1F.asm
View File

@ -3,7 +3,7 @@ FuchsiaPokeCenter1F_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x196458, NONE
dw UnknownScript_0x196458, 0
.MapCallbacks:
db 0

2
maps/GoldenrodDeptStoreRoof.asm
View File

@ -35,7 +35,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
ClerkScript_0x5673f:
loadfont
pokemart $4, NONE
pokemart $4, 0
loadmovesprites
end

14
maps/GoldenrodGym.asm
View File

@ -3,8 +3,8 @@ GoldenrodGym_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x5400a, NONE
dw UnknownScript_0x5400b, NONE
dw UnknownScript_0x5400a, 0
dw UnknownScript_0x5400b, 0
.MapCallbacks:
db 0
@ -23,7 +23,7 @@ WhitneyScript_0x5400c:
writetext UnknownText_0x54122
closetext
loadmovesprites
winlosstext UnknownText_0x541a5, NONE
winlosstext UnknownText_0x541a5, 0
loadtrainer WHITNEY, 1
startbattle
returnafterbattle
@ -87,7 +87,7 @@ GoldenrodGymTriggerRockets:
jumpstd radiotowerrockets
TrainerLassCarrie:
trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, NONE, LassCarrieScript
trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript
LassCarrieScript:
talkaftercancel
@ -111,7 +111,7 @@ WhitneyCriesScript:
end
TrainerLassBridget:
trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, NONE, LassBridgetScript
trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript
LassBridgetScript:
talkaftercancel
@ -122,7 +122,7 @@ LassBridgetScript:
end
TrainerBeautyVictoria:
trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, NONE, BeautyVictoriaScript
trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript
BeautyVictoriaScript:
talkaftercancel
@ -133,7 +133,7 @@ BeautyVictoriaScript:
end
TrainerBeautySamantha:
trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, NONE, BeautySamanthaScript
trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript
BeautySamanthaScript:
talkaftercancel

2
maps/GoldenrodMagnetTrainStation.asm
View File

@ -3,7 +3,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
db 1
; triggers
dw .Trigger1, NONE
dw .Trigger1, 0
.MapCallbacks:
db 0

4
maps/HallOfFame.asm
View File

@ -3,8 +3,8 @@ HallOfFame_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 0

2
maps/IlexForest.asm
View File

@ -376,7 +376,7 @@ UnknownScript_0x6edf7:
end
TrainerBug_catcherWayne:
trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, NONE, Bug_catcherWayneScript
trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript
Bug_catcherWayneScript:
talkaftercancel

2
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -3,7 +3,7 @@ IndigoPlateauPokeCenter1F_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x180009, NONE
dw UnknownScript_0x180009, 0
.MapCallbacks:
db 1

6
maps/KarensRoom.asm
View File

@ -3,8 +3,8 @@ KarensRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x180bbc, NONE
dw UnknownScript_0x180bc0, NONE
dw UnknownScript_0x180bbc, 0
dw UnknownScript_0x180bc0, 0
.MapCallbacks:
db 1
@ -52,7 +52,7 @@ KarenScript_0x180bee:
writetext UnknownText_0x180c27
closetext
loadmovesprites
winlosstext UnknownText_0x180cf8, NONE
winlosstext UnknownText_0x180cf8, 0
loadtrainer KAREN, 1
startbattle
returnafterbattle

6
maps/KogasRoom.asm
View File

@ -3,8 +3,8 @@ KogasRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x180728, NONE
dw UnknownScript_0x18072c, NONE
dw UnknownScript_0x180728, 0
dw UnknownScript_0x18072c, 0
.MapCallbacks:
db 1
@ -52,7 +52,7 @@ KogaScript_0x18075a:
writetext UnknownText_0x180793
closetext
loadmovesprites
winlosstext UnknownText_0x1808a9, NONE
winlosstext UnknownText_0x1808a9, 0
loadtrainer KOGA, 1
startbattle
returnafterbattle

4
maps/KrissHouse1F.asm
View File

@ -3,8 +3,8 @@ KrissHouse1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x7a4d6, NONE
dw UnknownScript_0x7a4d7, NONE
dw UnknownScript_0x7a4d6, 0
dw UnknownScript_0x7a4d7, 0
.MapCallbacks:
db 0

12
maps/LakeofRage.asm
View File

@ -3,8 +3,8 @@ LakeofRage_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 2
@ -137,7 +137,7 @@ UnknownScript_0x700b8:
end
TrainerFisherAndre:
trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, NONE, FisherAndreScript
trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript
FisherAndreScript:
talkaftercancel
@ -148,7 +148,7 @@ FisherAndreScript:
end
TrainerFisherRaymond:
trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, NONE, FisherRaymondScript
trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript
FisherRaymondScript:
talkaftercancel
@ -159,7 +159,7 @@ FisherRaymondScript:
end
TrainerCooltrainermAaron:
trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, NONE, CooltrainermAaronScript
trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript
CooltrainermAaronScript:
talkaftercancel
@ -170,7 +170,7 @@ CooltrainermAaronScript:
end
TrainerCooltrainerfLois:
trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, NONE, CooltrainerfLoisScript
trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript
CooltrainerfLoisScript:
talkaftercancel

6
maps/LancesRoom.asm
View File

@ -3,8 +3,8 @@ LancesRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x180e39, NONE
dw UnknownScript_0x180e3d, NONE
dw UnknownScript_0x180e39, 0
dw UnknownScript_0x180e3d, 0
.MapCallbacks:
db 1
@ -57,7 +57,7 @@ LanceScript_0x180e7b:
writetext UnknownText_0x180f67
closetext
loadmovesprites
winlosstext UnknownText_0x1810a4, NONE
winlosstext UnknownText_0x1810a4, 0
setlasttalked $2
loadtrainer CHAMPION, LANCE
startbattle

2
maps/LavenderNameRater.asm
View File

@ -3,7 +3,7 @@ LavenderNameRater_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x7eaf1, NONE
dw UnknownScript_0x7eaf1, 0
.MapCallbacks:
db 0

12
maps/MahoganyGym.asm
View File

@ -13,7 +13,7 @@ PryceScript_0x199a9e:
writetext UnknownText_0x199b8d
closetext
loadmovesprites
winlosstext UnknownText_0x199cb3, NONE
winlosstext UnknownText_0x199cb3, 0
loadtrainer PRYCE, 1
startbattle
returnafterbattle
@ -62,7 +62,7 @@ MahoganyGymTriggerRockets:
jumpstd radiotowerrockets
TrainerSkierRoxanne:
trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, NONE, SkierRoxanneScript
trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript
SkierRoxanneScript:
talkaftercancel
@ -73,7 +73,7 @@ SkierRoxanneScript:
end
TrainerSkierClarissa:
trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, NONE, SkierClarissaScript
trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript
SkierClarissaScript:
talkaftercancel
@ -84,7 +84,7 @@ SkierClarissaScript:
end
TrainerBoarderRonald:
trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, NONE, BoarderRonaldScript
trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript
BoarderRonaldScript:
talkaftercancel
@ -95,7 +95,7 @@ BoarderRonaldScript:
end
TrainerBoarderBrad:
trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, NONE, BoarderBradScript
trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript
BoarderBradScript:
talkaftercancel
@ -106,7 +106,7 @@ BoarderBradScript:
end
TrainerBoarderDouglas:
trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, NONE, BoarderDouglasScript
trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript
BoarderDouglasScript:
talkaftercancel

4
maps/MahoganyMart1F.asm
View File

@ -3,8 +3,8 @@ MahoganyMart1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x6c356, NONE
dw UnknownScript_0x6c357, NONE
dw UnknownScript_0x6c356, 0
dw UnknownScript_0x6c357, 0
.MapCallbacks:
db 1

4
maps/MahoganyTown.asm
View File

@ -3,8 +3,8 @@ MahoganyTown_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1

4
maps/MobileBattleRoom.asm
View File

@ -3,8 +3,8 @@ MobileBattleRoom_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 0

4
maps/MobileTradeRoomMobile.asm
View File

@ -3,8 +3,8 @@ MobileTradeRoomMobile_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 0

4
maps/MountMoon.asm
View File

@ -3,8 +3,8 @@ MountMoon_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x74089, NONE
dw UnknownScript_0x7408d, NONE
dw UnknownScript_0x74089, 0
dw UnknownScript_0x7408d, 0
.MapCallbacks:
db 0

2
maps/MountMoonSquare.asm
View File

@ -3,7 +3,7 @@ MountMoonSquare_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x77092, NONE
dw UnknownScript_0x77092, 0
.MapCallbacks:
db 2

4
maps/MountMortar1FInside.asm
View File

@ -6,7 +6,7 @@ MountMortar1FInside_MapScriptHeader:
db 0
TrainerPokemaniacMiller:
trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, NONE, PokemaniacMillerScript
trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript
PokemaniacMillerScript:
talkaftercancel
@ -17,7 +17,7 @@ PokemaniacMillerScript:
end
TrainerSupernerdMarkus:
trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, NONE, SupernerdMarkusScript
trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript
SupernerdMarkusScript:
talkaftercancel

2
maps/MountMortar2FInside.asm
View File

@ -6,7 +6,7 @@ MountMortar2FInside_MapScriptHeader:
db 0
TrainerSupernerdHugh:
trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, NONE, SupernerdHughScript
trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript
SupernerdHughScript:
talkaftercancel

2
maps/MountMortarB1F.asm
View File

@ -15,7 +15,7 @@ BlackBeltScript_0x7e1f6:
writetext UnknownText_0x7e24d
closetext
loadmovesprites
winlosstext UnknownText_0x7e2a9, NONE
winlosstext UnknownText_0x7e2a9, 0
loadtrainer BLACKBELT_T, KIYO
startbattle
returnafterbattle

4
maps/MrPokemonsHouse.asm
View File

@ -3,8 +3,8 @@ MrPokemonsHouse_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x196e51, NONE
dw UnknownScript_0x196e55, NONE
dw UnknownScript_0x196e51, 0
dw UnknownScript_0x196e55, 0
.MapCallbacks:
db 0

10
maps/NationalPark.asm
View File

@ -56,7 +56,7 @@ GameboyKidScript_0x5c037:
end
TrainerSchoolboyJack1:
trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, NONE, SchoolboyJack1Script
trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, SchoolboyJack1Script
SchoolboyJack1Script:
writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
@ -86,7 +86,7 @@ UnknownScript_0x5c074:
UnknownScript_0x5c088:
scall UnknownScript_0x5c114
winlosstext SchoolboyJack1BeatenText, NONE
winlosstext SchoolboyJack1BeatenText, 0
copybytetovar wJackFightCount
if_equal 4, .Fight4
if_equal 3, .Fight3
@ -173,7 +173,7 @@ UnknownScript_0x5c114:
end
TrainerPokefanmWilliam:
trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, NONE, PokefanmWilliamScript
trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript
PokefanmWilliamScript:
talkaftercancel
@ -184,7 +184,7 @@ PokefanmWilliamScript:
end
TrainerPokefanfBeverly1:
trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, NONE, PokefanfBeverly1Script
trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, PokefanfBeverly1Script
PokefanfBeverly1Script:
writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
@ -263,7 +263,7 @@ UnknownScript_0x5c1ab:
end
TrainerLassKrise:
trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, NONE, LassKriseScript
trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript
LassKriseScript:
talkaftercancel

4
maps/NewBarkTown.asm
View File

@ -3,8 +3,8 @@ NewBarkTown_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1

4
maps/OlivineCity.asm
View File

@ -3,8 +3,8 @@ OlivineCity_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1

2
maps/OlivineGym.asm
View File

@ -13,7 +13,7 @@ JasmineScript_0x9c12f:
writetext UnknownText_0x9c1b9
closetext
loadmovesprites
winlosstext UnknownText_0x9c2bb, NONE
winlosstext UnknownText_0x9c2bb, 0
loadtrainer JASMINE, 1
startbattle
returnafterbattle

6
maps/OlivineLighthouse2F.asm
View File

@ -6,7 +6,7 @@ OlivineLighthouse2F_MapScriptHeader:
db 0
TrainerGentlemanAlfred:
trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, NONE, GentlemanAlfredScript
trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript
GentlemanAlfredScript:
talkaftercancel
@ -17,7 +17,7 @@ GentlemanAlfredScript:
end
TrainerSailorHuey1:
trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, NONE, SailorHuey1Script
trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, SailorHuey1Script
SailorHuey1Script:
writecode VAR_CALLERID, PHONE_SAILOR_HUEY
@ -45,7 +45,7 @@ UnknownScript_0x5afb3:
UnknownScript_0x5afc7:
scall UnknownScript_0x5b06b
winlosstext SailorHuey1BeatenText, NONE
winlosstext SailorHuey1BeatenText, 0
copybytetovar wHueyFightCount
if_equal 3, .Fight3
if_equal 2, .Fight2

6
maps/OlivineLighthouse3F.asm
View File

@ -6,7 +6,7 @@ OlivineLighthouse3F_MapScriptHeader:
db 0
TrainerBird_keeperTheo:
trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, NONE, Bird_keeperTheoScript
trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript
Bird_keeperTheoScript:
talkaftercancel
@ -17,7 +17,7 @@ Bird_keeperTheoScript:
end
TrainerGentlemanPreston:
trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, NONE, GentlemanPrestonScript
trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript
GentlemanPrestonScript:
talkaftercancel
@ -28,7 +28,7 @@ GentlemanPrestonScript:
end
TrainerSailorTerrell:
trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, NONE, SailorTerrellScript
trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript
SailorTerrellScript:
talkaftercancel

4
maps/OlivineLighthouse4F.asm
View File

@ -6,7 +6,7 @@ OlivineLighthouse4F_MapScriptHeader:
db 0
TrainerLassConnie:
trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, NONE, LassConnie1Script
trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script
LassConnie1Script:
talkaftercancel
@ -17,7 +17,7 @@ LassConnie1Script:
end
TrainerSailorKent:
trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, NONE, SailorKentScript
trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript
SailorKentScript:
talkaftercancel

4
maps/OlivineLighthouse5F.asm
View File

@ -6,7 +6,7 @@ OlivineLighthouse5F_MapScriptHeader:
db 0
TrainerBird_keeperDenis:
trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, NONE, Bird_keeperDenisScript
trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript
Bird_keeperDenisScript:
talkaftercancel
@ -17,7 +17,7 @@ Bird_keeperDenisScript:
end
TrainerSailorErnest:
trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, NONE, SailorErnestScript
trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript
SailorErnestScript:
talkaftercancel

4
maps/OlivinePort.asm
View File

@ -3,8 +3,8 @@ OlivinePort_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x748ac, NONE
dw UnknownScript_0x748ad, NONE
dw UnknownScript_0x748ac, 0
dw UnknownScript_0x748ad, 0
.MapCallbacks:
db 0

4
maps/PewterGym.asm
View File

@ -13,7 +13,7 @@ BrockScript_0x1a2864:
writetext UnknownText_0x1a28d0
closetext
loadmovesprites
winlosstext UnknownText_0x1a29bb, NONE
winlosstext UnknownText_0x1a29bb, 0
loadtrainer BROCK, 1
startbattle
returnafterbattle
@ -36,7 +36,7 @@ BrockScript_0x1a2864:
end
TrainerCamperJerry:
trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, NONE, CamperJerryScript
trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript
CamperJerryScript:
talkaftercancel

12
maps/PokeCenter2F.asm
View File

@ -3,12 +3,12 @@ PokeCenter2F_MapScriptHeader:
db 6
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger3, NONE
dw .Trigger4, NONE
dw .Trigger5, NONE
dw .Trigger6, NONE
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
dw .Trigger4, 0
dw .Trigger5, 0
dw .Trigger6, 0
.MapCallbacks:
db 0

4
maps/PowerPlant.asm
View File

@ -3,8 +3,8 @@ PowerPlant_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x188dc3, NONE
dw UnknownScript_0x188dc4, NONE
dw UnknownScript_0x188dc3, 0
dw UnknownScript_0x188dc4, 0
.MapCallbacks:
db 0

2
maps/RadioTower1F.asm
View File

@ -178,7 +178,7 @@ YoungsterScript_0x5ce54:
jumptextfaceplayer UnknownText_0x5d4ac
TrainerGruntM3:
trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, NONE, GruntM3Script
trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script
GruntM3Script:
talkaftercancel

8
maps/RadioTower2F.asm
View File

@ -42,7 +42,7 @@ BlackBeltScript_0x5d722:
jumptextfaceplayer UnknownText_0x5da44
TrainerGruntM4:
trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, NONE, GruntM4Script
trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script
GruntM4Script:
talkaftercancel
@ -53,7 +53,7 @@ GruntM4Script:
end
TrainerGruntM5:
trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, NONE, GruntM5Script
trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script
GruntM5Script:
talkaftercancel
@ -64,7 +64,7 @@ GruntM5Script:
end
TrainerGruntM6:
trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, NONE, GruntM6Script
trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script
GruntM6Script:
talkaftercancel
@ -75,7 +75,7 @@ GruntM6Script:
end
TrainerGruntF2:
trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, NONE, GruntF2Script
trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script
GruntF2Script:
talkaftercancel

8
maps/RadioTower3F.asm
View File

@ -77,7 +77,7 @@ UnknownScript_0x5e5a1:
end
TrainerGruntM7:
trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, NONE, GruntM7Script
trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script
GruntM7Script:
talkaftercancel
@ -88,7 +88,7 @@ GruntM7Script:
end
TrainerGruntM8:
trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, NONE, GruntM8Script
trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script
GruntM8Script:
talkaftercancel
@ -99,7 +99,7 @@ GruntM8Script:
end
TrainerGruntM9:
trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, NONE, GruntM9Script
trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script
GruntM9Script:
talkaftercancel
@ -110,7 +110,7 @@ GruntM9Script:
end
TrainerScientistMarc:
trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, NONE, ScientistMarcScript
trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript
ScientistMarcScript:
talkaftercancel

8
maps/RadioTower4F.asm
View File

@ -47,7 +47,7 @@ GrowlitheScript_0x5ebb2:
end
TrainerGruntM10:
trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, NONE, GruntM10Script
trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script
GruntM10Script:
talkaftercancel
@ -58,7 +58,7 @@ GruntM10Script:
end
TrainerExecutivem2:
trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, NONE, Executivem2Script
trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script
Executivem2Script:
talkaftercancel
@ -69,7 +69,7 @@ Executivem2Script:
end
TrainerGruntF4:
trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, NONE, GruntF4Script
trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script
GruntF4Script:
talkaftercancel
@ -80,7 +80,7 @@ GruntF4Script:
end
TrainerScientistRich:
trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, NONE, ScientistRichScript
trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript
ScientistRichScript:
talkaftercancel

12
maps/RadioTower5F.asm
View File

@ -3,9 +3,9 @@ RadioTower5F_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x6000e, NONE
dw UnknownScript_0x6000f, NONE
dw UnknownScript_0x60010, NONE
dw UnknownScript_0x6000e, 0
dw UnknownScript_0x6000f, 0
dw UnknownScript_0x60010, 0
.MapCallbacks:
db 0
@ -32,7 +32,7 @@ UnknownScript_0x60011:
writetext UnknownText_0x60147
closetext
loadmovesprites
winlosstext UnknownText_0x60223, NONE
winlosstext UnknownText_0x60223, 0
setlasttalked $2
loadtrainer EXECUTIVEM, 3
startbattle
@ -63,7 +63,7 @@ UnknownScript_0x60054:
end
TrainerExecutivef1:
trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, NONE, Executivef1Script
trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script
Executivef1Script:
talkaftercancel
@ -81,7 +81,7 @@ UnknownScript_0x6006e:
writetext UnknownText_0x603d1
closetext
loadmovesprites
winlosstext UnknownText_0x604f3, NONE
winlosstext UnknownText_0x604f3, 0
setlasttalked $3
loadtrainer EXECUTIVEM, 1
startbattle

2
maps/RedsHouse1F.asm
View File

@ -3,7 +3,7 @@ RedsHouse1F_MapScriptHeader:
db 1
; triggers
dw .Trigger, NONE
dw .Trigger, 0
.MapCallbacks:
db 0

4
maps/Route1.asm
View File

@ -6,7 +6,7 @@ Route1_MapScriptHeader:
db 0
TrainerSchoolboyDanny:
trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, NONE, SchoolboyDannyScript
trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript
SchoolboyDannyScript:
talkaftercancel
@ -17,7 +17,7 @@ SchoolboyDannyScript:
end
TrainerCooltrainerfQuinn:
trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, NONE, CooltrainerfQuinnScript
trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript
CooltrainerfQuinnScript:
talkaftercancel

4
maps/Route10South.asm
View File

@ -6,7 +6,7 @@ Route10South_MapScriptHeader:
db 0
TrainerHikerJim:
trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, NONE, HikerJimScript
trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript
HikerJimScript:
talkaftercancel
@ -17,7 +17,7 @@ HikerJimScript:
end
TrainerPokefanmRobert:
trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, NONE, PokefanmRobertScript
trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript
PokefanmRobertScript:
talkaftercancel

Some files were not shown because too many files have changed in this diff Show More