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

changed labels and added comments

Browse Source
This commit is contained in:
JimB16 2015-08-23 15:09:56 +02:00
parent 9772c722ac
commit 3922ad2c3c
8 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
battle/core.asm
View File

@ -3280,7 +3280,7 @@ Function3d4c3: ; 3d4c3
call Function3d7a0 call Function3d7a0
call NewEnemyMonStatus call NewEnemyMonStatus
call ResetEnemyStatLevels call ResetEnemyStatLevels
call Function3d7c7 call Function_SetEnemyPkmnAndSendOutAnimation
call BreakAttraction call BreakAttraction
call Function3d57a call Function3d57a
ret ret
@ -3299,8 +3299,8 @@ Function3d4e1: ; 3d4e1
call Function3d74b call Function3d74b
push af push af
call Function3d7a0 call Function3d7a0
call Function3d7b8 call Function_BattleTextEnemySentOut
call Function3d7c7 call Function_SetEnemyPkmnAndSendOutAnimation
pop af pop af
ret c ret c
xor a xor a
@ -3323,8 +3323,8 @@ Function3d517: ; 3d517
ld a, 1 ld a, 1
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
call Function3d7a0 call Function3d7a0
call Function3d7b8 call Function_BattleTextEnemySentOut
jp Function3d7c7 jp Function_SetEnemyPkmnAndSendOutAnimation
; 3d533 ; 3d533
Function3d533: ; 3d533 Function3d533: ; 3d533
@ -3697,14 +3697,14 @@ Function3d7a0: ; 3d7a0
jp Function3ee27 jp Function3ee27
; 3d7b8 ; 3d7b8
Function3d7b8: ; 3d7b8 Function_BattleTextEnemySentOut: ; 3d7b8
callab Battle_GetTrainerName callab Battle_GetTrainerName
ld hl, BattleText_0x80af8 ld hl, BattleText_EnemySentOut
call StdBattleTextBox call StdBattleTextBox
jp WaitBGMap jp WaitBGMap
; 3d7c7 ; 3d7c7
Function3d7c7: ; 3d7c7 Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld [CurSpecies], a ld [CurSpecies], a

2
engine/specials.asm
View File

@ -144,7 +144,7 @@ SpecialsPointers:: ; c029
add_special Function17021d add_special Function17021d
add_special Function170b44 add_special Function170b44
add_special Function11ba38 add_special Function11ba38
add_special Function170bd3 add_special SpecialCheckForBattleTowerRules
add_special Function117656 add_special Function117656
add_special Reset add_special Reset
add_special Function1011f1 add_special Function1011f1

52
main.asm
View File

@ -60873,12 +60873,12 @@ UnknownText_0x8b1fc: ; 0x8b1fc
db "@" db "@"
; 0x8b201 ; 0x8b201
Function8b201: ; 8b201 CheckForBattleTowerRules: ; 8b201
ld hl, StringBuffer2 ld hl, StringBuffer2
ld [hl], "3" ld [hl], "3"
inc hl inc hl
ld [hl], "@" ld [hl], "@"
ld de, Unknown_8b215 ld de, CheckForBattleTowerRules_FunctionsText
call Function8b25b call Function8b25b
ret z ret z
call Function8b231 call Function8b231
@ -60886,29 +60886,29 @@ Function8b201: ; 8b201
ret ret
; 8b215 ; 8b215
Unknown_8b215: ; 8b215 CheckForBattleTowerRules_FunctionsText: ; 8b215
db 4 db 4
dw Unknown_8b21a dw CheckForBattleTowerRules_Functions
dw Unknown_8b222 dw CheckForBattleTowerRules_Text
Unknown_8b21a: ; 8b21a CheckForBattleTowerRules_Functions: ; 8b21a
dw Function8b2da dw Function_PartyCountEq3
dw Function8b2e2 dw Function8b2e2
dw Function8b32a dw Function8b32a
dw Function8b331 dw Function_HasPartyAnEgg
; 8b222 ; 8b222
Unknown_8b222: ; 8b222 CheckForBattleTowerRules_Text: ; 8b222
dw UnknownText_0x8b22c dw JumpText_ExcuseMeYoureNotReady
dw UnknownText_0x8b247 dw JumbText_OnlyThreePkmnMayBeEntered
dw UnknownText_0x8b24c dw JumpText_ThePkmnMustAllBeDifferentKinds
dw UnknownText_0x8b251 dw JumpText_ThePkmnMustNotHoldTheSameItems
dw UnknownText_0x8b256 dw JumpText_YouCantTakeAnEgg
; 8b22c ; 8b22c
UnknownText_0x8b22c: ; 0x8b22c JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
; Excuse me. You're not ready. ; Excuse me. You're not ready.
text_jump UnknownText_0x1c5944 text_jump Text_ExcuseMeYoureNotReady
db "@" db "@"
; 0x8b231 ; 0x8b231
@ -60936,27 +60936,27 @@ UnknownText_0x8b242: ; 0x8b242
db "@" db "@"
; 0x8b247 ; 0x8b247
UnknownText_0x8b247: ; 0x8b247 JumbText_OnlyThreePkmnMayBeEntered: ; 0x8b247
; Only three #MON may be entered. ; Only three #MON may be entered.
text_jump UnknownText_0x1c59c3 text_jump Text_OnlyThreePkmnMayBeEntered
db "@" db "@"
; 0x8b24c ; 0x8b24c
UnknownText_0x8b24c: ; 0x8b24c JumpText_ThePkmnMustAllBeDifferentKinds: ; 0x8b24c
; The @ #MON must all be different kinds. ; The @ #MON must all be different kinds.
text_jump UnknownText_0x1c59e5 text_jump Text_ThePkmnMustAllBeDifferentKinds
db "@" db "@"
; 0x8b251 ; 0x8b251
UnknownText_0x8b251: ; 0x8b251 JumpText_ThePkmnMustNotHoldTheSameItems: ; 0x8b251
; The @ #MON must not hold the same items. ; The @ #MON must not hold the same items.
text_jump UnknownText_0x1c5a13 text_jump Text_ThePkmnMustNotHoldTheSameItems
db "@" db "@"
; 0x8b256 ; 0x8b256
UnknownText_0x8b256: ; 0x8b256 JumpText_YouCantTakeAnEgg: ; 0x8b256
; You can't take an EGG! ; You can't take an EGG!
text_jump UnknownText_0x1c5a42 text_jump Text_YouCantTakeAnEgg
db "@" db "@"
; 0x8b25b ; 0x8b25b
@ -61085,7 +61085,7 @@ Function8b2c1: ; 8b2c1
ret ret
; 8b2da ; 8b2da
Function8b2da: ; 8b2da Function_PartyCountEq3: ; 8b2da
ld a, [PartyCount] ld a, [PartyCount]
cp 3 cp 3
ret z ret z
@ -61169,7 +61169,7 @@ Function8b32a: ; 8b32a
ret ret
; 8b331 ; 8b331
Function8b331: ; 8b331 Function_HasPartyAnEgg: ; 8b331
ld hl, PartyCount ld hl, PartyCount
ld a, [hli] ld a, [hli]
ld c, a ld c, a

