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

Prefix wram labels with w, part 2.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
engine/events/special.asm
View File

@@ -4,13 +4,13 @@ Special_GiveShuckle: ; 7305
; Adding to the party.
xor a
ld [MonType], a
ld [wMonType], a
; Level 15 Shuckle.
ld a, SHUCKLE
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld a, 15
ld [CurPartyLevel], a
ld [wCurPartyLevel], a
predef TryAddMonToParty
jr nc, .NotGiven
@@ -21,35 +21,35 @@ Special_GiveShuckle: ; 7305
; Holding a Berry.
ld bc, PARTYMON_STRUCT_LENGTH
ld a, [PartyCount]
ld a, [wPartyCount]
dec a
push af
push bc
ld hl, PartyMon1Item
ld hl, wPartyMon1Item
call AddNTimes
ld [hl], BERRY
pop bc
pop af
; OT ID.
ld hl, PartyMon1ID
ld hl, wPartyMon1ID
call AddNTimes
ld a, HIGH(MANIA_OT_ID)
ld [hli], a
ld [hl], LOW(MANIA_OT_ID)
; Nickname.
ld a, [PartyCount]
ld a, [wPartyCount]
dec a
ld hl, PartyMonNicknames
ld hl, wPartyMonNicknames
call SkipNames
ld de, SpecialShuckleNick
call CopyName2
; OT.
ld a, [PartyCount]
ld a, [wPartyCount]
dec a
ld hl, PartyMonOT
ld hl, wPartyMonOT
call SkipNames
ld de, SpecialShuckleOT
call CopyName2
@@ -58,12 +58,12 @@ Special_GiveShuckle: ; 7305
ld hl, wDailyFlags
set 5, [hl] ; ENGINE_SHUCKLE_GIVEN
ld a, 1
ld [ScriptVar], a
ld [wScriptVar], a
ret
.NotGiven:
xor a
ld [ScriptVar], a
ld [wScriptVar], a
ret
SpecialShuckleOT:
@@ -75,12 +75,12 @@ Special_ReturnShuckle: ; 737e
farcall SelectMonFromParty
jr c, .refused
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
cp SHUCKLE
jr nz, .DontReturn
ld a, [CurPartyMon]
ld hl, PartyMon1ID
ld a, [wCurPartyMon]
ld hl, wPartyMon1ID
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -93,8 +93,8 @@ Special_ReturnShuckle: ; 737e
jr nz, .DontReturn
; OT
ld a, [CurPartyMon]
ld hl, PartyMonOT
ld a, [wCurPartyMon]
ld hl, wPartyMonOT
call SkipNames
ld de, SpecialShuckleOT
.CheckOT:
@@ -110,8 +110,8 @@ Special_ReturnShuckle: ; 737e
.done
farcall CheckCurPartyMonFainted
jr c, .fainted
ld a, [CurPartyMon]
ld hl, PartyMon1Happiness
ld a, [wCurPartyMon]
ld hl, wPartyMon1Happiness
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
ld a, [hl]
@@ -123,36 +123,36 @@ Special_ReturnShuckle: ; 737e
callfar RemoveMonFromPartyOrBox
ld a, SHUCKIE_RETURNED
.HappyToStayWithYou:
ld [ScriptVar], a
ld [wScriptVar], a
ret
.refused
ld a, SHUCKIE_REFUSED
ld [ScriptVar], a
ld [wScriptVar], a
ret
.DontReturn:
xor a ; SHUCKIE_WRONG_MON
ld [ScriptVar], a
ld [wScriptVar], a
ret
.fainted
ld a, SHUCKIE_FAINTED
ld [ScriptVar], a
ld [wScriptVar], a
ret
Special_BillsGrandfather: ; 73f7
farcall SelectMonFromParty
jr c, .cancel
ld a, [CurPartySpecies]
ld [ScriptVar], a
ld a, [wCurPartySpecies]
ld [wScriptVar], a
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
jp CopyPokemonName_Buffer1_Buffer3
.cancel
xor a
ld [ScriptVar], a
ld [wScriptVar], a
ret
Special_YoungerHaircutBrother: ; 7413
@@ -171,7 +171,7 @@ MassageOrHaircut: ; 7420
farcall SelectMonFromParty
pop hl
jr c, .nope
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
cp EGG
jr z, .egg
push hl
@@ -197,19 +197,19 @@ MassageOrHaircut: ; 7420
.ok
inc hl
ld a, [hli]
ld [ScriptVar], a
ld [wScriptVar], a
ld c, [hl]
call ChangeHappiness
ret
.nope
xor a
ld [ScriptVar], a
ld [wScriptVar], a
ret
.egg
ld a, 1
ld [ScriptVar], a
ld [wScriptVar], a
ret
Data_YoungerHaircutBrother: ; 7459
@@ -226,8 +226,8 @@ Data_DaisyMassage: ; 746b
db $ff, 2, HAPPINESS_MASSAGE ; 99.6% chance
CopyPokemonName_Buffer1_Buffer3: ; 746e
ld hl, StringBuffer1
ld de, StringBuffer3
ld hl, wStringBuffer1
ld de, wStringBuffer3
ld bc, MON_NAME_LENGTH
jp CopyBytes