Merge pull request #324 from PikalaxALT/master

Movement and map objects
This commit is contained in:
yenatch 2015-11-03 07:56:05 -05:00
commit 1c1fe276ca
420 changed files with 4560 additions and 4417 deletions

View File

@ -370,7 +370,7 @@ Cry_2C_branch_f3022: ; f3022
unknownmusic0xde $52
sound $4, $f1, $0796
sound $4, $f1, $072d
sound $7, $0, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
sound $8, $0, 0
endchannel
; f3264
@ -1213,7 +1213,7 @@ Cry_09_Ch5: ; f361f
Cry_09_Ch6: ; f363c
unknownmusic0xde $5
sound $2, $8, $0000
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, $0000
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, $0000
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, $0000
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, $0000
sound $3, $8, 0
sound $8, $a7, $06a1
sound $6, $86, $06a3
sound $3, $74, $06a1

View File

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

View File

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

View File

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

View File

@ -490,7 +490,7 @@ Music_TitleScreen_Ch2: ; eb984
octave 4
note A_, 4
stereopanning $ff
tone $0000
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 $0000
tone 0
octave 4
note A_, 2
octave 5

View File

@ -151,7 +151,7 @@ Sfx_Save_Ch5: ; f09b6
Sfx_Save_Ch6: ; f09d5
dutycycle $2
sound $2, $8, $0000
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, $0000
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, $0000
sound $2, $0, 0
sound $3, $f8, $0621
sound $2, $0, $0000
sound $2, $0, 0
sound $3, $f8, $0611
sound $2, $0, $0000
sound $2, $0, 0
sound $3, $e8, $0601
sound $2, $0, $0000
sound $2, $0, 0
sound $3, $e8, $05f1
sound $2, $0, $0000
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, $0000
sound $4, $0, 0
sound $2, $c4, $0772
sound $4, $0, $0000
sound $4, $0, 0
sound $2, $b4, $0772
sound $4, $0, $0000
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, $0000
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, $0000
sound $2, $0, 0
sound $8, $c1, $07da
sound $2, $0, $0000
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, $0000
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, $0000
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, $0000
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, $0000
sound $1, $0, 0
sound $8, $c2, $07e7
sound $1, $0, $0000
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, $0000
sound $10, $0, 0
Sfx_Encore_branch_f170b: ; f170b
sound $2, $f8, $0774
sound $24, $0, $0000
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, $0000
sound $20, $0, 0
sound $1, $f1, $0760
sound $1a, $0, $0000
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, $0000
sound $17, $0, 0
sound $8, $b1, $0740
sound $17, $0, $0000
sound $17, $0, 0
sound $8, $81, $0740
sound $17, $0, $0000
sound $17, $0, 0
sound $8, $51, $0740
sound $17, $0, $0000
sound $17, $0, 0
endchannel
; f1b8c
Sfx_BallBounce_Ch6: ; f1b8c
dutycycle $2
sound $2, $8, $0000
sound $2, $8, 0
sound $8, $b1, $0741
sound $17, $0, $0000
sound $17, $0, 0
sound $8, $81, $0741
sound $17, $0, $0000
sound $17, $0, 0
sound $8, $51, $0741
sound $17, $0, $0000
sound $17, $0, 0
sound $8, $21, $0741
sound $17, $0, $0000
sound $17, $0, 0
endchannel
; f1bb3
@ -3916,7 +3916,7 @@ Sfx_GiveTrademon: ; f1c10
; f1c13
Sfx_GiveTrademon_Ch5: ; f1c13
sound $20, $0, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
sound $1, $0, 0
endchannel
; f1e21
Sfx_ChoosePcOption_Ch5: ; f1e21
dutycycle $2
sound $6, $f0, $0700
sound $4, $0, $0000
sound $4, $0, 0
sound $6, $f0, $0700
sound $1, $0, $0000
sound $1, $0, 0
endchannel
; f1e34
@ -4227,11 +4227,11 @@ Sfx_EscapeRope_Ch5: ; f1e34
Sfx_PushButton_Ch5: ; f1e4f
dutycycle $2
sound $4, $0, $0000
sound $4, $0, 0
sound $2, $f1, $0680
sound $1, $0, $0000
sound $1, $0, 0
sound $4, $f1, $0780
sound $4, $0, $0000
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, $0000
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, $0000
sound $4, $0, 0
sound $f, $f0, $0500
sound $1, $0, $0000
sound $1, $0, 0
endchannel
; f1f1c
Sfx_Wrong_Ch6: ; f1f1c
dutycycle $3
sound $4, $f0, $0401
sound $4, $0, $0000
sound $4, $0, 0
sound $f, $f0, $0401
sound $1, $0, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
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, $0000
sound $53, $0, $0000
sound $60, $0, 0
sound $53, $0, 0
endchannel
; f2754

View File

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

View File

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

View File

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

View File

@ -338,7 +338,7 @@ Functionc81c0: ; c81c0 (32:41c0)
jr .asm_c81d7
.asm_c81d1
hlcoord 2, 6
ld bc, $606
lb bc, 6, 6
.asm_c81d7
call ClearBox
pop bc
@ -437,7 +437,7 @@ Functionc825a: ; c825a (32:425a)
jr .asm_c8271
.asm_c826b
hlcoord 2, 6
ld bc, $106
lb bc, 1, 6
.asm_c8271
call ClearBox
ld a, $1
@ -503,7 +503,7 @@ Functionc82c7: ; c82c7 (32:42c7)
jr .asm_c82de
.asm_c82d8
hlcoord 2, 6
ld bc, $206
lb bc, 2, 6
.asm_c82de
call ClearBox
ld a, $1

View File

@ -3247,7 +3247,7 @@ MonFaintedAnimation: ; 3d444
Function3d490: ; 3d490
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld c, a
.asm_3d493
push bc
@ -3271,7 +3271,7 @@ Function3d490: ; 3d490
; 3d4ae
Function3d4ae: ; 3d4ae
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld c, a
cp $8
jr nz, .back
@ -3663,7 +3663,7 @@ Function3d714: ; 3d714
push af
ld a, [CurBattleMon]
ld [CurPartyMon], a
callba Functione538
callba CheckCurPartyMonFainted
pop bc
ld a, b
ld [CurPartyMon], a
@ -9364,7 +9364,7 @@ Function3fb6c: ; 3fb6c
call TextBox
callba MobileTextBorder
hlcoord 1, 5
ld bc, $0307
lb bc, 3, 7
call ClearBox
call Functione51
call Function3ed9f
@ -9486,7 +9486,7 @@ Function3fc30: ; 3fc30
Function3fc5b: ; 3fc5b
ld hl, Sprites
xor a
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld b, $6
ld e, $a8
.asm_3fc65
@ -9497,10 +9497,10 @@ Function3fc5b: ; 3fc5b
inc hl
ld [hl], e
inc hl
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld [hli], a
inc a
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld a, $1
ld [hli], a
ld a, d
@ -9508,9 +9508,9 @@ Function3fc5b: ; 3fc5b
ld d, a
dec c
jr nz, .asm_3fc69
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
add $3
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld a, e
add $8
ld e, a

View File

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

View File

@ -7257,7 +7257,7 @@ BattleCommand23: ; 3680f
ld c, $14
call DelayFrames
hlcoord 1, 0
ld bc, $040a
lb bc, 4, 10
call ClearBox
ld c, $14
call DelayFrames
@ -7351,7 +7351,7 @@ BattleCommand23: ; 3680f
ld c, $14
call DelayFrames
hlcoord 9, 7
ld bc, $050b
lb bc, 5, 11
call ClearBox
ld c, $14
call DelayFrames

View File

@ -1,4 +1,3 @@
INCLUDE "macros.asm"
INCLUDE "gbhw.asm"

View File

@ -38,3 +38,5 @@ const_value SET 1
const ANIM_GFX_ANGELS
const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST
TILESIZE EQU $10

View File

@ -369,3 +369,46 @@ ITEMMENU_NOUSE EQU 0
ITEMMENU_CURRENT EQU 4
ITEMMENU_PARTY EQU 5
ITEMMENU_CLOSE EQU 6
const_def
const MARTTYPE_STANDARD
const MARTTYPE_BITTER
const MARTTYPE_BARGAIN
const MARTTYPE_PHARMACY
const MARTTYPE_ROOFTOP
const_def
const MART_CHERRYGROVE
const MART_CHERRYGROVE_DEX
const MART_VIOLET
const MART_AZALEA
const MART_CIANWOOD
const MART_GOLDENROD_2F_1
const MART_GOLDENROD_2F_2
const MART_GOLDENROD_3F
const MART_GOLDENROD_4F
const MART_GOLDENROD_5F_1
const MART_GOLDENROD_5F_2
const MART_GOLDENROD_5F_3
const MART_GOLDENROD_5F_4
const MART_OLIVINE
const MART_ECRUTEAK
const MART_MAHOGANY_1
const MART_MAHOGANY_2
const MART_BLACKTHORN
const MART_VIRIDIAN
const MART_PEWTER
const MART_CERULEAN
const MART_LAVENDER
const MART_VERMILION
const MART_CELADON_2F_1
const MART_CELADON_2F_2
const MART_CELADON_3F
const MART_CELADON_4F
const MART_CELADON_5F_1
const MART_CELADON_5F_2
const MART_FUCHSIA
const MART_SAFFRON
const MART_MT_MOON
const MART_INDIGO_PLATEAU
const MART_UNDERGROUND

View File

@ -516,9 +516,9 @@ const_value SET 1
const OBJECT_SPRITE
const OBJECT_MAP_OBJECT_INDEX
const OBJECT_SPRITE_TILE
const OBJECT_03
const OBJECT_04
const OBJECT_FLAGS
const OBJECT_MOVEMENTTYPE
const OBJECT_FLAGS1
const OBJECT_FLAGS2
const OBJECT_PALETTE
const OBJECT_DIRECTION_WALKING
const OBJECT_FACING
@ -572,10 +572,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
OBJECT_STRUCT_3_DATA_WIDTH EQU 6
OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
OW_DOWN EQU $0
OW_UP EQU $4
OW_LEFT EQU $8
OW_RIGHT EQU $c
OW_DOWN EQU DOWN << 2
OW_UP EQU UP << 2
OW_LEFT EQU LEFT << 2
OW_RIGHT EQU RIGHT << 2
const_def
const EMOTE_SHOCK ; 0
@ -586,10 +586,8 @@ OW_RIGHT EQU $c
const EMOTE_BOLT ; 5
const EMOTE_SLEEP ; 6
const EMOTE_FISH ; 7
const EMOTE_ROD_DOWN ; 8
const EMOTE_ROD_UP ; 9
const EMOTE_ROD_LEFT ; a
const EMOTE_ROD_RIGHT ; b
const EMOTE_ROD ; 8 - add directional constant
EMOTE_MEM EQU -1
const_def
const SIGNPOST_READ

View File

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

View File

@ -181,7 +181,48 @@ const_value SET 1
const PAL_OW_TREE
const PAL_OW_ROCK
; sprite movements
; sprite movement data table indices
const_def
const SPRITEMOVEDATA_00
const SPRITEMOVEDATA_01
const SPRITEMOVEDATA_02
const SPRITEMOVEDATA_03
const SPRITEMOVEDATA_WALK_UP_DOWN
const SPRITEMOVEDATA_WALK_LEFT_RIGHT
const SPRITEMOVEDATA_STANDING_DOWN
const SPRITEMOVEDATA_STANDING_UP
const SPRITEMOVEDATA_STANDING_LEFT
const SPRITEMOVEDATA_STANDING_RIGHT
const SPRITEMOVEDATA_0A
const SPRITEMOVEDATA_0B
const SPRITEMOVEDATA_0C
const SPRITEMOVEDATA_0D
const SPRITEMOVEDATA_0E
const SPRITEMOVEDATA_0F
const SPRITEMOVEDATA_10
const SPRITEMOVEDATA_11
const SPRITEMOVEDATA_12
const SPRITEMOVEDATA_13
const SPRITEMOVEDATA_14
const SPRITEMOVEDATA_15
const SPRITEMOVEDATA_16
const SPRITEMOVEDATA_17
const SPRITEMOVEDATA_18
const SPRITEMOVEDATA_19
const SPRITEMOVEDATA_1A
const SPRITEMOVEDATA_1B
const SPRITEMOVEDATA_1C
const SPRITEMOVEDATA_1D
const SPRITEMOVEDATA_1E
const SPRITEMOVEDATA_1F
const SPRITEMOVEDATA_20
const SPRITEMOVEDATA_21
const SPRITEMOVEDATA_22
const SPRITEMOVEDATA_23
const SPRITEMOVEDATA_24
const SPRITEMOVEDATA_25
; sprite movement functions
const_def
const SPRITEMOVEFN_00
const SPRITEMOVEFN_01
@ -211,9 +252,3 @@ const_value SET 1
const SPRITEMOVEFN_19
const SPRITEMOVEFN_1A
const SPRITEMOVEFN_1B
const SPRITEMOVEFN_1C
const SPRITEMOVEFN_1D
const SPRITEMOVEFN_1E
const SPRITEMOVEFN_1F
const SPRITEMOVEFN_20
const SPRITEMOVEFN_21

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

View File

