You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
UnknownScript_0xa0b14:
|
||||
BuenaPhoneScript1:
|
||||
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
iftrue UnknownScript_0xa0b73
|
||||
checkcode VAR_HOUR
|
||||
@@ -6,7 +6,7 @@ UnknownScript_0xa0b14:
|
||||
scall UnknownScript_0xa0b32
|
||||
jump UnknownScript_0xa0c0e
|
||||
|
||||
UnknownScript_0xa0b26:
|
||||
BuenaPhoneScript2:
|
||||
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
iftrue UnknownScript_0xa0b73
|
||||
scall UnknownScript_0xa0b4f
|
||||
|
@@ -297,7 +297,7 @@ Function8bec: ; 8bec
|
||||
ld a, [EnemyLightScreenCount]
|
||||
ld c, a
|
||||
ld a, [EnemyReflectCount]
|
||||
ld hl, AttrMap
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld de, $0014
|
||||
.asm_8c04
|
||||
and a
|
||||
@@ -661,8 +661,8 @@ endr
|
||||
|
||||
|
||||
Function9699: ; 9699
|
||||
ld hl, AttrMap
|
||||
ld bc, $0168
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
xor a
|
||||
call ByteFill
|
||||
ret
|
||||
@@ -694,7 +694,7 @@ Function96b3: ; 96b3
|
||||
ret
|
||||
|
||||
.asm_96d0
|
||||
ld hl, AttrMap
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld de, VBGMap0
|
||||
ld b, $12
|
||||
ld a, $1
|
||||
|
@@ -527,7 +527,7 @@ Function109a95: ; 109a95 (42:5a95)
|
||||
ld a, $c
|
||||
ld [hBGMapAddress], a ; $ff00+$d6
|
||||
ld a, $28
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
ld bc, $168
|
||||
call ByteFill
|
||||
ld a, $7f
|
||||
@@ -540,7 +540,7 @@ Function109a95: ; 109a95 (42:5a95)
|
||||
hlcoord 0, 17
|
||||
ld a, $20
|
||||
call Function109b1d
|
||||
ld hl, AttrMap
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, $50
|
||||
xor a
|
||||
call ByteFill
|
||||
@@ -560,7 +560,7 @@ Function109a95: ; 109a95 (42:5a95)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapAddress], a ; $ff00+$d6
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
call Function109aff
|
||||
call Function3200
|
||||
ret
|
||||
|
@@ -14,8 +14,8 @@ Function1dd709: ; 1dd709
|
||||
ld de, VTiles2
|
||||
call Decompress
|
||||
ld hl, Tilemap_1ddc4b
|
||||
ld de, TileMap
|
||||
ld bc, $0168
|
||||
decoord 0, 0
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
call CopyBytes
|
||||
ld de, String_1dd760
|
||||
hlcoord 2, 5
|
||||
@@ -54,13 +54,13 @@ String_1dd768:
|
||||
; 1dd7ae
|
||||
|
||||
Function1dd7ae: ; 1dd7ae
|
||||
ld hl, TileMap
|
||||
ld bc, $0168
|
||||
hlcoord 0, 0
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
ld a, $7f
|
||||
call ByteFill
|
||||
ld hl, Tilemap_1dddb3
|
||||
ld de, TileMap
|
||||
ld bc, $0168
|
||||
decoord 0, 0
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
call CopyBytes
|
||||
ld de, String_1dd7fa
|
||||
hlcoord 8, 0
|
||||
|
@@ -29,9 +29,9 @@
|
||||
dwb StatusFlags, %01000000 ; credits skip
|
||||
dwb StatusFlags, %10000000 ; bug contest on ; $10
|
||||
dwb StatusFlags2, %00000100 ; bug contest timer
|
||||
dwb StatusFlags2, %00000010 ; rockets in radio tower
|
||||
dwb StatusFlags2, %00000001 ; bike shop call enabled (1024 bike steps reqd)
|
||||
dwb StatusFlags2, %00010000
|
||||
dwb StatusFlags2, %00000010
|
||||
dwb StatusFlags2, %00000001 ; rockets in radio tower
|
||||
dwb StatusFlags2, %00010000 ; bike shop call enabled (1024 bike steps reqd)
|
||||
dwb StatusFlags2, %00100000 ; give pokerus; berry -> berry juice when trading?
|
||||
dwb StatusFlags2, %01000000
|
||||
dwb StatusFlags2, %10000000 ; rockets in mahogany
|
||||
@@ -115,8 +115,8 @@
|
||||
dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07
|
||||
dwb WeeklyFlags, %00010000 ; tea in blues house
|
||||
dwb WeeklyFlags, %00100000 ; indigo plateau rival fight
|
||||
dwb WeeklyFlags, %01000000
|
||||
dwb WeeklyFlags, %10000000
|
||||
dwb WeeklyFlags, %01000000 ; move tutor
|
||||
dwb WeeklyFlags, %10000000 ; buenas password
|
||||
|
||||
dwb SwarmFlags, %00000001 ; $60
|
||||
dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on
|
||||
@@ -128,69 +128,69 @@
|
||||
dwb wdbf3, %00000100 ; have gs ball after kurt examined it
|
||||
|
||||
; rematches
|
||||
dwb wdc4c, %00000001 ; jack
|
||||
dwb wdc4c, %00000010 ; huey
|
||||
dwb wdc4c, %00000100 ; gaven
|
||||
dwb wdc4c, %00001000 ; beth ; $68
|
||||
dwb wdc4c, %00010000 ; jose
|
||||
dwb wdc4c, %00100000 ; reena
|
||||
dwb wdc4c, %01000000 ; joey
|
||||
dwb wdc4c, %10000000 ; wade
|
||||
dwb wdc4c + 1, %00000001 ; ralph
|
||||
dwb wdc4c + 1, %00000010 ; liz
|
||||
dwb wdc4c + 1, %00000100 ; anthony
|
||||
dwb wdc4c + 1, %00001000 ; todd ; $70
|
||||
dwb wdc4c + 1, %00010000 ; gina
|
||||
dwb wdc4c + 1, %00100000 ; arnie
|
||||
dwb wdc4c + 1, %01000000 ; alan
|
||||
dwb wdc4c + 1, %10000000 ; dana
|
||||
dwb wdc4c + 2, %00000001 ; chad
|
||||
dwb wdc4c + 2, %00000010 ; tully
|
||||
dwb wdc4c + 2, %00000100 ; brent
|
||||
dwb wdc4c + 2, %00001000 ; tiffany ; $78
|
||||
dwb wdc4c + 2, %00010000 ; vance
|
||||
dwb wdc4c + 2, %00100000 ; wilton
|
||||
dwb wdc4c + 2, %01000000 ; parry
|
||||
dwb wdc4c + 2, %10000000 ; erin
|
||||
dwb wDailyRematchFlags, %00000001 ; jack
|
||||
dwb wDailyRematchFlags, %00000010 ; huey
|
||||
dwb wDailyRematchFlags, %00000100 ; gaven
|
||||
dwb wDailyRematchFlags, %00001000 ; beth ; $68
|
||||
dwb wDailyRematchFlags, %00010000 ; jose
|
||||
dwb wDailyRematchFlags, %00100000 ; reena
|
||||
dwb wDailyRematchFlags, %01000000 ; joey
|
||||
dwb wDailyRematchFlags, %10000000 ; wade
|
||||
dwb wDailyRematchFlags + 1, %00000001 ; ralph
|
||||
dwb wDailyRematchFlags + 1, %00000010 ; liz
|
||||
dwb wDailyRematchFlags + 1, %00000100 ; anthony
|
||||
dwb wDailyRematchFlags + 1, %00001000 ; todd ; $70
|
||||
dwb wDailyRematchFlags + 1, %00010000 ; gina
|
||||
dwb wDailyRematchFlags + 1, %00100000 ; arnie
|
||||
dwb wDailyRematchFlags + 1, %01000000 ; alan
|
||||
dwb wDailyRematchFlags + 1, %10000000 ; dana
|
||||
dwb wDailyRematchFlags + 2, %00000001 ; chad
|
||||
dwb wDailyRematchFlags + 2, %00000010 ; tully
|
||||
dwb wDailyRematchFlags + 2, %00000100 ; brent
|
||||
dwb wDailyRematchFlags + 2, %00001000 ; tiffany ; $78
|
||||
dwb wDailyRematchFlags + 2, %00010000 ; vance
|
||||
dwb wDailyRematchFlags + 2, %00100000 ; wilton
|
||||
dwb wDailyRematchFlags + 2, %01000000 ; parry
|
||||
dwb wDailyRematchFlags + 2, %10000000 ; erin
|
||||
|
||||
dwb wdc50, %00000001 ; beverly has nugget
|
||||
dwb wdc50, %00000010 ; jose has star piece
|
||||
dwb wdc50, %00000100 ; wade has item (see bittable1 $032b-e)
|
||||
dwb wdc50, %00001000 ; gina has leaf stone ; $80
|
||||
dwb wdc50, %00010000 ; alan has fire stone
|
||||
dwb wdc50, %00100000 ; liz has thunderstone
|
||||
dwb wdc50, %01000000 ; derek has nugget
|
||||
dwb wdc50, %10000000 ; tully has water stone
|
||||
dwb wDailyPhoneItemFlags, %00000001 ; beverly has nugget
|
||||
dwb wDailyPhoneItemFlags, %00000010 ; jose has star piece
|
||||
dwb wDailyPhoneItemFlags, %00000100 ; wade has item (see bittable1 $032b-e)
|
||||
dwb wDailyPhoneItemFlags, %00001000 ; gina has leaf stone ; $80
|
||||
dwb wDailyPhoneItemFlags, %00010000 ; alan has fire stone
|
||||
dwb wDailyPhoneItemFlags, %00100000 ; liz has thunderstone
|
||||
dwb wDailyPhoneItemFlags, %01000000 ; derek has nugget
|
||||
dwb wDailyPhoneItemFlags, %10000000 ; tully has water stone
|
||||
|
||||
dwb wdc50 + 1, %00000001 ; tiffany has pink bow
|
||||
dwb wdc50 + 1, %00000010 ; wilton has item (see bittable1 $032f-31)
|
||||
dwb wDailyPhoneItemFlags + 1, %00000001 ; tiffany has pink bow
|
||||
dwb wDailyPhoneItemFlags + 1, %00000010 ; wilton has item (see bittable1 $032f-31)
|
||||
|
||||
dwb wdc54, %00000001
|
||||
dwb wdc54, %00000010 ; $88
|
||||
dwb wdc54, %00000100
|
||||
dwb wdc54, %00001000
|
||||
dwb wdc54, %00010000
|
||||
dwb wdc54, %00100000
|
||||
dwb wdc54, %01000000
|
||||
dwb wdc54, %10000000
|
||||
dwb wDailyPhoneTimeOfDayFlags, %00000001
|
||||
dwb wDailyPhoneTimeOfDayFlags, %00000010 ; $88
|
||||
dwb wDailyPhoneTimeOfDayFlags, %00000100
|
||||
dwb wDailyPhoneTimeOfDayFlags, %00001000
|
||||
dwb wDailyPhoneTimeOfDayFlags, %00010000
|
||||
dwb wDailyPhoneTimeOfDayFlags, %00100000
|
||||
dwb wDailyPhoneTimeOfDayFlags, %01000000
|
||||
dwb wDailyPhoneTimeOfDayFlags, %10000000
|
||||
|
||||
dwb wdc54 + 1, %00000001
|
||||
dwb wdc54 + 1, %00000010 ; $90
|
||||
dwb wdc54 + 1, %00000100
|
||||
dwb wdc54 + 1, %00001000
|
||||
dwb wdc54 + 1, %00010000
|
||||
dwb wdc54 + 1, %00100000
|
||||
dwb wdc54 + 1, %01000000
|
||||
dwb wdc54 + 1, %10000000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %00000001
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %00000010 ; $90
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %00000100
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %00001000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %00010000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %00100000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %01000000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 1, %10000000
|
||||
|
||||
dwb wdc54 + 2, %00000001
|
||||
dwb wdc54 + 2, %00000010 ; $98
|
||||
dwb wdc54 + 2, %00000100
|
||||
dwb wdc54 + 2, %00001000
|
||||
dwb wdc54 + 2, %00010000
|
||||
dwb wdc54 + 2, %00100000
|
||||
dwb wdc54 + 2, %01000000
|
||||
dwb wdc54 + 2, %10000000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %00000001
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %00000010 ; $98
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %00000100
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %00001000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %00010000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %00100000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %01000000
|
||||
dwb wDailyPhoneTimeOfDayFlags + 2, %10000000
|
||||
|
||||
dwb wd45b, %00000100 ; female player has been transformed into male
|
||||
|
||||
|
@@ -105,7 +105,7 @@ Function97cc0:: ; 97cc0
|
||||
ld hl, StatusFlags2
|
||||
bit 2, [hl]
|
||||
jr nz, .asm_97cdb
|
||||
callba Function2a0e7
|
||||
callba TryWildEncounter
|
||||
jr nz, .asm_97ce2
|
||||
jr .asm_97ce6
|
||||
|
||||
@@ -167,10 +167,10 @@ Function97cfd:: ; 97cfd
|
||||
; 97d23
|
||||
|
||||
Function97d23: ; 97d23
|
||||
call Function97d64
|
||||
call TryWildEncounter_BugContest
|
||||
ret nc
|
||||
call Function97d31
|
||||
callba Function2a1df
|
||||
callba CheckRepelEffect
|
||||
ret
|
||||
; 97d31
|
||||
|
||||
@@ -196,7 +196,7 @@ Function97d31:: ; 97d31
|
||||
|
||||
; Species
|
||||
ld a, [hli]
|
||||
ld [wd22e], a
|
||||
ld [TempWildMonSpecies], a
|
||||
|
||||
; Min level
|
||||
ld a, [hli]
|
||||
@@ -228,16 +228,16 @@ Function97d31:: ; 97d31
|
||||
ret
|
||||
; 97d64
|
||||
|
||||
Function97d64: ; 97d64
|
||||
TryWildEncounter_BugContest: ; 97d64
|
||||
ld a, [StandingTile]
|
||||
call Function188e
|
||||
call CheckSuperTallGrassTile
|
||||
ld b, $66
|
||||
jr z, .asm_97d70
|
||||
ld b, $33
|
||||
|
||||
.asm_97d70
|
||||
callba Function2a124
|
||||
callba Function2a138
|
||||
callba ApplyMusicEffectOnEncounterRate
|
||||
callba ApplyCleanseTagEffectOnEncounterRate
|
||||
call Random
|
||||
ld a, [hRandomAdd]
|
||||
cp b
|
||||
|
@@ -2,44 +2,44 @@
|
||||
INCLUDE "engine/facings.asm"
|
||||
|
||||
ObjectStruct3_Data:: ; 4273
|
||||
db $00, $00, $01, $02, $00, $00
|
||||
db $06, $00, $01, $0c, $00, $00
|
||||
db $03, $00, $01, $00, $00, $00
|
||||
db $04, $00, $01, $00, $00, $00
|
||||
db $01, $00, $01, $00, $00, $00
|
||||
db $02, $00, $01, $00, $00, $00
|
||||
db $06, $00, $01, $00, $00, $00
|
||||
db $06, $01, $01, $00, $00, $00
|
||||
db $06, $02, $01, $00, $00, $00
|
||||
db $06, $03, $01, $00, $00, $00
|
||||
db $05, $00, $01, $00, $00, $00
|
||||
db $07, $00, $01, $02, $00, $00
|
||||
db $08, $00, $01, $00, $00, $00
|
||||
db $09, $00, $01, $00, $00, $00
|
||||
db $0a, $00, $01, $00, $00, $00
|
||||
db $0b, $00, $01, $00, $00, $00
|
||||
db $0c, $00, $01, $00, $00, $00
|
||||
db $0d, $00, $01, $00, $00, $00
|
||||
db $0e, $00, $01, $00, $00, $00
|
||||
db $0f, $00, $01, $02, $00, $00
|
||||
db $10, $00, $01, $02, $00, $00
|
||||
db $15, $00, $09, $2e, $01, $c0
|
||||
db $16, $00, $0a, $2e, $00, $00
|
||||
db $06, $00, $01, $0c, $00, $00
|
||||
db $06, $00, $01, $2e, $10, $00
|
||||
db $11, $00, $01, $2e, $00, $40
|
||||
db $12, $00, $01, $02, $00, $00
|
||||
db $13, $00, $00, $8e, $01, $00
|
||||
db $14, $00, $08, $8e, $02, $00
|
||||
db $17, $00, $00, $82, $00, $00
|
||||
db $19, $02, $01, $00, $00, $00
|
||||
db $18, $03, $01, $00, $00, $00
|
||||
db $11, $00, $0c, $2e, $01, $c0
|
||||
db $11, $00, $0d, $2e, $01, $c0
|
||||
db $1a, $00, $0e, $8e, $01, $00
|
||||
db $1b, $00, $0f, $8e, $02, $00
|
||||
db $03, $00, $01, $00, $00, $20
|
||||
db $00, $00, $01, $00, $00, $00
|
||||
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
|
||||
; 4357
|
||||
|
||||
|
||||
@@ -238,40 +238,40 @@ endr
|
||||
; 445f
|
||||
|
||||
Pointers445f: ; 445f
|
||||
dw Function44a3
|
||||
dw Function44a3
|
||||
dw Function44b5
|
||||
dw Function44aa
|
||||
dw Function44c1
|
||||
dw Function44aa
|
||||
dw Function4508
|
||||
dw Function44aa
|
||||
dw Function4529
|
||||
dw Function44aa
|
||||
dw Function4539
|
||||
dw Function44a3
|
||||
dw Function456e
|
||||
dw Function456e
|
||||
dw Function457b
|
||||
dw Function44a3
|
||||
dw Function4582
|
||||
dw Function4582
|
||||
dw Function4589
|
||||
dw Function4589
|
||||
dw Function4590
|
||||
dw Function45a4
|
||||
dw Function45ab
|
||||
dw Function44aa
|
||||
dw Function45be
|
||||
dw Function45be
|
||||
dw Function45c5
|
||||
dw Function45c5
|
||||
dw Function45da
|
||||
dw Function44a3
|
||||
dw Function45ed
|
||||
dw Function44a3
|
||||
dw Function44e4
|
||||
dw Function44aa
|
||||
dw Function44a3 ; 00
|
||||
dw Function44a3 ; 01
|
||||
dw Function44b5 ; 02
|
||||
dw Function44aa ; 03
|
||||
dw Function44c1 ; 04
|
||||
dw Function44aa ; 05
|
||||
dw Function4508 ; 06
|
||||
dw Function44aa ; 07
|
||||
dw Function4529 ; 08
|
||||
dw Function44aa ; 09
|
||||
dw Function4539 ; 0a
|
||||
dw Function44a3 ; 0b
|
||||
dw Function456e ; 0c
|
||||
dw Function456e ; 0d
|
||||
dw Function457b ; 0e
|
||||
dw Function44a3 ; 0f
|
||||
dw Function4582 ; 10
|
||||
dw Function4582 ; 11
|
||||
dw Function4589 ; 12
|
||||
dw Function4589 ; 13
|
||||
dw Function4590 ; 14
|
||||
dw Function45a4 ; 15
|
||||
dw Function45ab ; 16
|
||||
dw Function44aa ; 17
|
||||
dw Function45be ; 18
|
||||
dw Function45be ; 19
|
||||
dw Function45c5 ; 1a
|
||||
dw Function45c5 ; 1b
|
||||
dw Function45da ; 1c
|
||||
dw Function44a3 ; 1d
|
||||
dw Function45ed ; 1e
|
||||
dw Function44a3 ; 1f
|
||||
dw Function44e4 ; 20
|
||||
dw Function44aa ; 21
|
||||
; 44a3
|
||||
|
||||
Function44a3: ; 44a3
|
||||
@@ -626,7 +626,7 @@ Function463f: ; 463f
|
||||
; 4661
|
||||
|
||||
Function4661: ; 4661
|
||||
call Function188e
|
||||
call CheckSuperTallGrassTile
|
||||
jr z, .set
|
||||
call Function1875
|
||||
jr c, .reset
|
||||
@@ -835,7 +835,7 @@ Function4769: ; 4769
|
||||
jr z, .ok
|
||||
push bc
|
||||
call GetMapObject
|
||||
ld hl, MAPOBJECT_FACING
|
||||
ld hl, MAPOBJECT_MOVEMENT
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
pop bc
|
||||
@@ -944,34 +944,34 @@ Function47dd: ; 47dd
|
||||
; 47e9
|
||||
|
||||
.Pointers ; 47e9
|
||||
dw Function4821
|
||||
dw Function4822
|
||||
dw Function482c
|
||||
dw Function4838
|
||||
dw Function4842
|
||||
dw Function4851
|
||||
dw Function4869
|
||||
dw Function487c
|
||||
dw Function4882
|
||||
dw Function4888
|
||||
dw Function488e
|
||||
dw Function4891
|
||||
dw Function4894
|
||||
dw Function4897
|
||||
dw Function489d
|
||||
dw Function48a0
|
||||
dw Function48a6
|
||||
dw Function48ac
|
||||
dw Function48ff
|
||||
dw Function49e5
|
||||
dw Function4a21
|
||||
dw Function4958
|
||||
dw Function496e
|
||||
dw Function4abc
|
||||
dw Function498d
|
||||
dw Function4984
|
||||
dw Function4a46
|
||||
dw Function4a89
|
||||
dw Function4821 ; 00
|
||||
dw Function4822 ; 01
|
||||
dw Function482c ; 02
|
||||
dw Function4838 ; 03
|
||||
dw Function4842 ; 04
|
||||
dw Function4851 ; 05
|
||||
dw Function4869 ; 06
|
||||
dw Function487c ; 07
|
||||
dw Function4882 ; 08
|
||||
dw Function4888 ; 09
|
||||
dw Function488e ; 0a
|
||||
dw Function4891 ; 0b
|
||||
dw Function4894 ; 0c
|
||||
dw Function4897 ; 0d
|
||||
dw Function489d ; 0e
|
||||
dw Function48a0 ; 0f
|
||||
dw Function48a6 ; 10
|
||||
dw Function48ac ; 11
|
||||
dw Function48ff ; 12
|
||||
dw Function49e5 ; 13
|
||||
dw Function4a21 ; 14
|
||||
dw Function4958 ; 15
|
||||
dw Function496e ; 16
|
||||
dw Function4abc ; 17
|
||||
dw Function498d ; 18
|
||||
dw Function4984 ; 19
|
||||
dw Function4a46 ; 1a
|
||||
dw Function4a89 ; 1b
|
||||
; 4821
|
||||
|
||||
Function4821: ; 4821
|
||||
@@ -3293,7 +3293,7 @@ Function58e3: ; 58e3
|
||||
jp z, Function5903
|
||||
push bc
|
||||
call GetMapObject
|
||||
ld hl, MAPOBJECT_FACING
|
||||
ld hl, MAPOBJECT_MOVEMENT
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
pop bc
|
||||
|
@@ -333,7 +333,7 @@ MapSetupCommands: ; 15440
|
||||
dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24
|
||||
dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25
|
||||
dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26
|
||||
dbw BANK(RestoreRoamMons), RestoreRoamMons ; 27
|
||||
dbw BANK(JumpRoamMons), JumpRoamMons ; 27
|
||||
dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28
|
||||
dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29
|
||||
dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a
|
||||
@@ -439,7 +439,7 @@ Function1551a: ; 1551a (5:551a)
|
||||
ret
|
||||
|
||||
Function1554e: ; 1554e (5:554e)
|
||||
call Function1852
|
||||
call CheckOnWater
|
||||
jr nz, .ret_nc
|
||||
ld a, [PlayerState]
|
||||
cp PLAYER_SURF
|
||||
|
@@ -87,5 +87,5 @@ ENDM
|
||||
trigger_def MOUNT_MOON_SQUARE, wMountMoonSquareTrigger
|
||||
trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger
|
||||
trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger
|
||||
db $ff
|
||||
db -1
|
||||
; 4d15b
|
||||
|
@@ -27,7 +27,7 @@ UnknownScript_0xa0036:
|
||||
farjump UnknownScript_0xa0055
|
||||
|
||||
UnknownScript_0xa003e:
|
||||
special Function2a51f
|
||||
special RandomPhoneWildMon
|
||||
farscall UnknownScript_0xbde3f
|
||||
if_equal $0, UnknownScript_0xa0051
|
||||
farscall UnknownScript_0xa017a
|
||||
@@ -37,7 +37,7 @@ UnknownScript_0xa0051:
|
||||
farjump UnknownScript_0xa006c
|
||||
|
||||
UnknownScript_0xa0055:
|
||||
special Function2a51f
|
||||
special RandomPhoneWildMon
|
||||
farscall UnknownScript_0xbde3f
|
||||
if_equal $0, UnknownScript_0xa0068
|
||||
farscall UnknownScript_0xa0226
|
||||
@@ -851,7 +851,7 @@ UnknownScript_0xa059c:
|
||||
farjump UnknownScript_0xa053a
|
||||
|
||||
UnknownScript_0xa05a0:
|
||||
special Function2a4ab
|
||||
special RandomPhoneRareWildMon
|
||||
end
|
||||
|
||||
UnknownScript_0xa05a4:
|
||||
@@ -1653,7 +1653,7 @@ UnknownScript_0xa0b04:
|
||||
farwritetext UnknownText_0x17717c
|
||||
end
|
||||
|
||||
UnknownScript_0xa0b09:
|
||||
BikeShopPhoneScript:
|
||||
farwritetext UnknownText_0x174000
|
||||
clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
|
||||
specialphonecall ELMCALL_NONE
|
||||
|
@@ -727,7 +727,7 @@ Function5412: ; 5412
|
||||
ld hl, OBJECT_STANDING_TILE
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
call Function188e
|
||||
call CheckSuperTallGrassTile
|
||||
jr z, .asm_542d
|
||||
|
||||
call Function1875
|
||||
|
@@ -1404,7 +1404,7 @@ Function10955: ; 10955
|
||||
hlcoord 5, 1
|
||||
lb bc, 11, 15
|
||||
call ClearBox
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
ld a, $28
|
||||
ld c, $14
|
||||
.asm_1098a
|
||||
@@ -1489,8 +1489,8 @@ Function10a1d: ; 10a1d
|
||||
; 10a2a
|
||||
|
||||
Function10a2a: ; 10a2a
|
||||
ld hl, TileMap
|
||||
ld bc, $0168
|
||||
hlcoord 0, 0
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
ld a, $7f
|
||||
call ByteFill
|
||||
ret
|
||||
|
@@ -298,7 +298,7 @@ ElmPhoneScript2: ; 0xbd081
|
||||
|
||||
; Jack
|
||||
|
||||
UnknownScript_0xbd0d0:
|
||||
JackPhoneScript1:
|
||||
trainertotext SCHOOLBOY, JACK1, $0
|
||||
checkflag ENGINE_JACK
|
||||
iftrue UnknownScript_0xbd0f3
|
||||
@@ -317,7 +317,7 @@ UnknownScript_0xbd0f3:
|
||||
displaylocation NATIONAL_PARK, $2
|
||||
farjump UnknownScript_0xa0a2d
|
||||
|
||||
UnknownScript_0xbd0fa:
|
||||
JackPhoneScript2:
|
||||
trainertotext SCHOOLBOY, JACK1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
farscall UnknownScript_0xbde3f
|
||||
@@ -350,7 +350,7 @@ UnknownScript_0xbd13b:
|
||||
|
||||
; Beverly
|
||||
|
||||
UnknownScript_0xbd13f:
|
||||
BeverlyPhoneScript1:
|
||||
trainertotext POKEFANF, BEVERLY1, $0
|
||||
farscall UnknownScript_0xbe0b6
|
||||
checkflag ENGINE_BEVERLY_HAS_NUGGET
|
||||
@@ -361,7 +361,7 @@ UnknownScript_0xbd151:
|
||||
displaylocation NATIONAL_PARK, $2
|
||||
farjump UnknownScript_0xa0aa5
|
||||
|
||||
UnknownScript_0xbd158:
|
||||
BeverlyPhoneScript2:
|
||||
trainertotext POKEFANF, BEVERLY1, $0
|
||||
farscall UnknownScript_0xbe41e
|
||||
checkflag ENGINE_BEVERLY_HAS_NUGGET
|
||||
@@ -379,7 +379,7 @@ UnknownScript_0xbd172:
|
||||
|
||||
; Huey
|
||||
|
||||
UnknownScript_0xbd17c:
|
||||
HueyPhoneScript1:
|
||||
trainertotext SAILOR, HUEY1, $0
|
||||
checkflag ENGINE_HUEY
|
||||
iftrue UnknownScript_0xbd1a2
|
||||
@@ -399,7 +399,7 @@ UnknownScript_0xbd1a2:
|
||||
displaylocation LIGHTHOUSE, $2
|
||||
farjump UnknownScript_0xa0a32
|
||||
|
||||
UnknownScript_0xbd1a9:
|
||||
HueyPhoneScript2:
|
||||
trainertotext SAILOR, HUEY1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_HUEY
|
||||
@@ -423,7 +423,7 @@ UnknownScript_0xbd1d0:
|
||||
|
||||
; Gaven
|
||||
|
||||
UnknownScript_0xbd1da:
|
||||
GavenPhoneScript1:
|
||||
trainertotext COOLTRAINERM, GAVEN3, $0
|
||||
checkflag ENGINE_GAVEN
|
||||
iftrue UnknownScript_0xbd1fd
|
||||
@@ -442,7 +442,7 @@ UnknownScript_0xbd1fd:
|
||||
displaylocation ROUTE_26, $2
|
||||
farjump UnknownScript_0xa0a37
|
||||
|
||||
UnknownScript_0xbd204:
|
||||
GavenPhoneScript2:
|
||||
trainertotext COOLTRAINERM, GAVEN3, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_GAVEN
|
||||
@@ -470,7 +470,7 @@ UnknownScript_0xbd239:
|
||||
|
||||
; Beth
|
||||
|
||||
UnknownScript_0xbd23d:
|
||||
BethPhoneScript1:
|
||||
trainertotext COOLTRAINERF, BETH1, $0
|
||||
checkflag ENGINE_BETH
|
||||
iftrue UnknownScript_0xbd260
|
||||
@@ -489,7 +489,7 @@ UnknownScript_0xbd260:
|
||||
displaylocation ROUTE_26, $2
|
||||
farjump UnknownScript_0xa0a3c
|
||||
|
||||
UnknownScript_0xbd267:
|
||||
BethPhoneScript2:
|
||||
trainertotext COOLTRAINERF, BETH1, $0
|
||||
farscall UnknownScript_0xbe41e
|
||||
checkflag ENGINE_BETH
|
||||
@@ -512,7 +512,7 @@ UnknownScript_0xbd28a:
|
||||
|
||||
; Jose
|
||||
|
||||
UnknownScript_0xbd294:
|
||||
JosePhoneScript1:
|
||||
trainertotext BIRD_KEEPER, JOSE2, $0
|
||||
checkflag ENGINE_JOSE
|
||||
iftrue UnknownScript_0xbd2bd
|
||||
@@ -537,7 +537,7 @@ UnknownScript_0xbd2c4:
|
||||
displaylocation ROUTE_27, $2
|
||||
farjump UnknownScript_0xa0a41
|
||||
|
||||
UnknownScript_0xbd2cb:
|
||||
JosePhoneScript2:
|
||||
trainertotext BIRD_KEEPER, JOSE2, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_JOSE
|
||||
@@ -574,7 +574,7 @@ UnknownScript_0xbd312:
|
||||
|
||||
; Reena
|
||||
|
||||
UnknownScript_0xbd31c:
|
||||
ReenaPhoneScript1:
|
||||
trainertotext COOLTRAINERF, REENA1, $0
|
||||
checkflag ENGINE_REENA
|
||||
iftrue UnknownScript_0xbd33f
|
||||
@@ -593,7 +593,7 @@ UnknownScript_0xbd33f:
|
||||
displaylocation ROUTE_27, $2
|
||||
farjump UnknownScript_0xa0a46
|
||||
|
||||
UnknownScript_0xbd346:
|
||||
ReenaPhoneScript2:
|
||||
trainertotext COOLTRAINERF, REENA1, $0
|
||||
farscall UnknownScript_0xbe41e
|
||||
checkflag ENGINE_REENA
|
||||
@@ -616,7 +616,7 @@ UnknownScript_0xbd369:
|
||||
|
||||
; Joey
|
||||
|
||||
UnknownScript_0xbd373:
|
||||
JoeyPhoneScript1:
|
||||
trainertotext YOUNGSTER, JOEY1, $0
|
||||
checkflag ENGINE_JOEY
|
||||
iftrue UnknownScript_0xbd399
|
||||
@@ -636,7 +636,7 @@ UnknownScript_0xbd399:
|
||||
displaylocation ROUTE_30, $2
|
||||
farjump UnknownScript_0xa0a4b
|
||||
|
||||
UnknownScript_0xbd3a0:
|
||||
JoeyPhoneScript2:
|
||||
trainertotext YOUNGSTER, JOEY1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_JOEY
|
||||
@@ -660,7 +660,7 @@ UnknownScript_0xbd3c7:
|
||||
|
||||
; Wade
|
||||
|
||||
UnknownScript_0xbd3d1:
|
||||
WadePhoneScript1:
|
||||
trainertotext BUG_CATCHER, WADE1, $0
|
||||
checkflag ENGINE_WADE
|
||||
iftrue UnknownScript_0xbd41a
|
||||
@@ -698,7 +698,7 @@ UnknownScript_0xbd421:
|
||||
displaylocation ROUTE_31, $2
|
||||
farjump UnknownScript_0xa0ab5
|
||||
|
||||
UnknownScript_0xbd428:
|
||||
WadePhoneScript2:
|
||||
trainertotext BUG_CATCHER, WADE1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
farscall UnknownScript_0xbde3f
|
||||
@@ -776,7 +776,7 @@ UnknownScript_0xbd4ce:
|
||||
|
||||
; Ralph
|
||||
|
||||
UnknownScript_0xbd4d2:
|
||||
RalphPhoneScript1:
|
||||
trainertotext FISHER, RALPH1, $0
|
||||
checkflag ENGINE_RALPH
|
||||
iftrue UnknownScript_0xbd4fb
|
||||
@@ -801,7 +801,7 @@ UnknownScript_0xbd502:
|
||||
displaylocation ROUTE_32, $2
|
||||
farjump UnknownScript_0xa0af5
|
||||
|
||||
UnknownScript_0xbd509:
|
||||
RalphPhoneScript2:
|
||||
trainertotext FISHER, RALPH1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_FLYPOINT_GOLDENROD
|
||||
@@ -841,7 +841,7 @@ UnknownScript_0xbd55c:
|
||||
|
||||
; Liz
|
||||
|
||||
UnknownScript_0xbd560:
|
||||
LizPhoneScript1:
|
||||
trainertotext PICNICKER, LIZ1, $0
|
||||
checkflag ENGINE_LIZ
|
||||
iftrue UnknownScript_0xbd586
|
||||
@@ -861,7 +861,7 @@ UnknownScript_0xbd586:
|
||||
displaylocation ROUTE_32, $2
|
||||
farjump UnknownScript_0xa0a5a
|
||||
|
||||
UnknownScript_0xbd58d:
|
||||
LizPhoneScript2:
|
||||
trainertotext PICNICKER, LIZ1, $0
|
||||
farscall UnknownScript_0xbde45
|
||||
if_equal $0, UnknownScript_0xbd5d0
|
||||
@@ -946,7 +946,7 @@ UnknownScript_0xbd630:
|
||||
|
||||
; Anthony
|
||||
|
||||
UnknownScript_0xbd634:
|
||||
AnthonyPhoneScript1:
|
||||
trainertotext HIKER, ANTHONY2, $0
|
||||
checkflag ENGINE_ANTHONY
|
||||
iftrue UnknownScript_0xbd65d
|
||||
@@ -971,7 +971,7 @@ UnknownScript_0xbd664:
|
||||
displaylocation ROUTE_33, $2
|
||||
farjump UnknownScript_0xa0afa
|
||||
|
||||
UnknownScript_0xbd66b:
|
||||
AnthonyPhoneScript2:
|
||||
trainertotext HIKER, ANTHONY2, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_FLYPOINT_GOLDENROD
|
||||
@@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6:
|
||||
iftrue UnknownScript_0xbd6bd
|
||||
setflag ENGINE_DUNSPARCE_SWARM
|
||||
pokenamemem DUNSPARCE, $1
|
||||
loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
|
||||
loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE
|
||||
displaylocation DARK_CAVE, $2
|
||||
farjump UnknownScript_0xa05de
|
||||
|
||||
@@ -1010,7 +1010,7 @@ UnknownScript_0xbd6bd:
|
||||
|
||||
; Todd
|
||||
|
||||
UnknownScript_0xbd6c1:
|
||||
ToddPhoneScript1:
|
||||
trainertotext CAMPER, TODD1, $0
|
||||
checkflag ENGINE_TODD
|
||||
iftrue UnknownScript_0xbd6ea
|
||||
@@ -1034,7 +1034,7 @@ UnknownScript_0xbd6ea:
|
||||
UnknownScript_0xbd6f1:
|
||||
farjump UnknownScript_0xa0b04
|
||||
|
||||
UnknownScript_0xbd6f5:
|
||||
ToddPhoneScript2:
|
||||
trainertotext CAMPER, TODD1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_TODD
|
||||
@@ -1072,7 +1072,7 @@ UnknownScript_0xbd73c:
|
||||
|
||||
; Gina
|
||||
|
||||
UnknownScript_0xbd743:
|
||||
GinaPhoneScript1:
|
||||
trainertotext PICNICKER, GINA1, $0
|
||||
checkflag ENGINE_GINA
|
||||
iftrue UnknownScript_0xbd776
|
||||
@@ -1102,7 +1102,7 @@ UnknownScript_0xbd77d:
|
||||
displaylocation ROUTE_34, $2
|
||||
farjump UnknownScript_0xa0abd
|
||||
|
||||
UnknownScript_0xbd784:
|
||||
GinaPhoneScript2:
|
||||
trainertotext PICNICKER, GINA1, $0
|
||||
farscall UnknownScript_0xbe41e
|
||||
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
@@ -1147,7 +1147,7 @@ UnknownScript_0xbd7dd:
|
||||
|
||||
; Irwin
|
||||
|
||||
UnknownScript_0xbd7e7:
|
||||
IrwinPhoneScript1:
|
||||
trainertotext JUGGLER, IRWIN1, $0
|
||||
farscall UnknownScript_0xbde4e
|
||||
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
@@ -1157,7 +1157,7 @@ UnknownScript_0xbd7e7:
|
||||
UnknownScript_0xbd7f9:
|
||||
farjump UnknownScript_0xa05be
|
||||
|
||||
UnknownScript_0xbd7fd:
|
||||
IrwinPhoneScript2:
|
||||
trainertotext JUGGLER, IRWIN1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
@@ -1169,7 +1169,7 @@ UnknownScript_0xbd80f:
|
||||
|
||||
; Arnie
|
||||
|
||||
UnknownScript_0xbd813:
|
||||
ArniePhoneScript1:
|
||||
trainertotext BUG_CATCHER, ARNIE1, $0
|
||||
checkflag ENGINE_ARNIE
|
||||
iftrue UnknownScript_0xbd83c
|
||||
@@ -1194,7 +1194,7 @@ UnknownScript_0xbd843:
|
||||
displaylocation ROUTE_35, $2
|
||||
farjump UnknownScript_0xa0aff
|
||||
|
||||
UnknownScript_0xbd84a:
|
||||
ArniePhoneScript2:
|
||||
trainertotext BUG_CATCHER, ARNIE1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_ARNIE
|
||||
@@ -1224,7 +1224,7 @@ UnknownScript_0xbd887:
|
||||
iftrue UnknownScript_0xbd8a2
|
||||
setflag ENGINE_YANMA_SWARM
|
||||
pokenamemem YANMA, $1
|
||||
loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35
|
||||
loadwilddata $1, ROUTE_35
|
||||
displaylocation ROUTE_35, $2
|
||||
farjump UnknownScript_0xa05ce
|
||||
|
||||
@@ -1236,7 +1236,7 @@ UnknownScript_0xbd8a2:
|
||||
|
||||
; Alan
|
||||
|
||||
UnknownScript_0xbd8a6:
|
||||
AlanPhoneScript1:
|
||||
trainertotext SCHOOLBOY, ALAN1, $0
|
||||
checkflag ENGINE_ALAN
|
||||
iftrue UnknownScript_0xbd8cf
|
||||
@@ -1261,7 +1261,7 @@ UnknownScript_0xbd8d6:
|
||||
displaylocation ROUTE_36, $2
|
||||
farjump UnknownScript_0xa0ac5
|
||||
|
||||
UnknownScript_0xbd8dd:
|
||||
AlanPhoneScript2:
|
||||
trainertotext SCHOOLBOY, ALAN1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_ALAN
|
||||
@@ -1299,7 +1299,7 @@ UnknownScript_0xbd926:
|
||||
|
||||
; Dana
|
||||
|
||||
UnknownScript_0xbd930:
|
||||
DanaPhoneScript1:
|
||||
trainertotext LASS, DANA1, $0
|
||||
checkflag ENGINE_DANA
|
||||
iftrue UnknownScript_0xbd959
|
||||
@@ -1324,7 +1324,7 @@ UnknownScript_0xbd960:
|
||||
displaylocation ROUTE_38, $2
|
||||
farjump UnknownScript_0xa0acd
|
||||
|
||||
UnknownScript_0xbd967:
|
||||
DanaPhoneScript2:
|
||||
trainertotext LASS, DANA1, $0
|
||||
farscall UnknownScript_0xbe41e
|
||||
checkflag ENGINE_DANA
|
||||
@@ -1367,7 +1367,7 @@ UnknownScript_0xbd9bc:
|
||||
|
||||
; Chad
|
||||
|
||||
UnknownScript_0xbd9c6:
|
||||
ChadPhoneScript1:
|
||||
trainertotext SCHOOLBOY, CHAD1, $0
|
||||
checkflag ENGINE_CHAD
|
||||
iftrue UnknownScript_0xbd9e9
|
||||
@@ -1386,7 +1386,7 @@ UnknownScript_0xbd9e9:
|
||||
displaylocation ROUTE_38, $2
|
||||
farjump UnknownScript_0xa0a7d
|
||||
|
||||
UnknownScript_0xbd9f0:
|
||||
ChadPhoneScript2:
|
||||
trainertotext SCHOOLBOY, CHAD1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
farscall UnknownScript_0xbde3f
|
||||
@@ -1417,7 +1417,7 @@ UnknownScript_0xbda2d:
|
||||
UnknownScript_0xbda31:
|
||||
farjump UnknownScript_0xa0754
|
||||
|
||||
UnknownScript_0xbda35:
|
||||
DerekPhoneScript1:
|
||||
trainertotext POKEFANM, DEREK1, $0
|
||||
farscall UnknownScript_0xbde4e
|
||||
checkflag ENGINE_DEREK_HAS_NUGGET
|
||||
@@ -1441,7 +1441,7 @@ UnknownScript_0xbda67:
|
||||
displaylocation ROUTE_39, $2
|
||||
farjump UnknownScript_0xa0ad5
|
||||
|
||||
UnknownScript_0xbda6e:
|
||||
DerekPhoneScript2:
|
||||
trainertotext POKEFANM, DEREK1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
farscall UnknownScript_0xbde3f
|
||||
@@ -1466,7 +1466,7 @@ UnknownScript_0xbdaa2:
|
||||
displaylocation ROUTE_39, $2
|
||||
farjump UnknownScript_0xa05e6
|
||||
|
||||
UnknownScript_0xbdaac:
|
||||
TullyPhoneScript1:
|
||||
trainertotext FISHER, TULLY1, $0
|
||||
checkflag ENGINE_TULLY
|
||||
iftrue UnknownScript_0xbdad5
|
||||
@@ -1491,7 +1491,7 @@ UnknownScript_0xbdadc:
|
||||
displaylocation ROUTE_42, $2
|
||||
farjump UnknownScript_0xa0add
|
||||
|
||||
UnknownScript_0xbdae3:
|
||||
TullyPhoneScript2:
|
||||
trainertotext FISHER, TULLY1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_TULLY
|
||||
@@ -1527,7 +1527,7 @@ UnknownScript_0xbdb2c:
|
||||
displaylocation ROUTE_42, $2
|
||||
farjump UnknownScript_0xa05e6
|
||||
|
||||
UnknownScript_0xbdb36:
|
||||
BrentPhoneScript1:
|
||||
trainertotext POKEMANIAC, BRENT1, $0
|
||||
checkflag ENGINE_BRENT
|
||||
iftrue UnknownScript_0xbdb59
|
||||
@@ -1546,7 +1546,7 @@ UnknownScript_0xbdb59:
|
||||
displaylocation ROUTE_43, $2
|
||||
farjump UnknownScript_0xa0a87
|
||||
|
||||
UnknownScript_0xbdb60:
|
||||
BrentPhoneScript2:
|
||||
trainertotext POKEMANIAC, BRENT1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
farscall UnknownScript_0xbde3f
|
||||
@@ -1572,7 +1572,7 @@ UnknownScript_0xbdb8b:
|
||||
UnknownScript_0xbdb95:
|
||||
farjump UnknownScript_0xa07ce
|
||||
|
||||
UnknownScript_0xbdb99:
|
||||
TiffanyPhoneScript1:
|
||||
trainertotext PICNICKER, TIFFANY3, $0
|
||||
checkflag ENGINE_TIFFANY
|
||||
iftrue UnknownScript_0xbdbc2
|
||||
@@ -1597,7 +1597,7 @@ UnknownScript_0xbdbc9:
|
||||
displaylocation ROUTE_43, $2
|
||||
farjump UnknownScript_0xa0ae5
|
||||
|
||||
UnknownScript_0xbdbd0:
|
||||
TiffanyPhoneScript2:
|
||||
trainertotext PICNICKER, TIFFANY3, $0
|
||||
farscall UnknownScript_0xbde45
|
||||
if_equal $0, UnknownScript_0xbdc21
|
||||
@@ -1673,7 +1673,7 @@ UnknownScript_0xbdc69:
|
||||
|
||||
; Vance
|
||||
|
||||
UnknownScript_0xbdc73:
|
||||
VancePhoneScript1:
|
||||
trainertotext BIRD_KEEPER, VANCE1, $0
|
||||
checkflag ENGINE_VANCE
|
||||
iftrue UnknownScript_0xbdc96
|
||||
@@ -1692,7 +1692,7 @@ UnknownScript_0xbdc96:
|
||||
displaylocation ROUTE_44, $2
|
||||
farjump UnknownScript_0xa0a91
|
||||
|
||||
UnknownScript_0xbdc9d:
|
||||
VancePhoneScript2:
|
||||
trainertotext BIRD_KEEPER, VANCE1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_VANCE
|
||||
@@ -1714,7 +1714,7 @@ UnknownScript_0xbdcc4:
|
||||
setflag ENGINE_VANCE
|
||||
farjump UnknownScript_0xa0376
|
||||
|
||||
UnknownScript_0xbdcce:
|
||||
WiltonPhoneScript1:
|
||||
trainertotext FISHER, WILTON1, $0
|
||||
checkflag ENGINE_WILTON
|
||||
iftrue UnknownScript_0xbdcf7
|
||||
@@ -1739,7 +1739,7 @@ UnknownScript_0xbdcfe:
|
||||
displaylocation ROUTE_44, $2
|
||||
farjump UnknownScript_0xa0aed
|
||||
|
||||
UnknownScript_0xbdd05:
|
||||
WiltonPhoneScript2:
|
||||
trainertotext FISHER, WILTON1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_WILTON
|
||||
@@ -1792,19 +1792,19 @@ UnknownScript_0xbdd6d:
|
||||
|
||||
; Kenji
|
||||
|
||||
UnknownScript_0xbdd71:
|
||||
KenjiPhoneScript1:
|
||||
trainertotext BLACKBELT_T, KENJI3, $0
|
||||
farscall UnknownScript_0xbde4e
|
||||
farjump UnknownScript_0xa09ee
|
||||
|
||||
UnknownScript_0xbdd7d:
|
||||
KenjiPhoneScript2:
|
||||
trainertotext BLACKBELT_T, KENJI3, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
farjump UnknownScript_0xa064c
|
||||
|
||||
; Parry
|
||||
|
||||
UnknownScript_0xbdd89:
|
||||
ParryPhoneScript1:
|
||||
trainertotext HIKER, PARRY1, $0
|
||||
checkflag ENGINE_PARRY
|
||||
iftrue UnknownScript_0xbddac
|
||||
@@ -1823,7 +1823,7 @@ UnknownScript_0xbddac:
|
||||
displaylocation ROUTE_45, $2
|
||||
farjump UnknownScript_0xa0a9b
|
||||
|
||||
UnknownScript_0xbddb3:
|
||||
ParryPhoneScript2:
|
||||
trainertotext HIKER, PARRY1, $0
|
||||
farscall UnknownScript_0xbe1b6
|
||||
checkflag ENGINE_PARRY
|
||||
@@ -1847,7 +1847,7 @@ UnknownScript_0xbddda:
|
||||
|
||||
; Erin
|
||||
|
||||
UnknownScript_0xbdde4:
|
||||
ErinPhoneScript1:
|
||||
trainertotext PICNICKER, ERIN1, $0
|
||||
checkflag ENGINE_ERIN
|
||||
iftrue UnknownScript_0xbde07
|
||||
@@ -1866,7 +1866,7 @@ UnknownScript_0xbde07:
|
||||
displaylocation ROUTE_46, $2
|
||||
farjump UnknownScript_0xa0aa0
|
||||
|
||||
UnknownScript_0xbde0e:
|
||||
ErinPhoneScript2:
|
||||
trainertotext PICNICKER, ERIN1, $0
|
||||
farscall UnknownScript_0xbe41e
|
||||
checkflag ENGINE_ERIN
|
||||
|
@@ -212,7 +212,7 @@ Function4013c: ; 4013c (10:413c)
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
call ClearSprites
|
||||
xor a
|
||||
ld hl, AttrMap
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, $168
|
||||
call ByteFill
|
||||
callba Function1de171
|
||||
@@ -725,7 +725,7 @@ Function4050a: ; 4050a (10:450a)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
xor a
|
||||
ld hl, AttrMap
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, $168
|
||||
call ByteFill
|
||||
call Function41ae1
|
||||
@@ -1071,10 +1071,10 @@ Function4074c: ; 4074c (10:474c)
|
||||
ld de, Unknown_407f2
|
||||
call Function40acd
|
||||
ld a, $32
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
ld bc, $168
|
||||
call ByteFill
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
lb bc, 7, 7
|
||||
call Function40ad5
|
||||
hlcoord 0, 9
|
||||
@@ -1135,7 +1135,7 @@ Unknown_407f2: ; 407f2
|
||||
|
||||
Function407fd: ; 407fd
|
||||
call Function40aa6
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
ld bc, $0f12
|
||||
call Function40ad5
|
||||
hlcoord 19, 0
|
||||
@@ -1259,7 +1259,7 @@ String_4094c: ; 4094c
|
||||
|
||||
Function40962: ; 40962 (10:4962)
|
||||
call Function40aa6
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
lb bc, 7, 7
|
||||
call Function40ad5
|
||||
hlcoord 0, 11
|
||||
@@ -1387,9 +1387,9 @@ Unknown_40a3e: ; 40a3e
|
||||
; 40aa6
|
||||
|
||||
Function40aa6: ; 40aa6
|
||||
ld hl, TileMap
|
||||
hlcoord 0, 0
|
||||
ld a, $32
|
||||
ld bc, $0168
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
call ByteFill
|
||||
ret
|
||||
; 40ab2
|
||||
|
@@ -79,7 +79,7 @@ PredefPointers:: ; 856b
|
||||
add_predef Functioncbcdd
|
||||
add_predef Predef2F
|
||||
add_predef Function9853 ; $30
|
||||
add_predef Function864c
|
||||
add_predef Predef_LoadSGBLayout
|
||||
add_predef Function91d11
|
||||
add_predef CheckContestMon
|
||||
add_predef Function8c20f
|
||||
|
4256
engine/radio.asm
4256
engine/radio.asm
File diff suppressed because it is too large
Load Diff
@@ -475,7 +475,7 @@ Script_loadmenudata: ; 0x96efa
|
||||
ld de, LoadMenuDataHeader
|
||||
ld a, [ScriptBank]
|
||||
call Call_a_de
|
||||
call DrawOnMap
|
||||
call UpdateSprites
|
||||
ret
|
||||
; 0x96f0f
|
||||
|
||||
@@ -483,7 +483,7 @@ Script_writebackup: ; 0x96f0f
|
||||
; script command 0x50
|
||||
|
||||
call WriteBackup
|
||||
call DrawOnMap
|
||||
call UpdateSprites
|
||||
ret
|
||||
; 0x96f16
|
||||
|
||||
@@ -1212,7 +1212,7 @@ ApplyPersonFacing: ; 0x9728b
|
||||
jr nz, .asm_972b5 ; 0x972b0 $3
|
||||
call Function972bc
|
||||
.asm_972b5
|
||||
call DrawOnMap
|
||||
call UpdateSprites
|
||||
ret
|
||||
.not_visible
|
||||
pop de
|
||||
@@ -1222,8 +1222,8 @@ ApplyPersonFacing: ; 0x9728b
|
||||
|
||||
Function972bc: ; 0x972bc
|
||||
call Function217a
|
||||
ld hl, TileMap
|
||||
ld bc, $0168
|
||||
hlcoord 0, 0
|
||||
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
|
||||
.asm_972c5
|
||||
res 7, [hl]
|
||||
inc hl
|
||||
@@ -1470,7 +1470,7 @@ Script_loadpikachudata: ; 0x973f0
|
||||
; script command 0x5a
|
||||
|
||||
ld a, PIKACHU
|
||||
ld [wd22e], a
|
||||
ld [TempWildMonSpecies], a
|
||||
ld a, 5
|
||||
ld [CurPartyLevel], a
|
||||
ret
|
||||
@@ -1505,7 +1505,7 @@ Script_loadpokedata: ; 0x97412
|
||||
ld a, $80
|
||||
ld [wd459], a
|
||||
call GetScriptByte
|
||||
ld [wd22e], a
|
||||
ld [TempWildMonSpecies], a
|
||||
call GetScriptByte
|
||||
ld [CurPartyLevel], a
|
||||
ret
|
||||
@@ -2970,7 +2970,7 @@ Script_reloadmappart:: ; 0x97ae3
|
||||
call Function2173
|
||||
call Function2914
|
||||
callba Function104061
|
||||
call DrawOnMap
|
||||
call UpdateSprites
|
||||
ret
|
||||
; 0x97af6
|
||||
|
||||
|
@@ -4,46 +4,42 @@ SpawnPoints: ; 0x152ab
|
||||
const_def
|
||||
|
||||
spawn: MACRO
|
||||
; name, map, y, x
|
||||
\1\@ EQUS "SPAWN_\1"
|
||||
const \1\@
|
||||
map \2
|
||||
db \3, \4
|
||||
; map, y, x
|
||||
map \1
|
||||
db \2, \3
|
||||
ENDM
|
||||
|
||||
spawn HOME, KRISS_HOUSE_2F, 3, 3
|
||||
spawn DEBUG, VIRIDIAN_POKECENTER_1F, 5, 3
|
||||
spawn KRISS_HOUSE_2F, 3, 3
|
||||
spawn VIRIDIAN_POKECENTER_1F, 5, 3
|
||||
|
||||
spawn PALLET, PALLET_TOWN, 5, 6
|
||||
spawn VIRIDIAN, VIRIDIAN_CITY, 23, 26
|
||||
spawn PEWTER, PEWTER_CITY, 13, 26
|
||||
spawn CERULEAN, CERULEAN_CITY, 19, 22
|
||||
spawn ROCK_TUNNEL, ROUTE_10_NORTH, 11, 2
|
||||
spawn VERMILION, VERMILION_CITY, 9, 6
|
||||
spawn LAVENDER, LAVENDER_TOWN, 5, 6
|
||||
spawn SAFFRON, SAFFRON_CITY, 9, 30
|
||||
spawn CELADON, CELADON_CITY, 29, 10
|
||||
spawn FUCHSIA, FUCHSIA_CITY, 19, 28
|
||||
spawn CINNABAR, CINNABAR_ISLAND, 11, 12
|
||||
spawn INDIGO, ROUTE_23, 9, 6
|
||||
spawn PALLET_TOWN, 5, 6
|
||||
spawn VIRIDIAN_CITY, 23, 26
|
||||
spawn PEWTER_CITY, 13, 26
|
||||
spawn CERULEAN_CITY, 19, 22
|
||||
spawn ROUTE_10_NORTH, 11, 2
|
||||
spawn VERMILION_CITY, 9, 6
|
||||
spawn LAVENDER_TOWN, 5, 6
|
||||
spawn SAFFRON_CITY, 9, 30
|
||||
spawn CELADON_CITY, 29, 10
|
||||
spawn FUCHSIA_CITY, 19, 28
|
||||
spawn CINNABAR_ISLAND, 11, 12
|
||||
spawn ROUTE_23, 9, 6
|
||||
|
||||
spawn NEW_BARK, NEW_BARK_TOWN, 13, 6
|
||||
spawn CHERRYGROVE, CHERRYGROVE_CITY, 29, 4
|
||||
spawn VIOLET, VIOLET_CITY, 31, 26
|
||||
spawn UNION_CAVE, ROUTE_32, 11, 74
|
||||
spawn AZALEA, AZALEA_TOWN, 15, 10
|
||||
spawn CIANWOOD, CIANWOOD_CITY, 23, 44
|
||||
spawn GOLDENROD, GOLDENROD_CITY, 15, 28
|
||||
spawn OLIVINE, OLIVINE_CITY, 13, 22
|
||||
spawn ECRUTEAK, ECRUTEAK_CITY, 23, 28
|
||||
spawn MAHOGANY, MAHOGANY_TOWN, 15, 14
|
||||
spawn LAKE, LAKE_OF_RAGE, 21, 29
|
||||
spawn BLACKTHORN, BLACKTHORN_CITY, 21, 30
|
||||
spawn MT_SILVER, SILVER_CAVE_OUTSIDE, 23, 20
|
||||
spawn FAST_SHIP, FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
|
||||
NUM_SPAWNS EQU const_value
|
||||
const_value = -1
|
||||
spawn N_A, N_A, -1, -1
|
||||
spawn NEW_BARK_TOWN, 13, 6
|
||||
spawn CHERRYGROVE_CITY, 29, 4
|
||||
spawn VIOLET_CITY, 31, 26
|
||||
spawn ROUTE_32, 11, 74
|
||||
spawn AZALEA_TOWN, 15, 10
|
||||
spawn CIANWOOD_CITY, 23, 44
|
||||
spawn GOLDENROD_CITY, 15, 28
|
||||
spawn OLIVINE_CITY, 13, 22
|
||||
spawn ECRUTEAK_CITY, 23, 28
|
||||
spawn MAHOGANY_TOWN, 15, 14
|
||||
spawn LAKE_OF_RAGE, 21, 29
|
||||
spawn BLACKTHORN_CITY, 21, 30
|
||||
spawn SILVER_CAVE_OUTSIDE, 23, 20
|
||||
spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
|
||||
spawn N_A, -1, -1
|
||||
|
||||
|
||||
|
||||
@@ -93,7 +89,7 @@ IsSpawnPoint: ; 15344
|
||||
|
||||
.next
|
||||
push bc
|
||||
ld bc, 4
|
||||
ld bc, 4 ; length of a spawn table entry
|
||||
add hl, bc
|
||||
pop bc
|
||||
inc c
|
||||
|
@@ -75,7 +75,7 @@ SpecialsPointers:: ; c029
|
||||
add_special WhiteBGMap
|
||||
add_special UpdateTimePals
|
||||
add_special ClearTileMap
|
||||
add_special DrawOnMap
|
||||
add_special UpdateSprites
|
||||
add_special Special_ReplaceKrisSprite
|
||||
add_special Special_GameCornerPrizeMonCheckDex
|
||||
add_special SpecialSeenMon
|
||||
@@ -110,9 +110,9 @@ SpecialsPointers:: ; c029
|
||||
add_special SpecialNameRater
|
||||
add_special Functionc2da
|
||||
add_special GetFirstPokemonHappiness
|
||||
add_special Function71ac
|
||||
add_special Function2a4ab
|
||||
add_special Function2a51f
|
||||
add_special CheckFirstMonIsEgg
|
||||
add_special RandomPhoneRareWildMon
|
||||
add_special RandomPhoneWildMon
|
||||
add_special RandomPhoneMon
|
||||
add_special RunCallback_04
|
||||
add_special Functionfb841
|
||||
|
@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
|
||||
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
|
||||
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
|
||||
specialphonecall ELMCALL_WEIRDBROADCAST
|
||||
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
|
||||
domaptrigger MAHOGANY_TOWN, $1
|
||||
end
|
||||
|
||||
BugContestResultsWarpScript:
|
||||
@@ -307,7 +307,7 @@ BugContestResultsWarpScript:
|
||||
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
|
||||
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
|
||||
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
|
||||
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
|
||||
warp ROUTE_36_NATIONAL_PARK_GATE, $0, $4
|
||||
applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
|
||||
|
||||
BugContestResultsScript:
|
||||
@@ -356,7 +356,7 @@ BugContestResults_DidNotLeaveMons
|
||||
BugContestResults_CleanUp
|
||||
loadmovesprites
|
||||
dotrigger $0
|
||||
domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
|
||||
domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
|
||||
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
|
||||
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
|
||||
setevent EVENT_BUG_CATCHING_CONTESTANT_3A
|
||||
|
Reference in New Issue
Block a user