Merge remote-tracking branch 'kanzure/master' into gfx-script

This commit is contained in:
yenatch
2015-07-20 23:05:28 -07:00
504 changed files with 32011 additions and 45776 deletions

View File

@@ -1,13 +1,13 @@
UnknownScript_0xa0b14:
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73
checkcode $a
if_greater_than $11, UnknownScript_0xa0b4b
checkcode VAR_HOUR
if_greater_than 17, UnknownScript_0xa0b4b
scall UnknownScript_0xa0b32
jump UnknownScript_0xa0c0e
UnknownScript_0xa0b26:
checkflag ENGINE_BIKE_SHOP_CALL_ENABLED
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73
scall UnknownScript_0xa0b4f
jump UnknownScript_0xa0b77
@@ -36,8 +36,8 @@ UnknownScript_0xa0b4b:
end
UnknownScript_0xa0b4f:
checkcode $a
if_greater_than $11, UnknownScript_0xa0b6e
checkcode VAR_HOUR
if_greater_than 17, UnknownScript_0xa0b6e
checkmorn
iftrue UnknownScript_0xa0b64
checkday
@@ -68,27 +68,27 @@ UnknownScript_0xa0b73:
UnknownScript_0xa0b77:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0xa0b82
random $b
random 11
jump UnknownScript_0xa0b84
UnknownScript_0xa0b82:
random $e
random 14
UnknownScript_0xa0b84:
if_equal $0, UnknownScript_0xa0bbc
if_equal $1, UnknownScript_0xa0bc2
if_equal $2, UnknownScript_0xa0bc8
if_equal $3, UnknownScript_0xa0bce
if_equal $4, UnknownScript_0xa0bd4
if_equal $5, UnknownScript_0xa0bda
if_equal $6, UnknownScript_0xa0be0
if_equal $7, UnknownScript_0xa0be6
if_equal $8, UnknownScript_0xa0bec
if_equal $9, UnknownScript_0xa0bf2
if_equal $a, UnknownScript_0xa0bf8
if_equal $b, UnknownScript_0xa0bfe
if_equal $c, UnknownScript_0xa0c04
if_equal $d, UnknownScript_0xa0c0a
if_equal 0, UnknownScript_0xa0bbc
if_equal 1, UnknownScript_0xa0bc2
if_equal 2, UnknownScript_0xa0bc8
if_equal 3, UnknownScript_0xa0bce
if_equal 4, UnknownScript_0xa0bd4
if_equal 5, UnknownScript_0xa0bda
if_equal 6, UnknownScript_0xa0be0
if_equal 7, UnknownScript_0xa0be6
if_equal 8, UnknownScript_0xa0bec
if_equal 9, UnknownScript_0xa0bf2
if_equal 10, UnknownScript_0xa0bf8
if_equal 11, UnknownScript_0xa0bfe
if_equal 12, UnknownScript_0xa0c04
if_equal 13, UnknownScript_0xa0c0a
UnknownScript_0xa0bbc:
writetext UnknownText_0xa0efb
@@ -149,10 +149,10 @@ UnknownScript_0xa0c0d:
end
UnknownScript_0xa0c0e:
random $3
if_equal $0, UnknownScript_0xa0c1c
if_equal $1, UnknownScript_0xa0c20
if_equal $2, UnknownScript_0xa0c24
random 3
if_equal 0, UnknownScript_0xa0c1c
if_equal 1, UnknownScript_0xa0c20
if_equal 2, UnknownScript_0xa0c24
UnknownScript_0xa0c1c:
writetext UnknownText_0xa1c88

View File

@@ -262,10 +262,9 @@ Function8bc6:
bit 7, a
jr z, .asm_8bd7
and $7f
rept 4
inc hl
inc hl
inc hl
inc hl
endr
.asm_8bd7
asm_8bd7
@@ -361,8 +360,9 @@ Function8c43: ; 8c43
.asm_8c5a
ld l, c
ld h, $0
rept 2
add hl, hl
add hl, hl
endr
ld bc, Palettes_a8be
add hl, bc
ld bc, $0004
@@ -398,8 +398,9 @@ Function8c8a: ; 8c8a
ld hl, Unknown_8f6a
ld b, 0
dec c
rept 2
add hl, bc
add hl, bc
endr
ld a, [rSVBK]
push af
ld a, $5
@@ -420,9 +421,9 @@ Function8c8a: ; 8c8a
Function8cb4: ; 8cb4
ld l, e
ld h, 0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld de, Palettes_8d05
add hl, de
call CheckCGB
@@ -433,8 +434,9 @@ Function8cb4: ; 8cb4
ld bc, $0010
call CopyBytes
pop hl
rept 2
inc hl
inc hl
endr
ld a, [hli]
ld [wcda9 + 3], a
ld a, [hli]
@@ -556,9 +558,9 @@ Function9615: ; 9615
Function9625: ; 9625
ld l, a
ld h, $0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld bc, Palettes_9df6
add hl, bc
ret
@@ -639,15 +641,13 @@ Function9673: ; 9673
ld c, $8
.asm_9683
ld a, $ff
rept 4
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
endr
xor a
rept 4
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
endr
dec c
jr nz, .asm_9683
pop af
@@ -806,8 +806,9 @@ Function9764: ; 9764
Function976b: ; 976b
ld l, a
ld h, 0
add hl, hl
add hl, hl
rept 2
add hl,hl
endr
ld bc, TrainerPalettes
add hl, bc
ret
@@ -896,9 +897,9 @@ Function97e5: ; 97e5
Function97ee: ; 97ee
ld l, a
ld h, $0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld bc, PokemonPalettes
add hl, bc
ret
@@ -912,10 +913,9 @@ Function97f9: ; 97f9
call CheckShininess
pop hl
ret nc
rept 4
inc hl
inc hl
inc hl
inc hl
endr
ret
; 9809
@@ -1139,8 +1139,9 @@ Function994a: ; 994a
jr nz, .asm_99a6
ld a, $20
ld [rJOYP], a
rept 2
ld a, [rJOYP]
ld a, [rJOYP]
endr
call Function9a7a
call Function9a7a
ld a, $30
@@ -1149,19 +1150,16 @@ Function994a: ; 994a
call Function9a7a
ld a, $10
ld [rJOYP], a
rept 6
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
endr
call Function9a7a
call Function9a7a
ld a, $30
ld [rJOYP], a
rept 3
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
endr
call Function9a7a
call Function9a7a
ld a, [rJOYP]
@@ -1943,21 +1941,22 @@ Functionb1de: ; b1de
callba Function494ac
jr c, .asm_b230
ld a, [wd19a]
ld a, [wPermission]
and 7
ld e, a
ld d, 0
ld hl, Unknown_b279
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [TimeOfDayPal]
and 3
rept 3
add a
add a
add a
endr
ld e, a
ld d, 0
add hl, de
@@ -1975,9 +1974,9 @@ Functionb1de: ; b1de
push hl
ld l, a
ld h, 0
add hl, hl
add hl, hl
add hl, hl
rept 3
add hl,hl
endr
ld de, TilesetBGPalette
add hl, de
ld e, l
@@ -2008,7 +2007,7 @@ Functionb1de: ; b1de
ld a, $5 ; BANK(Unkn2Pals)
call FarCopyWRAM
ld a, [wd19a]
ld a, [wPermission]
cp 1
jr z, .asm_b253
cp 2
@@ -2017,19 +2016,18 @@ Functionb1de: ; b1de
ld a, [MapGroup]
ld l, a
ld h, 0
add hl, hl
add hl, hl
add hl, hl
rept 3
add hl,hl
endr
ld de, RoofPals
add hl, de
ld a, [TimeOfDayPal]
and 3
cp NITE
jr c, .asm_b26d
rept 4
inc hl
inc hl
inc hl
inc hl
endr
.asm_b26d
ld de, Unkn1Pals + 8 * 6 + 2
ld bc, 4