@ -43,43 +43,49 @@ GiveOddEgg: ; 1fb4b6
ld a, OddEgg2 - OddEgg1
call AddNTimes
ld de, wEnemyMoveStruct
ld bc, $0046
ld de, OddEggSpecies
ld bc, party_struct_length + 2 * PKMN_NAME_LENGTH
call CopyBytes
ld a, EGG_TICKET
ld [CurItem], a
ld a, $1
ld [wd10c], a
ld a, $ff
ld [wd107], a
ld a, 1
ld [wItemQuantityChangeBuffer], a
ld a, -1
ld [ItemCountBuffer], a
ld hl, NumItems
call TossItem
; load species in wcd2a
ld a, EGG
ld [wcd2a], a
; load pointer to wcd29 in wcd20
ld a, wcd29 % $100
ld [CreditsPos], a
ld [wcd20], a
ld a, wcd29 / $100
ld [wcd21], a
ld a, wEnemyMoveStruct % $100
; load pointer to OddEggSpecies in wcd22
ld a, OddEggSpecies % $100
ld [wcd22], a
ld a, wEnemyMoveStruct / $100
ld a, OddEggSpecies / $100
ld [wcd23], a
; load Odd Egg Name in wcd2b
ld hl, .Odd
ld de, wcd2b
ld bc, PKMN_NAME_LENGTH
call CopyBytes
; load pointer to wcd2b in wcd24
ld a, wcd2b % $100
ld [wcd24], a
ld a, wcd2b / $100
ld [wcd25], a
ld a, BattleMonHappiness % $100
; load pointer to wOddEggName in wcd26
ld a, wOddEggName % $100
ld [wcd26], a
ld a, BattleMonHappiness / $100
ld a, wOddEggName / $100
ld [wcd27], a
callba Function11b98f
ret
@ -119,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
@ -146,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
@ -172,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
@ -198,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
@ -224,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
@ -250,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
@ -276,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
@ -302,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
@ -328,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
@ -354,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
@ -380,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
@ -406,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
@ -432,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
@ -458,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

View File

@ -1,6 +1,12 @@
INCLUDE "predef/sgb.asm"
SHINY_ATK_BIT EQU 5
SHINY_DEF_VAL EQU 10
SHINY_SPD_VAL EQU 10
SHINY_SPC_VAL EQU 10
LO_NYBBLE EQU $0f
HI_NYBBLE EQU $f0
CheckShininess: ; 8a68
; Check if a mon is shiny by DVs at bc.
@ -11,25 +17,25 @@ CheckShininess: ; 8a68
; Attack
ld a, [hl]
and %0010 << 4
and 1 << SHINY_ATK_BIT
jr z, .NotShiny
; Defense
ld a, [hli]
and %1111
cp %1010
and LO_NYBBLE
cp SHINY_DEF_VAL
jr nz, .NotShiny
; Speed
ld a, [hl]
and %1111 << 4
cp %1010 << 4
and HI_NYBBLE
cp SHINY_SPD_VAL << 4
jr nz, .NotShiny
; Special
ld a, [hl]
and %1111
cp %1010
and LO_NYBBLE
cp SHINY_SPC_VAL
jr nz, .NotShiny
.Shiny
@ -53,7 +59,7 @@ CheckContestMon: ; 8a88
; Defense
ld a, [hli]
and $f
and LO_NYBBLE
cp 10
jr c, .Bad
@ -64,7 +70,7 @@ CheckContestMon: ; 8a88
; Special
ld a, [hl]
and $f
and LO_NYBBLE
cp 10
jr c, .Bad

View File

@ -396,7 +396,7 @@ CheckTileEvent: ; 96874
ret
.return6
ld a, [StandingTile]
ld a, [PlayerStandingTile]
call CheckPitTile
jr nz, .pittile
ld a, 6
@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5
.IsObject
call PlayTalkObject
ld a, [hConnectedMapWidth]
ld a, [hObjectStructIndexBuffer]
call GetObjectStruct
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66
; 96b72
.Script ; 96b72
ptjump wd0e8
ptjump wQueuedScriptBank
; 96b75
.Asm ; 96b75
ptcallasm wd0e8
ptcallasm wQueuedScriptBank
end
; 96b79

View File

@ -109,7 +109,7 @@ RandomEncounter:: ; 97cc0
call CanUseSweetScent
jr nc, .nope
ld hl, StatusFlags2
bit 2, [hl]
bit 2, [hl] ; bug contest
jr nz, .bug_contest
callba TryWildEncounter
jr nz, .nope
@ -153,15 +153,15 @@ CanUseSweetScent:: ; 97cfd
bit 5, [hl]
jr nz, .no
ld a, [wPermission]
cp $4
cp CAVE
jr z, .ice_check
cp $7
cp DUNGEON
jr z, .ice_check
callba Function149dd
callba CheckGrassCollision
jr nc, .no
.ice_check
ld a, [StandingTile]
ld a, [PlayerStandingTile]
call CheckIceTile
jr z, .no
scf
@ -235,11 +235,11 @@ ChooseWildEncounter_BugContest:: ; 97d31
; 97d64
TryWildEncounter_BugContest: ; 97d64
ld a, [StandingTile]
ld a, [PlayerStandingTile]
call CheckSuperTallGrassTile
ld b, $66
ld b, 40 percent
jr z, .ok
ld b, $33
ld b, 20 percent
.ok
callba ApplyMusicEffectOnEncounterRate
@ -351,24 +351,24 @@ Function97df9:: ; 97df9
Function97e08:: ; 97e08
ld hl, wd6de
xor a
.asm_97e0c
ld [hConnectionStripLength], a
.loop
ld [hMapObjectIndexBuffer], a
ld a, [hl]
and a
jr z, .asm_97e19
jr z, .skip
push hl
ld b, h
ld c, l
call Function97e79
pop hl
.asm_97e19
.skip
ld de, $0006
add hl, de
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
inc a
cp $4
jr nz, .asm_97e0c
jr nz, .loop
ret
; 97e25
@ -441,14 +441,14 @@ Function97e5c:: ; 97e5c
; 97e72
Function97e72: ; 97e72
ld hl, $0000
ld hl, 0
add hl, bc
ld [hl], 0
ret
; 97e79
Function97e79: ; 97e79
ld hl, $0000
ld hl, 0
add hl, bc
ld a, [hl]
cp 5
@ -473,11 +473,11 @@ endr
; 97e94
Table97e94: ; 97e94
dbw BANK(Function97eb7), Function97eb7
dbw BANK(Function97eb8), Function97eb8
dbw BANK(Function97f42), Function97f42
dbw BANK(Function97ef9), Function97ef9
dbw BANK(Function97ebc), Function97ebc
dba Function97eb7
dba Function97eb8
dba Function97f42
dba Function97ef9
dba Function97ebc
; 97ea3
Function97ea3: ; 97ea3
@ -620,7 +620,7 @@ Function97f42: ; 97f42
.asm_97f47
push af
ld hl, $0000
ld hl, 0
add hl, de
ld a, [hl]
and a

View File

