pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213 from yenatch/merge-mrwint

Browse Source 
Merge mrwint/master into kanzure/master
This commit is contained in:
Bryan Bishop 2013-10-25 16:01:12 -07:00
commit 07612257cc
17 changed files with 46237 additions and 2355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
battle/effect_commands.asm
View File

@ -4469,9 +4469,7 @@ BattleCommand40: ; 35813
ret z ret z
ld b, a ld b, a
ld hl, $45ec callab Function3c5ec
ld a, $f
rst FarCall
ld a, b ld a, b
cp $59 cp $59
@ -4668,9 +4666,7 @@ BattleCommand42: ; 35926
ld hl, $c4ca ld hl, $c4ca
ld a, $b ld a, $b
call Predef call Predef
ld a, $5e callba Function178000
ld hl, $4000
rst FarCall
ld hl, SharedPainText ld hl, SharedPainText
jp StdBattleTextBox jp StdBattleTextBox
@ -5099,9 +5095,7 @@ BattleCommand48: ; 35b33
push bc push bc
ld b, a ld b, a
ld hl, $45ec callab Function3c5ec
ld a, $f
rst $8
ld a, b ld a, b
pop bc pop bc
@ -5324,9 +5318,7 @@ PlayFXAnimID: ; 35d08
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
ld hl, $40d6 callab Functioncc0d6
ld a, $33
rst FarCall ; callab SafePlayBattleAnimation
ret ret
; 35d1c ; 35d1c
@ -5589,9 +5581,7 @@ BattleCommand14: ; 35e5c
ld hl, FellAsleepText ld hl, FellAsleepText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
jp z, Function0x34216 jp z, Function0x34216
ret ret
@ -5666,9 +5656,7 @@ BattleCommand13: ; 35eee
ld hl, WasPoisonedText ld hl, WasPoisonedText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret ret
; 35f2c ; 35f2c
@ -5742,9 +5730,7 @@ BattleCommand2f: ; 35f2c
call StdBattleTextBox call StdBattleTextBox
.asm_35fb1 .asm_35fb1
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret ret
.asm_35fb8 .asm_35fb8
@ -5940,9 +5926,7 @@ BattleCommand17: ; 3608c
ld hl, WasBurnedText ld hl, WasBurnedText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret ret
; 360dd ; 360dd
@ -6013,9 +5997,7 @@ BattleCommand18: ; 36102
ld hl, WasFrozenText ld hl, WasFrozenText
call StdBattleTextBox call StdBattleTextBox
ld a, $f callba Function3dde9
ld hl, $5de9
rst FarCall
ret nz ret nz
call Function0x34216 call Function0x34216
call EndRechargeOpp call EndRechargeOpp
@ -7300,9 +7282,7 @@ BattleCommand23: ; 3680f
ld a, d ld a, d
inc a inc a
ld [$c718], a ld [$c718], a
ld hl, $54c3 callab Function3d4c3
ld a, $f
rst FarCall
ld hl, DraggedOutText ld hl, DraggedOutText
call StdBattleTextBox call StdBattleTextBox
@ -8509,9 +8489,7 @@ BattleCommand35: ; 36f9d
BattleCommand36: ; 36fe1 BattleCommand36: ; 36fe1
call Function0x37e01 call Function0x37e01
ld a, $41 callba Function1060e5
ld hl, $60e5
rst FarCall
jp PrintNothingHappened jp PrintNothingHappened
; 36fed ; 36fed
@ -8701,9 +8679,7 @@ BattleCommand1f: ; 3707f
inc de inc de
ld [de], a ld [de], a
ld [$d265], a ld [$d265], a
ld a, $14 callba GetTypeName
ld hl, $4964
rst FarCall
call Function0x37e01 call Function0x37e01
ld hl, TransformedTypeText ld hl, TransformedTypeText
jp StdBattleTextBox jp StdBattleTextBox
@ -9137,9 +9113,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand1a: ; 37380 BattleCommand1a: ; 37380
ld a, $41 callba Function10610d
ld hl, $610d
rst FarCall
ld a, $4 ld a, $4
ld [$cfca], a ld [$cfca], a
ld c, $3 ld c, $3
@ -9163,12 +9137,8 @@ BattleCommand1a: ; 37380
res 6, [hl] res 6, [hl]
call Function0x37ed5 call Function0x37ed5
ret nc ret nc
ld a, $f callba DrawPlayerHUD
ld hl, $5f58 callba Function3e043
rst FarCall
ld a, $f
ld hl, $6043
rst FarCall
call $31f6 call $31f6
jp RefreshBattleHuds jp RefreshBattleHuds
; 373c9 ; 373c9
@ -9822,9 +9792,7 @@ Function0x377f5: ; 377f5
xor a xor a
ld [MonType], a ld [MonType], a
ld a, $14 callba GetGender
ld hl, $4bdd
rst FarCall
jr c, .asm_37849 jr c, .asm_37849
ld b, 1 ld b, 1
@ -9848,9 +9816,7 @@ Function0x377f5: ; 377f5
ld [$d124], a ld [$d124], a
ld a, 3 ld a, 3
ld [MonType], a ld [MonType], a
ld a, $14 callba GetGender
ld hl, $4bdd
rst FarCall
pop bc pop bc
jr c, .asm_37849 jr c, .asm_37849
@ -9948,13 +9914,13 @@ BattleCommand61: ; 37874
ld [$c689], a ld [$c689], a
call Function0x37e01 call Function0x37e01
call SwitchTurn call SwitchTurn
ld hl, $5246 ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_378ce ; 378c9 $3 jr z, .asm_378ce ; 378c9 $3
ld hl, $5251 ld hl, AICheckEnemyMaxHP
.asm_378ce .asm_378ce
ld a, $e ld a, BANK(AICheckPlayerMaxHP)
rst FarCall rst FarCall
jr c, .asm_378f3 ; 378d1 $20 jr c, .asm_378f3 ; 378d1 $20
ld hl, $4c8e ld hl, $4c8e
@ -10132,19 +10098,13 @@ BattleCommand67: ; 379c9
call $1d6e call $1d6e
ld a, $f callba Function3d2f7
ld hl, $52f7
rst FarCall
ld a, $f callba Function3d380
ld hl, $5380
rst FarCall
call $3317 call $3317
ld a, $f callba Function3ed9f
ld hl, $6d9f
rst FarCall
call $1c17 call $1c17
call $300b call $300b
@ -10158,9 +10118,7 @@ BattleCommand67: ; 379c9
call $32f9 call $32f9
call Function0x37a67 call Function0x37a67
ld a, $f callba Function3d2e0
ld hl, $52e0
rst FarCall
jp c, EndMoveEffect jp c, EndMoveEffect
@ -10182,9 +10140,7 @@ BattleCommand67: ; 379c9
call Function0x37e01 call Function0x37e01
call Function0x37a82 call Function0x37a82
ld a, $f callba Function3d2e0
ld hl, $52e0
rst FarCall
jp c, EndMoveEffect jp c, EndMoveEffect
xor a xor a
@ -10484,9 +10440,7 @@ BattleCommand6a6c: ; 37b7e
call Function0x37e01 call Function0x37e01
call SwitchTurn call SwitchTurn
ld hl, $4cef callab Function3ccef
ld a, $f
rst FarCall ; callab 3ccef
call SwitchTurn call SwitchTurn
call UpdateUserInParty call UpdateUserInParty
@ -10552,21 +10506,15 @@ BattleCommand95: ; 37c1a
and a and a
jr nz, .asm_37c4f jr nz, .asm_37c4f
ld hl, $4c9f callab GetHalfMaxHP
ld a, $f
rst FarCall
ld hl, $4cde callab Function3ccde
ld a, $f
rst FarCall
jr nc, .asm_37c4f jr nc, .asm_37c4f
push bc push bc
call Function0x37e01 call Function0x37e01
pop bc pop bc
ld hl, $4c3f callab Function3cc3f
ld a, $f
rst FarCall
call UpdateUserInParty call UpdateUserInParty
ld a, $5 ld a, $5
@ -10642,9 +10590,7 @@ BattleCommand9a: ; 37c95
and a and a
ret z ret z
ld b, a ld b, a
ld hl, $45ec callab Function3c5ec
ld a, $f
rst FarCall
ld a, b ld a, b
cp $90 cp $90
ret z ret z
@ -10965,9 +10911,7 @@ Function0x37e47: ; 37e47
push hl push hl
push de push de
push bc push bc
ld hl, $40d6 callab Functioncc0d6
ld a, $33
rst FarCall ; callab SafePlayBattleAnimation
pop bc pop bc
pop de pop de
pop hl pop hl
@ -10988,9 +10932,7 @@ Function0x37e54: ; 37e54
push bc push bc
call SwitchTurn call SwitchTurn
ld hl, $40d6 callab Functioncc0d6
ld a, $33
rst FarCall ; callab SafePlayBattleAnimation
call SwitchTurn call SwitchTurn
pop bc pop bc
@ -11080,25 +11022,19 @@ GetMoveByte: ; 37ebb
Function0x37ec0: ; 37ec0 Function0x37ec0: ; 37ec0
ld a, $3e callba Functionfbd54
ld hl, $7d54
rst $8
ret ret
; 37ec7 ; 37ec7
Function0x37ec7: ; 37ec7 Function0x37ec7: ; 37ec7
ld a, $3e callba Functionfbd71
ld hl, $7d71
rst $8
ret ret
; 37ece ; 37ece
Function0x37ece: ; 37ece Function0x37ece: ; 37ece
ld a, $3e callba Functionfbd69
ld hl, $7d69
rst $8
ret ret
; 37ed5 ; 37ed5
@ -11108,9 +11044,7 @@ Function0x37ed5: ; 37ed5
push hl push hl
push de push de
push bc push bc
ld a, $13 callba Function4ea44
ld hl, $6a44
rst $8
pop bc pop bc
pop de pop de
pop hl pop hl