4
maps/BattleTower1F.asm
View File

@ -73,7 +73,7 @@ UnknownScript_0x9e3fc:
UnknownScript_0x9e40f: UnknownScript_0x9e40f:
writebyte $1a writebyte $1a
special Function170687 special Function170687
special Function170bd3 special SpecialCheckForBattleTowerRules
if_not_equal $0, UnknownScript_0x9e4bb if_not_equal $0, UnknownScript_0x9e4bb
writetext UnknownText_0x9ef1f writetext UnknownText_0x9ef1f
yesorno yesorno
@ -190,7 +190,7 @@ UnknownScript_0x9e4ea:
writebyte $19 writebyte $19
special Function170687 special Function170687
if_not_equal $0, UnknownScript_0x9e549 if_not_equal $0, UnknownScript_0x9e549
special Function170bd3 special SpecialCheckForBattleTowerRules
if_not_equal $0, UnknownScript_0x9e4bb if_not_equal $0, UnknownScript_0x9e4bb
writebyte $5 writebyte $5
special Function170687 special Function170687

4
misc/mobile_45.asm
View File

@ -24237,8 +24237,8 @@ Function170bd2: ; 170bd2
ret ret
; 170bd3 ; 170bd3
Function170bd3: ; 170bd3 SpecialCheckForBattleTowerRules: ; 170bd3
callba Function8b201 callba CheckForBattleTowerRules
jr c, .asm_170bde jr c, .asm_170bde
xor a xor a
jr .asm_170be0 jr .asm_170be0

2
text/battle.asm
View File

@ -271,7 +271,7 @@ BattleText_0x80aca: ; 0x80aca
done done
; 0x80af8 ; 0x80af8
BattleText_0x80af8: ; 0x80af8 BattleText_EnemySentOut: ; 0x80af8
text "<ENEMY>" text "<ENEMY>"
line "sent out" line "sent out"
cont "@" cont "@"

10
text/common_4.asm
View File

@ -1262,7 +1262,7 @@ UnknownText_0x1c5937: ; 0x1c5937
done done
; 0x1c5944 ; 0x1c5944
UnknownText_0x1c5944: ; 0x1c5944 Text_ExcuseMeYoureNotReady: ; 0x1c5944
text "Excuse me." text "Excuse me."
line "You're not ready." line "You're not ready."
para "" para ""
@ -1289,14 +1289,14 @@ UnknownText_0x1c59a3: ; 0x1c59a3
done done
; 0x1c59c3 ; 0x1c59c3
UnknownText_0x1c59c3: ; 0x1c59c3 Text_OnlyThreePkmnMayBeEntered: ; 0x1c59c3
text "Only three #MON" text "Only three #MON"
line "may be entered." line "may be entered."
para "" para ""
done done
; 0x1c59e5 ; 0x1c59e5
UnknownText_0x1c59e5: ; 0x1c59e5 Text_ThePkmnMustAllBeDifferentKinds: ; 0x1c59e5
text "The @" text "The @"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text " #MON" text " #MON"
@ -1306,7 +1306,7 @@ UnknownText_0x1c59e5: ; 0x1c59e5
done done
; 0x1c5a13 ; 0x1c5a13
UnknownText_0x1c5a13: ; 0x1c5a13 Text_ThePkmnMustNotHoldTheSameItems: ; 0x1c5a13
text "The @" text "The @"
text_from_ram StringBuffer2 text_from_ram StringBuffer2
text " #MON" text " #MON"
@ -1316,7 +1316,7 @@ UnknownText_0x1c5a13: ; 0x1c5a13
done done
; 0x1c5a42 ; 0x1c5a42
UnknownText_0x1c5a42: ; 0x1c5a42 Text_YouCantTakeAnEgg: ; 0x1c5a42
text "You can't take an" text "You can't take an"
line "EGG!" line "EGG!"
para "" para ""