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

minor wram fixes

Browse Source
This commit is contained in:
yenatch
2013-04-08 02:15:08 -04:00
parent 1888e8ad6b
commit 5f4fcbfba2
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
battle/effect_commands.asm
View File

@@ -1976,7 +1976,7 @@ Function0x349f4: ; 349f4
Function0x34a2a: ; 34a2a Function0x34a2a: ; 34a2a
ld hl, OTPartyMon1Species2 ld hl, OTPartyMon1
ld a, [OTPartyCount] ld a, [OTPartyCount]
ld b, a ld b, a
ld c, $20 ld c, $20
@@ -3914,8 +3914,8 @@ Function0x355bd: ; 355bd
and a and a
ld hl, PartyMon1Species ld hl, PartyMon1Species
jr z, .asm_355cc jr z, .asm_355cc
ld hl, OTPartyMon1Species
ld hl, OTPartyMon1Species2
.asm_355cc .asm_355cc
ld a, [DefaultFlypoint] ld a, [DefaultFlypoint]
add hl, bc add hl, bc

1
constants.asm
View File

@@ -3357,6 +3357,7 @@ SPECIAL_MONCHECK EQU $0097
; predefs ; predefs
PREDEF_FILLPP EQU $05 PREDEF_FILLPP EQU $05
PREDEF_ADDPARTYMON EQU $06
PREDEF_FILLSTATS EQU $0C PREDEF_FILLSTATS EQU $0C
PREDEF_FILLMOVES EQU $1B PREDEF_FILLMOVES EQU $1B
PREDEF_GETUNOWNLETTER EQU $2D PREDEF_GETUNOWNLETTER EQU $2D

14
wram.asm
View File

@@ -634,7 +634,7 @@ PlayerEvaLevel: ; c6d2
ds 1 ds 1
; c6d3 ; c6d3
ds 1 ds 1
PlayerStatLevelsEnd PlayerStatLevelsEnd:
EnemyStatLevels: ; c6d4 EnemyStatLevels: ; c6d4
; 07 neutral ; 07 neutral
@@ -746,7 +746,7 @@ LastEnemyMove: ; c71c
SECTION "overworldmap",BSS[$c800] SECTION "overworldmap",BSS[$c800]
OverworldMap: ; c800 OverworldMap: ; c800
ds 1300 ds 1300
OverworldMapEnd OverworldMapEnd:
ds 12 ds 12
@@ -1102,7 +1102,7 @@ OTPartySpecies: ; d281
; or the routine will keep going ; or the routine will keep going
OTPartyMon1: OTPartyMon1:
OTPartyMon1Species2: ; d288 OTPartyMon1Species: ; d288
ds 1 ds 1
OTPartyMon1Item: ; d289 OTPartyMon1Item: ; d289
ds 1 ds 1
@@ -1239,6 +1239,7 @@ PlayerID: ; d47b
ds 2 ds 2
PlayerName: ; d47d PlayerName: ; d47d
ds 11 ds 11
PlayerNameEnd: ; d478
ds 46 ds 46
@@ -1430,9 +1431,8 @@ PartyCount: ; dcd7
ds 1 ; number of Pokémon in party ds 1 ; number of Pokémon in party
PartySpecies: ; dcd8 PartySpecies: ; dcd8
ds 6 ; species of each Pokémon in party ds 6 ; species of each Pokémon in party
; dcde PartyEnd: ; dcde
ds 1 ; any empty slots including the 7th must be FF ds 1 ; legacy functions don't check PartyCount
; or the routine will keep going
PartyMons: PartyMons:
PartyMon1: PartyMon1:
@@ -1479,7 +1479,7 @@ PartyMon1PokerusStatus: ; dcfb
ds 1 ds 1
PartyMon1CaughtData: ; dcfc PartyMon1CaughtData: ; dcfc
PartyMon1CaughtTime: ; dcfc PartyMon1CaughtTime: ; dcfc
PartyMon1CaughtLevel ; dcfc PartyMon1CaughtLevel: ; dcfc
ds 1 ds 1
PartyMon1CaughtGender: ; dcfd PartyMon1CaughtGender: ; dcfd
PartyMon1CaughtLocation: ; dcfd PartyMon1CaughtLocation: ; dcfd