141
engine/credits.asm
View File

@ -283,8 +283,96 @@ ParseCredits: ; 1099aa
; 109a95 ; 109a95
INCBIN "baserom.gbc", $109a95, $109b2c - $109a95 ; known jump sources: 1098ac (42:58ac)
Function109a95: ; 109a95 (42:5a95)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld a, $c
ld [hBGMapAddress], a ; $ff00+$d6
ld a, $28
ld hl, TileMap ; $c4a0 (aliases: SpritesEnd)
ld bc, $168
call ByteFill
ld a, $7f
ld hl, $c4f0
ld bc, $118
call ByteFill
ld hl, $c4f0
ld a, $24
call Function109b1d
ld hl, $c5f4
ld a, $20
call Function109b1d
ld hl, AttrMap ; $cdd9
ld bc, $50
xor a
call ByteFill
ld hl, $ce29
ld bc, $14
ld a, $1
call ByteFill
ld hl, $ce3d
ld bc, $f0
ld a, $2
call ByteFill
ld hl, $cf2d
ld bc, $14
ld a, $1
call ByteFill
call Function3200
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapAddress], a ; $ff00+$d6
ld hl, TileMap ; $c4a0 (aliases: SpritesEnd)
call Function109aff
call Function3200
ret
; known jump sources: 109af8 (42:5af8)
Function109aff: ; 109aff (42:5aff)
ld b, $5
.asm_109b01
push hl
ld de, $11
ld c, $4
xor a
.asm_109b08
ld [hli], a
inc a
ld [hli], a
inc a
ld [hli], a
inc a
ld [hl], a
inc a
add hl, de
dec c
jr nz, .asm_109b08
pop hl
inc hl
inc hl
inc hl
inc hl
dec b
jr nz, .asm_109b01
ret
; known jump sources: 109ab7 (42:5ab7), 109abf (42:5abf)
Function109b1d: ; 109b1d (42:5b1d)
ld c, $5
.asm_109b1f
push af
ld [hli], a
inc a
ld [hli], a
inc a
ld [hli], a
inc a
ld [hli], a
pop af
dec c
jr nz, .asm_109b1f
ret
GetCreditsPalette: ; 109b2c GetCreditsPalette: ; 109b2c
call .GetPalAddress call .GetPalAddress
@ -342,7 +430,56 @@ INCBIN "baserom.gbc",$109b9a,$18 ; ditto.pal
INCBIN "baserom.gbc",$109bb2,$18 ; igglybuff.pal INCBIN "baserom.gbc",$109bb2,$18 ; igglybuff.pal
; 109bca ; 109bca
INCBIN "baserom.gbc", $109bca, $109c24 - $109bca ; known jump sources: 10989e (42:589e), 109964 (42:5964)
Function109bca: ; 109bca (42:5bca)
ld hl, $cf64
ld a, [hl]
cp $ff
jr z, .asm_109bed
and $3
ld e, a
inc a
and $3
ld [hl], a
ld a, [$cf65]
and $3
add a
add a
add e
add a
ld e, a
ld d, $0
ld hl, $5bf1
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
ret
.asm_109bed
ld hl, $ca00
ret
; 109bf1 (42:5bf1)
INCBIN "baserom.gbc",$109bf1,$109c11 - $109bf1
; known jump sources: 109a1b (42:5a1b)
Function109c11: ; 109c11 (42:5c11)
ld a, $40
ld hl, $c55a
call Function109c1c
ld hl, $c56e
; known jump sources: 109c16 (42:5c16)
Function109c1c: ; 109c1c (42:5c1c)
ld c, $8
.asm_109c1e
ld [hli], a
inc a
dec c
jr nz, .asm_109c1e
ret
; 109c24 (42:5c24)
CreditsGFX: CreditsGFX:
INCBIN "gfx/credits/border.2bpp" INCBIN "gfx/credits/border.2bpp"