@ -2,44 +2,45 @@
INCLUDE "engine/facings.asm"
ObjectStruct3_Data:: ; 4273
db $00, $00, $01, $02, $00, $00 ; 00
db $06, $00, $01, $0c, $00, $00 ; 01
db $03, $00, $01, $00, $00, $00 ; 02
db $04, $00, $01, $00, $00, $00 ; 03
db $01, $00, $01, $00, $00, $00 ; 04
db $02, $00, $01, $00, $00, $00 ; 05
db $06, $00, $01, $00, $00, $00 ; 06
db $06, $01, $01, $00, $00, $00 ; 07
db $06, $02, $01, $00, $00, $00 ; 08
db $06, $03, $01, $00, $00, $00 ; 09
db $05, $00, $01, $00, $00, $00 ; 0a
db $07, $00, $01, $02, $00, $00 ; 0b
db $08, $00, $01, $00, $00, $00 ; 0c
db $09, $00, $01, $00, $00, $00 ; 0d
db $0a, $00, $01, $00, $00, $00 ; 0e
db $0b, $00, $01, $00, $00, $00 ; 0f
db $0c, $00, $01, $00, $00, $00 ; 10
db $0d, $00, $01, $00, $00, $00 ; 11
db $0e, $00, $01, $00, $00, $00 ; 12
db $0f, $00, $01, $02, $00, $00 ; 13
db $10, $00, $01, $02, $00, $00 ; 14
db $15, $00, $09, $2e, $01, $c0 ; 15
db $16, $00, $0a, $2e, $00, $00 ; 16
db $06, $00, $01, $0c, $00, $00 ; 17
db $06, $00, $01, $2e, $10, $00 ; 18
db $11, $00, $01, $2e, $00, $40 ; 19
db $12, $00, $01, $02, $00, $00 ; 1a
db $13, $00, $00, $8e, $01, $00 ; 1b
db $14, $00, $08, $8e, $02, $00 ; 1c
db $17, $00, $00, $82, $00, $00 ; 1d
db $19, $02, $01, $00, $00, $00 ; 1e
db $18, $03, $01, $00, $00, $00 ; 1f
db $11, $00, $0c, $2e, $01, $c0 ; 20
db $11, $00, $0d, $2e, $01, $c0 ; 21
db $1a, $00, $0e, $8e, $01, $00 ; 22
db $1b, $00, $0f, $8e, $02, $00 ; 23
db $03, $00, $01, $00, $00, $20 ; 24
db $00, $00, $01, $00, $00, $00 ; 25
; function, facing, ?, ?, ?, ?
db SPRITEMOVEFN_00, DOWN, $01, $02, $00, $00 ; 00
db SPRITEMOVEFN_06, DOWN, $01, $0c, $00, $00 ; 01
db SPRITEMOVEFN_03, DOWN, $01, $00, $00, $00 ; 02
db SPRITEMOVEFN_04, DOWN, $01, $00, $00, $00 ; 03
db SPRITEMOVEFN_01, DOWN, $01, $00, $00, $00 ; 04
db SPRITEMOVEFN_02, DOWN, $01, $00, $00, $00 ; 05
db SPRITEMOVEFN_06, DOWN, $01, $00, $00, $00 ; 06
db SPRITEMOVEFN_06, UP, $01, $00, $00, $00 ; 07
db SPRITEMOVEFN_06, LEFT, $01, $00, $00, $00 ; 08
db SPRITEMOVEFN_06, RIGHT, $01, $00, $00, $00 ; 09
db SPRITEMOVEFN_05, DOWN, $01, $00, $00, $00 ; 0a
db SPRITEMOVEFN_07, DOWN, $01, $02, $00, $00 ; 0b
db SPRITEMOVEFN_08, DOWN, $01, $00, $00, $00 ; 0c
db SPRITEMOVEFN_09, DOWN, $01, $00, $00, $00 ; 0d
db SPRITEMOVEFN_0A, DOWN, $01, $00, $00, $00 ; 0e
db SPRITEMOVEFN_0B, DOWN, $01, $00, $00, $00 ; 0f
db SPRITEMOVEFN_0C, DOWN, $01, $00, $00, $00 ; 10
db SPRITEMOVEFN_0D, DOWN, $01, $00, $00, $00 ; 11
db SPRITEMOVEFN_0E, DOWN, $01, $00, $00, $00 ; 12
db SPRITEMOVEFN_0F, DOWN, $01, $02, $00, $00 ; 13
db SPRITEMOVEFN_10, DOWN, $01, $02, $00, $00 ; 14
db SPRITEMOVEFN_15, DOWN, $09, $2e, $01, $c0 ; 15
db SPRITEMOVEFN_16, DOWN, $0a, $2e, $00, $00 ; 16
db SPRITEMOVEFN_06, DOWN, $01, $0c, $00, $00 ; 17
db SPRITEMOVEFN_06, DOWN, $01, $2e, $10, $00 ; 18
db SPRITEMOVEFN_11, DOWN, $01, $2e, $00, $40 ; 19
db SPRITEMOVEFN_12, DOWN, $01, $02, $00, $00 ; 1a
db SPRITEMOVEFN_13, DOWN, $00, $8e, $01, $00 ; 1b
db SPRITEMOVEFN_14, DOWN, $08, $8e, $02, $00 ; 1c
db SPRITEMOVEFN_17, DOWN, $00, $82, $00, $00 ; 1d
db SPRITEMOVEFN_19, LEFT, $01, $00, $00, $00 ; 1e
db SPRITEMOVEFN_18, RIGHT, $01, $00, $00, $00 ; 1f
db SPRITEMOVEFN_11, DOWN, $0c, $2e, $01, $c0 ; 20
db SPRITEMOVEFN_11, DOWN, $0d, $2e, $01, $c0 ; 21
db SPRITEMOVEFN_1A, DOWN, $0e, $8e, $01, $00 ; 22
db SPRITEMOVEFN_1B, DOWN, $0f, $8e, $02, $00 ; 23
db SPRITEMOVEFN_03, DOWN, $01, $00, $00, $20 ; 24
db SPRITEMOVEFN_00, DOWN, $01, $00, $00, $00 ; 25
; 4357
@ -78,7 +79,7 @@ Function437b: ; 437b
; 4386
Function4386: ; 4386
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 6, [hl]
ld a, [XCoord]
@ -104,7 +105,7 @@ Function4386: ; 4386
jr .yes
.ok
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
set 6, [hl]
ld a, [XCoord]
@ -133,7 +134,7 @@ Function4386: ; 4386
ret
.ok2
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 1, [hl]
jr nz, .yes2
@ -142,7 +143,7 @@ Function4386: ; 4386
ret
.yes2
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
set 6, [hl]
and a
@ -155,20 +156,20 @@ Function43f3: ; 43f3
ld a, [hl]
and a
jr z, .zero
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
bit 5, [hl]
jr nz, .not_bit5
jr nz, .bit5
cp 1
jr z, .one
jr .ok
.zero
call Function47bc
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
bit 5, [hl]
jr nz, .not_bit5
jr nz, .bit5
.one
call Function47dd
@ -185,17 +186,17 @@ Function43f3: ; 43f3
rst JumpTable
ret
.not_bit5
.bit5
ret
; 4427
Function4427: ; 4427
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 0, [hl]
jr nz, Function44a3
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
bit 6, [hl]
jr nz, Function44a3
@ -208,7 +209,7 @@ Function4427: ; 4427
; 4440
Function4440: ; 4440
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 0, [hl]
jr nz, Function44a3
@ -300,7 +301,7 @@ Function44b5: ; 44b5
; 44c1
Function44c1: ; 44c1
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 3, [hl]
jp nz, Function44aa
@ -324,7 +325,7 @@ Function44c1: ; 44c1
; 44e4
Function44e4: ; 44e4
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 3, [hl]
jp nz, Function44aa
@ -348,7 +349,7 @@ Function44e4: ; 44e4
; 4508
Function4508: ; 4508
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 3, [hl]
jp nz, Function44aa
@ -603,7 +604,7 @@ Function462a: ; 462a
; 463f
Function463f: ; 463f
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
bit 3, [hl]
jr z, .ok
@ -632,13 +633,13 @@ Function4661: ; 4661
jr c, .reset
.set
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
set 3, [hl]
ret
.reset
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
ret
@ -670,7 +671,7 @@ Function4690: ; 4690
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], a
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 2, [hl]
jr nz, .ok
@ -827,7 +828,7 @@ Function4759: ; 4759
ret
; 4769
Function4769: ; 4769
RestoreDefaultMovement: ; 4769
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
ld a, [hl]
@ -1028,7 +1029,7 @@ Function4851: ; 4851
jp Function4b26
; 4869
Function4869: ; 4869
Function4869: ; standing?
call Function462a
call Function467b
ld hl, OBJECT_11
@ -1082,7 +1083,7 @@ Function48a0: ; 48a0
; 48a6
Function48a6: ; 48a6
ld hl, Function500e
ld hl, Function500e ; scripted
jp Function5041
; 48ac
@ -1098,7 +1099,7 @@ Function48b3: ; 48b3
ld a, [hl]
call CheckPitTile
jr z, .on_pit
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
bit 2, [hl]
res 2, [hl]
@ -1192,7 +1193,7 @@ Function48ff: ; 48ff
and %00001100
or d
pop bc
jp Function5412
jp NormalStep
.standing
pop bc
@ -1499,7 +1500,7 @@ Function4af0: ; 4af0
add hl, bc
ld [hl], 2
ld hl, wd4cf
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
cp [hl]
jr z, .ok
ld hl, OBJECT_09
@ -1604,7 +1605,7 @@ Function4b8d: ; 4b8d
ret nz
call Function4600
call Function46a6
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
call IncrementObjectStructField28
@ -1648,7 +1649,7 @@ Function4bd2: ; 4bd2
dec [hl]
ret nz
call Function4600
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
ld hl, wd150
@ -1723,7 +1724,7 @@ Function4c42: ; 4c42
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], $10
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 3, [hl]
call IncrementObjectStructField28
@ -2046,7 +2047,7 @@ Function4e0c: ; 4e0c
; 4e13
Function4e13: ; 4e13
call Function4769
call RestoreDefaultMovement
call Function1a47
ld hl, OBJECT_FACING
add hl, bc
@ -2198,7 +2199,7 @@ Function4ecd: ; 4ecd
ld b, a
callba CopyDECoordsToMapObject
pop bc
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 2, [hl]
call Function4600
@ -2395,7 +2396,7 @@ UpdateJumpPosition: ; 4fd5
db -11, -10, -9, -8, -6, -4, 0, 0
; 5000
Function5000: ; 5000
Function5000: ; unscripted?
ld a, [wc2de]
ld hl, wc2df
ld [hl], a
@ -2405,8 +2406,8 @@ Function5000: ; 5000
ret
; 500e
Function500e: ; 500e
ld hl, wc2e3
Function500e: ; scripted
ld hl, wMovementDataPointer
call Function1aae
ret
; 5015
@ -2417,7 +2418,7 @@ Function5015: ; 5015
ld e, [hl]
inc [hl]
ld d, 0
ld hl, wc2e2
ld hl, wMovementPerson
ld a, [hli]
ld h, [hl]
ld l, a
@ -2447,7 +2448,7 @@ Function5037: ; 5037
; 503d
Function503d: ; 503d
ld a, [wc2e2]
ld a, [wMovementPerson]
ret
; 5041
@ -2466,14 +2467,14 @@ Function5041: ; 5041
CopyMovementPointer: ; 5055
ld a, l
ld [wc2eb], a
ld [wMovementPointer], a
ld a, h
ld [wc2ec], a
ld [wMovementPointer + 1], a
ret
; 505e
GetMovementByte: ; 505e
ld hl, wc2eb
ld hl, wMovementPointer
ld a, [hli]
ld h, [hl]
ld l, a
@ -2488,7 +2489,7 @@ Function5065: ; 5065
DoMovementFunction: ; 506b
push af
call Function54b8
call ApplyMovementToFollower
pop af
ld hl, MovementPointers
rst JumpTable
@ -2501,14 +2502,14 @@ INCLUDE "engine/movement.asm"
; 54b8
Function54b8: ; 54b8
ApplyMovementToFollower: ; 54b8
ld e, a
ld a, [wd4ce]
ld a, [wObjectFollow_Follower]
cp -1
ret z
ld a, [wd4cd]
ld a, [wObjectFollow_Leader]
ld d, a
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
cp d
ret nz
ld a, e
@ -2564,7 +2565,7 @@ Function54e6: ; 54e6
; 550a
Function550a: ; 550a
ld a, [wd4cd]
ld a, [wObjectFollow_Leader]
cp -1
jr z, .nope
push bc
@ -2580,7 +2581,7 @@ Function550a: ; 550a
.nope
ld a, $ff
ld [wd4ce], a
ld [wObjectFollow_Follower], a
ld a, $47
scf
ret
@ -2651,7 +2652,7 @@ Function5565: ; 5565
Function5579: ; 5579
push bc
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld c, a
call Function5582
pop bc
@ -2663,7 +2664,7 @@ Function5582: ; 5582
ld a, NUM_OBJECT_STRUCTS
.loop
push af
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, de
bit 7, [hl]
jr z, .next
@ -2690,7 +2691,7 @@ Function5582: ; 5582
; 55ac
Function55ac: ; 55ac
call Function1a13
call FindFirstEmptyObjectStruct
ret nc
ld d, h
ld e, l
@ -2712,7 +2713,7 @@ Function55b9: ; 55b9
ld [hli], a
ld a, [de]
ld [hli], a
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld [hli], a
push hl
ld hl, OBJECT_MAP_X
@ -2737,7 +2738,7 @@ Function55e0:: ; 55e0
ld bc, ObjectStructs
xor a
.loop
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
call GetObjectSprite
jr z, .ok
call Function565c
@ -2747,7 +2748,7 @@ Function55e0:: ; 55e0
add hl, bc
ld b, h
ld c, l
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
inc a
cp NUM_OBJECT_STRUCTS
jr nz, .loop
@ -2801,13 +2802,13 @@ Function5645: ; 5645
xor a
ld bc, ObjectStructs
.loop
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
call Function5680
ld hl, OBJECT_STRUCT_LENGTH
add hl, bc
ld b, h
ld c, l
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
inc a
cp NUM_OBJECT_STRUCTS
jr nz, .loop
@ -2927,7 +2928,7 @@ Function56cd: ; 56cd
sub $20
.ok3
ld [$ffbd], a
ld [hUsedSpriteIndex], a
ld a, [wd14d]
ld e, a
ld hl, OBJECT_SPRITE_Y_OFFSET
@ -2959,7 +2960,7 @@ Function56cd: ; 56cd
sub $20
.ok6
ld [$ffbe], a
ld [hUsedSpriteTile], a
ld hl, OBJECT_PALETTE
add hl, bc
bit 7, [hl]
@ -2977,14 +2978,14 @@ Function56cd: ; 56cd
.loop
ld a, [$ffbf]
ld d, a
ld a, [$ffbe]
ld a, [hUsedSpriteTile]
add e
dec a
cp $12
jr nc, .ok9
ld b, a
.next
ld a, [$ffbd]
ld a, [hUsedSpriteIndex]
add d
dec a
cp $14
@ -3032,7 +3033,7 @@ Function5781: ; 5781
ld bc, ObjectStructs
xor a
.loop
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
call GetObjectSprite
jr z, .next
call Function437b
@ -3042,7 +3043,7 @@ Function5781: ; 5781
add hl, bc
ld b, h
ld c, l
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
inc a
cp NUM_OBJECT_STRUCTS
jr nz, .loop
@ -3055,7 +3056,7 @@ Function579d: ; 579d
ld [wc2df], a
xor a
ld [wd04e], a
ld [wd4e2], a
ld [PlayerObject12], a
call Function57bc
callba CheckWarpCollision
call c, SpawnInFacingDown
@ -3100,9 +3101,9 @@ Function57db: ; 57db
Function57e2: ; 57e2
ld a, d
and $80
and %10000000
ret z
ld bc, $0000 ; debug?
ld bc, 0 ; debug?
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
@ -3122,74 +3123,74 @@ Function57e2: ; 57e2
ret
; 5803
Function5803:: ; 5803
StartFollow:: ; 5803
push bc
ld a, b
call Function5815
call SetLeaderIfVisible
pop bc
ret c
ld a, c
call Function582c
call SetFollowerIfVisible
callba Function848a
ret
; 5815
Function5815: ; 5815
call Function18de
SetLeaderIfVisible: ; 5815
call CheckObjectVisibility
ret c
ld a, [hConnectedMapWidth]
ld [wd4cd], a
ld a, [hObjectStructIndexBuffer]
ld [wObjectFollow_Leader], a
ret
; 581f
Function581f:: ; 581f
call Function5826
call Function5847
StopFollow:: ; 581f
call ResetLeader
call ResetFollower
ret
; 5826
Function5826: ; 5826
ResetLeader: ; 5826
ld a, -1
ld [wd4cd], a
ld [wObjectFollow_Leader], a
ret
; 582c
Function582c: ; 582c
SetFollowerIfVisible: ; 582c
push af
call Function5847
call ResetFollower
pop af
call Function18de
call CheckObjectVisibility
ret c
ld hl, OBJECT_03
ld hl, OBJECT_MOVEMENTTYPE
add hl, bc
ld [hl], $13
ld [hl], SPRITEMOVEDATA_13
ld hl, OBJECT_09
add hl, bc
ld [hl], 0
ld a, [hConnectedMapWidth]
ld [wd4ce], a
ld a, [hObjectStructIndexBuffer]
ld [wObjectFollow_Follower], a
ret
; 5847
Function5847: ; 5847
ld a, [wd4ce]
ResetFollower: ; 5847
ld a, [wObjectFollow_Follower]
cp -1
ret z
call GetObjectStruct
callba Function58e3
ld a, -1
ld [wd4ce], a
ld [wObjectFollow_Follower], a
ret
; 585c
SetFlagsForMovement_1:: ; 585c
ld a, c
call Function18de
call CheckObjectVisibility
ret c
push bc
call Function587a
pop bc
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
xor a
@ -3197,9 +3198,9 @@ SetFlagsForMovement_1:: ; 585c
; 586e
Function586e: ; 586e
call Function18de
call CheckObjectVisibility
ret c
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
set 5, [hl]
xor a
@ -3213,7 +3214,7 @@ Function587a: ; 587a
push af
call GetObjectSprite
jr z, .next
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
set 5, [hl]
@ -3230,7 +3231,7 @@ Function587a: ; 587a
; 5897
_SetFlagsForMovement_2:: ; 5897
ld a, [wd4cd]
ld a, [wObjectFollow_Leader]
cp -1
ret z
push bc
@ -3241,11 +3242,11 @@ _SetFlagsForMovement_2:: ; 5897
pop bc
cp c
ret nz
ld a, [wd4ce]
ld a, [wObjectFollow_Follower]
cp -1
ret z
call GetObjectStruct
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
ret
@ -3259,7 +3260,7 @@ Function58b9:: ; 58b9
push af
call GetObjectSprite
jr z, .next
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
@ -3277,9 +3278,9 @@ Function58b9:: ; 58b9
; 58d8
Function58d8: ; 58d8
call Function18de
call CheckObjectVisibility
ret c
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
res 5, [hl]
ret
@ -3297,7 +3298,7 @@ Function58e3: ; 58e3
add hl, bc
ld a, [hl]
pop bc
ld hl, OBJECT_03
ld hl, OBJECT_MOVEMENTTYPE
add hl, bc
ld [hl], a
ld hl, OBJECT_09
@ -3312,10 +3313,10 @@ Function5903: ; 5903
rrca
ld e, a
ld d, 0
ld hl, .data_591c
ld hl, .standing_movefns
add hl, de
ld a, [hl]
ld hl, OBJECT_03
ld hl, OBJECT_MOVEMENTTYPE
add hl, bc
ld [hl], a
ld hl, OBJECT_09
@ -3323,8 +3324,11 @@ Function5903: ; 5903
ld [hl], 0
ret
.data_591c
db 6, 7, 8, 9
.standing_movefns
db SPRITEMOVEDATA_STANDING_DOWN
db SPRITEMOVEDATA_STANDING_UP
db SPRITEMOVEDATA_STANDING_LEFT
db SPRITEMOVEDATA_STANDING_RIGHT
; 5920
RefreshMapAppearDisappear:: ; 5920
@ -3332,7 +3336,7 @@ RefreshMapAppearDisappear:: ; 5920
bit 0, a
ret z
xor a
ld [$ffbd], a
ld [hUsedSpriteIndex], a
ld a, [hOAMUpdate]
push af
ld a, 1
@ -3352,12 +3356,12 @@ Function593a: ; 593a
ld b, $70
.ok
ld a, [$ffbd]
ld a, [hUsedSpriteIndex]
cp b
ret nc
ld l, a
ld h, $c4
ld de, OBJECT_04
ld de, OBJECT_FLAGS1
ld a, b
ld c, $a0
.loop
@ -3427,13 +3431,13 @@ Function5991: ; 5991
Function59a4: ; 59a4
xor a
ld hl, wc2eb
ld hl, wMovementPointer
ld bc, 13
call ByteFill
ld d, 0
ld bc, ObjectStructs
ld hl, wc2eb
ld hl, wMovementPointer
.loop
push hl
call GetObjectSprite
@ -3447,7 +3451,7 @@ Function59a4: ; 59a4
; Define the sprite priority.
ld e, $10
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
bit 0, [hl]
jr nz, .add
@ -3484,7 +3488,7 @@ Function59a4: ; 59a4
; 59f3
Function59f3: ; 59f3
ld hl, wc2eb
ld hl, wMovementPointer
.next
ld a, [hli]
ld d, a
@ -3517,7 +3521,7 @@ Function5a0d: ; 5a0d
or %00001000
.skip1
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, bc
ld e, [hl]
bit 7, e
@ -3592,11 +3596,11 @@ Function5a0d: ; 5a0d
ld h, [hl]
ld l, a
ld a, [$ffbd]
ld a, [hUsedSpriteIndex]
ld c, a
ld b, Sprites / $100
ld a, [hli]
ld [$ffbe], a
ld [hUsedSpriteTile], a
add c
cp SpritesEnd % $100
jr nc, .full
@ -3641,13 +3645,13 @@ Function5a0d: ; 5a0d
ld [bc], a
inc c
ld a, [$ffbe]
ld a, [hUsedSpriteTile]
dec a
ld [$ffbe], a
ld [hUsedSpriteTile], a
jr nz, .addsprite
ld a, c
ld [$ffbd], a
ld [hUsedSpriteIndex], a
.done
xor a
@ -3673,16 +3677,16 @@ endr
.Addresses ; 5ace
dw PlayerStruct
dw ObjectStruct1
dw ObjectStruct2
dw ObjectStruct3
dw ObjectStruct4
dw ObjectStruct5
dw ObjectStruct6
dw ObjectStruct7
dw ObjectStruct8
dw ObjectStruct9
dw ObjectStruct10
dw ObjectStruct11
dw ObjectStruct12
dw Object1Struct
dw Object2Struct
dw Object3Struct
dw Object4Struct
dw Object5Struct
dw Object6Struct
dw Object7Struct
dw Object8Struct
dw Object9Struct
dw Object10Struct
dw Object11Struct
dw Object12Struct
; 5ae8

