Merge pull request #44 from yenatch/master

CheckSurfOW
This commit is contained in:
Bryan Bishop 2012-11-24 06:21:38 -08:00
commit 947bb5eeb2
3 changed files with 765 additions and 22 deletions

View File

@ -1343,6 +1343,7 @@ MAP_MR_POKEMONS_HOUSE EQU $0a
MAP_ROUTE_31_VIOLET_GATE EQU $0b
; item constants
NO_ITEM EQU $00
MASTER_BALL EQU $01
ULTRA_BALL EQU $02
BRIGHTPOWDER EQU $03
@ -3345,4 +3346,106 @@ callchannel: MACRO
ENDM
endchannel: MACRO
db $ff
ENDM
ENDM
; specials
NUM_SPECIALS EQU $a8
SPECIAL_UPDATESPRITETILES EQU $0038
SPECIAL_WAITSFX EQU $003b
SPECIAL_BIKESURFMUSIC EQU $003c
SPECIAL_LOADFACESTEP EQU $003f
SPECIAL_SNORLAXAWAKE EQU $0060
SPECIAL_GAMEBOYCHECK EQU $0066
SPECIAL_TRAINERHOUSE EQU $0067
SPECIAL_RUSTLETREE EQU $006a
SPECIAL_ODDEGG EQU $007d
SPECIAL_MOVETUTOR EQU $0083
SPECIAL_OMANYTECHAMBER EQU $0084
SPECIAL_RUINCHAMBERWALL EQU $0087
SPECIAL_HOOHCHAMBER EQU $008d
SPECIAL_CELEBI EQU $008f
SPECIAL_AFTERCELEBI EQU $0090
SPECIAL_POKESEER EQU $0091
SPECIAL_DRATINI EQU $0094
SPECIAL_BEASTSCHECK EQU $0096
SPECIAL_MONCHECK EQU $0097
; battle scripts
BATTLE_FILLPP EQU $05
BATTLE_FILLSTATS EQU $0C
BATTLE_FILLMOVES EQU $1B
BATTLE_GETUNOWNLETTER EQU $2D
; vars
NUM_VARS EQU $1b
VAR_MOVEMENT EQU $08
; player states
PLAYER_NORMAL EQU $00
PLAYER_BIKE EQU $01
PLAYER_SLIP EQU $02
PLAYER_SURF EQU $04
PLAYER_SURF_PIKA EQU $08
; battle
MAX_LEVEL EQU 100
NUM_MOVES EQU 4
; move struct
MOVE_LENGTH EQU 7
MOVE_ANIM EQU 0
MOVE_EFFECT EQU 1
MOVE_POWER EQU 2
MOVE_TYPE EQU 3
MOVE_ACC EQU 4
MOVE_PP EQU 5
MOVE_CHANCE EQU 6
; stat constants
NUM_STATS EQU 6
STAT_HP EQU 1
STAT_ATK EQU 2
STAT_DEF EQU 3
STAT_SPD EQU 4
STAT_SATK EQU 5
STAT_SDEF EQU 6
STAT_MIN_NORMAL EQU 5
STAT_MIN_HP EQU 10
; shiny dvs
ATKDEFDV_SHINY EQU $EA
SPDSPCDV_SHINY EQU $AA
; battle classes
WILD_BATTLE EQU $00
TRAINER_BATTLE EQU $02
; battle types
BATTLETYPE_NORMAL EQU $00
BATTLETYPE_TUTORIAL EQU $03
BATTLETYPE_FISH EQU $04
BATTLETYPE_ROAMING EQU $05
BATTLETYPE_SHINY EQU $07
BATTLETYPE_TREE EQU $08
BATTLETYPE_FORCEITEM EQU $0a
BATTLETYPE_SUICUNE EQU $0c

511
main.asm

File diff suppressed because it is too large Load Diff

171
wram.asm
View File