View File

@@ -260,8 +260,9 @@ Function109926: ; 109926
ld e, a
ld d, 0
ld hl, Jumptable_109937
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -326,8 +327,9 @@ Function109986: ; 109986 (42:5986)
cp $30
jr c, Function109986
ld a, [wcf66]
rept 2
dec a
dec a
endr
ld [wcf66], a
ld hl, LYOverrides + $1f
call Function1099a3
@@ -397,8 +399,9 @@ ParseCredits: ; 1099aa
ld e, a
ld d, 0
ld hl, CreditsStrings
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld d, [hl]
ld e, a
@@ -582,10 +585,9 @@ Function109aff: ; 109aff (42:5aff)
dec c
jr nz, .asm_109b08
pop hl
rept 4
inc hl
inc hl
inc hl
inc hl
endr
dec b
jr nz, .asm_109b01
ret
@@ -735,8 +737,9 @@ Function109bca: ; 109bca (42:5bca)
ld [hl], a
ld a, [wcf65]
and 3
rept 2
add a
add a
endr
add e
add a
ld e, a

View File

@@ -100,26 +100,26 @@
dwb wdc9d, %00000001 ; lucky number show
dwb StatusFlags2, %00001000
dwb wdc1e, %00000001 ; kurt making balls ; $50
dwb wdc1e, %00000010
dwb wdc1e, %00000100 ; special wilddata?
dwb wdc1e, %00001000 ; time capsule (24h wait)
dwb wdc1e, %00010000 ; all fruit trees
dwb wdc1e, %00100000 ; shuckle given
dwb wdc1e, %01000000 ; goldenrod underground merchant closed
dwb wdc1e, %10000000 ; fought in trainer hall today
dwb DailyFlags, %00000001 ; kurt making balls ; $50
dwb DailyFlags, %00000010
dwb DailyFlags, %00000100 ; special wilddata?
dwb DailyFlags, %00001000 ; time capsule (24h wait)
dwb DailyFlags, %00010000 ; all fruit trees
dwb DailyFlags, %00100000 ; shuckle given
dwb DailyFlags, %01000000 ; goldenrod underground merchant closed
dwb DailyFlags, %10000000 ; fought in trainer hall today
dwb wdc1f, %00000001 ; mt moon square clefairy ; $58
dwb wdc1f, %00000010 ; union cave lapras
dwb wdc1f, %00000100 ; goldenrod underground haircut used
dwb wdc1f, %00001000 ; goldenrod mall happiness event floor05 person07
dwb wdc1f, %00010000 ; tea in blues house
dwb wdc1f, %00100000 ; indigo plateau rival fight
dwb wdc1f, %01000000
dwb wdc1f, %10000000
dwb WeeklyFlags, %00000001 ; mt moon square clefairy ; $58
dwb WeeklyFlags, %00000010 ; union cave lapras
dwb WeeklyFlags, %00000100 ; goldenrod underground haircut used
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 wdc20, %00000001 ; $60
dwb wdc20, %00000010 ; goldenrod dept store sale is on
dwb SwarmFlags, %00000001 ; $60
dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on
dwb GameTimerPause, %10000000 ; $62
@@ -194,5 +194,5 @@
dwb wd45b, %00000100 ; female player has been transformed into male
dwb wdc20, %00000100 ; dunsparce swarm ; $a0
dwb wdc20, %00001000 ; yanma swarm
dwb SwarmFlags, %00000100 ; dunsparce swarm ; $a0
dwb SwarmFlags, %00001000 ; yanma swarm

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
; More overworld event handling.
Function97c28:: ; 97c28
WarpToSpawnPoint:: ; 97c28
ld hl, StatusFlags2
res 1, [hl]
res 2, [hl]
@@ -48,46 +48,46 @@ Function97c5f:: ; 97c5f
call GetFacingTileCoord
ld [EngineBuffer1], a
ld c, a
callba Function1365b
jr c, .asm_97cb9
callba CheckFacingTileForStd
jr c, .done
call CheckCutTreeTile
jr nz, .whirlpool
callba TryCutOW
jr .asm_97cb9
jr .done
.whirlpool
ld a, [EngineBuffer1]
call CheckWhirlpoolTile
jr nz, .waterfall
callba TryWhirlpoolOW
jr .asm_97cb9
jr .done
.waterfall
ld a, [EngineBuffer1]
call CheckWaterfallTile
jr nz, .headbutt
callba TryWaterfallOW
jr .asm_97cb9
jr .done
.headbutt
ld a, [EngineBuffer1]
call CheckHeadbuttTreeTile
jr nz, .surf
callba TryHeadbuttOW
jr c, .asm_97cb9
jr .asm_97cb7
jr c, .done
jr .noevent
.surf
callba TrySurfOW
jr nc, .asm_97cb7
jr .asm_97cb9
jr nc, .noevent
jr .done
.asm_97cb7
.noevent
xor a
ret
.asm_97cb9
.done
call PlayClickSFX
ld a, $ff
scf
@@ -125,8 +125,8 @@ Function97cc0:: ; 97cc0
jr .asm_97cf4
.asm_97ced
ld a, BANK(UnknownScript_0x135eb)
ld hl, UnknownScript_0x135eb
ld a, BANK(BugCatchingContestBattleScript)
ld hl, BugCatchingContestBattleScript
jr .asm_97cf4
.asm_97cf4
@@ -146,7 +146,7 @@ Function97cfd:: ; 97cfd
ld hl, StatusFlags
bit 5, [hl]
jr nz, .asm_97d21
ld a, [wd19a]
ld a, [wPermission]
cp $4
jr z, .asm_97d17
cp $7
@@ -271,21 +271,21 @@ Function97db3:: ; 97db3
Function97db5: ; 97db5
ld hl, StatusFlags2
bit 4, [hl]
jr z, .asm_97df7
jr z, .NoCall
ld a, [PlayerState]
cp $1
jr nz, .asm_97df7
call Function2d05
cp 1
jr nz, .NoCall
call GetMapHeaderPhoneServiceNybble
and a
jr nz, .asm_97df7
jr nz, .NoCall
ld hl, wdca1 + 1
ld a, [hli]
ld d, a
ld e, [hl]
cp $ff
cp -1
jr nz, .asm_97dd8
ld a, e
cp $ff
cp -1
jr z, .asm_97ddc
.asm_97dd8
@@ -297,34 +297,34 @@ Function97db5: ; 97db5
.asm_97ddc
ld a, d
cp $4
jr c, .asm_97df7
ld a, [wdc31]
jr c, .NoCall
ld a, [wSpecialPhoneCallID]
and a
jr nz, .asm_97df7
ld a, $6
ld [wdc31], a
jr nz, .NoCall
ld a, 6
ld [wSpecialPhoneCallID], a
xor a
ld [wdc31 + 1], a
ld [wSpecialPhoneCallID + 1], a
ld hl, StatusFlags2
res 4, [hl]
scf
ret
.asm_97df7
.NoCall
xor a
ret
; 97df9
Function97df9:: ; 97df9
ld hl, wd6de
ld de, $0006
ld c, $4
ld de, 6
ld c, 4
xor a
.asm_97e02
.loop
ld [hl], a
add hl, de
dec c
jr nz, .asm_97e02
jr nz, .loop
ret
; 97e08
@@ -439,9 +439,9 @@ Function97e79: ; 97e79
ld e, a
ld d, 0
ld hl, Table97e94
rept 3
add hl, de
add hl, de
add hl, de
endr
ld a, [hli]
push af
ld a, [hli]

