pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

CheckContestMon and a couple labels in bank 0

Browse Source
This commit is contained in:
yenatch 2013-08-15 06:06:50 -04:00
parent 8ecd66f5d5
commit 000c6d1349
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.asm
View File

@ -236,6 +236,7 @@ PREDEF_PRINT_MOVE_TYPE EQU $2A
PREDEF_PRINT_TYPE EQU $2B PREDEF_PRINT_TYPE EQU $2B
PREDEF_GET_UNOWN_LETTER EQU $2D PREDEF_GET_UNOWN_LETTER EQU $2D
PREDEF_LOAD_SGB_LAYOUT EQU $31 PREDEF_LOAD_SGB_LAYOUT EQU $31
PREDEF_CHECK_CONTEST_MON EQU $33
PREDEF_PARTYMON_ITEM_NAME EQU $3B PREDEF_PARTYMON_ITEM_NAME EQU $3B
PREDEF_DECOMPRESS EQU $40 PREDEF_DECOMPRESS EQU $40

29
main.asm
View File

@ -143,10 +143,14 @@ Function17d: ; 17d
call Function245 call Function245
call ClearSprites call ClearSprites
call Function270 call Function270
ld a, $1
rst Bankswitch
call $4031
ld a, BANK(Function4031)
rst Bankswitch
call Function4031
; Note that Function642e is called later assuming it's in the same bank.
xor a xor a
ld [$ffde], a ld [$ffde], a
ld [$ffcf], a ld [$ffcf], a
@ -164,25 +168,22 @@ Function17d: ; 17d
ld [rLCDC], a ld [rLCDC], a
ld a, $ff ld a, $ff
ld [$ffcb], a ld [$ffcb], a
ld a, $2 callba Function9890
ld hl, $5890
rst FarCall
ld a, $9c ld a, $9c
ld [$ffd7], a ld [$ffd7], a
xor a xor a
ld [hBGMapAddress], a ld [hBGMapAddress], a
ld a, $5 callba Function14089
ld hl, $4089
rst FarCall
xor a xor a
ld [$6000], a ld [$6000], a
ld [$0000], a ld [$0000], a
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_22b jr z, .asm_22b
call Function2ff7 call Function2ff7
.asm_22b .asm_22b
xor a xor a
ld [rIF], a ld [rIF], a
ld a, $f ld a, $f
@ -194,7 +195,7 @@ Function17d: ; 17d
call CleanSoundRestart call CleanSoundRestart
xor a xor a
ld [CurMusic], a ld [CurMusic], a
jp $642e jp Function642e
; 245 ; 245
Function245: ; 245 Function245: ; 245
@ -319,7 +320,7 @@ Function4a3: ; 4a3
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_4af jr z, .asm_4af
ld hl, $0517 ld hl, IncGradGBPalTable_00
ld b, $4 ld b, $4
jr Function4c7 jr Function4c7
@ -20963,7 +20964,7 @@ PredefPointers: ; 856b
dwb $5853, $02 dwb $5853, $02
dwb $464c, $02 ; LoadSGBLayout, BANK(LoadSGBLayout) dwb $464c, $02 ; LoadSGBLayout, BANK(LoadSGBLayout)
dwb $5d11, $24 dwb $5d11, $24
dwb $4a88, $02 dwb CheckContestMon, BANK(CheckContestMon)
dwb $420f, $23 dwb $420f, $23
dwb $4000, $23 dwb $4000, $23
dwb $4000, $23 dwb $4000, $23
@ -21052,7 +21053,7 @@ CheckShininess: ; 0x8a68
; 8a88 ; 8a88
Function8a88: ; 8a88 CheckContestMon: ; 8a88
ld a, [hl] ld a, [hl]
cp $a0 cp $a0
jr c, .asm_8aa2 jr c, .asm_8aa2