40
engine/engine_flags.asm
View File

@ -3,7 +3,7 @@
; location, bit ; location, bit
; pokegear ; pokegear
dwb $d957, %00000010 ; radio card dwb $d957, %00000010 ; radio card ; $0
dwb $d957, %00000001 ; map card dwb $d957, %00000001 ; map card
dwb $d957, %00000100 ; phone card dwb $d957, %00000100 ; phone card
dwb $d957, %00001000 ; expn card dwb $d957, %00001000 ; expn card
@ -17,7 +17,7 @@
; DaycareLady, %10000000 = daycare 2 on ; DaycareLady, %10000000 = daycare 2 on
dwb DaycareLady, %00000001 ; monster 2 in daycare dwb DaycareLady, %00000001 ; monster 2 in daycare
dwb $d854, %00000001 ; mom saving money dwb $d854, %00000001 ; mom saving money ; $8
dwb $d854, %10000000 ; dst dwb $d854, %10000000 ; dst
dwb $dc39, %00000001 dwb $dc39, %00000001
@ -27,7 +27,7 @@
dwb $d84c, %00001000 ; pokerus dwb $d84c, %00001000 ; pokerus
dwb $d84c, %00010000 ; rocket signal on ch20 dwb $d84c, %00010000 ; rocket signal on ch20
dwb $d84c, %01000000 ; credits skip dwb $d84c, %01000000 ; credits skip
dwb $d84c, %10000000 ; bug contest on dwb $d84c, %10000000 ; bug contest on ; $10
dwb $d84d, %00000100 ; bug contest timer dwb $d84d, %00000100 ; bug contest timer
dwb $d84d, %00000010 ; rockets in radio tower dwb $d84d, %00000010 ; rockets in radio tower
dwb $d84d, %00000001 ; bike shop call enabled (1024 bike steps reqd) dwb $d84d, %00000001 ; bike shop call enabled (1024 bike steps reqd)
@ -36,7 +36,7 @@
dwb $d84d, %01000000 dwb $d84d, %01000000
dwb $d84d, %10000000 ; rockets in mahogany dwb $d84d, %10000000 ; rockets in mahogany
dwb $dbf5, %00000001 ; strength active dwb $dbf5, %00000001 ; strength active ; $18
dwb $dbf5, %00000010 ; always on bike (cant surf) dwb $dbf5, %00000010 ; always on bike (cant surf)
dwb $dbf5, %00000100 ; downhill (cycling road) dwb $dbf5, %00000100 ; downhill (cycling road)
@ -45,7 +45,7 @@
dwb JohtoBadges, %00000100 ; plainbadge dwb JohtoBadges, %00000100 ; plainbadge
dwb JohtoBadges, %00001000 ; fogbadge dwb JohtoBadges, %00001000 ; fogbadge
dwb JohtoBadges, %00010000 ; mineralbadge dwb JohtoBadges, %00010000 ; mineralbadge
dwb JohtoBadges, %00100000 ; stormbadge dwb JohtoBadges, %00100000 ; stormbadge ; $20
dwb JohtoBadges, %01000000 ; glacierbadge dwb JohtoBadges, %01000000 ; glacierbadge
dwb JohtoBadges, %10000000 ; risingbadge dwb JohtoBadges, %10000000 ; risingbadge
@ -54,7 +54,7 @@
dwb KantoBadges, %00000100 ; thunderbadge dwb KantoBadges, %00000100 ; thunderbadge
dwb KantoBadges, %00001000 ; rainbowbadge dwb KantoBadges, %00001000 ; rainbowbadge
dwb KantoBadges, %00010000 ; soulbadge dwb KantoBadges, %00010000 ; soulbadge
dwb KantoBadges, %00100000 ; marshbadge dwb KantoBadges, %00100000 ; marshbadge ; $28
dwb KantoBadges, %01000000 ; volcanobadge dwb KantoBadges, %01000000 ; volcanobadge
dwb KantoBadges, %10000000 ; earthbadge dwb KantoBadges, %10000000 ; earthbadge
@ -64,7 +64,7 @@
dwb UnlockedUnowns, %00000100 ; 3 dwb UnlockedUnowns, %00000100 ; 3
dwb UnlockedUnowns, %00001000 ; 4 dwb UnlockedUnowns, %00001000 ; 4
dwb UnlockedUnowns, %00010000 ; 5 dwb UnlockedUnowns, %00010000 ; 5
dwb UnlockedUnowns, %00100000 ; 6 dwb UnlockedUnowns, %00100000 ; 6 ; $30
dwb UnlockedUnowns, %01000000 ; 7 dwb UnlockedUnowns, %01000000 ; 7
dwb UnlockedUnowns, %10000000 ; 8 dwb UnlockedUnowns, %10000000 ; 8
@ -74,7 +74,7 @@
dwb FlypointPerms, %00000100 ; pallet dwb FlypointPerms, %00000100 ; pallet
dwb FlypointPerms, %00001000 ; viridian dwb FlypointPerms, %00001000 ; viridian
dwb FlypointPerms, %00010000 ; pewter dwb FlypointPerms, %00010000 ; pewter
dwb FlypointPerms, %00100000 ; cerulean dwb FlypointPerms, %00100000 ; cerulean ; $38
dwb FlypointPerms, %01000000 ; rock tunnel dwb FlypointPerms, %01000000 ; rock tunnel
dwb FlypointPerms, %10000000 ; vermilion dwb FlypointPerms, %10000000 ; vermilion
dwb FlypointPerms + 1, %00000001 ; lavender dwb FlypointPerms + 1, %00000001 ; lavender
@ -82,7 +82,7 @@
dwb FlypointPerms + 1, %00000100 ; celadon dwb FlypointPerms + 1, %00000100 ; celadon
dwb FlypointPerms + 1, %00001000 ; fuchsia dwb FlypointPerms + 1, %00001000 ; fuchsia
dwb FlypointPerms + 1, %00010000 ; cinnabar dwb FlypointPerms + 1, %00010000 ; cinnabar
dwb FlypointPerms + 1, %00100000 ; indigo plateau dwb FlypointPerms + 1, %00100000 ; indigo plateau ; $40
dwb FlypointPerms + 1, %01000000 ; new bark dwb FlypointPerms + 1, %01000000 ; new bark
dwb FlypointPerms + 1, %10000000 ; cherrygrove dwb FlypointPerms + 1, %10000000 ; cherrygrove
dwb FlypointPerms + 2, %00000001 ; violet dwb FlypointPerms + 2, %00000001 ; violet
@ -90,7 +90,7 @@
dwb FlypointPerms + 2, %00001000 ; cianwood dwb FlypointPerms + 2, %00001000 ; cianwood
dwb FlypointPerms + 2, %00010000 ; goldenrod dwb FlypointPerms + 2, %00010000 ; goldenrod
dwb FlypointPerms + 2, %00100000 ; olivine dwb FlypointPerms + 2, %00100000 ; olivine
dwb FlypointPerms + 2, %01000000 ; ecruteak dwb FlypointPerms + 2, %01000000 ; ecruteak ; $48
dwb FlypointPerms + 2, %10000000 ; mahogany dwb FlypointPerms + 2, %10000000 ; mahogany
dwb FlypointPerms + 3, %00000001 ; lake of rage dwb FlypointPerms + 3, %00000001 ; lake of rage
dwb FlypointPerms + 3, %00000010 ; blackthorn dwb FlypointPerms + 3, %00000010 ; blackthorn
@ -100,7 +100,7 @@
dwb $dc9d, %00000001 ; lucky number show dwb $dc9d, %00000001 ; lucky number show
dwb $d84d, %00001000 dwb $d84d, %00001000
dwb $dc1e, %00000001 ; kurt making balls dwb $dc1e, %00000001 ; kurt making balls ; $50
dwb $dc1e, %00000010 dwb $dc1e, %00000010
dwb $dc1e, %00000100 ; special wilddata? dwb $dc1e, %00000100 ; special wilddata?
dwb $dc1e, %00001000 ; time capsule (24h wait) dwb $dc1e, %00001000 ; time capsule (24h wait)
@ -109,7 +109,7 @@
dwb $dc1e, %01000000 ; goldenrod underground merchant closed dwb $dc1e, %01000000 ; goldenrod underground merchant closed
dwb $dc1e, %10000000 ; fought in trainer hall today dwb $dc1e, %10000000 ; fought in trainer hall today
dwb $dc1f, %00000001 ; mt moon square clefairy dwb $dc1f, %00000001 ; mt moon square clefairy ; $58
dwb $dc1f, %00000010 ; union cave lapras dwb $dc1f, %00000010 ; union cave lapras
dwb $dc1f, %00000100 ; goldenrod underground haircut used dwb $dc1f, %00000100 ; goldenrod underground haircut used
dwb $dc1f, %00001000 ; goldenrod mall happiness event floor05 person07 dwb $dc1f, %00001000 ; goldenrod mall happiness event floor05 person07
@ -131,7 +131,7 @@
dwb $dc4c, %00000001 ; jack dwb $dc4c, %00000001 ; jack
dwb $dc4c, %00000010 ; huey dwb $dc4c, %00000010 ; huey
dwb $dc4c, %00000100 ; gaven dwb $dc4c, %00000100 ; gaven
dwb $dc4c, %00001000 ; beth dwb $dc4c, %00001000 ; beth ; $68
dwb $dc4c, %00010000 ; jose dwb $dc4c, %00010000 ; jose
dwb $dc4c, %00100000 ; reena dwb $dc4c, %00100000 ; reena
dwb $dc4c, %01000000 ; joey dwb $dc4c, %01000000 ; joey
@ -139,7 +139,7 @@
dwb $dc4d, %00000001 ; ralph dwb $dc4d, %00000001 ; ralph
dwb $dc4d, %00000010 ; liz dwb $dc4d, %00000010 ; liz
dwb $dc4d, %00000100 ; anthony dwb $dc4d, %00000100 ; anthony
dwb $dc4d, %00001000 ; todd dwb $dc4d, %00001000 ; todd ; $70
dwb $dc4d, %00010000 ; gina dwb $dc4d, %00010000 ; gina
dwb $dc4d, %00100000 ; arnie dwb $dc4d, %00100000 ; arnie
dwb $dc4d, %01000000 ; alan dwb $dc4d, %01000000 ; alan
@ -147,7 +147,7 @@
dwb $dc4e, %00000001 ; chad dwb $dc4e, %00000001 ; chad
dwb $dc4e, %00000010 ; tully dwb $dc4e, %00000010 ; tully
dwb $dc4e, %00000100 ; brent dwb $dc4e, %00000100 ; brent
dwb $dc4e, %00001000 ; tiffany dwb $dc4e, %00001000 ; tiffany ; $78
dwb $dc4e, %00010000 ; vance dwb $dc4e, %00010000 ; vance
dwb $dc4e, %00100000 ; wilton dwb $dc4e, %00100000 ; wilton
dwb $dc4e, %01000000 ; parry dwb $dc4e, %01000000 ; parry
@ -156,7 +156,7 @@
dwb $dc50, %00000001 ; beverly has nugget dwb $dc50, %00000001 ; beverly has nugget
dwb $dc50, %00000010 ; jose has star piece dwb $dc50, %00000010 ; jose has star piece
dwb $dc50, %00000100 ; wade has item (see bittable1 $032b-e) dwb $dc50, %00000100 ; wade has item (see bittable1 $032b-e)
dwb $dc50, %00001000 ; gina has leaf stone dwb $dc50, %00001000 ; gina has leaf stone ; $80
dwb $dc50, %00010000 ; alan has fire stone dwb $dc50, %00010000 ; alan has fire stone
dwb $dc50, %00100000 ; liz has thunderstone dwb $dc50, %00100000 ; liz has thunderstone
dwb $dc50, %01000000 ; derek has nugget dwb $dc50, %01000000 ; derek has nugget
@ -166,7 +166,7 @@
dwb $dc51, %00000010 ; wilton has item (see bittable1 $032f-31) dwb $dc51, %00000010 ; wilton has item (see bittable1 $032f-31)
dwb $dc54, %00000001 dwb $dc54, %00000001
dwb $dc54, %00000010 dwb $dc54, %00000010 ; $88
dwb $dc54, %00000100 dwb $dc54, %00000100
dwb $dc54, %00001000 dwb $dc54, %00001000
dwb $dc54, %00010000 dwb $dc54, %00010000
@ -175,7 +175,7 @@
dwb $dc54, %10000000 dwb $dc54, %10000000
dwb $dc55, %00000001 dwb $dc55, %00000001
dwb $dc55, %00000010 dwb $dc55, %00000010 ; $90
dwb $dc55, %00000100 dwb $dc55, %00000100
dwb $dc55, %00001000 dwb $dc55, %00001000
dwb $dc55, %00010000 dwb $dc55, %00010000
@ -184,7 +184,7 @@
dwb $dc55, %10000000 dwb $dc55, %10000000
dwb $dc56, %00000001 dwb $dc56, %00000001
dwb $dc56, %00000010 dwb $dc56, %00000010 ; $98
dwb $dc56, %00000100 dwb $dc56, %00000100
dwb $dc56, %00001000 dwb $dc56, %00001000
dwb $dc56, %00010000 dwb $dc56, %00010000
@ -194,5 +194,5 @@
dwb $d45b, %00000100 ; female player has been transformed into male dwb $d45b, %00000100 ; female player has been transformed into male
dwb $dc20, %00000100 ; dunsparce swarm dwb $dc20, %00000100 ; dunsparce swarm ; $a0
dwb $dc20, %00001000 ; yanma swarm dwb $dc20, %00001000 ; yanma swarm