View File

@@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041
; 4404c
TryResetFruitTrees: ; 4404c
ld hl, wdc1e
ld hl, DailyFlags
bit 4, [hl]
ret nz
jp ResetFruitTrees
@@ -66,11 +66,11 @@ PickedFruitTree: ; 4405f
ResetFruitTrees: ; 4406a
xor a
ld hl, FruitTreeFlags
rept 3
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld hl, wdc1e
ld hl, DailyFlags
set 4, [hl]
ret
; 44078

View File

@@ -3,8 +3,9 @@ GetLandmarkCoords: ; 0x1ca896
push hl
ld l, e
ld h, 0
rept 2
add hl, hl
add hl, hl
endr
ld de, Landmarks
add hl, de
ld a, [hli]
@@ -23,8 +24,9 @@ GetLandmarkName:: ; 0x1ca8a5
ld l, e
ld h, 0
rept 2
add hl, hl
add hl, hl
endr
ld de, Landmarks + 2
add hl, de
ld a, [hli]

File diff suppressed because it is too large Load Diff

View File

@@ -6,8 +6,9 @@ RunMapSetupScript:: ; 15363
ld c, a
ld b, 0
ld hl, MapSetupScripts
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -259,9 +260,9 @@ ReadMapSetupScript: ; 1541d
ld c, a
ld b, 0
ld hl, MapSetupCommands
rept 3
add hl, bc
add hl, bc
add hl, bc
endr
; bank
ld b, [hl]
@@ -293,76 +294,76 @@ ReadMapSetupScript: ; 1541d
; 15440
MapSetupCommands: ; 15440
dbw BANK(EnableLCD), EnableLCD
dbw BANK(DisableLCD), DisableLCD
dbw BANK(SoundRestart), SoundRestart
dbw BANK(PlayMapMusic), PlayMapMusic
dbw BANK(RestartMapMusic), RestartMapMusic
dbw BANK(FadeToMapMusic), FadeToMapMusic
dbw BANK(Function15574), Function15574
dbw BANK(EnterMapMusic), EnterMapMusic
dbw BANK(Function15587), Function15587
dbw BANK(Function3cae), Function3cae
dbw BANK(Function24cd), Function24cd
dbw BANK(Function28e3), Function28e3
dbw BANK(Function289d), Function289d
dbw BANK(Function2879), Function2879
dbw BANK(Function1047cf), Function1047cf
dbw BANK(LoadTilesetHeader), LoadTilesetHeader
dbw BANK(Function104750), Function104750
dbw BANK(Function1047eb), Function1047eb
dbw BANK(Function29ff8), Function29ff8
dbw BANK(Function1047f0), Function1047f0
dbw BANK(Function1045b0), Function1045b0
dbw BANK(Function1045c4), Function1045c4
dbw BANK(Function154d7), Function154d7
dbw BANK(LoadSpawnPoint), LoadSpawnPoint
dbw BANK(EnterMapConnection), EnterMapConnection
dbw BANK(Function1046c6), Function1046c6
dbw BANK(Function2309), Function2309
dbw BANK(Function2317), Function2317
dbw BANK(WhiteBGMap), WhiteBGMap
dbw BANK(Function8c084), Function8c084
dbw BANK(Function8c079), Function8c079
dbw BANK(Function10486d), Function10486d
dbw BANK(Function248a), Function248a
dbw BANK(Function57d9), Function57d9
dbw BANK(Function8029), Function8029
dbw BANK(Function80b8), Function80b8
dbw BANK(Function154eb), Function154eb
dbw BANK(Function154f1), Function154f1
dbw BANK(Function2a30d), Function2a30d
dbw BANK(Function2a394), Function2a394
dbw BANK(Function15567), Function15567
dbw BANK(Function154cf), Function154cf
dbw BANK(Function154d3), Function154d3
dbw BANK(Function1556d), Function1556d
dbw BANK(Function154ca), Function154ca
dbw BANK(Functionb8000), Functionb8000
dbw BANK(EnableLCD), EnableLCD ; 00
dbw BANK(DisableLCD), DisableLCD ; 01
dbw BANK(SoundRestart), SoundRestart ; 02
dbw BANK(PlayMapMusic), PlayMapMusic ; 03
dbw BANK(RestartMapMusic), RestartMapMusic ; 04
dbw BANK(FadeToMapMusic), FadeToMapMusic ; 05
dbw BANK(FadeOutMapAndMusic), FadeOutMapAndMusic ; 06
dbw BANK(EnterMapMusic), EnterMapMusic ; 07
dbw BANK(ForceMapMusic), ForceMapMusic ; 08
dbw BANK(CrankUpTheVolume), CrankUpTheVolume ; 09
dbw BANK(LoadBlockData), LoadBlockData ; 0a
dbw BANK(LoadNeighboringBlockData), LoadNeighboringBlockData ; 0b
dbw BANK(SaveScreen), SaveScreen ; 0c
dbw BANK(BufferScreen), BufferScreen ; 0d
dbw BANK(LoadGraphics), LoadGraphics ; 0e
dbw BANK(LoadTilesetHeader), LoadTilesetHeader ; 0f
dbw BANK(LoadMapTimeOfDay), LoadMapTimeOfDay ; 10
dbw BANK(LoadMapPalettes), LoadMapPalettes ; 11
dbw BANK(LoadWildMonData), LoadWildMonData ; 12
dbw BANK(RefreshMapSprites), RefreshMapSprites ; 13
dbw BANK(RunCallback_05_03), RunCallback_05_03 ; 14
dbw BANK(RunCallback_03), RunCallback_03 ; 15
dbw BANK(LoadObjectsRunCallback_02), LoadObjectsRunCallback_02 ; 16
dbw BANK(LoadSpawnPoint), LoadSpawnPoint ; 17
dbw BANK(EnterMapConnection), EnterMapConnection ; 18
dbw BANK(LoadWarpData), LoadWarpData ; 19
dbw BANK(LoadMapAttributes), LoadMapAttributes ; 1a
dbw BANK(LoadMapAttributes_IgnoreHidden), LoadMapAttributes_IgnoreHidden ; 1b
dbw BANK(WhiteBGMap), WhiteBGMap ; 1c
dbw BANK(FadeBlackBGMap), FadeBlackBGMap ; 1d
dbw BANK(FadeInBGMap), FadeInBGMap ; 1e
dbw BANK(GetCoordOfUpperLeftCorner), GetCoordOfUpperLeftCorner ; 1f
dbw BANK(RestoreFacingAfterWarp), RestoreFacingAfterWarp ; 20
dbw BANK(SpawnInFacingDown), SpawnInFacingDown ; 21
dbw BANK(GetSpawnCoord), GetSpawnCoord ; 22
dbw BANK(RefreshPlayerCoords), RefreshPlayerCoords ; 23
dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24
dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25
dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26
dbw BANK(RestoreRoamMons), RestoreRoamMons ; 27
dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28
dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29
dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a
dbw BANK(RetainOldPalettes), RetainOldPalettes ; 2b
dbw BANK(DontScrollText), DontScrollText ; 2c
dbw BANK(ReturnFromMapSetupScript), ReturnFromMapSetupScript ; 2d
; 154ca
Function154ca: ; 154ca
DontScrollText: ; 154ca
xor a
ld [wc2d7], a
ret
; 154cf
Function154cf: ; 154cf
ActivateMapAnims: ; 154cf
ld a, $1
ld [$ffde], a
ret
; 154d3
Function154d3: ; 154d3
SuspendMapAnims: ; 154d3
xor a
ld [$ffde], a
ret
; 154d7
Function154d7: ; 154d7
LoadObjectsRunCallback_02: ; 154d7
ld a, $2
call Function263b
call RunMapCallback
callba Function2454f
callba Function8177
ret
@@ -372,13 +373,13 @@ Function154ea: ; 154ea
ret
; 154eb
Function154eb: ; 154eb
DelayClearingOldSprites: ; 154eb
ld hl, wd45b
set 7, [hl]
ret
; 154f1
Function154f1: ; 154f1
DelayLoadingNewSprites: ; 154f1
ld hl, wd45b
set 6, [hl]
ret
@@ -386,14 +387,14 @@ Function154f1: ; 154f1
Function154f7: ; 154f7
nop
call Function1550c
jr c, .asm_15508
jr c, .ok
call Function1554e
jr c, .asm_15508
jr c, .ok
call Function1551a
jr c, .asm_15508
jr c, .ok
ret
.asm_15508
call Functione4a
.ok
call Special_ReplaceKrisSprite
ret
Function1550c: ; 1550c (5:550c)
@@ -401,89 +402,89 @@ Function1550c: ; 1550c (5:550c)
ld hl, BikeFlags
bit 1, [hl]
ret z
ld a, $1
ld a, PLAYER_BIKE
ld [PlayerState], a
scf
ret
Function1551a: ; 1551a (5:551a)
ld a, [PlayerState]
cp $0
jr z, .asm_1554c
cp $2
jr z, .asm_1554c
cp $4
jr z, .asm_15545
cp $8
jr z, .asm_15545
cp PLAYER_NORMAL
jr z, .nope
cp PLAYER_SLIP
jr z, .nope
cp PLAYER_SURF
jr z, .surfing
cp PLAYER_SURF_PIKA
jr z, .surfing
call GetMapPermission
cp $3
jr z, .asm_1553e
jr z, .checkbiking
cp $5
jr z, .asm_1553e
jr z, .checkbiking
cp $7
jr z, .asm_1553e
jr .asm_1554c
.asm_1553e
jr z, .checkbiking
jr .nope
.checkbiking
ld a, [PlayerState]
cp $1
jr nz, .asm_1554c
.asm_15545
ld a, $0
cp PLAYER_BIKE
jr nz, .nope
.surfing
ld a, PLAYER_NORMAL
ld [PlayerState], a
scf
ret
.asm_1554c
.nope
and a
ret
Function1554e: ; 1554e (5:554e)
call Function1852
jr nz, .asm_15565
jr nz, .ret_nc
ld a, [PlayerState]
cp $4
jr z, .asm_15563
cp $8
jr z, .asm_15563
ld a, $4
cp PLAYER_SURF
jr z, .surfing
cp PLAYER_SURF_PIKA
jr z, .surfing
ld a, PLAYER_SURF
ld [PlayerState], a
.asm_15563
.surfing
scf
ret
.asm_15565
.ret_nc
and a
ret
; 15567
Function15567: ; 15567
FadeOldMapMusic: ; 15567
ld a, 6
call SkipMusic
ret
; 1556d
Function1556d: ; 1556d
RetainOldPalettes: ; 1556d
callba _UpdateTimePals
ret
Function15574: ; 15574
FadeOutMapAndMusic: ; 15574
ld e, 0
ld a, [MusicFadeIDLo]
ld d, 0
ld a, [MusicFadeIDHi]
ld a, $4
ld [MusicFade], a
call Function4b6
call FadeToWhite
ret
; 15587
Function15587: ; 15587
ForceMapMusic: ; 15587
ld a, [PlayerState]
cp $1
jr nz, .asm_15596
cp PLAYER_BIKE
jr nz, .notbiking
call VolumeOff
ld a, $88
ld [MusicFade], a
.asm_15596
call Function3d2f
.notbiking
call TryRestartMapMusic
ret
; 1559a

