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 #623 from mid-kid/patch-1

Browse Source 
Create some battle tower SRAM labels
This commit is contained in:
Rangi 2019-04-13 11:50:43 -04:00 committed by GitHub
commit 5cdf4f9ae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 291 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/text/common_3.asm
View File

@ -1133,28 +1133,28 @@ UnknownText_0x1c5962::
line "you're ready."
done
UnknownText_0x1c5983::
_NeedAtLeastThreeMonText::
text "You need at least"
line "three #MON."
para ""
done
UnknownText_0x1c59a3::
_EggDoesNotQualifyText::
text "Sorry, an EGG"
line "doesn't qualify."
para ""
done
Text_OnlyThreeMonMayBeEntered::
_OnlyThreeMonMayBeEnteredText::
text "Only three #MON"
line "may be entered."
para ""
done
Text_TheMonMustAllBeDifferentKinds::
_TheMonMustAllBeDifferentKindsText::
text "The @"
text_ram wStringBuffer2
text " #MON"
@ -1164,7 +1164,7 @@ Text_TheMonMustAllBeDifferentKinds::
para ""
done
Text_TheMonMustNotHoldTheSameItems::
_TheMonMustNotHoldTheSameItemsText::
text "The @"
text_ram wStringBuffer2
text " #MON"
@ -1174,7 +1174,7 @@ Text_TheMonMustNotHoldTheSameItems::
para ""
done
Text_YouCantTakeAnEgg::
_YouCantTakeAnEggText::
text "You can't take an"
line "EGG!"

2
engine/battle_anims/anim_commands.asm
View File

@ -152,7 +152,7 @@ BattleAnimRestoreHuds:
ldh a, [rSVBK]
push af
ld a, BANK(wCurBattleMon) ; alternatively: BANK(wTempMon), BANK(wPartyMon1), several others
ld a, BANK(wCurBattleMon) ; aka BANK(wTempMon) and BANK(wPartyMon1) and several others
ldh [rSVBK], a
ld hl, UpdateBattleHuds

380
engine/events/battle_tower/battle_tower.asm
View File

File diff suppressed because it is too large Load Diff

42
engine/events/battle_tower/rules.asm
View File

@ -17,8 +17,8 @@ CheckForMobileBattleRules:
.TextPointers:
dw .ExcuseMeText
dw JumpText_NeedAtLeastThreeMon
dw JumpText_EggDoesNotQualify
dw NeedAtLeastThreeMonText
dw EggDoesNotQualifyText
.ExcuseMeText:
; Excuse me!
@ -50,10 +50,10 @@ _CheckForBattleTowerRules:
.TextPointers:
dw JumpText_ExcuseMeYoureNotReady
dw JumpText_OnlyThreeMonMayBeEntered
dw JumpText_TheMonMustAllBeDifferentKinds
dw JumpText_TheMonMustNotHoldTheSameItems
dw JumpText_YouCantTakeAnEgg
dw OnlyThreeMonMayBeEnteredText
dw TheMonMustAllBeDifferentKindsText
dw TheMonMustNotHoldTheSameItemsText
dw YouCantTakeAnEggText
JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
@ -70,34 +70,34 @@ BattleTower_PleaseReturnWhenReady:
text_far UnknownText_0x1c5962
text_end
JumpText_NeedAtLeastThreeMon:
NeedAtLeastThreeMonText:
; You need at least three #MON.
text_far UnknownText_0x1c5983
text_far _NeedAtLeastThreeMonText
text_end
JumpText_EggDoesNotQualify:
EggDoesNotQualifyText:
; Sorry, an EGG doesn't qualify.
text_far UnknownText_0x1c59a3
text_far _EggDoesNotQualifyText
text_end
JumpText_OnlyThreeMonMayBeEntered:
OnlyThreeMonMayBeEnteredText:
; Only three #MON may be entered.
text_far Text_OnlyThreeMonMayBeEntered
text_far _OnlyThreeMonMayBeEnteredText
text_end
JumpText_TheMonMustAllBeDifferentKinds:
TheMonMustAllBeDifferentKindsText:
; The @ #MON must all be different kinds.
text_far Text_TheMonMustAllBeDifferentKinds
text_far _TheMonMustAllBeDifferentKindsText
text_end
JumpText_TheMonMustNotHoldTheSameItems:
TheMonMustNotHoldTheSameItemsText:
; The @ #MON must not hold the same items.
text_far Text_TheMonMustNotHoldTheSameItems
text_far _TheMonMustNotHoldTheSameItemsText
text_end
JumpText_YouCantTakeAnEgg:
YouCantTakeAnEggText:
; You can't take an EGG!
text_far Text_YouCantTakeAnEgg
text_far _YouCantTakeAnEggText
text_end
BattleTower_ExecuteJumptable:
@ -161,7 +161,7 @@ BattleTower_ExecuteJumptable:
call z, .PrintFirstText
pop bc
call .PrintNthText
ld b, $1
ld b, 1
pop de
ret
@ -178,7 +178,7 @@ BattleTower_ExecuteJumptable:
call .GetTextPointers
inc hl
inc hl
ld b, $0
ld b, 0
add hl, bc
add hl, bc
call .LoadTextPointer
@ -194,7 +194,7 @@ BattleTower_CheckPartyLengthIs3:
BattleTower_CheckPartyHasThreeMonsThatAreNotEggs:
ld hl, wPartyCount
ld a, [hli]
ld b, $0
ld b, 0
ld c, a
.loop
ld a, [hli]