View File

@ -313,7 +313,7 @@ SuspendMapAnims: ; 154d3
LoadObjectsRunCallback_02: ; 154d7
ld a, $2
call RunMapCallback
callba Function2454f
callba LoadObjectMasks
callba Function8177
ret
; 154ea (5:54ea)

File diff suppressed because it is too large Load Diff

View File

@ -64,7 +64,7 @@ Function10067: ; 10067 (4:4067)
ld hl, MenuDataHeader_0x10a4f
call CopyMenuDataHeader
ld a, [wItemsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0df]
ld [wd0e4], a
call Function350c
@ -92,7 +92,7 @@ Function100a6: ; 100a6 (4:40a6)
ld hl, MenuDataHeader_0x10a7f
call CopyMenuDataHeader
ld a, [wKeyItemsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0e0]
ld [wd0e4], a
call Function350c
@ -222,7 +222,7 @@ Function10198: ; 10198 (4:4198)
ld hl, MenuDataHeader_0x10aaf
call CopyMenuDataHeader
ld a, [wBallsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0e1]
ld [wd0e4], a
call Function350c
@ -722,7 +722,7 @@ Function104fa: ; 104fa (4:44fa)
ld hl, MenuDataHeader_0x10a4f
call CopyMenuDataHeader
ld a, [wItemsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0df]
ld [wd0e4], a
call Function350c
@ -750,7 +750,7 @@ Function10539: ; 10539 (4:4539)
ld hl, MenuDataHeader_0x10a7f
call CopyMenuDataHeader
ld a, [wKeyItemsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0e0]
ld [wd0e4], a
call Function350c
@ -801,7 +801,7 @@ Function105a6: ; 105a6 (4:45a6)
ld hl, MenuDataHeader_0x10aaf
call CopyMenuDataHeader
ld a, [wBallsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0e1]
ld [wd0e4], a
call Function350c
@ -1007,7 +1007,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld hl, MenuDataHeader_0x10a67
call CopyMenuDataHeader
ld a, [wItemsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0df]
ld [wd0e4], a
call Function350c
@ -1023,7 +1023,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld hl, MenuDataHeader_0x10a97
call CopyMenuDataHeader
ld a, [wKeyItemsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0e0]
ld [wd0e4], a
call Function350c
@ -1048,7 +1048,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld hl, MenuDataHeader_0x10ac7
call CopyMenuDataHeader
ld a, [wBallsPocketCursor]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ld a, [wd0e1]
ld [wd0e4], a
call Function350c
@ -1411,7 +1411,7 @@ Function10955: ; 10955
ld a, BANK(PackMenuGFX)
call FarCopyBytes
hlcoord 0, 1
ld bc, $00dc
ld bc, 220
ld a, $24
call ByteFill
hlcoord 5, 1

View File

@ -385,7 +385,7 @@ NoRadioName: ; 918a9 (24:58a9)
xor a
ld [hBGMapMode], a ; $ff00+$d4
hlcoord 1, 8
ld bc, $312
lb bc, 3, 18
call ClearBox
hlcoord 0, 12
ld bc, $412

View File

@ -529,7 +529,7 @@ Script_interpretmenu: ; 0x96f41
ld a, [ScriptBank]
ld hl, InterpretMenu
rst FarCall
ld a, [wPocketCursorBuffer]
ld a, [wMenuCursorBuffer]
jr nc, .ok
xor a
.ok
@ -608,7 +608,7 @@ Script_verbosegiveitem2: ; 0x96f8e
call GetScriptByte
call GetVarAction
ld a, [de]
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
ld a, 1
@ -1191,7 +1191,7 @@ endr
ApplyPersonFacing: ; 0x9728b
ld a, d
push de
call Function18de
call CheckObjectVisibility
jr c, .not_visible ; 0x97290 $27
ld hl, OBJECT_SPRITE
add hl, bc
@ -1200,7 +1200,7 @@ ApplyPersonFacing: ; 0x9728b
call Function1836
pop bc
jr c, .not_visible ; 0x9729c $1b
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, bc
bit 2, [hl]
jr nz, .not_visible ; 0x972a4 $13
@ -1209,28 +1209,29 @@ ApplyPersonFacing: ; 0x9728b
call SetSpriteDirection
ld hl, VramState
bit 6, [hl]
jr nz, .asm_972b5 ; 0x972b0 $3
call Function972bc
.asm_972b5
jr nz, .text_state ; 0x972b0 $3
call .DisableTextTiles
.text_state
call UpdateSprites
ret
.not_visible
pop de
scf
ret
; 0x972bc
Function972bc: ; 0x972bc
.DisableTextTiles: ; 0x972bc
call Function217a
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
.asm_972c5
.loop
res 7, [hl]
inc hl
dec bc
ld a, b
or c
jr nz, .asm_972c5 ; 0x972cb $f8
jr nz, .loop ; 0x972cb $f8
ret
; 0x972ce
@ -1258,7 +1259,7 @@ Script_appear: ; 0x972dd
call GetScriptByte
call GetScriptPerson
call _CopyObjectStruct
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld b, 0 ; clear
call ApplyEventActionAppearDisappear
ret
@ -1276,7 +1277,7 @@ Script_disappear: ; 0x972ee
ld a, [hLastTalked]
.ok
call DeleteObjectStruct
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld b, 1 ; set
call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear
@ -1316,14 +1317,14 @@ Script_follow: ; 0x97325
call GetScriptByte
call GetScriptPerson
ld c, a
callba Function5803
callba StartFollow
ret
; 0x9733a
Script_stopfollow: ; 0x9733a
; script command 0x71
callba Function581f
callba StopFollow
ret
; 0x97341
@ -1390,7 +1391,7 @@ Script_loademote: ; 0x97384
ld a, [ScriptVar]
.not_var_emote
ld c, a
callba Function1442f
callba LoadEmote
ret
; 0x97396
@ -1417,7 +1418,7 @@ Script_showemote: ; 0x97396
; 0x973b6
ShowEmoteScript: ; 973b6
loademote -1
loademote EMOTE_MEM
applymovement2 .Show
pause 0
applymovement2 .Hide
@ -1446,7 +1447,7 @@ Script_earthquake: ; 0x973c7
call CopyBytes
call GetScriptByte
ld [wd003], a
and $3f
and (1 << 6) - 1
ld [wd005], a
ld b, BANK(.script)
ld de, .script
@ -2344,7 +2345,7 @@ Script_giveitem: ; 0x977ca
.ok
ld [CurItem], a
call GetScriptByte
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
jr nc, .full ; 0x977e3 $6
@ -2368,7 +2369,7 @@ Script_takeitem: ; 0x977f0
call GetScriptByte
ld [CurItem], a
call GetScriptByte
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
ld a, $ff
ld [wd107], a
ld hl, NumItems
@ -2428,10 +2429,10 @@ Script_checkmoney: ; 0x97843
call GetMoneyAccount
call LoadMoneyAmountToMem
callba CheckMoney
callba CompareMoney
; 0x9784f
CheckMoneyAction: ; 0x9784f
CompareMoneyAction: ; 0x9784f
jr c, .two
jr z, .one
ld a, 0
@ -2497,12 +2498,12 @@ Script_checkcoins: ; 0x97895
call LoadCoinAmountToMem
callba CheckCoins
jr CheckMoneyAction
jr CompareMoneyAction
; 978a0
LoadCoinAmountToMem: ; 978a0
call GetScriptByte
ld [$ffc4], a
ld [hMoneyTemp + 1], a
call GetScriptByte
ld [hMoneyTemp], a
ld bc, hMoneyTemp

View File

@ -115,7 +115,7 @@ SpecialsPointers:: ; c029
add_special RandomPhoneWildMon
add_special RandomPhoneMon
add_special RunCallback_04
add_special Functionfb841
add_special PlaySlowCry
add_special SpecialSnorlaxAwake
add_special Special_YoungerHaircutBrother
add_special Special_OlderHaircutBrother
@ -333,7 +333,7 @@ Special_GetMysteryGiftItem: ; c309
ld a, [sMysteryGiftItem]
ld [CurItem], a
ld a, $1
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
jr nc, .asm_c33d
@ -413,9 +413,9 @@ Special_DummyNonfunctionalGameCornerGame: ; c38d
; c39a
Special_StartGameCornerGame: ; c39a
call Function31cf
call FarQueueScript
call FadeToMenu
ld hl, wd0e8
ld hl, wQueuedScriptBank
ld a, [hli]
push af
ld a, [hli]

View File

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

View File

@ -1,7 +1,7 @@
SpecialBuenasPassword: ; 8af6b
xor a
ld [wcf76], a
ld hl, MenuDataHeader_0x8afa9
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [wBuenasPassword]
ld c, a
@ -11,7 +11,7 @@ SpecialBuenasPassword: ; 8af6b
add $2
ld [wMenuBorderRightCoord], a
call BackUpTiles
call Function1e5d
call Function1e5d ; menu
callba Function4ae5e
ld b, $0
ld a, [MenuSelection]
@ -19,38 +19,38 @@ SpecialBuenasPassword: ; 8af6b
ld a, [wBuenasPassword]
and $3
cp c
jr nz, .asm_8afa4
jr nz, .wrong
ld b, $1
.asm_8afa4
.wrong
ld a, b
ld [ScriptVar], a
ret
; 8afa9
MenuDataHeader_0x8afa9: ; 0x8afa9
.MenuDataHeader: ; 0x8afa9
db $40 ; flags
db 00, 00 ; start coords
db 07, 10 ; end coords
dw MenuData2_0x8afb2
dw .MenuData2
db 1 ; default option
; 0x8afb1
db 0
MenuData2_0x8afb2: ; 0x8afb2
.MenuData2: ; 0x8afb2
db $81 ; flags
db 0 ; items
dw Unknown_8afb8
dw Function8afbd
dw .PasswordIndices
dw .PlacePasswordChoices
; 0x8afb4
Unknown_8afb8: ; 8afb8
.PasswordIndices: ; 8afb8
db 3
db 0, 1, 2
db -1
Function8afbd: ; 8afbd
.PlacePasswordChoices: ; 8afbd
push de
ld a, [wBuenasPassword]
and $f0
@ -71,29 +71,29 @@ SpecialBuenaPrize: ; 8afd4
ld [MenuSelection], a
call Function8b0d6
call Function8b090
ld hl, UnknownText_0x8b072
ld hl, .Text_AskWhichPrize
call PrintText
jr .asm_8aff1
jr .okay
.asm_8afeb
ld hl, UnknownText_0x8b072
call Function105a
.loop
ld hl, .Text_AskWhichPrize
call BuenaPrintText
.asm_8aff1
.okay
call DelayFrame
call UpdateSprites
call Function8b097
call Function8b0e2
jr z, .asm_8b05f
jr z, .done
ld [wcf75], a
call Buena_getprize
ld a, [hl]
ld [wd265], a
call GetItemName
ld hl, UnknownText_0x8b077
call Function105a
ld hl, .Text_IsThatRight
call BuenaPrintText
call YesNoBox
jr c, .asm_8afeb
jr c, .loop
ld a, [wcf75]
call Buena_getprize
@ -108,77 +108,76 @@ SpecialBuenaPrize: ; 8afd4
push hl
ld [CurItem], a
ld a, $1
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
ld hl, NumItems
call ReceiveItem
pop hl
jr nc, .asm_8b04c
jr nc, .BagFull
ld a, [hl]
ld c, a
ld a, [wBlueCardBalance]
sub c
ld [wBlueCardBalance], a
call Function8b097
jr .asm_8b051
jr .Purchase
.InsufficientBalance
ld hl, UnknownText_0x8b081
jr .asm_8b05a
ld hl, .Text_NotEnoughPoints
jr .print
.asm_8b04c
ld hl, UnknownText_0x8b086
jr .asm_8b05a
.BagFull
ld hl, .Text_NoRoom
jr .print
.asm_8b051
.Purchase
ld de, SFX_TRANSACTION
call PlaySFX
ld hl, UnknownText_0x8b07c
ld hl, .Text_HereYouGo
.asm_8b05a
call Function105a
jr .asm_8afeb
.print
call BuenaPrintText
jr .loop
.asm_8b05f
.done
call WriteBackup
call WriteBackup
ld hl, UnknownText_0x8b08b
ld hl, .Text_PleaseComeBackAgain
call PrintText
call JoyWaitAorB
call PlayClickSFX
ret
; 8b072
UnknownText_0x8b072: ; 0x8b072
.Text_AskWhichPrize: ; 0x8b072
; Which prize would you like?
text_jump UnknownText_0x1c589f
db "@"
; 0x8b077
UnknownText_0x8b077: ; 0x8b077
.Text_IsThatRight: ; 0x8b077
; ? Is that right?
text_jump UnknownText_0x1c58bc
db "@"
; 0x8b07c
UnknownText_0x8b07c: ; 0x8b07c
; Here you go!
.Text_HereYouGo ; Here you go!
text_jump UnknownText_0x1c58d1
db "@"
; 0x8b081
UnknownText_0x8b081: ; 0x8b081
.Text_NotEnoughPoints: ; 0x8b081
; You don't have enough points.
text_jump UnknownText_0x1c58e0
db "@"
; 0x8b086
UnknownText_0x8b086: ; 0x8b086
.Text_NoRoom: ; 0x8b086
; You have no room for it.
text_jump UnknownText_0x1c58ff
db "@"
; 0x8b08b
UnknownText_0x8b08b: ; 0x8b08b
.Text_PleaseComeBackAgain: ; 0x8b08b
; Oh. Please come back again!
text_jump UnknownText_0x1c591a
db "@"
@ -247,7 +246,7 @@ Function8b0e2: ; 8b0e2
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [MenuSelection]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
xor a
ld [wcf76], a
ld [hBGMapMode], a