View File

@@ -55,7 +55,7 @@ UnknownScript_0xa0074:
farjump UnknownScript_0xa053a
UnknownScript_0xa007c:
checkcode $17
checkcode VAR_CALLERID
if_equal $5, UnknownScript_0xa00c2
if_equal $b, UnknownScript_0xa00c8
if_equal $d, UnknownScript_0xa00ce
@@ -160,7 +160,7 @@ UnknownScript_0xa0122:
end
UnknownScript_0xa0128:
checkcode $17
checkcode VAR_CALLERID
if_equal $6, UnknownScript_0xa014a
if_equal $c, UnknownScript_0xa0150
if_equal $e, UnknownScript_0xa0156
@@ -211,7 +211,7 @@ UnknownScript_0xa0174:
end
UnknownScript_0xa017a:
checkcode $17
checkcode VAR_CALLERID
if_equal $5, UnknownScript_0xa01c0
if_equal $b, UnknownScript_0xa01c6
if_equal $d, UnknownScript_0xa01cc
@@ -316,7 +316,7 @@ UnknownScript_0xa0220:
end
UnknownScript_0xa0226:
checkcode $17
checkcode VAR_CALLERID
if_equal $6, UnknownScript_0xa0248
if_equal $c, UnknownScript_0xa024e
if_equal $e, UnknownScript_0xa0254
@@ -367,7 +367,7 @@ UnknownScript_0xa0272:
end
UnknownScript_0xa0278:
checkcode $17
checkcode VAR_CALLERID
if_equal $5, UnknownScript_0xa02be
if_equal $b, UnknownScript_0xa02c4
if_equal $d, UnknownScript_0xa02ca
@@ -472,7 +472,7 @@ UnknownScript_0xa031e:
end
UnknownScript_0xa0324:
checkcode $17
checkcode VAR_CALLERID
if_equal $6, UnknownScript_0xa0346
if_equal $c, UnknownScript_0xa034c
if_equal $e, UnknownScript_0xa0352
@@ -531,7 +531,7 @@ UnknownScript_0xa037e:
farjump UnknownScript_0xa053a
UnknownScript_0xa0386:
checkcode $17
checkcode VAR_CALLERID
if_equal $5, UnknownScript_0xa03cc
if_equal $7, UnknownScript_0xa03d2
if_equal $b, UnknownScript_0xa03d8
@@ -636,7 +636,7 @@ UnknownScript_0xa042c:
end
UnknownScript_0xa0432:
checkcode $17
checkcode VAR_CALLERID
if_equal $c, UnknownScript_0xa0450
if_equal $e, UnknownScript_0xa0456
if_equal $12, UnknownScript_0xa045c
@@ -689,7 +689,7 @@ UnknownScript_0xa047f:
end
UnknownScript_0xa0484:
checkcode $17
checkcode VAR_CALLERID
if_equal $5, UnknownScript_0xa04d6
if_equal $7, UnknownScript_0xa04db
if_equal $b, UnknownScript_0xa04e0
@@ -792,7 +792,7 @@ UnknownScript_0xa0535:
end
UnknownScript_0xa053a:
checkcode $17
checkcode VAR_CALLERID
if_equal $6, UnknownScript_0xa055c
if_equal $c, UnknownScript_0xa0561
if_equal $e, UnknownScript_0xa0566
@@ -855,7 +855,7 @@ UnknownScript_0xa05a0:
end
UnknownScript_0xa05a4:
checkcode $17
checkcode VAR_CALLERID
if_equal $10, UnknownScript_0xa05ae
if_equal $1c, UnknownScript_0xa05b6
@@ -895,7 +895,7 @@ UnknownScript_0xa05de:
jump UnknownScript_0xa0484
UnknownScript_0xa05e6:
checkcode $17
checkcode VAR_CALLERID
if_equal $d, UnknownScript_0xa0600
if_equal $10, UnknownScript_0xa0605
if_equal $18, UnknownScript_0xa060a
@@ -928,7 +928,7 @@ UnknownScript_0xa0619:
end
UnknownScript_0xa061e:
checkcode $17
checkcode VAR_CALLERID
if_equal $6, UnknownScript_0xa0630
if_equal $15, UnknownScript_0xa0635
if_equal $1a, UnknownScript_0xa063a
@@ -1459,7 +1459,7 @@ UnknownScript_0xa09e6:
jump UnknownScript_0xa0484
UnknownScript_0xa09ee:
checkcode $1a
checkcode VAR_KENJI_BREAK
if_equal $2, UnknownScript_0xa0a00
if_equal $1, UnknownScript_0xa0a08
farwritetext UnknownText_0x66e17
@@ -1476,7 +1476,7 @@ UnknownScript_0xa0a08:
iftrue UnknownScript_0xa0a1d
checknite
iftrue UnknownScript_0xa0a25
setevent $026a
setevent EVENT_KENJI_ON_BREAK
farwritetext UnknownText_0x66f11
keeptextopen
jump UnknownScript_0xa0484
@@ -1655,6 +1655,6 @@ UnknownScript_0xa0b04:
UnknownScript_0xa0b09:
farwritetext UnknownText_0x174000
clearflag ENGINE_14
specialphonecall $0000
clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
specialphonecall ELMCALL_NONE
end