5
engine/fruit_trees.asm
View File

@ -58,10 +58,7 @@ CheckFruitTree: ; 44055
; 4405f ; 4405f
PickedFruitTree: ; 4405f PickedFruitTree: ; 4405f
ld a, $41 callba Function10609b ; empty function
ld hl, $609b
rst FarCall ; empty function
ld b, 1 ld b, 1
jp GetFruitTreeFlag jp GetFruitTreeFlag
; 4406a ; 4406a

206
engine/scripting.asm
View File

File diff suppressed because it is too large Load Diff

24
home/copy.asm
View File

@ -106,44 +106,32 @@ Functiondfd: ; dfd
Functione4a: ; e4a Functione4a: ; e4a
ld a, $5 callba Function14135
ld hl, $4135
rst FarCall
ret ret
; e51 ; e51
Functione51: ; e51 Functione51: ; e51
ld a, $3e callba Functionfb449
ld hl, $7449
rst FarCall
ret ret
; e58 ; e58
Functione58: ; e58 Functione58: ; e58
ld a, $3e callba Functionfb4be
ld hl, $74be
rst FarCall
ret ret
; e5f ; e5f
Functione5f: ; e5f Functione5f: ; e5f
ld a, $3e callba Functionfb48a
ld hl, $748a callba Functionfb4b0
rst FarCall
ld a, $3e
ld hl, $74b0
rst FarCall
ret ret
; e6c ; e6c
Functione6c: ; e6c Functione6c: ; e6c
ld a, $3e callba Functionfb4b0
ld hl, $74b0
rst FarCall
ret ret
; e73 ; e73