View File

@ -47,7 +47,7 @@ Special_SelectApricornForKurt: ; 88018
call Kurt_SelectQuantity
pop bc
jr nc, .loop
ld a, [wd10c]
ld a, [wItemQuantityChangeBuffer]
ld [wKurtApricornQuantity], a
call Kurt_GiveUpSelectedQuantityOfSelectedApricorn
@ -62,7 +62,7 @@ Kurt_SelectApricorn: ; 88055
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [MenuSelection]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
xor a
ld [hBGMapMode], a
call Function352f
@ -115,7 +115,7 @@ Kurt_SelectApricorn: ; 88055
ld [CurItem], a
call Kurt_GetQuantityOfApricorn
ret z
ld a, [wd10c]
ld a, [wItemQuantityChangeBuffer]
ld [wcf75], a
callba PlaceMenuItemQuantity
ret
@ -126,10 +126,10 @@ Kurt_SelectQuantity: ; 880c2
ld [MenuSelection], a
call Kurt_GetQuantityOfApricorn
jr z, .done
ld a, [wd10c]
ld [wd10d], a
ld a, [wItemQuantityChangeBuffer]
ld [wItemQuantityBuffer], a
ld a, $1
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
ld hl, .MenuDataHeader
call LoadMenuDataHeader
.loop
@ -149,8 +149,8 @@ Kurt_SelectQuantity: ; 880c2
ld a, b
cp -1
jr z, .done
ld a, [wd10c]
ld [wd10c], a ; What is the point of this operation?
ld a, [wItemQuantityChangeBuffer]
ld [wItemQuantityChangeBuffer], a ; What is the point of this operation?
scf
.done
@ -181,7 +181,7 @@ PlaceApricornQuantity: ; 88126
add hl, de
ld [hl], "×"
inc hl
ld de, wd10c
ld de, wItemQuantityChangeBuffer
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
jp PrintNum
; 88139
@ -213,7 +213,7 @@ Kurt_GetQuantityOfApricorn: ; 88139
.done2
ld a, b
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
and a
pop bc
ret
@ -325,7 +325,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
ld [ItemCountBuffer], a
call Kurt_GetRidOfItem
pop hl
ld a, [wd10c]
ld a, [wItemQuantityChangeBuffer]
and a
jr z, .done
push hl
@ -348,7 +348,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
jr .loop4
.done
ld a, [wd10c]
ld a, [wItemQuantityChangeBuffer]
and a
pop bc
pop de
@ -389,7 +389,7 @@ endr
jr z, .done
cp c
jr nz, .done
ld a, [wd10c]
ld a, [wItemQuantityChangeBuffer]
ld c, a
ld a, [hl]
sub c
@ -402,14 +402,14 @@ endr
push bc
ld hl, NumItems
ld a, b
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
call TossItem
pop bc
ld a, c
sub b
.done
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
pop bc
ret
; 88248

View File

@ -162,7 +162,7 @@ endr
jr z, .CancelDeposit
ld de, Money
ld bc, StringBuffer2
callba CheckMoney
callba CompareMoney
jr c, .DontHaveThatMuchToDeposit
ld hl, StringBuffer2
ld de, StringBuffer2 + 3
@ -234,7 +234,7 @@ endr
call CopyBytes
ld de, wd851
ld bc, StringBuffer2
callba CheckMoney
callba CompareMoney
jr c, .InsufficientFundsInBank
ld bc, Money
ld de, StringBuffer2
@ -401,7 +401,7 @@ Function164d1: ; 164d1
Function164ea: ; 164ea
hlcoord 1, 14
ld bc, $0312
lb bc, 3, 18
call ClearBox
ret
; 164f4

View File

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

View File

@ -475,17 +475,17 @@ CallPointerAt:: ; 31be
; 31cd
ExitMenuCallScript:: ; 31cd
; Push pointer hl in the current bank to wd0e8.
QueueScript:: ; 31cd
; Push pointer hl in the current bank to wQueuedScriptBank.
ld a, [hROMBank]
Function31cf:: ; 31cf
; Push pointer a:hl to wd0e8.
ld [wd0e8], a
FarQueueScript:: ; 31cf
; Push pointer a:hl to wQueuedScriptBank.
ld [wQueuedScriptBank], a
ld a, l
ld [wd0e9], a
ld [wQueuedScriptAddr], a
ld a, h
ld [wd0e9 + 1], a
ld [wQueuedScriptAddr + 1], a
ret
; 31db
@ -1515,11 +1515,11 @@ FacingPlayerDistance:: ; 36ad
add hl, bc
ld e, [hl]
ld a, [MapX]
ld a, [PlayerMapX]
cp d
jr z, .CheckY
ld a, [MapY]
ld a, [PlayerMapY]
cp e
jr z, .CheckX
@ -1527,7 +1527,7 @@ FacingPlayerDistance:: ; 36ad
ret
.CheckY
ld a, [MapY]
ld a, [PlayerMapY]
sub e
jr z, .NotFacing
jr nc, .Above
@ -1545,7 +1545,7 @@ FacingPlayerDistance:: ; 36ad
jr .CheckFacing
.CheckX
ld a, [MapX]
ld a, [PlayerMapX]
sub d
jr z, .NotFacing
jr nc, .Left

View File

@ -356,14 +356,14 @@ JoyTextDelay:: ; a57
; a80
Functiona80:: ; a80
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
push af
ld a, [hConnectedMapWidth]
ld a, [hObjectStructIndexBuffer]
push af
xor a
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld a, 6
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
.loop
push hl
@ -377,9 +377,9 @@ Functiona80:: ; a80
jr z, .loop
pop af
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
pop af
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ret
; aa5
@ -459,37 +459,37 @@ Functionb06:: ; b06
cp b
pop bc
jr nz, .asm_b27
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
dec a
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ret nz
ld a, [hConnectedMapWidth]
ld a, [hObjectStructIndexBuffer]
dec a
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
ret nz
ld a, "─"
ld [hl], a
ld a, -1
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld a, 6
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
ret
.asm_b27
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
and a
ret z
dec a
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ret nz
dec a
ld [hConnectionStripLength], a
ld a, [hConnectedMapWidth]
ld [hMapObjectIndexBuffer], a
ld a, [hObjectStructIndexBuffer]
dec a
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
ret nz
ld a, $6
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
ld a, $ee
ld [hl], a
ret

View File

@ -111,7 +111,7 @@ Function217a:: ; 217a
call Function2198
ld a, $60
hlcoord 0, 0
ld bc, TileMapEnd - TileMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, BANK(Function4d15b)
@ -131,12 +131,12 @@ Function2198:: ; 2198
ld hl, wEnemyMoveStruct
ld b, $5
.asm_21a5
.loop
push de
push hl
ld c, $6
.asm_21a9
.loop2
push de
push hl
ld a, [de]
@ -187,7 +187,7 @@ endr
pop de
inc de
dec c
jp nz, .asm_21a9
jp nz, .loop2
pop hl
ld de, $0060
add hl, de
@ -201,7 +201,7 @@ endr
.asm_2225
dec b
jp nz, .asm_21a5
jp nz, .loop
ret
; 222a
@ -252,10 +252,10 @@ Function2252:: ; 2252
; 2266
Function2266:: ; 2266
ld a, [MapY]
ld a, [PlayerMapY]
sub $4
ld e, a
ld a, [MapX]
ld a, [PlayerMapX]
sub $4
ld d, a
ld a, [wCurrMapWarpCount]
@ -652,11 +652,11 @@ Function2457:: ; 2457
; 2471
Function2471:: ; 2471
ld hl, ObjectStruct1
ld hl, Object1Struct
ld bc, OBJECT_STRUCT_LENGTH * (NUM_OBJECT_STRUCTS - 1)
xor a
call ByteFill
ld hl, ObjectStruct1
ld hl, Object1Struct
ld de, OBJECT_STRUCT_LENGTH
ld c, NUM_OBJECT_STRUCTS - 1
xor a
@ -1170,33 +1170,33 @@ CoordinatesEventText:: ; 2702
; 2707
Function2707:: ; 2707
ld a, [hConnectionStripLength]
CheckObjectMask:: ; 2707
ld a, [hMapObjectIndexBuffer]
ld e, a
ld d, $0
ld hl, wd81e
ld hl, wObjectMasks
add hl, de
ld a, [hl]
ret
; 2712
Function2712:: ; 2712
ld a, [hConnectionStripLength]
MaskObject:: ; 2712
ld a, [hMapObjectIndexBuffer]
ld e, a
ld d, $0
ld hl, wd81e
ld hl, wObjectMasks
add hl, de
ld [hl], $ff
ld [hl], -1 ; ,masked
ret
; 271e
Function271e:: ; 271e
ld a, [hConnectionStripLength]
UnmaskObject:: ; 271e
ld a, [hMapObjectIndexBuffer]
ld e, a
ld d, $0
ld hl, wd81e
ld hl, wObjectMasks
add hl, de
ld [hl], $0
ld [hl], 0 ; unmasked
ret
; 272a
@ -1463,7 +1463,7 @@ SaveScreen:: ; 289d
ld de, XCoord + 1
ld a, [MapWidth]
add $6
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld a, [wd151]
and a
jr z, .asm_28cb
@ -1477,7 +1477,7 @@ SaveScreen:: ; 289d
.asm_28c0
ld de, wdcbf
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld c, a
ld b, $0
add hl, bc
@ -1512,7 +1512,7 @@ LoadNeighboringBlockData:: ; 28e3
ld l, a
ld a, [MapWidth]
add $6
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
ld de, XCoord + 1
ld b, $6
ld c, $5
@ -1537,7 +1537,7 @@ Function28f7:: ; 28f7
.asm_2908
pop hl
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
ld c, a
ld b, $0
add hl, bc
@ -1552,15 +1552,15 @@ Function2914:: ; 2914
ld [TilePermissions], a
call Function296c
call Function294d
ld a, [MapX]
ld a, [PlayerMapX]
ld d, a
ld a, [MapY]
ld a, [PlayerMapY]
ld e, a
call Function2a3c
ld [StandingTile], a
ld [PlayerStandingTile], a
call Function29ff
ret nz
ld a, [StandingTile]
ld a, [PlayerStandingTile]
and 7
ld hl, .data_2945
add l
@ -1580,9 +1580,9 @@ Function2914:: ; 2914
; 294d
Function294d:: ; 294d
ld a, [MapX]
ld a, [PlayerMapX]
ld d, a
ld a, [MapY]
ld a, [PlayerMapY]
ld e, a
push de
inc e
@ -1598,9 +1598,9 @@ Function294d:: ; 294d
; 296c
Function296c:: ; 296c
ld a, [MapX]
ld a, [PlayerMapX]
ld d, a
ld a, [MapY]
ld a, [PlayerMapY]
ld e, a
push de
dec d
@ -1725,10 +1725,10 @@ endr
ld h, [hl]
ld l, a
ld a, [MapX]
ld a, [PlayerMapX]
add d
ld d, a
ld a, [MapY]
ld a, [PlayerMapY]
add e
ld e, a
ld a, [hl]
@ -1906,10 +1906,10 @@ CheckStandingOnXYTrigger:: ; 2ae7
call CheckTriggers
ld b, a
; Load your current coordinates into de. This will be used to check if your position is in the xy-trigger table for the current map.
ld a, [MapX]
ld a, [PlayerMapX]
sub 4
ld d, a
ld a, [MapY]
ld a, [PlayerMapY]
sub 4
ld e, a
@ -2145,7 +2145,7 @@ GetMapBank:: ; 2c29
GetAnyMapBank:: ; 2c31
push hl
push de
ld de, $0000
ld de, 0
call GetAnyMapHeaderMember
ld a, c
pop de

View File

