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

enum macros/move_anim.asm, resolve battle/anims.asm function labels

Browse Source
This commit is contained in:
PikalaxALT
2015-11-10 16:53:37 -05:00
parent ba05bfeafe
commit d13fb46d40
41 changed files with 2128 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
engine/battle_start.asm
View File

@@ -254,7 +254,7 @@ StartTrainerBattle_SetUpBGMap: ; 8c3a1 (23:43a1)
call StartTrainerBattle_NextScene
xor a
ld [wcf64], a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ret
StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
@@ -309,10 +309,10 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
callba Function5602
ld a, $5
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
call StartTrainerBattle_NextScene
ld a, $43
ld [hLCDStatCustom], a ; $ff00+$c6
ld [hLCDStatCustom], a
xor a
ld [hLCDStatCustom + 1], a
ld a, $90
@@ -365,7 +365,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
callba Function5602
ld a, $5
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
call StartTrainerBattle_NextScene
xor a
ld [wcf64], a
@@ -386,7 +386,7 @@ ENDM
StartTrainerBattle_SpinToBlack: ; 8c44f (23:444f)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld a, [wcf64]
ld e, a
ld d, 0
@@ -400,7 +400,7 @@ endr
ld [wcf65], a
call .load
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call DelayFrame
call DelayFrame
ld hl, wcf64
@@ -409,12 +409,12 @@ endr
.end
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call DelayFrame
call DelayFrame
call DelayFrame
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld a, $20
ld [wJumptableIndex], a
ret
@@ -508,12 +508,12 @@ endr
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
callba Function5602
ld a, $5
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
call StartTrainerBattle_NextScene
ld a, $10
ld [wcf64], a
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ret
StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
@@ -533,12 +533,12 @@ StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
.done
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call DelayFrame
call DelayFrame
call DelayFrame
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld a, $20
ld [wJumptableIndex], a
ret
@@ -580,7 +580,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
jp z, .nextscene
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
hlcoord 0, 0, AttrMap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
inc b
@@ -636,11 +636,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
dec b
jr nz, .loop2
ld a, [hCGB] ; $ff00+$e6
ld a, [hCGB]
and a
jr nz, .cgb
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call DelayFrame
call DelayFrame
jr .nextscene
@@ -653,10 +653,10 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
jr nz, .daytime
ld hl, .nightpals
.daytime
ld a, [rSVBK] ; $ff00+$70
ld a, [rSVBK]
push af
ld a, $5 ; WRAM5 = palettes
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
call .copypals
push hl
ld de, Unkn1Pals + 8 * 7
@@ -667,9 +667,9 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ld bc, $8
call CopyBytes
pop af
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
ld a, $1
ld [hCGBPalUpdate], a ; $ff00+$e5
ld [hCGBPalUpdate], a
call DelayFrame
call Function8cf4f
@@ -829,7 +829,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
inc de
ld h, a
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call .Copy
call WaitBGMap
jr .loop

976
engine/breeding/egg.asm Executable file
View File

File diff suppressed because it is too large Load Diff

8
engine/clock_reset.asm
View File

@@ -72,9 +72,9 @@ RestartClock: ; 20021 (8:4021)
call UpdateTime
call GetWeekday
ld [Buffer4], a
ld a, [hHours] ; $ff00+$94
ld a, [hHours]
ld [Buffer5], a
ld a, [hMinutes] ; $ff00+$96
ld a, [hMinutes]
ld [Buffer6], a
.loop
@@ -223,7 +223,7 @@ RestartClock: ; 20021 (8:4021)
.unreferenced: ; 20160
ld a, [Buffer3]
ld b, a
call GetTileCoord
call Coord2Tile
ret
; 20168
@@ -233,7 +233,7 @@ RestartClock: ; 20021 (8:4021)
ld a, [Buffer3]
dec a
ld b, a
call GetTileCoord
call Coord2Tile
pop de
ld [hl], d
ld bc, 2 * SCREEN_WIDTH

14
engine/credits.asm
View File

