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

Merge pull request #125 from yenatch/master

Browse Source 
fishing encounter data
This commit is contained in:
Bryan Bishop
2013-03-22 10:18:05 -07:00
parent 66b74f2a36 87c36ebbc0
commit a238e4bd55
4 changed files with 558 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
constants.asm
View File

@@ -3249,6 +3249,8 @@ MUSIC_SUICUNE_BATTLE EQU 100
MUSIC_BATTLE_TOWER_LOBBY EQU 101 MUSIC_BATTLE_TOWER_LOBBY EQU 101
MUSIC_MOBILE_CENTER EQU 102 MUSIC_MOBILE_CENTER EQU 102
MUSIC_MAHOGANY_MART EQU 100 ; grandfathered from gold
; sound ; sound
_4CH1 EQU $c0 _4CH1 EQU $c0
_3CH1 EQU $80 _3CH1 EQU $80
@@ -3416,6 +3418,30 @@ BATTLETYPE_FORCEITEM EQU $0a
BATTLETYPE_SUICUNE EQU $0c BATTLETYPE_SUICUNE EQU $0c
; battle variables
BATTLE_VARS_SUBSTATUS1 EQU 0
BATTLE_VARS_SUBSTATUS2 EQU 1
BATTLE_VARS_SUBSTATUS3 EQU 2
BATTLE_VARS_SUBSTATUS4 EQU 3
BATTLE_VARS_SUBSTATUS5 EQU 4
BATTLE_VARS_SUBSTATUS1_OPP EQU 5
BATTLE_VARS_SUBSTATUS2_OPP EQU 6
BATTLE_VARS_SUBSTATUS3_OPP EQU 7
BATTLE_VARS_SUBSTATUS4_OPP EQU 8
BATTLE_VARS_SUBSTATUS5_OPP EQU 9
BATTLE_VARS_STATUS EQU 10
BATTLE_VARS_STATUS_OPP EQU 11
BATTLE_VARS_MOVE_ANIM EQU 12
BATTLE_VARS_MOVE_EFFECT EQU 13
BATTLE_VARS_MOVE_POWER EQU 14
BATTLE_VARS_MOVE_TYPE EQU 15
BATTLE_VARS_MOVE EQU 16
BATTLE_VARS_LAST_COUNTER_MOVE EQU 17
BATTLE_VARS_LAST_COUNTER_MOVE_OPP EQU 18
BATTLE_VARS_LAST_MOVE EQU 19
BATTLE_VARS_LAST_MOVE_OPP EQU 20
; joypad ; joypad
BUTTONS EQU %00010000 BUTTONS EQU %00010000
D_PAD EQU %00100000 D_PAD EQU %00100000

25
main.asm
View File

@@ -3415,7 +3415,21 @@ GetPartyLocation: ; 3927
jp AddNTimes jp AddNTimes
; 392d ; 392d
INCBIN "baserom.gbc",$392d,$3b86 - $392d INCBIN "baserom.gbc", $392d, $3985 - $392d
SetPlayerTurn: ; 3985
xor a
ld [hBattleTurn], a
ret
; 3989
SetEnemyTurn: ; 3989
ld a, 1
ld [hBattleTurn], a
ret
; 398e
INCBIN "baserom.gbc", $398e, $3b86 - $398e
LoadMusicByte: ; 3b86 LoadMusicByte: ; 3b86
; load music data into CurMusicByte ; load music data into CurMusicByte
@@ -11200,7 +11214,14 @@ INCBIN "baserom.gbc", $91fff, $92168 - $91fff
KantoMap: KantoMap:
INCBIN "baserom.gbc", $92168, $922d1 - $92168 INCBIN "baserom.gbc", $92168, $922d1 - $92168
INCBIN "baserom.gbc", $922d1, $93a31 - $922d1
INCBIN "baserom.gbc", $922d1, $92402 - $922d1
INCLUDE "stats/wild/fish.asm"
INCBIN "baserom.gbc", $926c7, $93a31 - $926c7
SECTION "bank25",DATA,BANK[$25] SECTION "bank25",DATA,BANK[$25]

502
stats/wild/fish.asm Normal file
View File

File diff suppressed because it is too large Load Diff

11
wram.asm
View File

@@ -565,10 +565,8 @@ EnemyDamageTaken: ; c684
BattleScriptBuffer: ; c68a BattleScriptBuffer: ; c68a
ds 40 ds 40
BattleScriptBufferLocLo: ; c6b2 BattleScriptBufferLoc: ; c6b2
ds 1 ds 2
BattleScriptBufferLocHi: ; c6b3
ds 1
ds 25 ds 25
@@ -1286,6 +1284,11 @@ Box13Name: ; dbe1
Box14Name: ; dbea Box14Name: ; dbea
ds 9 ds 9
SECTION "steps", BSS[$dc73]
StepCount: ; dc73
ds 1
PoisonStepCount: ; dc74
ds 1
SECTION "FlypointPermissions", BSS[$dca5] SECTION "FlypointPermissions", BSS[$dca5]
FlypointPerms: ; dca5 FlypointPerms: ; dca5