@ -21,7 +21,7 @@ Function180e:: ; 180e
ld hl, UsedSprites + 2
ld c, SPRITE_GFX_LIST_CAPACITY - 1
ld b, a
ld a, [hConnectionStripLength]
ld a, [hMapObjectIndexBuffer]
cp 0
jr z, .nope
ld a, b
@ -78,14 +78,14 @@ Function1836:: ; 1836
Function184a:: ; 184a
ld a, [StandingTile]
ld a, [PlayerStandingTile]
call GetTileCollision
ld b, a
ret
; 1852
CheckOnWater:: ; 1852
ld a, [StandingTile]
ld a, [PlayerStandingTile]
call GetTileCollision
sub 1
ret z
@ -209,7 +209,7 @@ CheckWaterfallTile:: ; 18bd
; 18c3
CheckStandingOnEntrance:: ; 18c3
ld a, [StandingTile]
ld a, [PlayerStandingTile]
cp $71 ; door
ret z
cp $79
@ -232,16 +232,16 @@ GetMapObject:: ; 18d2
; 18de
Function18de:: ; 18de
CheckObjectVisibility:: ; 18de
; Sets carry if the object is not visible on the screen.
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp -1
jr z, .not_visible
ld [hConnectedMapWidth], a
ld [hObjectStructIndexBuffer], a
call GetObjectStruct
and a
ret
@ -251,7 +251,7 @@ Function18de:: ; 18de
ret
; 18f5
Function18f5:: ; 18f5
CheckObjectTime:: ; 18f5
ld hl, MAPOBJECT_HOUR
add hl, bc
ld a, [hl]
@ -326,7 +326,7 @@ Function18f5:: ; 18f5
; 194d
Function194d:: ; 194d
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
call GetMapObject
call CopyObjectStruct
ret
@ -335,22 +335,22 @@ Function194d:: ; 194d
_CopyObjectStruct:: ; 1956
ld [hConnectionStripLength], a
call Function271e
ld a, [hConnectionStripLength]
ld [hMapObjectIndexBuffer], a
call UnmaskObject
ld a, [hMapObjectIndexBuffer]
call GetMapObject
callba CopyObjectStruct
ret
; 1967
Function1967:: ; 1967
ld [hConnectionStripLength], a
ld [hMapObjectIndexBuffer], a
call GetMapObject
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp -1
ret z
ret z ; already hidden
ld [hl], -1
push af
call Function1985
@ -361,24 +361,24 @@ Function1967:: ; 1967
; 1985
Function1985:: ; 1985
ld hl, wd4cd
ld hl, wObjectFollow_Leader
cp [hl]
jr z, .ok
ld hl, wd4ce
ld hl, wObjectFollow_Follower
cp [hl]
ret nz
.ok
callba Function581f
callba StopFollow
ld a, -1
ld [wd4cd], a
ld [wd4ce], a
ld [wObjectFollow_Leader], a
ld [wObjectFollow_Follower], a
ret
; 199f
DeleteObjectStruct:: ; 199f
call Function1967
call Function2712
call MaskObject
ret
; 19a6
@ -413,11 +413,11 @@ Function19b8:: ; 19b8
cp $d
ret nc
ld b, a
ld a, [wd4cd]
ld a, [wObjectFollow_Leader]
cp b
jr nz, .ok
ld a, -1
ld [wd4cd], a
ld [wObjectFollow_Leader], a
.ok
ld a, b
@ -429,19 +429,19 @@ Function19b8:: ; 19b8
Function19e9:: ; 19e9
ld [wc2e2], a
ld [wMovementPerson], a
ld a, [hROMBank]
ld [wc2e3], a
ld [wMovementDataPointer], a
ld a, l
ld [wc2e3 + 1], a
ld [wMovementDataPointer + 1], a
ld a, h
ld [wc2e3 + 2], a
ld a, [wc2e2]
call Function18de
ld [wMovementDataPointer + 2], a
ld a, [wMovementPerson]
call CheckObjectVisibility
ret c
ld hl, OBJECT_03
ld hl, OBJECT_MOVEMENTTYPE
add hl, bc
ld [hl], $14
ld [hl], SPRITEMOVEDATA_14
ld hl, OBJECT_09
add hl, bc
ld [hl], 0
@ -453,7 +453,10 @@ Function19e9:: ; 19e9
Function1a13:: ; 1a13
FindFirstEmptyObjectStruct:: ; 1a13
; Returns the index of the first empty object struct in A and its address in HL, then sets carry.
; If all object structs are occupied, A = 0 and Z is set.
; Preserves BC and DE.
push bc
push de
ld hl, ObjectStructs
@ -462,15 +465,15 @@ Function1a13:: ; 1a13
.loop
ld a, [hl]
and a
jr z, .empty
jr z, .break
add hl, de
dec c
jr nz, .loop
xor a
jr .done
.empty
ld a, $d
.break
ld a, NUM_OBJECT_STRUCTS
sub c
scf
@ -483,7 +486,7 @@ Function1a13:: ; 1a13
Function1a2f:: ; 1a2f
ld hl, OBJECT_03
ld hl, OBJECT_MOVEMENTTYPE
add hl, bc
ld a, [hl]
cp OBJECT_STRUCT_3_DATA_HEIGHT
@ -541,13 +544,13 @@ Function1a61:: ; 1a61
; 1a71
Function1a71:: ; 1a71
ld hl, OBJECT_03
ld hl, OBJECT_MOVEMENTTYPE
add hl, de
ld [hl], a
push de
ld e, a
ld d, 0
ld hl, ObjectStruct3_Data + 1
ld hl, ObjectStruct3_Data + 1 ; facing?
rept OBJECT_STRUCT_3_DATA_WIDTH
add hl, de
endr
@ -569,12 +572,12 @@ endr
ld [hl], a
ld a, [bc]
inc bc
ld hl, OBJECT_04
ld hl, OBJECT_FLAGS1
add hl, de
ld [hl], a
ld a, [bc]
inc bc
ld hl, OBJECT_FLAGS
ld hl, OBJECT_FLAGS2
add hl, de
ld [hl], a
ld a, [bc]

View File

@ -16,7 +16,7 @@ CopyMenuDataHeader::
; 0x1d4b
Function1d4b:: ; 1d4b
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
ret
; 1d4f
@ -62,7 +62,7 @@ MenuDataHeader_0x1d75:: ; 1d75
db $40 ; tile backup
db 0, 0 ; start coords
db 17, 19 ; end coords
dw $0000
dw 0
db 1 ; default option
; 1d7d
@ -410,7 +410,7 @@ Function1f2a:: ; 1f2a
ld a, [hl]
ld [MenuSelection], a
ld a, [wcfa9]
ld [wPocketCursorBuffer], a
ld [wMenuCursorBuffer], a
and a
ret
@ -571,7 +571,7 @@ InterpretMenu:: ; 202a
ld a, [hROMBank]
ld [wcf94], a
callba Function2400e
ld a, [wPocketCursorBuffer]
ld a, [wMenuCursorBuffer]
ret
; 2039
@ -579,7 +579,7 @@ Function2039:: ; 2039
ld a, [hROMBank]
ld [wcf94], a
callba Function24022
ld a, [wPocketCursorBuffer]
ld a, [wMenuCursorBuffer]
ret
; 2048
@ -587,7 +587,7 @@ Function2048:: ; 2048
ld a, [hROMBank]
ld [wcf94], a
callba Function2403c
ld a, [wPocketCursorBuffer]
ld a, [wMenuCursorBuffer]
ret
; 2057

View File

@ -175,7 +175,7 @@ RadioTerminator:: ; 1052
PrintText:: ; 1057
call SetUpTextBox
Function105a:: ; 105a
BuenaPrintText:: ; 105a
push hl
hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY
lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW
@ -1057,13 +1057,13 @@ Function1522:: ; 1522
; 152d
TextSFX:: ; 152d
dbw $0b, SFX_DEX_FANFARE_50_79
dbw $12, SFX_FANFARE
dbw $0e, SFX_DEX_FANFARE_20_49
dbw $0f, SFX_ITEM
dbw $10, SFX_CAUGHT_MON
dbw $11, SFX_DEX_FANFARE_80_109
dbw $13, SFX_SLOT_MACHINE_START
dbw TX_SOUND_0B, SFX_DEX_FANFARE_50_79
dbw TX_SOUND_12, SFX_FANFARE
dbw TX_SOUND_0E, SFX_DEX_FANFARE_20_49
dbw TX_SOUND_0F, SFX_ITEM
dbw TX_SOUND_10, SFX_CAUGHT_MON
dbw TX_SOUND_11, SFX_DEX_FANFARE_80_109
dbw TX_SOUND_13, SFX_SLOT_MACHINE_START
db -1
; 1543
@ -1122,11 +1122,11 @@ Text_TX_STRINGBUFFER:: ; 156a
push hl
ld e, a
ld d, 0
ld hl, Unknown_24000
ld hl, StringBufferPointers
rept 2
add hl, de
endr
ld a, BANK(Unknown_24000)
ld a, BANK(StringBufferPointers)
call GetFarHalfword
ld d, h
ld e, l

View File

@ -175,7 +175,7 @@ Function1cc6:: ; 1cc6
Function1ce1:: ; 1ce1
call GetMemTileCoord
ld bc, $0015
lb bc, 0, 21
add hl, bc
call GetMenuBoxDims
dec b

View File

@ -32,6 +32,9 @@ hJoyDown EQU $ffa8
hJoyLast EQU $ffa9
hInMenu EQU $ffaa
hMapObjectIndexBuffer EQU $ffaf
hObjectStructIndexBuffer EQU $ffb0
hConnectionStripLength EQU $ffaf
hConnectedMapWidth EQU $ffb0
@ -58,6 +61,8 @@ hPrintNum5 EQU $ffb7
hPrintNum6 EQU $ffb8
hPrintNum7 EQU $ffb9
hUsedSpriteIndex EQU $ffbd
hUsedSpriteTile EQU $ffbe
hMoneyTemp EQU $ffc3
hLCDStatCustom EQU $ffc6

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

View File

@ -720,7 +720,7 @@ endr
.toss
ld hl, NumItems
inc a
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
jp TossItem
.used_park_ball
@ -2947,7 +2947,7 @@ Functionf789: ; f789
Functionf795: ; f795
ld hl, NumItems
ld a, 1
ld [wd10c], a
ld [wItemQuantityChangeBuffer], a
jp TossItem
; f7a0

View File

@ -2,7 +2,6 @@
INCLUDE "gbhw.asm"
SECTION "Main", ROMX
Function110000: ; 110000 (44:4000)
@ -258,7 +257,7 @@ Function110115: ; 110115
cp $0
jr z, .asm_11015d
.asm_110158
ld hl, $0000
ld hl, 0
.asm_11015b
ld a, e
ret
@ -684,14 +683,14 @@ rept 2
inc de
endr
pop hl
ld bc, $0000
ld bc, 0
call Function110007
ld a, c
ld [$cb7a], a
ld [$c86b], a
push de
inc de
ld bc, $0000
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, $0000
ld bc, 0
call Function11000f
ld a, c
pop hl
@ -4810,7 +4809,7 @@ Function111f07: ; 111f07 (44:5f07)
Function111f63: ; 111f63
push de
ld hl, $0000
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, $0000
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, $0000
ld de, $0000
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, $0000
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, $0000
ld de, 0
.asm_113551
ld a, [hli]
add e

View File

@ -79,11 +79,17 @@ bigdw: MACRO ; big-endian word
ENDM
dba: MACRO ; dbw bank, address
rept _NARG
dbw BANK(\1), \1
shift
endr
ENDM
dab: MACRO ; dwb address, bank
rept _NARG
dwb \1, BANK(\1)
shift
endr
ENDM
lb: MACRO ; r, hi, lo

View File

@ -18,6 +18,10 @@ enum: macro
__enum__ = __enum__ + __enumdir__
endm
enum_set: macro
__enum__ = \1
endm
; Enumerate constants

View File

@ -74,9 +74,7 @@ map_header_2: MACRO
; label, map, border block, connections
\1_SecondMapHeader::
db \3
\2\@HEIGHT EQUS "\2_HEIGHT"
\2\@WIDTH EQUS "\2_WIDTH"
db \2\@HEIGHT, \2\@WIDTH
db \2_HEIGHT, \2_WIDTH
db BANK(\1_BlockData)
dw \1_BlockData
db BANK(\1_MapScriptHeader)
@ -162,11 +160,6 @@ GROUP_\1 EQU const_value
\1_HEIGHT EQU \2
\1_WIDTH EQU \3
ENDM
; map id, height, width
; \1\@ EQUS "GROUP_\1"
; \1\@_2 EQUS "MAP_\1"
; \1\@ EQU const_value
; enum \1\@_2
newgroup: MACRO
const_value = const_value + 1

View File

@ -12,72 +12,127 @@ page EQUS "db $50," ; Start a new Pokedex page.
dex EQUS "db $e8, $50" ; End a Pokedex entry.
TX_RAM EQU $01
TX_FAR EQU $16
; TX_RAM EQU $01
; TX_FAR EQU $16
enum_start 1
enum TX_RAM
text_from_ram: MACRO
db TX_RAM
dw \1
ENDM
enum TX_BCD
text_bcd: macro
db TX_BCD
dw \1
db \2
ENDM
enum TX_MOVE
text_move: macro
db TX_MOVE
dw \1
ENDM
enum TX_BOX
text_box: macro
db TX_BOX
dw \1
db \2, \3
ENDM
enum TX_LOW
text_low: macro
db TX_LOW
endm
enum WAIT_BUTTON
text_waitbutton: macro
db WAIT_BUTTON
endm
enum TX_SCROLL
text_scroll: macro
db TX_SCROLL
endm
enum START_ASM
start_asm: macro
db START_ASM
endm
enum TX_NUM
deciram: macro
db TX_NUM
dw \1 ; address
dn \2, \3 ; bytes, digits
endm
enum TX_EXIT
interpret_data: macro
db TX_EXIT
endm
enum TX_SOUND_0B
sound0: macro
db TX_SOUND_0B
endm
enum TX_DOTS
limited_interpret_data: macro
db TX_DOTS
db \1
endm
enum TX_LINK_WAIT_BUTTON
link_wait_button: macro
db TX_LINK_WAIT_BUTTON
endm
enum TX_SOUND_0E
sound1: macro
db TX_SOUND_0E
endm
enum TX_SOUND_0F
sound0x0F: macro
db TX_SOUND_0F
endm
enum TX_SOUND_10
sound0x02: macro
db TX_SOUND_10
endm
enum TX_SOUND_11
sound0x0A: macro
db TX_SOUND_11
endm
enum TX_SOUND_12
sound0x12: macro
db TX_SOUND_12
endm
enum TX_SOUND_13
sound0x2C: macro
db $13
endm
enum TX_STRINGBUFFER
text_buffer: macro
db TX_STRINGBUFFER
db \1
endm
enum TX_DAY
current_day: macro
db TX_DAY
endm
enum TX_FAR
text_jump: MACRO
db TX_FAR
dw \1
db BANK(\1)
ENDM
text_from_ram: MACRO
db TX_RAM
dw \1
ENDM
text_dunno1: macro
db 5
endm
text_waitbutton: macro
db 6
endm
text_dunno2: macro
db 7
endm
start_asm: macro
db 8
endm
deciram: macro
db 9
dw \1
db \2
endm
interpret_data: macro
db 10
endm
sound0: macro
db 11
endm
limited_interpret_data: macro
db 12
db \1
endm
sound0x0F: macro
db $f
endm
sound0x02: macro
db $10
endm
sound0x0A: macro
db $11
endm
sound0x2C: macro
db $13
endm
current_day: macro
db $15
endm