@@ -300,7 +300,7 @@ Function109956: ; 109956 (42:5956)
Function10995e: ; 10995e (42:595e)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
jp Function109951
Function109964: ; 109964 (42:5964)
@@ -317,13 +317,13 @@ Function109964: ; 109964 (42:5964)
Function10997b: ; 10997b (42:597b)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld a, $8
ld [Requested2bpp], a
jp Function109951
Function109986: ; 109986 (42:5986)
ld a, [rLY] ; $ff00+$44
ld a, [rLY]
cp $30
jr c, Function109986
ld a, [wcf66]
@@ -523,9 +523,9 @@ endr
Function109a95: ; 109a95 (42:5a95)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld a, $c
ld [hBGMapAddress], a ; $ff00+$d6
ld [hBGMapAddress], a
ld a, $28
hlcoord 0, 0
ld bc, $168
@@ -558,8 +558,8 @@ Function109a95: ; 109a95 (42:5a95)
call ByteFill
call Function3200
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapAddress], a ; $ff00+$d6
ld [hBGMapMode], a
ld [hBGMapAddress], a
hlcoord 0, 0
call Function109aff
call Function3200

4
engine/link.asm
View File

@@ -1813,7 +1813,7 @@ Function28b87: ; 28b87
ld a, [hli]
ld [wc6fd], a
ld a, [hl]
ld [wc6fe], a
ld [wPlayerMinimized], a
ld a, [DefaultFlypoint]
ld hl, PartyMon1Species
call GetPartyLocation
@@ -2810,7 +2810,7 @@ Function2942e: ; 2942e
ld [CurPartySpecies], a
ld a, [wc6fd]
ld [TempMonDVs], a
ld a, [wc6fe]
ld a, [wPlayerMinimized]
ld [TempMonDVs + 1], a
ld b, $1a
call GetSGBLayout

2
engine/map_objects.asm
View File

@@ -2995,7 +2995,7 @@ Function56cd: ; 56cd
jr nc, .ok8
ld c, a
push bc
call GetTileCoord
call Coord2Tile
pop bc
ld a, [hl]
cp $60

14
engine/menu.asm
View File

@@ -1,5 +1,5 @@
Function2400e:: ; 2400e
ld hl, Function1c66
ld hl, CopyMenuData2
ld a, [wcf94]
rst FarCall
call Function24085
@@ -10,7 +10,7 @@ Function2400e:: ; 2400e
; 24022
Function24022:: ; 24022
ld hl, Function1c66
ld hl, CopyMenuData2
ld a, [wcf94]
rst FarCall
call Function24085
@@ -22,7 +22,7 @@ Function24022:: ; 24022
; 2403c
Function2403c:: ; 2403c
ld hl, Function1c66
ld hl, CopyMenuData2
ld a, [wcf94]
rst FarCall
call Function24085
@@ -126,8 +126,8 @@ Function240db: ; 240db
ld e, [hl]
inc hl
ld d, [hl]
call Function1cc6
call GetTileCoord
call GetMenuTextStartCoord
call Coord2Tile
call Function240d3
ld b, a
.asm_240eb
@@ -166,7 +166,7 @@ Function240db: ; 240db
Function2411a: ; 2411a (9:411a)
call Function1cc6
call GetMenuTextStartCoord
ld a, b
ld [wcfa1], a
dec c
@@ -538,7 +538,7 @@ Function24329: ; 24329
ld b, a
ld a, [wcfa2]
ld c, a
call GetTileCoord
call Coord2Tile
ld a, [wcfa7]
swap a
and $f

16
engine/pack.asm
View File

@@ -44,7 +44,7 @@ Jumptable_10030: ; 10030 (4:4030)
Function10046: ; 10046 (4:4046)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function10955
ld a, [wcf64]
ld [wJumptableIndex], a
@@ -113,7 +113,7 @@ Function100d3: ; 100d3 (4:40d3)
call ClearPocketList
call DrawPocketName
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call WaitBGMap_DrawPackGFX
call Function10866
ret
@@ -203,7 +203,7 @@ Function10159: ; 10159
ld [Options], a
.asm_10179
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function10955
call WaitBGMap_DrawPackGFX
call Function10a40
@@ -478,7 +478,7 @@ Function10311: ; 10311
jr z, .NoPokemon
call DoItemEffect
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function10955
call WaitBGMap_DrawPackGFX
call Function10a40
@@ -634,7 +634,7 @@ Function103fd: ; 103fd
pop af
ld [Options], a
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function10955
call WaitBGMap_DrawPackGFX
call Function10a40
@@ -702,7 +702,7 @@ Jumptable_104c3: ; 104c3 (4:44c3)
Function104d9: ; 104d9 (4:44d9)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function10955
ld a, [wcf64]
ld [wJumptableIndex], a
@@ -771,7 +771,7 @@ Function10566: ; 10566 (4:4566)
call ClearPocketList
call DrawPocketName
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call WaitBGMap_DrawPackGFX
ld hl, UnknownText_0x10b0c
call Function10889
@@ -915,7 +915,7 @@ Function105dc: ; 105dc (4:45dc)
and a
jr nz, .asm_1067e
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function10955
call WaitBGMap_DrawPackGFX
call Function10a40