View File

@@ -130,7 +130,7 @@ Movement_step_wait5: ; 5145
ld hl, $000b
add hl, bc
ld [hl], $4
call Function505e
call GetMovementByte
ld hl, $000a
add hl, bc
ld [hl], a
@@ -150,7 +150,7 @@ Function516a: ; 516a
ld hl, $000c
add hl, bc
ld [hl], a
call Function505e
call GetMovementByte
ld hl, $000a
add hl, bc
ld [hl], a
@@ -174,7 +174,7 @@ Function5189: ; 5189
; 5196
Function5196: ; 5196
call Function505e
call GetMovementByte
ld hl, $000a
add hl, bc
ld [hl], a
@@ -228,7 +228,7 @@ Function51db: ; 51db
ld hl, $001b
add hl, bc
ld [hl], $0
call Function505e
call GetMovementByte
ld hl, $000a
add hl, bc
ld [hl], a
@@ -302,7 +302,7 @@ Movement_step_sleep: ; 5242
; parameters:
; duration (DecimalParam)
call Function505e
call GetMovementByte
jr Function5247
Function5247: ; 5247
@@ -411,7 +411,7 @@ Movement_step_shake: ; 52d5
; parameters:
; displacement (DecimalParam)
call Function505e
call GetMovementByte
call Function5565
jp Function5065
; 52de