916
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -5,21 +5,21 @@ AzaleaGym_MapScriptHeader:
.MapCallbacks:
db 0
BugsyScript_0x18ec1e:
BugsyScript:
faceplayer
loadfont
checkevent EVENT_BEAT_BUGSY
iftrue .FightDone
writetext UnknownText_0x18ed0b
writetext BugsyText_INeverLose
closetext
loadmovesprites
winlosstext UnknownText_0x18edae, $0000
winlosstext BugsyText_ResearchIncomplete, 0
loadtrainer BUGSY, 1
startbattle
returnafterbattle
setevent EVENT_BEAT_BUGSY
loadfont
writetext UnknownText_0x18ee14
writetext Text_ReceivedHiveBadge
playsound SFX_GET_BADGE
waitbutton
setflag ENGINE_HIVEBADGE
@ -32,18 +32,18 @@ BugsyScript_0x18ec1e:
setevent EVENT_BEAT_BUG_CATCHER_BENNY
setevent EVENT_BEAT_BUG_CATCHER_AL
setevent EVENT_BEAT_BUG_CATCHER_JOSH
writetext UnknownText_0x18ee2b
writetext BugsyText_HiveBadgeSpeech
keeptextopen
verbosegiveitem TM_FURY_CUTTER, 1
iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER
writetext UnknownText_0x18eefa
writetext BugsyText_FuryCutterSpeech
closetext
loadmovesprites
end
.GotFuryCutter:
writetext UnknownText_0x18ef98
writetext BugsyText_BugMonsAreDeep
closetext
.NoRoomForFuryCutter:
loadmovesprites
@ -61,56 +61,56 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets
TrainerTwinsAmyandmay1:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f1fc
writetext TwinsAmyandmay1AfterBattleText
closetext
loadmovesprites
end
TrainerTwinsAmyandmay2:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f269
writetext TwinsAmyandmay2AfterBattleText
closetext
loadmovesprites
end
TrainerBug_catcherBug_catcher_benny:
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript
TrainerBug_catcherbenny:
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f053
writetext Bug_catcherbennyAfterBattleText
closetext
loadmovesprites
end
TrainerBug_catcherAl:
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f0d3
writetext Bug_catcherAlAfterBattleText
closetext
loadmovesprites
end
TrainerBug_catcherJosh:
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f17e
writetext Bug_catcherJoshAfterBattleText
closetext
loadmovesprites
end
@ -140,7 +140,7 @@ AzaleaGymStatue:
trainertotext BUGSY, 1, $1
jumpstd gymstatue2
UnknownText_0x18ed0b:
BugsyText_INeverLose:
text "I'm BUGSY!"
line "I never lose when"
@ -158,7 +158,7 @@ UnknownText_0x18ed0b:
cont "from my studies."
done
UnknownText_0x18edae:
BugsyText_ResearchIncomplete:
text "Whoa, amazing!"
line "You're an expert"
cont "on #MON!"
@ -170,12 +170,12 @@ UnknownText_0x18edae:
line "this BADGE."
done
UnknownText_0x18ee14:
Text_ReceivedHiveBadge:
text "<PLAYER> received"
line "HIVEBADGE."
done
UnknownText_0x18ee2b:
BugsyText_HiveBadgeSpeech:
text "Do you know the"
line "benefits of HIVE-"
cont "BADGE?"
@ -196,7 +196,7 @@ UnknownText_0x18ee2b:
line "you to have this."
done
UnknownText_0x18eefa:
BugsyText_FuryCutterSpeech:
text "TM49 contains"
line "FURY CUTTER."
@ -212,7 +212,7 @@ UnknownText_0x18eefa:
line "I discovered it!"
done
UnknownText_0x18ef98:
BugsyText_BugMonsAreDeep:
text "Bug #MON are"
line "deep. There are"
@ -223,7 +223,7 @@ UnknownText_0x18ef98:
line "ites thoroughly."
done
Bug_catcherBug_catcher_bennySeenText:
Bug_catcherbennySeenText:
text "Bug #MON evolve"
line "young. So they get"
@ -231,12 +231,12 @@ Bug_catcherBug_catcher_bennySeenText:
line "faster."
done
Bug_catcherBug_catcher_bennyBeatenText:
Bug_catcherbennyBeatenText:
text "Just evolving"
line "isn't enough!"
done
UnknownText_0x18f053:
Bug_catcherbennyAfterBattleText:
text "#MON become"
line "stronger if they"
cont "evolve. Really!"
@ -255,7 +255,7 @@ Bug_catcherAlBeatenText:
line "tough you are…"
done
UnknownText_0x18f0d3:
Bug_catcherAlAfterBattleText:
text "They're so cool,"
line "but most girls"
@ -279,7 +279,7 @@ Bug_catcherJoshBeatenText:
text "Urrgggh!"
done
UnknownText_0x18f17e:
Bug_catcherJoshAfterBattleText:
text "I guess I should"
line "teach them better"
cont "moves…"
@ -296,7 +296,7 @@ TwinsAmyandmay1BeatenText:
line "double goodness!"
done
UnknownText_0x18f1fc:
TwinsAmyandmay1AfterBattleText:
text "AMY: You're"
line "really strong!"
done
@ -312,7 +312,7 @@ TwinsAmyandmay2BeatenText:
line "double goodness!"
done
UnknownText_0x18f269:
TwinsAmyandmay2AfterBattleText:
text "MAY: Our bug #-"
line "MON lost! Oh, what"
cont "a shame."
@ -371,10 +371,10 @@ AzaleaGym_MapEventHeader:
.PersonEvents:
db 7
person_event SPRITE_BUGSY, 7, 5, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript_0x18ec1e, -1
person_event SPRITE_BUG_CATCHER, 3, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherBug_catcher_benny, -1
person_event SPRITE_BUG_CATCHER, 8, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1
person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BugsyScript, -1
person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 2, TrainerBug_catcherbenny, -1
person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherJosh, -1
person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay1, -1
person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsAmyandmay2, -1
person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, AzaleaGymGuyScript, -1

View File

@ -7,7 +7,7 @@ AzaleaMart_MapScriptHeader:
ClerkScript_0x18e040:
loadfont
pokemart $0, $0003
pokemart MARTTYPE_STANDARD, MART_AZALEA
loadmovesprites
end
@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
person_event SPRITE_COOLTRAINER_M, 5, 2, $7, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
person_event SPRITE_BUG_CATCHER, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x18e040, -1
person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, 0, 0, CooltrainerMScript_0x18e047, -1
person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x18e04a, -1

View File

@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x18db27, $0000
dw UnknownScript_0x18db27, 0
.MapCallbacks:
db 0
@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
person_event SPRITE_GENTLEMAN, 6, 9, $4, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
person_event SPRITE_FISHING_GURU, 1, 6, $6, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
person_event SPRITE_POKEFAN_F, 4, 1, $2, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18db28, -1
person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, 0, 0, GentlemanScript_0x18db2b, -1
person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, FishingGuruScript_0x18db2e, -1
person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_02, 2, 1, -1, -1, 0, 0, 0, PokefanFScript_0x18db31, -1

View File

@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader:
db 3
; triggers
dw .Trigger1, $0000
dw .Trigger2, $0000
dw .Trigger3, $0000
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks:
db 1
@ -481,15 +481,15 @@ AzaleaTown_MapEventHeader:
.PersonEvents:
db 12
person_event SPRITE_AZALEA_ROCKET, 9, 31, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
person_event SPRITE_GRAMPS, 9, 21, $2, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
person_event SPRITE_TEACHER, 13, 15, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
person_event SPRITE_YOUNGSTER, 9, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
person_event SPRITE_SLOWPOKE, 17, 8, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 18, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 29, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 15, 15, $1, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_FRUIT_TREE, 2, 8, $1, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 10, 11, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
person_event SPRITE_AZALEA_ROCKET, 16, 10, $6, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_KURT_OUTSIDE, 5, 6, $8, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT
person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_02, 2, 1, -1, -1, 0, 0, 0, GrampsScript_0x1980b1, -1
person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x1980c5, -1
person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1980c8, -1
person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT

View File

@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9e39d, $0000
dw UnknownScript_0x9e3d3, $0000
dw UnknownScript_0x9e39d, 0
dw UnknownScript_0x9e3d3, 0
.MapCallbacks:
db 0
@ -734,7 +734,7 @@ Text_APkmnLevelExceeds: ; 0x9f1e5
text "One or more of"
line "your #MON's"
cont "levels exceeds @"
deciram ScriptVar, $13
deciram ScriptVar, 1, 3
text "."
done
@ -746,7 +746,7 @@ Text_MayNotEnterABattleRoomUnderL70: ; 0x9f217
para "This BATTLE ROOM"
line "is for L@"
deciram ScriptVar, $13
deciram ScriptVar, 1, 3
text "."
done
@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_RECEPTIONIST, 6, 7, $6, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
person_event SPRITE_YOUNGSTER, 9, 14, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
person_event SPRITE_COOLTRAINER_F, 9, 4, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
person_event SPRITE_BUG_CATCHER, 3, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
person_event SPRITE_GRANNY, 3, 14, $4, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1
person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ReceptionistScript_0x9e3e2, -1
person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, YoungsterScript_0x9e55d, -1
person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x9e568, -1
person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BugCatcherScript_0x9e56b, -1
person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, 0, 0, GrannyScript_0x9e56e, -1

View File

@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader:
db 2
; triggers
dw Script_EnterBattleRoom, $0000
dw UnknownScript_0x9f420, $0000
dw Script_EnterBattleRoom, 0
dw UnknownScript_0x9f420, 0
.MapCallbacks:
db 0
@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_YOUNGSTER, 0, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 6, 1, $9, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1
person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, -1

View File

@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f562, $0000
dw UnknownScript_0x9f567, $0000
dw UnknownScript_0x9f562, 0
dw UnknownScript_0x9f567, 0
.MapCallbacks:
db 0
@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_RECEPTIONIST, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1
person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, MovementData_0x9f58f, -1

View File

@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f5bb, $0000
dw UnknownScript_0x9f5c0, $0000
dw UnknownScript_0x9f5bb, 0
dw UnknownScript_0x9f5c0, 0
.MapCallbacks:
db 0
@ -98,4 +98,4 @@ BattleTowerHallway_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_RECEPTIONIST, 2, 11, $6, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1
person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, BattleTowerHallway_MapEventHeader, -1

View File

@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
person_event SPRITE_BUENA, 11, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
person_event SPRITE_SAILOR, 18, 12, $5, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 24, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, StandingYoungsterScript_0x9f85f, -1
person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BuenaScript_0x9f862, -1
person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ObjectEvent, -1

View File

@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_GRAMPS, 3, 2, $7, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1
person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrampsScript_0x189538, -1

View File

@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
.PersonEvents:
db 9
person_event SPRITE_SUPER_NERD, 12, 18, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
person_event SPRITE_SUPER_NERD, 12, 19, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
person_event SPRITE_GRAMPS, 2, 20, $6, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 2, 21, $8, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
person_event SPRITE_BLACK_BELT, 31, 24, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
person_event SPRITE_COOLTRAINER_F, 25, 9, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
person_event SPRITE_YOUNGSTER, 15, 13, $5, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
person_event SPRITE_YOUNGSTER, 20, 22, $6, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 19, 35, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1
person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, BlackBeltScript_0x1a470e, -1
person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x1a4722, -1
person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, YoungsterScript_0x1a4725, -1
person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x1a4728, -1

View File

@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_LASS, 3, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1
person_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, Emy, -1

View File

@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_GRANNY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
person_event SPRITE_EKANS, 5, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1
person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x195949, -1
person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, EkansScript_0x19594c, -1

View File

@ -33,7 +33,7 @@ ClairScript_0x194e24:
writetext UnknownText_0x194efa
closetext
loadmovesprites
winlosstext UnknownText_0x194fd6, $0000
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, $0000, 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, $0000, 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, $0000, CooltrainerfLolaScript
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript
CooltrainerfLolaScript:
talkaftercancel
@ -404,8 +404,8 @@ BlackthornGym1F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_CLAIR, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
person_event SPRITE_COOLTRAINER_M, 6, 6, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 14, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 2, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
person_event SPRITE_GYM_GUY, 15, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1
person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClairScript_0x194e24, -1
person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfLola, -1
person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BlackthornGymGuyScript, -1

View File

@ -59,7 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder
TrainerCooltrainermCody:
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, 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, $0000, CooltrainerfFranScript
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript
CooltrainerfFranScript:
talkaftercancel
@ -145,11 +145,11 @@ BlackthornGym2F_MapEventHeader:
.PersonEvents:
db 8
person_event SPRITE_COOLTRAINER_M, 1, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
person_event SPRITE_COOLTRAINER_F, 11, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
person_event SPRITE_BOULDER, 2, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
person_event SPRITE_BOULDER, 3, 2, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
person_event SPRITE_BOULDER, 16, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
person_event SPRITE_BOULDER, 3, 3, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 1, 6, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 14, 8, $19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainermCody, -1
person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerCooltrainerfFran, -1
person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BlackthornGymBoulder, -1

View File

@ -7,7 +7,7 @@ BlackthornMart_MapScriptHeader:
ClerkScript_0x195a5d:
loadfont
pokemart $0, $0011
pokemart MARTTYPE_STANDARD, MART_BLACKTHORN
loadmovesprites
end
@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
person_event SPRITE_BLACK_BELT, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x195a5d, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, 0, 0, CooltrainerMScript_0x195a64, -1
person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, BlackBeltScript_0x195a67, -1

View File

@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
person_event SPRITE_GENTLEMAN, 3, 5, $6, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
person_event SPRITE_TWIN, 4, 1, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x195b79, -1
person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, GentlemanScript_0x195b7c, -1
person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TwinScript_0x195b7f, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x195b82, -1

View File