72
home/map.asm
View File

@ -197,7 +197,7 @@ endr
ld de, $0060 ld de, $0060
add hl, de add hl, de
pop de pop de
ld a, [$d19f] ld a, [MapWidth]
add $6 add $6
add e add e
ld e, a ld e, a
@ -421,7 +421,7 @@ Function2326: ; 2326
Function2336: ; 2336 Function2336: ; 2336
push af push af
ld hl, $d1a6 ld hl, MapEventHeaderPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -438,7 +438,7 @@ Function2336: ; 2336
; 234f ; 234f
Function234f: ; 234f Function234f: ; 234f
ld hl, $d1a4 ld hl, MapScriptHeaderPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -466,7 +466,7 @@ Function2368: ; 2368
ld [WestConnectedMapGroup], a ld [WestConnectedMapGroup], a
ld [EastConnectedMapGroup], a ld [EastConnectedMapGroup], a
ld a, [$d1a8] ld a, [MapConnections]
ld b, a ld b, a
bit 3, b bit 3, b
@ -670,10 +670,10 @@ Function2471: ; 2471
; 248a ; 248a
Function248a: ; 248a Function248a: ; 248a
call GetMapEventBank call GetMapScriptHeaderBank
rst Bankswitch rst Bankswitch
ld hl, $d1a6 ld hl, MapEventHeaderPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -696,9 +696,7 @@ Function248a: ; 248a
call Function24ba call Function24ba
.asm_24b3 .asm_24b3
ld a, $41 callba Function10486d
ld hl, $486d
rst FarCall
ret ret
; 24ba ; 24ba
@ -730,7 +728,7 @@ Function24e4: ; 24e4
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld hl, OverworldMap ld hl, OverworldMap
ld a, [$d19f] ld a, [MapWidth]
ld [hConnectedMapWidth], a ld [hConnectedMapWidth], a
add $6 add $6
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
@ -741,14 +739,14 @@ Function24e4: ; 24e4
add hl, bc add hl, bc
ld c, $3 ld c, $3
add hl, bc add hl, bc
ld a, [$d1a0] ld a, [MapBlockDataBank]
rst Bankswitch rst Bankswitch
ld a, [$d1a1] ld a, [MapBlockDataPointer]
ld e, a ld e, a
ld a, [$d1a2] ld a, [MapBlockDataPointer+1]
ld d, a ld d, a
ld a, [$d19e] ld a, [MapHeight]
ld b, a ld b, a
.asm_250c .asm_250c
push hl push hl
@ -901,7 +899,7 @@ FillSouthConnectionStrip: ; 25d3
add hl, de add hl, de
pop de pop de
ld a, [$d19f] ld a, [MapWidth]
add 6 add 6
add e add e
ld e, a ld e, a
@ -918,7 +916,7 @@ FillWestConnectionStrip:
FillEastConnectionStrip: ; 25f6 FillEastConnectionStrip: ; 25f6
.asm_25f6 .asm_25f6
ld a, [$d19f] ld a, [MapWidth]
add 6 add 6
ld [hConnectedMapWidth], a ld [hConnectedMapWidth], a
@ -979,7 +977,7 @@ Function2631: ; 2631
ld a, [ScriptRunning] ld a, [ScriptRunning]
and a and a
ret nz ret nz
call GetMapEventBank call GetMapScriptHeaderBank
jr CallScript jr CallScript
; 263b ; 263b
@ -991,7 +989,7 @@ Function263b: ; 263b
call Function2653 call Function2653
jr nc, .done jr nc, .done
call GetMapEventBank call GetMapScriptHeaderBank
ld b, a ld b, a
ld d, h ld d, h
ld e, l ld e, l
@ -1444,7 +1442,7 @@ Function2879: ; 2879
dec b dec b
jr nz, .asm_2888 jr nz, .asm_2888
pop hl pop hl
ld a, [$d19f] ld a, [MapWidth]
add $6 add $6
ld c, a ld c, a
ld b, $0 ld b, $0
@ -1461,7 +1459,7 @@ Function289d: ; 289d
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, $dcb9 ld de, $dcb9
ld a, [$d19f] ld a, [MapWidth]
add $6 add $6
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
ld a, [$d151] ld a, [$d151]
@ -1508,7 +1506,7 @@ Function289d: ; 289d
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [$d19f] ld a, [MapWidth]
add $6 add $6
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
ld de, $dcb9 ld de, $dcb9
@ -1778,7 +1776,7 @@ Function2a3c: ; 2a3c
; 2a66 ; 2a66
Function2a66: ; 2a66 Function2a66: ; 2a66
ld a, [$d19f] ld a, [MapWidth]
add $6 add $6
ld c, a ld c, a
ld b, $0 ld b, $0
@ -1942,9 +1940,7 @@ FadeToMenu: ; 2b29
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1d6e call Function1d6e
ld a, $23 callba Function8c084
ld hl, $4084
rst FarCall
call ClearSprites call ClearSprites
call Function2ed3 call Function2ed3
ret ret
@ -1971,13 +1967,9 @@ Function2b4d: ; 2b4d
Function2b5c: ; 2b5c Function2b5c: ; 2b5c
ld b, $9 ld b, $9
call GetSGBLayout call GetSGBLayout
ld a, $12 callba Function49409
ld hl, $5409
rst FarCall
call Function3200 call Function3200
ld a, $23 callba Function8c079
ld hl, $4079
rst FarCall
call Function2ee4 call Function2ee4
ret ret
; 2b74 ; 2b74
@ -2011,9 +2003,7 @@ Function2b74: ; 0x2b74
Function2bae: ; 2bae Function2bae: ; 2bae
call DisableLCD call DisableLCD
call ClearSprites call ClearSprites
ld a, $5 callba Function14168
ld hl, $4168
rst FarCall
call Functione51 call Functione51
call Functione5f call Functione5f
ld a, [hROMBank] ld a, [hROMBank]
@ -2023,9 +2013,7 @@ Function2bae: ; 2bae
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
call Function2c24 call Function2c24
ld a, $23 callba Function8c001
ld hl, $4001
rst FarCall
call Function2173 call Function2173
call Function2821 call Function2821
ld a, $9 ld a, $9
@ -2161,14 +2149,14 @@ Function2c3d: ; 2c3d
; 2c52 ; 2c52
Function2c52: ; 2c52 Function2c52: ; 2c52
ld a, [MapEventBank] ld a, [MapScriptHeaderBank]
rst Bankswitch rst Bankswitch
ret ret
; 2c57 ; 2c57
GetMapEventBank: ; 2c57 GetMapScriptHeaderBank: ; 2c57
ld a, [MapEventBank] ld a, [MapScriptHeaderBank]
ret ret
; 2c5b ; 2c5b
@ -2276,9 +2264,7 @@ Function2cbd: ; 2cbd
jr z, .asm_2cee jr z, .asm_2cee
bit 7, c bit 7, c
jr nz, .asm_2cda jr nz, .asm_2cda
ld a, $22 callba Function8b342
ld hl, $7342
rst FarCall
ld e, c ld e, c
ld d, $0 ld d, $0
.asm_2cd7 .asm_2cd7