4
pokecrystal.link
View File

@ -361,7 +361,9 @@ SRAM $02
"Boxes 1-7"
SRAM $03
"Boxes 8-14"
SRAM $04
"SRAM Mobile 1"
SRAM $05
"SRAM Mobile"
"SRAM Mobile 2"
HRAM
"HRAM"

70
sram.asm
View File

@ -239,8 +239,13 @@ sBox12:: box sBox12
sBox13:: box sBox13
sBox14:: box sBox14
SECTION "SRAM Mobile 1", SRAM
SECTION "SRAM Mobile", SRAM, BANK [5]
ds $13
s4_a013:: ds 36 ; a013
SECTION "SRAM Mobile 2", SRAM
ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English
@ -292,9 +297,64 @@ sTrainerRankingsEnd:: ; a083
ds 1 ; Former location for sMobileEventIndexBackup, moved to 1:BE44 in English
sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings
sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings ; a084
ds $945
; aa4b
ds $6fa
sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH
s5_a800:: db ; a800
ds $24
s5_a825:: db ; a825
s5_a826:: db ; a826
ds $6d
s5_a894:: ds NAME_LENGTH_JAPANESE ; a894
ds $2
s5_a89c:: ds 22 ; a89c
s5_a8b2:: ds 150 ; a8b2
s5_a948:: ds 246 ; a948
ds $3
s5_aa41:: ds 4 ; aa41
ds $2
s5_aa47:: db ; aa47
s5_aa48:: db ; aa48
ds $2
sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b
ds $1
s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa5d
ds $1d
s5_aa8b:: db ; aa8b
s5_aa8c:: db ; aa8c
s5_aa8d:: db ; aa8d
s5_aa8e:: ds 7 * $cc ; aa8e
ds $1
s5_b023:: ds 105 ; b023
s5_b08c:: ds 4 ; b08c
ds $269
s5_b2f9:: db ; b2f9
s5_b2fa:: db ; b2fa
s5_b2fb:: db ; b2fb
ds $b49
s5_be45:: db ; be45
s5_be46:: db ; be46

5
wram.asm
View File

@ -2409,7 +2409,10 @@ wStartHour:: db ; d4b7
wStartMinute:: db ; d4b8
wStartSecond:: db ; d4b9
wRTC:: ds 8 ; d4ba
wRTC:: ds 4 ; d4ba
ds 4
wDST:: ; d4c2
; bit 7: dst
db