View File

@@ -62,7 +62,7 @@ Function10056: ; 10056 (4:4056)
Function10067: ; 10067 (4:4067)
ld hl, MenuDataHeader_0x10a4f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -90,7 +90,7 @@ Function10094: ; 10094 (4:4094)
Function100a6: ; 100a6 (4:40a6)
ld hl, MenuDataHeader_0x10a7f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -137,8 +137,8 @@ Function100e8: ; 100e8 (4:40e8)
.asm_10110
push de
call LoadMenuDataHeader
call Function1d81
call Function1c07
call InterpretMenu2
call ExitMenu
pop hl
ret c
ld a, [wcfa9]
@@ -220,7 +220,7 @@ Function10186: ; 10186 (4:4186)
Function10198: ; 10198 (4:4198)
ld hl, MenuDataHeader_0x10aaf
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -289,8 +289,8 @@ Function101c5: ; 101c5 (4:41c5)
.asm_10235
push de
call LoadMenuDataHeader
call Function1d81
call Function1c07
call InterpretMenu2
call ExitMenu
pop hl
ret c
ld a, [wcfa9]
@@ -495,15 +495,15 @@ Function10364: ; 10364
call Function10889
callba Function24fbf
push af
call Function1c07
call ExitMenu
pop af
jr c, .asm_1039c
call Function10a1d
ld hl, UnknownText_0x10ae9
call Function1d4f
call MenuTextBox
call YesNoBox
push af
call Function1c07
call ExitMenu
pop af
jr c, .asm_1039c
ld hl, NumItems
@@ -709,7 +709,7 @@ Function104e9: ; 104e9 (4:44e9)
Function104fa: ; 104fa (4:44fa)
ld hl, MenuDataHeader_0x10a4f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -737,7 +737,7 @@ Function10527: ; 10527 (4:4527)
Function10539: ; 10539 (4:4539)
ld hl, MenuDataHeader_0x10a7f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -788,7 +788,7 @@ Function10594: ; 10594 (4:4594)
Function105a6: ; 105a6 (4:45a6)
ld hl, MenuDataHeader_0x10aaf
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -821,8 +821,8 @@ Function105dc: ; 105dc (4:45dc)
.asm_105ed
push de
call LoadMenuDataHeader
call Function1d81
call Function1c07
call InterpretMenu2
call ExitMenu
pop hl
ret c
ld a, [wcfa9]
@@ -992,7 +992,7 @@ Function106d9: ; 106d9 (4:46d9)
xor a
call Function10762
ld hl, MenuDataHeader_0x10a67
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -1008,7 +1008,7 @@ Function106ff: ; 106ff (4:46ff)
ld a, $2
call Function10762
ld hl, MenuDataHeader_0x10a97
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -1033,7 +1033,7 @@ Function1073b: ; 1073b (4:473b)
ld a, $1
call Function10762
ld hl, MenuDataHeader_0x10ac7
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -1223,7 +1223,7 @@ Function1085a: ; 1085a (4:485a)
push hl
call Function10762
pop hl
call Function1d3c
call CopyMenuDataHeader
call Function350c
ret
@@ -1235,8 +1235,9 @@ Function10866: ; 10866 (4:4866)
Function1086b: ; 1086b
ld e, a
ld d, 0
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1285,8 +1286,9 @@ Function1089d: ; 1089d
.asm_108b3
ld hl, PackGFXPointers
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld e, a
ld d, [hl]
@@ -1673,7 +1675,7 @@ UnknownText_0x10b07: ; 0x10b07
; 0x10b0c
UnknownText_0x10b0c: ; 0x10b0c
;
;
text_jump UnknownText_0x1c0c83
db "@"
; 0x10b11

File diff suppressed because it is too large Load Diff

View File

@@ -899,10 +899,9 @@ asm_4065d: ; 4065d (10:465d)
ld e, a
ld d, 0
ld hl, Unknown_40a3e + 2
rept 4
add hl, de
add hl, de
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1339,10 +1338,9 @@ Function409f1: ; 409f1 (10:49f1)
jr z, .asm_40a39
push af
ld hl, Unknown_40a3e
rept 4
add hl, de
add hl, de
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1883,15 +1881,9 @@ Function40fcd: ; 40fcd (10:4fcd)
ld e, a
ld d, 0
ld hl, Strings_40fe4
rept 9
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
add hl, de
endr
ld e, l
ld d, h
pop hl
@@ -2406,8 +2398,9 @@ Function41427: ; 41427
Function41432: ; 41432
ld e, a
ld d, 0
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a

108
engine/predef.asm Normal file
View File

@@ -0,0 +1,108 @@
GetPredefPointer:: ; 854b
; Return the bank and address of PredefID in a and PredefAddress.
; Save hl for later (back in Predef)
ld a, h
ld [PredefTemp], a
ld a, l
ld [PredefTemp + 1], a
push de
ld a, [PredefID]
ld e, a
ld d, 0
ld hl, PredefPointers
rept 3
add hl,de
endr
pop de
ld a, [hli]
ld [PredefAddress + 1], a
ld a, [hli]
ld [PredefAddress], a
ld a, [hl]
ret
; 856b
PredefPointers:: ; 856b
; $4b Predef pointers
; address, bank
add_predef LearnMove ; $0
add_predef Predef1
add_predef HealParty
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
add_predef Functiond88c
add_predef Functionda96
add_predef Functiondb3f ; $8
add_predef Functionde6e
add_predef GiveEgg
add_predef Functionc6e0
add_predef Functione167
add_predef Functione17b
add_predef CanLearnTMHMMove
add_predef GetTMHMMove
add_predef Function28eef ; $ 10
add_predef PrintMoveDesc
add_predef UpdatePlayerHUD
add_predef FillBox
add_predef Function3d873
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
add_predef Function3f43d ; $18
add_predef Function3f47c
add_predef LearnLevelMoves
add_predef FillMoves
add_predef Function421e6
add_predef Function28f63
add_predef Function28f24
add_predef Function5084a
add_predef ListMoves ; $20
add_predef Function50d2e
add_predef Function50cdb
add_predef Function50c50
add_predef GetGender
add_predef StatsScreenInit
add_predef DrawPlayerHP
add_predef DrawEnemyHP
add_predef PrintTempMonStats ; $28
add_predef GetTypeName
add_predef PrintMoveType
add_predef PrintType
add_predef PrintMonTypes
add_predef GetUnownLetter
add_predef Functioncbcdd
add_predef Predef2F
add_predef Function9853 ; $30
add_predef Function864c
add_predef Function91d11
add_predef CheckContestMon
add_predef Function8c20f
add_predef Function8c000
add_predef Function8c000_2
add_predef PlayBattleAnim
add_predef Predef38 ; $38
add_predef Predef39
add_predef Functionfd1d0
add_predef PartyMonItemName
add_predef GetFrontpic
add_predef GetBackpic
add_predef Function5108b
add_predef GetTrainerPic
add_predef DecompressPredef ; $40
add_predef Function347d3
add_predef ConvertMon_1to2
add_predef Functionfb877
add_predef Functiond0000
add_predef Function50d0a
add_predef Functiond00a3
add_predef Functiond008e
add_predef Functiond0669 ; $48
add_predef Functiond066e
dbw $ff, Function2d43 ; ????
; 864c