@ -278,6 +278,25 @@ SECTION "linkbattle",BSS[$c2dc]
InLinkBattle: ; 0xc2dc
ds 1 ; nonzero when in a link battle
SECTION "tiles",BSS[$c2fa]
TileDown: ; c2fa
ds 1
TileUp: ; c2fb
ds 1
TileLeft: ; c2fc
ds 1
TileRight: ; c2fd
ds 1
TilePermissions: ; c2fe
; set if tile behavior prevents
; you from walking in that direction
; bit 3: down
; bit 2: up
; bit 1: left
; bit 0: right
ds 1
SECTION "BattleMons",BSS[$c62a]
BattleMonSpecies: ; c62a
@ -338,6 +357,10 @@ BattleMonSpclAtk: ; c646
BattleMonSpclDef: ; c648
ds 2
SECTION "prng",BSS[$c6e5]
LinkBattleRNCount: ; c6e5
ds 1
SECTION "Engine",BSS[$cfcc]
Options: ; cfcc
; bit 0-2: number of frames to delay when printing text
@ -347,10 +370,14 @@ Options: ; cfcc
; bit 6: battle style shift/set
; bit 7: battle scene off/on
ds 1
ds 1
TextBoxFrame: ; cfce
; bits 0-2: textbox frame 0-7
ds 1
ds 1
GBPrinter: ; cfd0
; bit 0-6: brightness
@ -365,6 +392,16 @@ Options2: ; cfd1
; bit 1: menu account off/on
ds 1
ds 161
StringBuffer1: ; d073
ds 19
StringBuffer2: ; d086
ds 19
StringBuffer3: ; d099
ds 19
ds 65
VramState: ; d0ed
; bit 0: overworld sprite updating on/off
@ -373,13 +410,36 @@ VramState: ; d0ed
; flickers when climbing waterfall
ds 1
ds 26
CurPartySpecies: ; d108
ds 1
CurPartyMon: ; d109
; contains which monster in your party
; contains which monster in a party
; is being dealt with at the moment
; 0-5
ds 1
ds 57
CurPartyLevel: ; d143
ds 1
ds 166
Buffer1:
MagikarpLength:
MagikarpLengthHi: ; d1ea
ds 1
Buffer2:
MagikarpLengthLo: ; d1eb
ds 1
SECTION "prng2",BSS[$d1fa]
LinkBattleRNs: ; d1fa
ds 10
SECTION "EnemyMon",BSS[$d204]
EnemyMonSpecies: ; d204
@ -447,7 +507,15 @@ EnemyMonSpclAtk: ; d220
EnemyMonSpclDef: ; d222
ds 2
SECTION "OtherTrainerClass",BSS[$d22f]
SECTION "Battle",BSS[$d22d]
BattleClass: ; d22d
; 0: wild battle
; 1:
; 2: trainer battle
ds 1
ds 1
OtherTrainerClass: ; 0xd22f
; class (Youngster, Bug Catcher, etc.) of opposing trainer
@ -455,8 +523,19 @@ OtherTrainerClass: ; 0xd22f
ds 1
BattleType: ; 0xd230
; 00 normal
; 08 headbutt/rock smash. probably bit 3
; $00 normal
; $01
; $02
; $03 dude
; $04 fishing
; $05 roaming
; $06
; $07 shiny
; $08 headbutt/rock smash
; $09
; $0a force Item1
; $0b
; $0c suicune
ds 1
OtherTrainerID: ; 0xd231
@ -464,6 +543,16 @@ OtherTrainerID: ; 0xd231
; (Joey, Mikey, Albert, etc.)
ds 1
ds 2
UnownLetter: ; d234
ds 1
ds 1
CurBaseStats: ; d236
ds 32
SECTION "TimeOfDay",BSS[$d269]
TimeOfDay: ; 0xd269
@ -1002,15 +1091,37 @@ OTPartyMon5Nickname: ; d416
OTPartyMon6Nickname: ; d421
ds 11
SECTION "Player",BSS[$d47b]
PlayerID: ; 0xd47b
ds 2
PlayerName: ; 0xd47d
ds 11
ds 46
; init time set at newgame
StartDay: ; d4b6
ds 1
StartHour: ; d4b7
ds 1
StartMinute: ; d4b8
ds 1
StartSecond: ; d4b9
ds 1
ds 17
CurDay: ; d4cb
ds 1
ds 12
PlayerSprite: ; 0xd4d8
ds 1
ds 5
PlayerDirection: ; d4de
; uses bits 2 and 3 / $0c / %00001100
; %00 down
@ -1572,6 +1683,16 @@ PartyMon5Nickname: ; 0xde6d
PartyMon6Nickname: ; 0xde78
ds 11
SECTION "Pokedex",BSS[$de99]
PokedexSeen: ; de99
ds 32
PokedexCaught: ; deb9
ds 32
UnownDex: ; ded9
ds 26
UnownUnlockedGroups: ; def3
ds 1
SECTION "Breeding",BSS[$def5]
DaycareMan: ; def5
; bit 7: active
@ -1621,3 +1742,43 @@ EggStats:
EggSpecies: ; df7b
ds 1
ds 31
SECTION "RoamMons",BSS[$dfcf]
RoamMon1Species: ; dfcf
ds 1
RoamMon1Level: ; dfd0
ds 1
RoamMon1MapGroup: ; dfd1
ds 1
RoamMon1MapNumber: ; dfd2
ds 1
RoamMon1CurHP: ; dfd3
ds 1
RoamMon1DVs: ; dfd4
ds 2
RoamMon2Species: ; dfd6
ds 1
RoamMon2Level: ; dfd7
ds 1
RoamMon2MapGroup: ; dfd8
ds 1
RoamMon2MapNumber: ; dfd9
ds 1
RoamMon2CurHP: ; dfda
ds 1
RoamMon2DVs: ; dfdb
ds 2
RoamMon3Species: ; dfdd
ds 1
RoamMon3Level: ; dfde
ds 1
RoamMon3MapGroup: ; dfdf
ds 1
RoamMon3MapNumber: ; dfe0
ds 1
RoamMon3CurHP: ; dfe1
ds 1
RoamMon3DVs: ; dfe2
ds 2