4
home/map_objects.asm
View File

@ -337,9 +337,7 @@ Function1956: ; 1956
call Function271e call Function271e
ld a, [hConnectionStripLength] ld a, [hConnectionStripLength]
call GetMapObject call GetMapObject
ld a, $2 callba Function80e7
ld hl, $40e7
rst FarCall
ret ret
; 1967 ; 1967

12
home/menu.asm
View File

@ -561,9 +561,7 @@ Function201c: ; 201c
Function202a: ; 202a Function202a: ; 202a
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
ld a, $9 callba Function2400e
ld hl, $400e
rst FarCall
ld a, [$cf88] ld a, [$cf88]
ret ret
; 2039 ; 2039
@ -571,9 +569,7 @@ Function202a: ; 202a
Function2039: ; 2039 Function2039: ; 2039
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
ld a, $9 callba Function24022
ld hl, $4022
rst FarCall
ld a, [$cf88] ld a, [$cf88]
ret ret
; 2048 ; 2048
@ -581,9 +577,7 @@ Function2039: ; 2039
Function2048: ; 2048 Function2048: ; 2048
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
ld a, $9 callba Function2403c
ld hl, $403c
rst FarCall
ld a, [$cf88] ld a, [$cf88]
ret ret
; 2057 ; 2057

12
home/text.asm
View File