2115
engine/radio.asm Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -18,7 +18,7 @@ ENDM
spawn VIRIDIAN, VIRIDIAN_CITY, 23, 26
spawn PEWTER, PEWTER_CITY, 13, 26
spawn CERULEAN, CERULEAN_CITY, 19, 22
spawn ROCK_TUNNEL, ROUTE_10A, 11, 2
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
@@ -41,22 +41,24 @@ ENDM
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
db -1, -1, -1, -1
const NUM_SPAWNS
LoadSpawnPoint: ; 1531f
; loads the spawn point in wd001
push hl
push de
ld a, [wd001]
cp -1
jr z, .asm_15341
cp SPAWN_N_A
jr z, .spawn_n_a
ld l, a
ld h, 0
add hl, hl
add hl, hl
rept 2 ; multiply hl by 4
add hl,hl
endr
ld de, SpawnPoints
add hl, de
ld a, [hli]
@@ -67,7 +69,7 @@ LoadSpawnPoint: ; 1531f
ld [XCoord], a
ld a, [hli]
ld [YCoord], a
.asm_15341
.spawn_n_a
pop de
pop hl
ret
@@ -75,32 +77,33 @@ LoadSpawnPoint: ; 1531f
IsSpawnPoint: ; 15344
; Checks if the map loaded in de is a spawn point. Returns carry if it's a spawn point.
ld hl, SpawnPoints
ld c, 0
.asm_15349
.loop
ld a, [hl]
cp -1
jr z, .asm_1535f
cp SPAWN_N_A
jr z, .nope
cp d
jr nz, .asm_15356
jr nz, .next
inc hl
ld a, [hld]
cp e
jr z, .asm_15361
jr z, .yes
.asm_15356
.next
push bc
ld bc, 4
add hl, bc
pop bc
inc c
jr .asm_15349
jr .loop
.asm_1535f
.nope
and a
ret
.asm_15361
.yes
scf
ret
; 15363

View File

