pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source
This commit is contained in:
Rangi 2018-05-06 22:45:07 -04:00
commit 8acc8d6e30
23 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/script_constants.asm
View File

@ -22,7 +22,7 @@ NUM_MEM_BUFFERS EQU const_value
const HAVE_AMOUNT ; 1
const HAVE_LESS ; 2
; checkpokeitem return values
; checkpokemail return values
const_def
const POKEMAIL_WRONG_MAIL ; 0
const POKEMAIL_CORRECT ; 1

2
constants/sprite_constants.asm
View File

@ -1,5 +1,5 @@
; sprite ids
; OverworldSprites indexes (see data/sprites.asm)
; OverworldSprites indexes (see data/sprites/sprites.asm)
const_def
const SPRITE_NONE ; 00
const SPRITE_CHRIS ; 01

2
data/moves/animations.asm
View File

@ -303,7 +303,7 @@ BattleAnim_SweetScent2: ; c929c
anim_ret
; c92c1
BattleAnim_ThrowPokeBall
BattleAnim_ThrowPokeBall:
anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall
anim_if_param_equal MASTER_BALL, .MasterBall
anim_if_param_equal ULTRA_BALL, .UltraBall

1
data/wild/flee_mons.asm
View File

@ -31,6 +31,5 @@ OftenFleeMons: ; 3c5a8
AlwaysFleeMons: ; 3c5b1
db RAIKOU
db ENTEI
; db SUICUNE
db -1
; 3c5b4

2
docs/bugs_and_glitches.md
View File

@ -1122,7 +1122,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
```asm
.Cry: ; 40340
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
call PlayMonCry
ret
```

4
docs/event_commands.md
View File