@ -2,7 +2,7 @@ ClearBox: ; fb6
; Fill a c*b box at hl with blank tiles. ; Fill a c*b box at hl with blank tiles.
ld a, " " ld a, " "
.y Functionfb8:
push bc push bc
push hl push hl
.x .x
@ -14,7 +14,7 @@ ClearBox: ; fb6
add hl, bc add hl, bc
pop bc pop bc
dec b dec b
jr nz, .y jr nz, Functionfb8
ret ret
; fc8 ; fc8
@ -315,9 +315,7 @@ CheckDict: ; 1087
Function117b: ; 117b Function117b: ; 117b
ld c, l ld c, l
ld b, h ld b, h
ld a, $5f callba Function17f036
ld hl, $7036
rst FarCall
jp PlaceNextChar jp PlaceNextChar
; 1186 ; 1186
@ -463,9 +461,7 @@ Function1205: ; 1205
ld de, String12a2 ld de, String12a2
call PlaceString call PlaceString
push bc push bc
ld hl, $5939 callab Function39939
ld a, $e
rst FarCall
pop hl pop hl
ld de, StringBuffer1 ld de, StringBuffer1
jr .asm_126a ; 0x1246 $22 jr .asm_126a ; 0x1246 $22

11
home/time.asm
View File

@ -192,8 +192,9 @@ Function658: ; 658
ld [StringBuffer2], a ld [StringBuffer2], a
ld a, $0 ld a, $0
ld [$d089], a ld [$d089], a
jr .asm_677 jr Function677
Function663: ; 663
call UpdateTime call UpdateTime
ld a, [hHours] ld a, [hHours]
ld [$d087], a ld [$d087], a
@ -201,12 +202,10 @@ Function658: ; 658
ld [$d088], a ld [$d088], a
ld a, [hSeconds] ld a, [hSeconds]
ld [$d089], a ld [$d089], a
jr .asm_677 jr Function677
.asm_677 Function677
ld a, $5 callba Function140ed
ld hl, $40ed
rst FarCall
ret ret
; 67e ; 67e

