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

Split up bank 2; other relabelings

Browse Source
This commit is contained in:
PikalaxALT
2015-10-16 13:35:43 -04:00
parent 1e2ff967aa
commit 4fa6c6daa4
45 changed files with 7856 additions and 7783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/credits.asm
View File

@@ -193,7 +193,7 @@ Function109847:: ; 109847
ld a, $5
ld [hVBlank], a
ld a, $1
ld [$ffaa], a
ld [hInMenu], a
xor a
ld [hBGMapMode], a
ld [CreditsPos], a

4
engine/map_objects.asm
View File

@@ -3137,7 +3137,7 @@ Function5803:: ; 5803
Function5815: ; 5815
call Function18de
ret c
ld a, [$ffb0]
ld a, [hConnectedMapWidth]
ld [wd4cd], a
ret
; 581f
@@ -3166,7 +3166,7 @@ Function582c: ; 582c
ld hl, OBJECT_09
add hl, bc
ld [hl], 0
ld a, [$ffb0]
ld a, [hConnectedMapWidth]
ld [wd4ce], a
ret
; 5847

36
engine/pack.asm
View File

@@ -1157,8 +1157,8 @@ MenuData2_0x107f7: ; 0x107f7
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
dbw 0, OTPartyMons
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10807
@@ -1181,8 +1181,8 @@ MenuData2_0x10816: ; 0x10816
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
dbw 0, OTPartyMon1Exp + 2
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10826
@@ -1214,8 +1214,8 @@ MenuData2_0x1084a: ; 0x1084a
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
dbw 0, OTPartyMon1CaughtGender
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 1085a
@@ -1525,8 +1525,8 @@ MenuData2_0x10a57: ; 0x10a57
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
dbw 0, NumItems
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10a67
@@ -1543,8 +1543,8 @@ MenuData2_0x10a6f: ; 0x10a6f
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
dbw 0, NumItems
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10a7f
@@ -1561,8 +1561,8 @@ MenuData2_0x10a87: ; 0x10a87
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
dbw 0, NumKeyItems
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10a97
@@ -1579,8 +1579,8 @@ MenuData2_0x10a9f: ; 0x10a9f
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
dbw 0, NumKeyItems
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10aaf
@@ -1597,8 +1597,8 @@ MenuData2_0x10ab7: ; 0x10ab7
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
dbw 0, NumBalls
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10ac7
@@ -1615,8 +1615,8 @@ MenuData2_0x10acf: ; 0x10acf
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
dbw 0, NumBalls
dbw BANK(Function24ab4), Function24ab4
dbw BANK(Function24ac3), Function24ac3
dbw BANK(PlaceMenuItemName), PlaceMenuItemName
dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
dbw BANK(Function244c3), Function244c3
; 10adf

2
engine/phone_scripts.asm
View File

@@ -833,7 +833,7 @@ UnknownScript_0xbd544:
pokenamemem QWILFISH, $1
displaylocation ROUTE_32, $2
writebyte $1
special Functionc3fc
special Special_ActivateFishingSwarm
farjump UnknownScript_0xa05d6
UnknownScript_0xbd55c:

16
engine/pokedex.asm
View File

@@ -16,10 +16,10 @@ Pokedex: ; 40000
push af
xor a
ld [VramState], a
ld a, [$ffaa]
ld a, [hInMenu]
push af
ld a, $1
ld [$ffaa], a
ld [hInMenu], a
xor a
ld [$ffde], a
@@ -44,7 +44,7 @@ Pokedex: ; 40000
ld [wd959], a
pop af
ld [$ffaa], a
ld [hInMenu], a
pop af
ld [VramState], a
pop af
@@ -844,7 +844,7 @@ Function405df: ; 405df (10:45df)
ret
Function40610: ; 40610 (10:4610)
ld hl, $ffa9
ld hl, hJoyLast
ld a, [hl]
and D_RIGHT
jr nz, .right
@@ -913,7 +913,7 @@ Function4066c: ; 4066c (10:466c)
ld [wc7e2], a
ld a, [wc7d0]
ld [wc7e3], a
ld hl, $ffa9
ld hl, hJoyLast
ld a, [hl]
and D_UP
jr nz, .up
@@ -964,7 +964,7 @@ Function406c5: ; 406c5 (10:46c5)
ld d, a
ld a, [wc7d2]
ld e, a
ld hl, $ffa9
ld hl, hJoyLast
ld a, [hl]
and D_UP
jr nz, Function406ea
@@ -1799,7 +1799,7 @@ Function40f4f: ; 40f4f (10:4f4f)
ld a, [wc7d8]
cp $2
jr nc, .asm_40f63
ld hl, $ffa9
ld hl, hJoyLast
ld a, [hl]
and $20
jr nz, .asm_40f65
@@ -2274,7 +2274,7 @@ Function4135a: ; 4135a (10:535a)
jr nz, .asm_413c1
call Function413f5
jr c, .asm_413bf
ld hl, $ffa9
ld hl, hJoyLast
ld a, [hl]
and D_LEFT | D_UP
and b