@ -99,9 +99,9 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$2E`: <code>giveegg <i>mon_id</i>, <i>level</i></code>
## `$2F`: <code>givepokeitem <i>pointer</i></code>
## `$2F`: <code>givepokemail <i>pointer</i></code>
## `$30`: <code>checkpokeitem <i>pointer</i></code>
## `$30`: <code>checkpokemail <i>pointer</i></code>
## `$31`: <code>checkevent <i>event_flag</i></code>

2
engine/battle/core.asm
View File

@ -6451,7 +6451,7 @@ LoadEnemyMon: ; 3e8eb
.InitRoamHP:
; HP only uses the lo byte in the RoamMon struct since
; Raikou/Entei/Suicune will have < 256 hp at level 40
; Raikou and Entei will have < 256 hp at level 40
ld a, [wEnemyMonHP + 1]
ld [hl], a
jr .Moves

28
engine/events/std_scripts.asm
View File

@ -240,7 +240,7 @@ SmashRockScript:
PokecenterSignScript:
farjumptext PokecenterSignText
MartSignScript
MartSignScript:
farjumptext MartSignText
DayToTextScript:
@ -331,30 +331,30 @@ BugContestResultsScript:
verbosegiveitem BERRY
iffalse BugContestResults_NoRoomForBerry
BugContestResults_DidNotWin
BugContestResults_DidNotWin:
farwritetext ContestResults_DidNotWinText
buttonsound
jump BugContestResults_FinishUp
; 0xbc2b1
BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1
BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1
farwritetext ContestResults_JoinUsNextTimeText
buttonsound
BugContestResults_FinishUp
BugContestResults_FinishUp:
checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
iffalse BugContestResults_DidNotLeaveMons
farwritetext ContestResults_ReturnPartyText
waitbutton
special ContestReturnMons
BugContestResults_DidNotLeaveMons
BugContestResults_DidNotLeaveMons:
special CheckPartyFullAfterContest
ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
; BUGCONTEST_BOXED_MON
farwritetext ContestResults_PartyFullText
waitbutton
BugContestResults_CleanUp
BugContestResults_CleanUp:
closetext
setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
@ -383,7 +383,7 @@ BugContestResults_CleanUp
end
; 0xbc31e
BugContestResults_FirstPlace ; 0xbc31e
BugContestResults_FirstPlace: ; 0xbc31e
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
itemtotext SUN_STONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
@ -393,7 +393,7 @@ BugContestResults_FirstPlace ; 0xbc31e
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc332
BugContestResults_SecondPlace ; 0xbc332
BugContestResults_SecondPlace: ; 0xbc332
itemtotext EVERSTONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
@ -402,7 +402,7 @@ BugContestResults_SecondPlace ; 0xbc332
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc343
BugContestResults_ThirdPlace ; 0xbc343
BugContestResults_ThirdPlace: ; 0xbc343
itemtotext GOLD_BERRY, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton
@ -411,35 +411,35 @@ BugContestResults_ThirdPlace ; 0xbc343
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc354
BugContestResults_NoRoomForSunStone ; 0xbc354
BugContestResults_NoRoomForSunStone: ; 0xbc354
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc35f
BugContestResults_NoRoomForEverstone ; 0xbc35f
BugContestResults_NoRoomForEverstone: ; 0xbc35f
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc36a
BugContestResults_NoRoomForGoldBerry ; 0xbc36a
BugContestResults_NoRoomForGoldBerry: ; 0xbc36a
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
jump BugContestResults_ReturnAfterWinnersPrize
; 0xbc375
BugContestResults_NoRoomForBerry ; 0xbc375
BugContestResults_NoRoomForBerry: ; 0xbc375
farwritetext BugContestPrizeNoRoomText
buttonsound
setevent EVENT_CONTEST_OFFICER_HAS_BERRY
jump BugContestResults_DidNotWin
; 0xbc380
BugContestResults_CopyContestantsToResults ; 0xbc380
BugContestResults_CopyContestantsToResults: ; 0xbc380
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue .skip1
clearevent EVENT_BUG_CATCHING_CONTESTANT_1B

4
engine/overworld/map_objects.asm
View File

@ -163,12 +163,12 @@ Function4440: ; 4440
add hl, bc
bit INVISIBLE, [hl]
jr nz, SetFacingStanding
asm_4448
asm_4448:
ld de, ObjectActionPairPointers + 2 ; use second column
jr _HandleObjectAction
; 444d
_HandleObjectAction
_HandleObjectAction:
; call [4 * wObjectStructs[ObjInd, OBJECT_ACTION] + de]
ld hl, OBJECT_ACTION
add hl, bc

12
engine/overworld/scripting.asm
View File

@ -112,8 +112,8 @@ ScriptCommandTable:
dw Script_checkpoke ; 2c
dw Script_givepoke ; 2d
dw Script_giveegg ; 2e
dw Script_givepokeitem ; 2f
dw Script_checkpokeitem ; 30
dw Script_givepokemail ; 2f
dw Script_checkpokemail ; 30
dw Script_checkevent ; 31
dw Script_clearevent ; 32
dw Script_setevent ; 33
@ -2019,7 +2019,7 @@ Script_stringtotext:
ld de, wStringBuffer2
jp ConvertMemToText
Script_givepokeitem:
Script_givepokemail:
; script command 0x2f
; parameters: pointer
@ -2037,10 +2037,10 @@ Script_givepokeitem:
ld a, [wScriptBank]
call FarCopyBytes
pop bc
farcall GivePokeItem
farcall GivePokeMail
ret
Script_checkpokeitem:
Script_checkpokemail:
; script command 0x30
; parameters: pointer
@ -2050,7 +2050,7 @@ Script_checkpokeitem:
ld d, a
ld a, [wScriptBank]
ld b, a
farcall CheckPokeItem
farcall CheckPokeMail
ret
Script_giveitem:

8
engine/overworld/wildmons.asm
View File

@ -417,7 +417,7 @@ _WaterWildmonLookup: ; 2a21d
ld bc, WATER_WILDDATA_LENGTH
jr _NormalWildmonOK
_JohtoWildmonCheck
_JohtoWildmonCheck:
call IsInJohto
and a
ret z
@ -425,7 +425,7 @@ _JohtoWildmonCheck
ld l, e
ret
_SwarmWildmonCheck
_SwarmWildmonCheck:
call CopyCurrMapDE
push hl
ld hl, wSwarmFlags
@ -460,11 +460,11 @@ _SwarmWildmonCheck
scf
ret
_NoSwarmWildmon
_NoSwarmWildmon:
and a
ret
_NormalWildmonOK
_NormalWildmonOK:
call CopyCurrMapDE
jr LookUpWildmonsForMapDE
; 2a27f

2
engine/phone/phone.asm
View File

@ -604,7 +604,7 @@ Phone_StartRinging: ; 9033f
HangUp_Wait20Frames: ; 90355
jr Phone_Wait20Frames
Phone_Wait20Frames
Phone_Wait20Frames:
ld c, 20
call DelayFrames
farcall PhoneRing_CopyTilemapAtOnce

2
engine/pokemon/breeding.asm
View File

@ -24,7 +24,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [wTempMonDVs], a
ld a, [wBreedMon2DVs + 1]
ld [wTempMonDVs + 1], a
ld a, $3
ld a, TEMPMON
ld [wMonType], a
predef GetGender
pop bc

2
engine/pokemon/evolve.asm
View File

@ -18,7 +18,7 @@ EvolveAfterBattle: ; 421e6
push hl
EvolveAfterBattle_MasterLoop
EvolveAfterBattle_MasterLoop:
ld hl, wCurPartyMon
inc [hl]

4
engine/pokemon/mail.asm
View File

@ -124,7 +124,7 @@ GetMailboxCount: ; 44648
jp CloseSRAM
; 44654
CheckPokeItem:: ; 44654
CheckPokeMail:: ; 44654
push bc
push de
farcall SelectMonFromParty
@ -194,7 +194,7 @@ CheckPokeItem:: ; 44654
; 446cc
GivePokeItem:: ; 446cc
GivePokeMail:: ; 446cc
ld a, [wPartyCount]
dec a
push af

2
macros/legacy.asm
View File

@ -51,6 +51,8 @@ reloadmapmusic EQUS "dontrestartmapmusic"
resetfuncs EQUS "endall"
storetext EQUS "battletowertext"
displaylocation EQUS "landmarktotext"
givepokeitem EQUS "givepokemail"
checkpokeitem EQUS "checkpokemail"
; macros/scripts/maps.asm

14
macros/scripts/events.asm
View File

@ -1,4 +1,4 @@
; ScriptCommandTable indexes (see engine/scripting.asm)
; ScriptCommandTable indexes (see engine/overworld/scripting.asm)
enum_start
enum scall_command ; $00
@ -315,15 +315,15 @@ giveegg: MACRO
db \2 ; level
ENDM
enum givepokeitem_command ; $2f
givepokeitem: MACRO
db givepokeitem_command
enum givepokemail_command ; $2f
givepokemail: MACRO
db givepokemail_command
dw \1 ; pointer
ENDM
enum checkpokeitem_command ; $30
checkpokeitem: MACRO
db checkpokeitem_command
enum checkpokemail_command ; $30
checkpokemail: MACRO
db checkpokemail_command
dw \1 ; pointer
ENDM

2
macros/scripts/movement.asm
View File

@ -1,4 +1,4 @@
; MovementPointers indexes (see engine/movement.asm)
; MovementPointers indexes (see engine/overworld/movement.asm)
enum_start
; Directional movements

2
maps/OaksLab.asm
View File

@ -223,7 +223,7 @@ OaksLabPoster2Text:
line "manner."
done
OaksLabTrashcanText
OaksLabTrashcanText:
text "There's nothing in"
line "here…"
done

2
maps/Route31.asm
View File

@ -195,7 +195,7 @@ Route31MailRecipientScript:
.TryGiveKenya:
writetext Text_Route31SleepyManGotMail
buttonsound
checkpokeitem ReceivedSpearowMailText
checkpokemail ReceivedSpearowMailText
ifequal POKEMAIL_WRONG_MAIL, .WrongMail
ifequal POKEMAIL_REFUSED, .Refused
ifequal POKEMAIL_NO_MAIL, .NoMail

2
maps/Route35GoldenrodGate.asm
View File

@ -29,7 +29,7 @@ RandyScript:
playsound SFX_KEY_ITEM
waitsfx
givepoke SPEAROW, 10, NO_ITEM, TRUE, GiftSpearowName, GiftSpearowOTName
givepokeitem GiftSpearowMail
givepokemail GiftSpearowMail
setevent EVENT_GOT_KENYA
.alreadyhavekenya
writetext UnknownText_0x69ed6

4
mobile/mobile_40.asm
View File

@ -2320,7 +2320,7 @@ Function100eb4: ; 100eb4
and a
call Function100eca
asm_100eb8
asm_100eb8:
ld hl, wcd68
inc [hl]
ld a, [hl]
@ -2332,7 +2332,7 @@ asm_100eb8
Function100ec4: ; 100ec4
ret
Function100ec5
Function100ec5:
ld hl, wcd67
inc [hl]
ret

2
mobile/mobile_42.asm
View File

@ -1293,7 +1293,7 @@ MobileTradeAnim_DisplayReceivedMon:
call MobileTradeAnim_MonDisplay_UpdateBGMap
ret
MobileTradeAnim_DisplayEggData
MobileTradeAnim_DisplayEggData:
call WaitTop
call MobileTradeAnim_ClearTilemap
ld a, HIGH(vBGMap1)