4
items/item_descriptions.asm
View File

@ -4,9 +4,7 @@ GetItemDescription: ; 0x1c8955
jr c, .nomovedesc ; if not a TM, use a predefined string jr c, .nomovedesc ; if not a TM, use a predefined string
ld [$d106], a ld [$d106], a
push de push de
ld a, $b ; XXX replace this with BANK(label) callba Function2c7b6
ld hl, $47b6 ; XXX replace this with label
rst FarCall
pop hl pop hl
ld a, [$d265] ld a, [$d265]
ld [$cf60], a ld [$cf60], a

638
items/item_effects.asm
View File

File diff suppressed because it is too large Load Diff

1591
lib/mobile/main.asm
View File

File diff suppressed because it is too large Load Diff

44960
main.asm
View File

File diff suppressed because it is too large Load Diff

6
predef/cgb.asm
View File

@ -158,9 +158,9 @@ Function8e23: ; 8e23
Function8e85: ; 8e85 Function8e85: ; 8e85
ld a, $40 callba Function100dc0
ld hl, $4dc0
rst FarCall Function8e8b: ; 8e8b
ld hl, $7311 ld hl, $7311
jr nc, .asm_8e93 jr nc, .asm_8e93
ld hl, $7309 ld hl, $7309

28
wram.asm
View File

@ -1099,15 +1099,29 @@ SECTION "UsedSprites",WRAMX[$d154],BANK[1]
UsedSprites: ; d154 UsedSprites: ; d154
ds 32 ds 32
SECTION "map",WRAMX[$d1a3],BANK[1] SECTION "map",WRAMX[$d19d],BANK[1]
MapEventBank: ; d1a3 ; both are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
MapHeader: ; d19d
MapBorderBlock: ; d19d
ds 1
MapHeight: ; d19e
ds 1
MapWidth: ; d19f
ds 1
MapBlockDataBank: ; d1a0
ds 1
MapBlockDataPointer: ; d1a1
ds 2
MapScriptHeaderBank: ; d1a3
ds 1
MapScriptHeaderPointer: ; d1a4
ds 2
MapEventHeaderPointer: ; d1a6
ds 2
; bit set
MapConnections: ; d1a8
ds 1 ds 1
ds 5
MapConnections:
NorthMapConnection: ; d1a9 NorthMapConnection: ; d1a9
NorthConnectedMapGroup: ; d1a9 NorthConnectedMapGroup: ; d1a9
ds 1 ds 1