4
engine/predef.asm
View File

@@ -83,8 +83,8 @@ PredefPointers:: ; 856b
add_predef Function91d11
add_predef CheckContestMon
add_predef Function8c20f
add_predef Function8c000
add_predef Function8c000_2
add_predef Predef35
add_predef Predef36
add_predef PlayBattleAnim
add_predef Predef38 ; $38
add_predef Predef39

4
engine/save.asm
View File

@@ -380,7 +380,7 @@ ErasePreviousSave: ; 14cbb
ld [sStackTop + 1], a
call CloseSRAM
ld a, $1
ld [wd4b4], a
ld [wSavedAtLeastOnce], a
ret
; 14ce2
@@ -486,7 +486,7 @@ Function14d93: ; 14d93
Function14da0: ; 14da0
ld a, [wd4b4]
ld a, [wSavedAtLeastOnce]
and a
ret nz
call ErasePreviousSave

26
engine/specials.asm
View File

@@ -39,7 +39,7 @@ SpecialsPointers:: ; c029
add_special Special_GetMysteryGiftItem
add_special Special_UnlockMysteryGift
; Bug Catching Contest
; Map Events
add_special BugContestJudging
add_special CheckPartyFullAfterContest
add_special CheckFirstMonFainted
@@ -88,25 +88,25 @@ SpecialsPointers:: ; c029
add_special Special_FindAtLeastThatHappy
add_special Special_FindThatSpecies
add_special Special_FindThatSpeciesYourTrainerID
add_special Functionc3ef
add_special Function17421
add_special Function17440
add_special Functionc3ef ; unreferenced
add_special Special_DayCareMon1
add_special Special_DayCareMon2
add_special Special_SelectRandomBugContestContestants
add_special Functionc3fc
add_special Special_ActivateFishingSwarm
add_special ToggleMaptileDecorations
add_special ToggleDecorationsVisibility
add_special SpecialGiveShuckle
add_special SpecialReturnShuckle
add_special Function73f7
add_special Special_BillsGrandfather
add_special SpecialCheckPokerus
add_special Function24b25
add_special Function24b4e
add_special Special_DisplayCoinCaseBalance
add_special Special_DisplayMoneyAndCoinBalance
add_special Function24ae8
add_special Special_CheckForLuckyNumberWinners
add_special Special_CheckLuckyNumberShowFlag
add_special Special_ResetLuckyNumberShowFlag
add_special Function4d9d3
add_special Function88018
add_special Special_PrintTodaysLuckyNumber
add_special Special_SelectApricornForKurt
add_special SpecialNameRater
add_special Functionc2da
add_special GetFirstPokemonHappiness
@@ -489,9 +489,9 @@ Functionc3ef: ; c3ef
ret
; c3fc
Functionc3fc: ; c3fc
Special_ActivateFishingSwarm: ; c3fc
ld a, [ScriptVar]
ld [wdfce], a
ld [wFishingSwarmFlag], a
ret
; c403
@@ -531,7 +531,7 @@ Special_ResetLuckyNumberShowFlag: ; c422
; c434
Special_CheckLuckyNumberShowFlag: ; c434
callba Function11542
callba CheckLuckyNumberShowFlag
jp ScriptReturnCarry
; c43d

2
engine/std_scripts.asm
View File

@@ -1809,7 +1809,7 @@ CoinVendor_IntroScript: ; 0xbcde0
farwritetext CoinVendor_IntroText
CoinVendor_SellCoinsMenuScript: ; 0xbcde4
special Function24b4e
special Special_DisplayMoneyAndCoinBalance
loadmenudata CoinVendor_MenuDataHeader
interpretmenu2
writebackup

12
engine/time.asm
View File

@@ -62,7 +62,7 @@ Function11415: ; 11415
ret
; 11420
Function11420: ; 11420
CheckDayDependentEventHL: ; 11420
inc hl
push hl
call Function115cf
@@ -98,7 +98,7 @@ Function1144c: ; 1144c
Function11452:: ; 11452
ld hl, wdc1c
call Function11420
call CheckDayDependentEventHL
ret nc
xor a
ld hl, DailyFlags
@@ -217,7 +217,7 @@ Function114fc: ; 114fc
ret
; 1150c
Function1150c: ; 1150c
Function1150c: ; Specific version of CheckDayDependentEventHL when hl = $dc3a
ld hl, wdc3b
call Function115cf
call Function115c8
@@ -262,9 +262,9 @@ Function1152b: ; 1152b
ret
; 11542
Function11542: ; 11542
CheckLuckyNumberShowFlag: ; 11542
ld hl, wLuckyNumberDayBuffer
jp Function11420
jp CheckDayDependentEventHL
; 11548
Function11548: ; 11548
@@ -277,7 +277,7 @@ Function11548: ; 11548
ld [Buffer2], a
call CloseSRAM
ld hl, Buffer1
call Function11420
call CheckDayDependentEventHL
jr nc, .asm_11572
ld hl, Buffer1
call Function11413