@ -158,4 +158,4 @@ BluesHouse_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_DAISY, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1
person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, DaisyScript_0x19b0d0, -1

View File

@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x180993, $0000
dw UnknownScript_0x180997, $0000
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, $0000
winlosstext UnknownText_0x180b23, 0
loadtrainer BRUNO, 1
startbattle
returnafterbattle
@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_BRUNO, 7, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1
person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, BrunoScript_0x1809c5, -1

View File

@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x185bf2, $0000
dw UnknownScript_0x185bf6, $0000
dw UnknownScript_0x185bf7, $0000
dw UnknownScript_0x185bf2, 0
dw UnknownScript_0x185bf6, 0
dw UnknownScript_0x185bf7, 0
.MapCallbacks:
db 1
@ -309,8 +309,8 @@ BurnedTower1F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_ROCK, 4, 15, $18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 12, 12, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 9, 8, $8, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 14, 14, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 2, 14, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP
person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_18, 0, 0, -1, -1, 0, 0, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP

View File

@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x18615e, $0000
dw UnknownScript_0x18615f, $0000
dw UnknownScript_0x18615e, 0
dw UnknownScript_0x18615f, 0
.MapCallbacks:
db 1
@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader:
.PersonEvents:
db 9
person_event SPRITE_BOULDER, 8, 17, $19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
person_event SPRITE_RAIKOU, 3, 7, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_ENTEI, 3, 12, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_SUICUNE, 4, 10, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_RAIKOU, 3, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 3, 12, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 4, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 4, 16, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 12, 10, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER
person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_19, 0, 0, -1, -1, 0, 0, 0, BurnedTowerB1FBoulder, -1
person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, 0, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER

View File

@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_SUPER_NERD, 3, 9, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
person_event SPRITE_FISHER, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
person_event SPRITE_FISHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
person_event SPRITE_FISHER, 2, 1, $9, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
person_event SPRITE_TEACHER, 3, 4, $8, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1
person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, SuperNerdScript_0x73049, -1
person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73051, -1
person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x73062, -1
person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, FisherScript_0x73073, -1
person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, TeacherScript_0x73084, -1

View File

@ -257,12 +257,12 @@ CeladonCity_MapEventHeader:
.PersonEvents:
db 9
person_event SPRITE_FISHER, 11, 26, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
person_event SPRITE_POLIWAG, 11, 27, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
person_event SPRITE_TEACHER, 24, 20, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
person_event SPRITE_GRAMPS, 16, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
person_event SPRITE_GRAMPS, 31, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
person_event SPRITE_YOUNGSTER, 13, 18, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
person_event SPRITE_YOUNGSTER, 33, 24, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
person_event SPRITE_TEACHER, 14, 6, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
person_event SPRITE_LASS, 22, 7, $4, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1
person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x1a9f43, -1
person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonCityPoliwrath, -1
person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, TeacherScript_0x1a9f50, -1
person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, GrampsScript_0x1a9f53, -1
person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrampsScript_0x1a9f56, -1
person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, YoungsterScript_0x1a9f59, -1
person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x1a9f5c, -1
person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x1a9f5f, -1
person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, LassScript_0x1a9f62, -1

View File

@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_RECEPTIONIST, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
person_event SPRITE_GENTLEMAN, 4, 11, $2, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
person_event SPRITE_TEACHER, 3, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1
person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, ReceptionistScript_0x709e0, -1
person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_02, 1, 1, -1, -1, 0, 0, 0, GentlemanScript_0x709e3, -1
person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x709e6, -1

View File

@ -8,14 +8,14 @@ CeladonDeptStore2F_MapScriptHeader:
ClerkScript_0x70bad:
faceplayer
loadfont
pokemart $0, $0017
pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1
loadmovesprites
end
ClerkScript_0x70bb5:
faceplayer
loadfont
pokemart $0, $0018
pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2
loadmovesprites
end
@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
person_event SPRITE_CLERK, 5, 14, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
person_event SPRITE_POKEFAN_M, 2, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
person_event SPRITE_YOUNGSTER, 2, 6, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1
person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bad, -1
person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70bb5, -1
person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x70bbd, -1
person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70bc0, -1

View File

@ -8,7 +8,7 @@ CeladonDeptStore3F_MapScriptHeader:
ClerkScript_0x70d29:
faceplayer
loadfont
pokemart $0, $0019
pokemart MARTTYPE_STANDARD, MART_CELADON_3F
loadmovesprites
end
@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_CLERK, 1, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 4, 6, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
person_event SPRITE_GAMEBOY_KID, 1, 9, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
person_event SPRITE_GAMEBOY_KID, 1, 10, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
person_event SPRITE_SUPER_NERD, 4, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1
person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, YoungsterScript_0x70d31, -1
person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GameboyKidScript_0x70d34, -1
person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GameboyKidScript_0x70d3f, -1
person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, SuperNerdScript_0x70d4a, -1

View File

@ -8,7 +8,7 @@ CeladonDeptStore4F_MapScriptHeader:
ClerkScript_0x70f0d:
faceplayer
loadfont
pokemart $0, $001a
pokemart MARTTYPE_STANDARD, MART_CELADON_4F
loadmovesprites
end
@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_CLERK, 5, 13, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
person_event SPRITE_SUPER_NERD, 6, 7, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
person_event SPRITE_YOUNGSTER, 2, 8, $7, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1
person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x70f0d, -1
person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, SuperNerdScript_0x70f15, -1
person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, 0, 0, YoungsterScript_0x70f18, -1

View File

@ -8,14 +8,14 @@ CeladonDeptStore5F_MapScriptHeader:
ClerkScript_0x71004:
faceplayer
loadfont
pokemart $0, $001b
pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1
loadmovesprites
end
ClerkScript_0x7100c:
faceplayer
loadfont
pokemart $0, $001c
pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2
loadmovesprites
end
@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_CLERK, 5, 7, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
person_event SPRITE_CLERK, 5, 8, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
person_event SPRITE_GENTLEMAN, 5, 13, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
person_event SPRITE_SAILOR, 4, 3, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
person_event SPRITE_TEACHER, 7, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1
person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x71004, -1
person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ClerkScript_0x7100c, -1
person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x71014, -1
person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SailorScript_0x71017, -1
person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x7101a, -1

View File

@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_SUPER_NERD, 2, 9, $7, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
person_event SPRITE_YOUNGSTER, 5, 12, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1
person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, 0, 0, SuperNerdScript_0x7117a, -1
person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_02, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x7117d, -1

View File

@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader:
.PersonEvents:
db 9
person_event SPRITE_CLERK, 2, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
person_event SPRITE_RECEPTIONIST, 2, 3, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
person_event SPRITE_POKEFAN_M, 10, 14, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
person_event SPRITE_TEACHER, 7, 17, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
person_event SPRITE_FISHING_GURU, 7, 11, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
person_event SPRITE_FISHER, 10, 8, $8, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
person_event SPRITE_GYM_GUY, 3, 11, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 8, 2, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1
person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ClerkScript_0x7211d, -1
person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ReceptionistScript_0x72120, -1
person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PokefanMScript_0x72123, -1
person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x7212e, -1
person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x72139, -1
person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x72144, -1
person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x72190, -1

View File

@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_GENTLEMAN, 2, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
person_event SPRITE_PHARMACIST, 4, 4, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1
person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GentlemanScript_0x726e9, -1
person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x726ec, -1

View File

@ -13,7 +13,7 @@ ErikaScript_0x72a6a:
writetext UnknownText_0x72b28
closetext
loadmovesprites
winlosstext UnknownText_0x72c3e, $0000
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, $0000, 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, $0000, 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, $0000, 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, $0000, 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, $0000, TwinsJoandzoe2Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script
TwinsJoandzoe2Script:
talkaftercancel
@ -278,9 +278,9 @@ CeladonGym_MapEventHeader:
.PersonEvents:
db 6
person_event SPRITE_ERIKA, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
person_event SPRITE_LASS, 8, 7, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
person_event SPRITE_LASS, 8, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
person_event SPRITE_BUENA, 5, 3, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
person_event SPRITE_TWIN, 10, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
person_event SPRITE_TWIN, 10, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1
person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, ErikaScript_0x72a6a, -1
person_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerLassMichelle, -1
person_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerPicnickerTanya, -1
person_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerBeautyJulia, -1
person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe1, -1
person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerTwinsJoandzoe2, -1

View File

@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_GRANNY, 5, 1, $3, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
person_event SPRITE_GROWLITHE, 6, 2, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
person_event SPRITE_CLEFAIRY, 4, 3, $16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
person_event SPRITE_GROWLITHE, 4, 4, $16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1
person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, CeladonMansionManager, -1
person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FMeowth, -1
person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_16, 0, 0, -1, -1, 0, 0, 0, CeladonMansion1FClefairy, -1
person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_16, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeladonMansion1FNidoranF, -1

View File

@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_COOLTRAINER_M, 6, 3, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
person_event SPRITE_GYM_GUY, 4, 3, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
person_event SPRITE_SUPER_NERD, 7, 0, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
person_event SPRITE_FISHER, 4, 0, $7, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1
person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerMScript_0x71670, -1
person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GymGuyScript_0x71696, -1
person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x716bc, -1
person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x716bf, -1

View File

@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_FISHER, 5, 7, $4, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1
person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, FisherScript_0x71a39, -1

View File

@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_PHARMACIST, 2, 3, $6, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1
person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, PharmacistScript_0x71afd, -1

View File

@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
person_event SPRITE_GENTLEMAN, 5, 1, $5, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 3, 0, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
person_event SPRITE_COOLTRAINER_F, 6, 8, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
person_event SPRITE_SUPER_NERD, 3, 4, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x71e22, -1
person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, PharmacistScript_0x71e2b, -1
person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x71e28, -1
person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH

View File

@ -299,9 +299,9 @@ CeruleanCity_MapEventHeader:
.PersonEvents:
db 6
person_event SPRITE_COOLTRAINER_M, 23, 15, $2, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
person_event SPRITE_SUPER_NERD, 15, 23, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
person_event SPRITE_SLOWPOKE, 24, 20, $1, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
person_event SPRITE_COOLTRAINER_F, 24, 21, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
person_event SPRITE_FISHER, 26, 30, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
person_event SPRITE_YOUNGSTER, 12, 6, $3, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1
person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_02, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CooltrainerMScript_0x184009, -1
person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, SuperNerdScript_0x18401d, -1
person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, CeruleanCitySlowbro, -1
person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerFScript_0x18402a, -1
person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x18404a, -1
person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_03, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x184064, -1

View File

@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x1883d9, $0000
dw UnknownScript_0x1883da, $0000
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, $0000
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, $0000, 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, $0000, 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, $0000, SwimmermParkerScript
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript
SwimmermParkerScript:
talkaftercancel
@ -377,9 +377,9 @@ CeruleanGym_MapEventHeader:
.PersonEvents:
db 6
person_event SPRITE_ROCKET, 10, 4, $6, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
person_event SPRITE_MISTY, 3, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 6, 4, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 9, 1, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GUY, 9, 8, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_GYM_GUY, 13, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM

View File

@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
.PersonEvents:
db 1
person_event SPRITE_POKEFAN_M, 3, 2, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1
person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x188002, -1

View File

@ -7,7 +7,7 @@ CeruleanMart_MapScriptHeader:
ClerkScript_0x188ac0:
loadfont
pokemart $0, $0014
pokemart MARTTYPE_STANDARD, MART_CERULEAN
loadmovesprites
end
@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_CLERK, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
person_event SPRITE_COOLTRAINER_M, 6, 1, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
person_event SPRITE_COOLTRAINER_F, 2, 7, $5, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ClerkScript_0x188ac0, -1
person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, CooltrainerMScript_0x188ac7, -1
person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, CooltrainerFScript_0x188aca, -1

View File

@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_NURSE, 1, 3, $6, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
person_event SPRITE_SUPER_NERD, 4, 8, $5, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
person_event SPRITE_GYM_GUY, 5, 1, $2, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, NurseScript_0x18820f, -1
person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, SuperNerdScript_0x188212, -1
person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_02, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GymGuyScript_0x18821e, -1

View File

@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_FISHING_GURU, 1, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
person_event SPRITE_POKEFAN_F, 4, 5, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
person_event SPRITE_DIGLETT, 5, 3, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1
person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FishingGuruScript_0x18804a, -1
person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, PokefanFScript_0x18804d, -1
person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, DiglettScript_0x188050, -1

View File

@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader:
.PersonEvents:
db 4
person_event SPRITE_GRANNY, 4, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
person_event SPRITE_GRAMPS, 2, 1, $2, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
person_event SPRITE_RHYDON, 2, 5, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
person_event SPRITE_ZUBAT, 6, 5, $16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1
person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, GrannyScript_0x188133, -1
person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_02, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, GrampsScript_0x188136, -1
person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, RhydonScript_0x188139, -1
person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_16, 0, 0, -1, -1, 0, 0, 0, ZubatScript_0x188143, -1

View File

@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_BLACK_BELT, 3, 2, $3, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
person_event SPRITE_YOUNGSTER, 3, 5, $2, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
person_event SPRITE_MOLTRES, 6, 5, $16, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_02, 1, 1, -1, -1, 0, 0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_16, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 0, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D

View File

@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader:
db 2
; triggers
dw .Trigger1, $0000
dw .Trigger2, $0000
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1
@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_GRAMPS, 6, 32, $6, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 6, 39, $3, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 12, 27, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
person_event SPRITE_YOUNGSTER, 7, 23, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
person_event SPRITE_FISHER, 12, 7, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1
person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, TeacherScript_0x19c146, -1
person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x19c15a, -1
person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, MysticWaterGuy, -1

View File

@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_LASS, 5, 3, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
person_event SPRITE_YOUNGSTER, 5, 2, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1
person_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, LassScript_0x196cb9, -1
person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, YoungsterScript_0x196cb2, -1

View File

@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_POKEFAN_M, 3, 2, $6, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
person_event SPRITE_BUG_CATCHER, 5, 5, $5, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1
person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x196ae1, -1
person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, BugCatcherScript_0x196ae4, -1

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