@@ -2,9 +2,9 @@
Special:: ; c01b
; Run script special de.
ld hl, SpecialsPointers
add hl, de
add hl, de
add hl, de
rept 3
add hl,de
endr
ld b, [hl]
inc hl
ld a, [hli]
@@ -16,64 +16,68 @@ Special:: ; c01b
; c029
SpecialsPointers:: ; c029
add_special Function97c28
add_special Function29ce8
add_special Function29d11
add_special Function29d92
add_special Function29e66
add_special Function29e82
add_special Function29efa
add_special Function29eee
add_special Function29c92
add_special Function29cf1
add_special Function29cfa
add_special Function29bfb
add_special Function29c7b
add_special Function29ec4
add_special Function29ed9
add_special Function29eaf
add_special Function29f47
add_special Functionc2f6
add_special Functionc309
add_special Function1050b9
add_special Functionc34a
add_special Function4d9e5
add_special Function13a12
add_special Function13a31
add_special Function135db
add_special Functionfbb32
add_special Functionfbcd2
add_special WarpToSpawnPoint
; Communications
add_special Special_SetBitsForLinkTradeRequest
add_special Special_WaitForLinkedFriend
add_special Special_CheckLinkTimeout
add_special Special_TryQuickSave
add_special Special_CheckBothSelectedSameRoom
add_special Special_FailedLinkToPast
add_special Special_CloseLink
add_special Special_AbortLink
add_special Special_SetBitsForBattleRequest
add_special Special_SetBitsForTimeCapsuleRequest
add_special Special_CheckTimeCapsuleCompatibility
add_special Special_EnterTimeCapsule
add_special Special_TradeCenter
add_special Special_Colosseum
add_special Special_TimeCapsule
add_special Special_CableClubCheckWhichChris
add_special Special_CheckMysteryGift
add_special Special_GetMysteryGiftItem
add_special Special_UnlockMysteryGift
; Bug Catching Contest
add_special BugContestJudging
add_special CheckPartyFullAfterContest
add_special CheckFirstMonFainted
add_special ContestReturnMons
add_special Special_GiveParkBalls
add_special Special_CheckMagikarpLength
add_special Special_MagikarpHouseSign
add_special HealParty
add_special Function1559a
add_special Functionc2e7
add_special Function166d6
add_special Function1672a
add_special Function16936
add_special PokemonCenterPC
add_special Special_KrissHousePC
add_special Special_DayCareMan
add_special Special_DayCareLady
add_special Special_DayCareManOutside
add_special MoveDeletion
add_special Function16218
add_special Function8cc04
add_special Special_BankOfMom
add_special Special_MagnetTrain
add_special SpecialNameRival
add_special Function90913
add_special Functionc2c0
add_special Functionc2cd
add_special Functionc355
add_special Functionc360
add_special Functionc373
add_special Functionc380
add_special Functionc38d
add_special Functionc3db
add_special Function8c084
add_special Function8c092
add_special Function8c0b6
add_special Function8c079
add_special Function8c0ab
add_special Functiond91
add_special Special_SetDayOfWeek
add_special Special_TownMap
add_special Special_UnownPrinter
add_special MapRadio
add_special Special_UnownPuzzle
add_special Special_SlotMachine
add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_WhiteBGMapBufferScreen
add_special FadeBlackBGMap
add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly
add_special FadeInBGMap
add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes
add_special WhiteBGMap
add_special UpdateTimePals
add_special ClearTileMap
add_special Function1ad2
add_special Functione4a
add_special Functionc230
add_special DrawOnMap
add_special Special_ReplaceKrisSprite
add_special Special_GameCornerPrizeMonCheckDex
add_special SpecialSeenMon
add_special WaitSFX
add_special PlayMapMusic
@@ -87,10 +91,10 @@ SpecialsPointers:: ; c029
add_special Functionc3ef
add_special Function17421
add_special Function17440
add_special Function139a8
add_special Special_SelectRandomBugContestContestants
add_special Functionc3fc
add_special Function26feb
add_special Function27043
add_special ToggleMaptileDecorations
add_special ToggleDecorationsVisibility
add_special SpecialGiveShuckle
add_special SpecialReturnShuckle
add_special Function73f7
@@ -105,12 +109,12 @@ SpecialsPointers:: ; c029
add_special Function88018
add_special SpecialNameRater
add_special Functionc2da
add_special Function718d
add_special GetFirstPokemonHappiness
add_special Function71ac
add_special Function2a4ab
add_special Function2a51f
add_special RandomPhoneMon
add_special Function14209
add_special RunCallback_04
add_special Functionfb841
add_special SpecialSnorlaxAwake
add_special Function7413
@@ -148,10 +152,10 @@ SpecialsPointers:: ; c029
add_special Function101225
add_special Function101231
add_special Function4925b
add_special Function8adef
add_special SpecialOmanyteChamber
add_special Function11c1ab
add_special Function170687
add_special Function8ae68
add_special Special_DisplayUnownWords
add_special Function17d224
add_special Function17d2b6
add_special Function17d2ce
@@ -170,17 +174,17 @@ SpecialsPointers:: ; c029
add_special SpecialMonCheck
add_special Functionc225
add_special Function170bd2
add_special Function10366e
add_special Mobile_SelectThreeMons
add_special Function1037eb
add_special Function10383c
add_special Function1060a2
add_special Mobile_HealParty
add_special Function14168
add_special Function1037c2
add_special Function10630f
add_special Function103780
add_special Function10387b
add_special Function4ae12
add_special Function1047eb
add_special LoadMapPalettes
add_special Function4a927
add_special Function90a54
add_special Function90a88
@@ -198,7 +202,7 @@ Functionc225: ; c225
ret
; c230
Functionc230: ; c230
Special_GameCornerPrizeMonCheckDex: ; c230
ld a, [ScriptVar]
dec a
call CheckCaughtMon
@@ -263,7 +267,7 @@ Functionc298: ; c298
SpecialNameRival: ; 0xc29d
ld b, $2 ; rival
ld de, RivalName
callba Function116b7
callba _NamingScreen
; default to "SILVER"
ld hl, RivalName
ld de, DefaultRivalName
@@ -279,14 +283,14 @@ SpecialNameRater: ; c2b9
ret
; c2c0
Functionc2c0: ; c2c0
Special_TownMap: ; c2c0
call FadeToMenu
callba Function9191c
call Function2b4d
ret
; c2cd
Functionc2cd: ; c2cd
Special_UnownPrinter: ; c2cd
call FadeToMenu
callba Function16be4
call Function2b4d
@@ -300,7 +304,7 @@ Functionc2da: ; c2da
ret
; c2e7
Functionc2e7: ; c2e7
Special_KrissHousePC: ; c2e7
xor a
ld [ScriptVar], a
callba Function156d9
@@ -309,21 +313,21 @@ Functionc2e7: ; c2e7
ret
; c2f6
Functionc2f6: ; c2f6
Special_CheckMysteryGift: ; c2f6
ld a, $0
call GetSRAMBank
ld a, [$abe2]
and a
jr z, .asm_c302
jr z, .no
inc a
.asm_c302
.no
ld [ScriptVar], a
call CloseSRAM
ret
; c309
Functionc309: ; c309
Special_GetMysteryGiftItem: ; c309
ld a, $0
call GetSRAMBank
ld a, [$abe2]
@@ -358,21 +362,21 @@ UnknownText_0xc345: ; 0xc345
db "@"
; 0xc34a
Functionc34a: ; c34a
callba Function1369d
BugContestJudging: ; c34a
callba _BugContestJudging
ld a, b
ld [ScriptVar], a
ret
; c355
Functionc355: ; c355
MapRadio: ; c355
ld a, [ScriptVar]
ld e, a
callba Function91a53
callba PlayRadio
ret
; c360
Functionc360: ; c360
Special_UnownPuzzle: ; c360
call FadeToMenu
callba Functione1190
ld a, [wd0ec]
@@ -381,34 +385,34 @@ Functionc360: ; c360
ret
; c373
Functionc373: ; c373
call Functionc3ae
Special_SlotMachine: ; c373
call Special_CheckCoins
ret c
ld a, BANK(Function926c7)
ld hl, Function926c7
call Functionc39a
ld a, BANK(_SlotMachine)
ld hl, _SlotMachine
call Special_StartGameCornerGame
ret
; c380
Functionc380: ; c380
call Functionc3ae
Special_CardFlip: ; c380
call Special_CheckCoins
ret c
ld a, BANK(Functione00ee)
ld hl, Functione00ee
call Functionc39a
ld a, BANK(_CardFlip)
ld hl, _CardFlip
call Special_StartGameCornerGame
ret
; c38d
Functionc38d: ; c38d
call Functionc3ae
Special_DummyNonfunctionalGameCornerGame: ; c38d
call Special_CheckCoins
ret c
ld a, BANK(Functione1e5b)
ld hl, Functione1e5b
call Functionc39a
ld a, BANK(_DummyGame)
ld hl, _DummyGame
call Special_StartGameCornerGame
ret
; c39a
Functionc39a: ; c39a
Special_StartGameCornerGame: ; c39a
call Function31cf
call FadeToMenu
ld hl, wd0e8
@@ -423,7 +427,7 @@ Functionc39a: ; c39a
ret
; c3ae
Functionc3ae: ; c3ae
Special_CheckCoins: ; c3ae
ld hl, Coins
ld a, [hli]
or [hl]
@@ -461,9 +465,9 @@ UnknownText_0xc3d6: ; 0xc3d6
db "@"
; 0xc3db
Functionc3db: ; c3db
Special_WhiteBGMapBufferScreen: ; c3db
call WhiteBGMap
call Function2879
call BufferScreen
ret
; c3e2
@@ -492,17 +496,18 @@ Functionc3fc: ; c3fc
; c403
Functionc403:: ; c403
LoadWildData:: ; c403
ld a, c
and a
jr nz, .asm_c410
jr nz, .swarm_route35
; swarm dark cave violet entrance
ld a, d
ld [wdfcc], a
ld a, e
ld [wdfcd], a
ret
.asm_c410
.swarm_route35
ld a, d
ld [wdc5a], a
ld a, e

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