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

More label updates, moved predefs to new file

Browse Source 
Also named most of the engine and event flag constants.
This commit is contained in:
PikalaxALT
2015-07-20 03:51:52 -04:00
parent 94129b6b45
commit bef792f2d2
90 changed files with 1926 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
engine/engine_flags.asm
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

2
engine/events_2.asm
View File

@@ -275,7 +275,7 @@ Function97db5: ; 97db5
ld a, [PlayerState]
cp 1
jr nz, .NoCall
call Function2d05
call GetMapHeaderPhoneServiceNybble
and a
jr nz, .NoCall
ld hl, wdca1 + 1

4
engine/fruit_trees.asm
View File

@@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041
; 4404c
TryResetFruitTrees: ; 4404c
ld hl, wdc1e
ld hl, DailyFlags
bit 4, [hl]
ret nz
jp ResetFruitTrees
@@ -70,7 +70,7 @@ ResetFruitTrees: ; 4406a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, wdc1e
ld hl, DailyFlags
set 4, [hl]
ret
; 44078

6
engine/map_objects.asm
View File

@@ -3051,8 +3051,8 @@ Function579d: ; 579d
ld [wd04e], a
ld [wd4e2], a
call Function57bc
callba Function149c6
call c, Function57d9
callba CheckWarpCollision
call c, SpawnInFacingDown
call Function57ca
ret
; 57bc
@@ -3080,7 +3080,7 @@ Function57ca: ; 57ca
jr Function57db
; 57d9
Function57d9: ; 57d9
SpawnInFacingDown: ; 57d9
ld a, 0
; fallthrough
; 57db

184
engine/map_setup.asm
View File

@@ -293,76 +293,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(BufferScreen), BufferScreen
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 +372,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,13 +386,13 @@ 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
.ok
call Functione4a
ret
@@ -401,89 +401,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
.notbiking
call Function3d2f
ret
; 1559a

2
engine/more_phone_scripts.asm
View File

@@ -1476,7 +1476,7 @@ UnknownScript_0xa0a08:
iftrue UnknownScript_0xa0a1d
checknite
iftrue UnknownScript_0xa0a25
setevent EVENT_26A
setevent EVENT_KENJI_ON_BREAK
farwritetext UnknownText_0x66f11
keeptextopen
jump UnknownScript_0xa0484

10
engine/pack.asm
View File

@@ -138,7 +138,7 @@ Function100e8: ; 100e8 (4:40e8)
push de
call LoadMenuDataHeader
call InterpretMenu2
call Function1c07
call ExitMenu
pop hl
ret c
ld a, [wcfa9]
@@ -290,7 +290,7 @@ Function101c5: ; 101c5 (4:41c5)
push de
call LoadMenuDataHeader
call InterpretMenu2
call Function1c07
call ExitMenu
pop hl
ret c
ld a, [wcfa9]
@@ -495,7 +495,7 @@ Function10364: ; 10364
call Function10889
callba Function24fbf
push af
call Function1c07
call ExitMenu
pop af
jr c, .asm_1039c
call Function10a1d
@@ -503,7 +503,7 @@ Function10364: ; 10364
call MenuTextBox
call YesNoBox
push af
call Function1c07
call ExitMenu
pop af
jr c, .asm_1039c
ld hl, NumItems
@@ -822,7 +822,7 @@ Function105dc: ; 105dc (4:45dc)
push de
call LoadMenuDataHeader
call InterpretMenu2
call Function1c07
call ExitMenu
pop hl
ret c
ld a, [wcfa9]

811
engine/phone_scripts.asm
View File

File diff suppressed because it is too large Load Diff

106
engine/predef.asm Normal file
View File

@@ -0,0 +1,106 @@
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
add_n_times hl, de, 3
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

6
engine/scripting.asm
View File

@@ -2124,7 +2124,7 @@ ConvertMemToText: ; 0x976c0
CopyConvertedText: ; 976c8
ld hl, StringBuffer3
ld bc, 19
ld bc, StringBuffer4 - StringBuffer3
call AddNTimes
call CopyName2
ret
@@ -2200,7 +2200,7 @@ Script_name: ; 0x97716
call GetScriptByte
ld [wcf61], a
Unknown_9771c: ; 0x9771c
ContinueToGetName: ; 0x9771c
call GetScriptByte
ld [CurSpecies], a
call GetName
@@ -2216,7 +2216,7 @@ Script_trainerclassname: ; 0x9772b
ld a, TRAINER_NAME
ld [wcf61], a
jr Unknown_9771c ; 0x97730 $ea
jr ContinueToGetName ; 0x97730 $ea
; 0x97732
Script_readmoney: ; 0x97732

10
engine/specials.asm
View File

@@ -46,7 +46,7 @@ SpecialsPointers:: ; c029
add_special Special_CheckMagikarpLength
add_special Functionfbcd2
add_special HealParty
add_special Function1559a
add_special PokemonCenterPC
add_special Functionc2e7
add_special Function166d6
add_special Function1672a
@@ -64,10 +64,10 @@ SpecialsPointers:: ; c029
add_special Functionc380
add_special Functionc38d
add_special Functionc3db
add_special Function8c084
add_special FadeBlackBGMap
add_special Function8c092
add_special Function8c0b6
add_special Function8c079
add_special FadeInBGMap
add_special Function8c0ab
add_special Functiond91
add_special WhiteBGMap
@@ -112,7 +112,7 @@ SpecialsPointers:: ; c029
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
@@ -182,7 +182,7 @@ SpecialsPointers:: ; c029
add_special Function103780
add_special Function10387b
add_special Function4ae12
add_special Function1047eb
add_special LoadMapPalettes
add_special Function4a927
add_special Function90a54
add_special Function90a88

8
engine/std_scripts.asm
View File

@@ -221,7 +221,7 @@ TrashCanScript: ; 0xbc1a5
PCScript:
loadfont
special Function1559a
special PokemonCenterPC
loadmovesprites
end
@@ -306,13 +306,13 @@ BugContestResultsWarpScript:
scall BugContestResults_CopyContestantsToResults
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_2D2
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement $0, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
clearflag ENGINE_BUG_CONTEST_TIMER
clearevent EVENT_2D2
clearevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
@@ -383,7 +383,7 @@ BugContestResults_CleanUp
; 0xbc31e
BugContestResults_FirstPlace ; 0xbc31e
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
itemtotext SUN_STONE, $1
farwritetext ContestResults_PlayerWonAPrizeText
closetext