2
engine/phone.asm
View File

@@ -182,7 +182,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
; Sample a random number between 0 and 31.
ld c, a
call Random
ld a, [hRandomAdd] ; $ff00+$e1
ld a, [hRandomAdd]
swap a
and $1f
; Compute that number modulo the number of available callers.

60
engine/pokedex.asm
View File

@@ -209,7 +209,7 @@ Function40136: ; 40136 (10:4136)
Function4013c: ; 4013c (10:413c)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call ClearSprites
xor a
hlcoord 0, 0, AttrMap
@@ -226,7 +226,7 @@ Function4013c: ; 4013c (10:413c)
call Function41af7
call Function4074c
ld a, $5
ld [hSCX], a ; $ff00+$cf
ld [hSCX], a
ld a, [wc7d4]
cp $1
ld a, $4a
@@ -234,9 +234,9 @@ Function4013c: ; 4013c (10:413c)
ld a, $47
.asm_4017b
ld [hWX], a ; $ff00+$d1
ld [hWX], a
xor a
ld [hWY], a ; $ff00+$d2
ld [hWY], a
call WaitBGMap
call Function41af7
ld a, $ff
@@ -272,7 +272,7 @@ Function401ae: ; 401ae (10:41ae)
ret nc
call Function41148
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function40b0f
call Function41ad7
call Function41af7
@@ -293,9 +293,9 @@ Function401ae: ; 401ae (10:41ae)
ld a, $7
ld [wJumptableIndex], a
xor a
ld [hSCX], a ; $ff00+$cf
ld [hSCX], a
ld a, $a7
ld [hWX], a ; $ff00+$d1
ld [hWX], a
call DelayFrame
ret
@@ -304,9 +304,9 @@ Function401ae: ; 401ae (10:41ae)
ld a, $5
ld [wJumptableIndex], a
xor a
ld [hSCX], a ; $ff00+$cf
ld [hSCX], a
ld a, $a7
ld [hWX], a ; $ff00+$d1
ld [hWX], a
call DelayFrame
ret
@@ -320,7 +320,7 @@ Function40217: ; 40217 (10:4217)
xor a
ld [wPokedexStatus], a
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call ClearSprites
call Function41478
call Function407fd
@@ -331,7 +331,7 @@ Function40217: ; 40217 (10:4217)
call Function40ba0
call WaitBGMap
ld a, $a7
ld [hWX], a ; $ff00+$d1
ld [hWX], a
call Function40bb1
ld [CurPartySpecies], a
ld a, $4
@@ -392,7 +392,7 @@ Function402aa: ; 402aa (10:42aa)
xor a
ld [wPokedexStatus], a
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function407fd
call Function4134f
call Function41478
@@ -509,7 +509,7 @@ Function4038d: ; 4038d
Function4039d: ; 4039d (10:439d)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call ClearSprites
call Function4087c
call Function4134f
@@ -615,7 +615,7 @@ Function4043a: ; 4043a (10:443a)
Function40443: ; 40443 (10:4443)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call ClearSprites
call Function408f0
call Function4134f
@@ -723,7 +723,7 @@ Function40501: ; 40501
Function4050a: ; 4050a (10:450a)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
xor a
hlcoord 0, 0, AttrMap
ld bc, $168
@@ -739,11 +739,11 @@ Function4050a: ; 4050a (10:450a)
call Function41af7
call Function40962
ld a, $5
ld [hSCX], a ; $ff00+$cf
ld [hSCX], a
ld a, $4a
ld [hWX], a ; $ff00+$d1
ld [hWX], a
xor a
ld [hWY], a ; $ff00+$d2
ld [hWY], a
call WaitBGMap
call Function41af7
callba Function1de1d1
@@ -768,7 +768,7 @@ Function40562: ; 40562 (10:4562)
ret nc
call Function41281
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call Function40b0f
call Function41ad7
call Function41af7
@@ -797,9 +797,9 @@ Function40562: ; 40562 (10:4562)
ld a, $5
ld [wJumptableIndex], a
xor a
ld [hSCX], a ; $ff00+$cf
ld [hSCX], a
ld a, $a7
ld [hWX], a ; $ff00+$d1
ld [hWX], a
ret
Function405bd: ; 405bd (10:45bd)
@@ -876,14 +876,14 @@ Function40610: ; 40610 (10:4610)
.asm_40635
push af
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
pop af
call Function40654
call Function41a58
call Function40658
callba Functionfba2e
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
call DelayFrame
call DelayFrame
ret
@@ -1773,7 +1773,7 @@ String_40ee4: ; 40ee4
Function40f08: ; 40f08 (10:4f08)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
hlcoord 0, 12
ld bc, $412
call Function40ad5
@@ -1781,7 +1781,7 @@ Function40f08: ; 40f08 (10:4f08)
hlcoord 1, 14
call PlaceString
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld c, $40
call DelayFrames
ld de, SFX_CHANGE_DEX_MODE
@@ -1861,7 +1861,7 @@ Function40f84: ; 40f84
Function40fa8: ; 40fa8 (10:4fa8)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
hlcoord 9, 3
ld bc, $408
ld a, $7f
@@ -1873,7 +1873,7 @@ Function40fa8: ; 40fa8 (10:4fa8)
hlcoord 9, 6
call Function40fcd
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ret
Function40fcd: ; 40fcd (10:4fcd)
@@ -2363,16 +2363,16 @@ Function413fe: ; 413fe (10:53fe)
jp FillBoxWithByte
Function41401: ; 41401 (10:5401)
ld a, [rSVBK] ; $ff00+$70
ld a, [rSVBK]
push af
ld a, $5
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
ld hl, Unkn1Pals
ld bc, $40
xor a
call ByteFill
pop af
ld [rSVBK], a ; $ff00+$70
ld [rSVBK], a
Function41415: ; 41415
ld a, $ff

12
engine/radio.asm
View File

@@ -1679,15 +1679,15 @@ BuenasPassword1: ; b8f12 (2e:4f12)
.PlayPassword: ; b8f22 (2e:4f22)
call StartRadioStation
ld a, [hBGMapMode] ; $ff00+$d4
ld a, [hBGMapMode]
push af
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld de, String_b9171
hlcoord 2, 9
call PlaceString
pop af
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld hl, UnknownText_0xb9182
ld a, BUENAS_PASSWORD_2
jp NextRadioLine
@@ -1951,12 +1951,12 @@ BuenasPassword19: ; b9122 (2e:5122)
jp NextRadioLine
BuenasPassword20: ; b912a (2e:512a)
ld a, [hBGMapMode] ; $ff00+$d4
ld a, [hBGMapMode]
push af
callba NoRadioMusic
callba NoRadioName
pop af
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ld hl, WeeklyFlags
res 7, [hl]
ld a, BUENAS_PASSWORD
@@ -1980,7 +1980,7 @@ BuenasPassword21: ; b9152 (2e:5152)
BuenasPasswordCheckTime: ; b9169 (2e:5169)
call UpdateTime
ld a, [hHours] ; $ff00+$94
ld a, [hHours]
cp 18 ; 6 PM
ret
; b9171 (2e:5171)

4
engine/radio2.asm
View File

@@ -371,7 +371,7 @@ NoRadioStation: ; 91888 (24:5888)
ld [wc6da], a
ld [wc6db], a
ld a, $1
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
ret
NoRadioMusic: ; 9189d (24:589d)
@@ -383,7 +383,7 @@ NoRadioMusic: ; 9189d (24:589d)
NoRadioName: ; 918a9 (24:58a9)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapMode], a
hlcoord 1, 8
lb bc, 3, 18
call ClearBox