Leahnaya/pokepinball
1
0
Fork 0
mirror of https://github.com/pret/pokepinball.git synced 2026-04-25 07:19:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some WRAM changes; update farcall macro

Browse Source
This commit is contained in:
PikalaxALT 2017-02-12 15:06:36 -05:00
parent 36381c3553
commit 8bb81d151a
8 changed files with 518 additions and 956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
charmap.asm
View File

@ -1,9 +1,4 @@
charmap "@", $00
charmap "♂", $24
charmap ".", $2E
charmap "é", $40
charmap "♀", $5C
charmap "@", $00
charmap "♂", $24
charmap "é", $40
charmap "♀", $5C

5
home.asm
View File

@ -75,7 +75,7 @@ Start: ; 0x150
ld hl, wc000
ld bc, $2000
call ClearData ; Clear WRAM Bank 0
ld hl, vTiles0
ld hl, vTilesOB
ld bc, $1000
call ClearData ; Clear First half of VRAM
ld a, SRAM_ENABLE
@ -3899,7 +3899,6 @@ Func_1ffc: ; 0x1ffc
ld [wd806], a
ld a, $4
ld [wd807], a
ld [hFarCallTempA], a
callba Func_3c000
ld a, $1
ld [wd85d], a
@ -5290,7 +5289,6 @@ Func_3500:
ld [hli], a
ld [hl], a
ld bc, wd464
ldh [hFarCallTempA], a
callba AddBigBCD6FromQueueWithBallMultiplier
ret
@ -5308,7 +5306,6 @@ AddBCDEToCurBufferValue: ; 0x351c
ld [hli], a
ld [hl], a
ld bc, wd464
ld [hFarCallTempA], a
callba AddBigBCD6FromQueue
ret

4
home/sgb.asm
View File

@ -124,9 +124,9 @@ FarSendSGBPacket_BGMapRows: ; 0x1353
ld [rBGP], a
ld de, $0010
add hl, de
ld de, vTiles1 ; tiles
ld de, vTilesSH ; tiles
call LocalCopyData
ld hl, vBGMap0 ; bgmap
ld hl, vBGMap ; bgmap
ld de, $000c
ld a, $80
ld c, $d

3
home/text.asm
View File

@ -217,7 +217,7 @@ Func_31e1: ; 0x31e1
Data_320e:
macro_320e: MACRO
dw vTiles1 tile \1
dw vTilesSH tile \1
dba \2
ENDM
macro_320e 3, GFX_d6440
@ -666,7 +666,6 @@ Func_3475: ; 0x3475
ld a, Bank(HandleFlippers)
ld hl, HandleFlippers
call nz, BankSwitch
ld [hFarCallTempA], a
callba Func_84b7
call Func_33e3
call Func_926

13
macros.asm
View File

@ -58,20 +58,13 @@ bigdw: MACRO ; big-endian word
dx 2, \1
ENDM
farcall: MACRO
callba: MACRO
ld [hFarCallTempA], a
ld a, BANK(\1)
ld hl, \1
call BankSwitch
ENDM
callba EQUS "farcall"
callab: MACRO
ld hl, \1
ld a, BANK(\1)
call BankSwitch
ENDM
bigBCD6: MACRO
; There is probably a better name for this macro.
; It write a BCD in big-endian form.
@ -95,7 +88,7 @@ ENDM
;\1 = X
;\2 = Y
;\3 = Reference Background Map (e.g. vBGMap0 or vBGMap1)
;\3 = Reference Background Map (e.g. vBGMap or vBGWin)
coord: MACRO
ld \1, \4 + $20 * \3 + \2
ENDM

1414
main.asm
View File

File diff suppressed because it is too large Load Diff

10
vram.asm
View File

@ -1,5 +1,5 @@
vTiles0 EQU $8000
vTiles1 EQU $8800
vTiles2 EQU $9000
vBGMap0 EQU $9800
vBGMap1 EQU $9c00
vTilesOB EQU $8000
vTilesSH EQU $8800
vTilesBG EQU $9000
vBGMap EQU $9800
vBGWin EQU $9c00

12
wram.asm
View File

@ -134,10 +134,7 @@ wd464:: ; 0xd464
ds $6
wScore:: ; 0xd46a
ds $5
wd46f:: ; 0xd46f
ds $1
ds $6
wd470:: ; 0xd470
ds $1
@ -149,10 +146,7 @@ wd472:: ; 0xd472
ds $1
wd473:: ; 0xd473
ds $3
wd476:: ; 0xd476
ds $1
ds $4
wAddScoreQueueOffset:: ; 0xd477
ds $1
@ -241,7 +235,7 @@ wBallSaverTimerFrames:: ; 0xd4a3
wBallSaverTimerSeconds:: ; 0xd4a4
ds $1
wd4a5:: ; 0xd4a5
wNumTimesBallSavedTextWillDisplay:: ; 0xd4a5
ds $1
wBallSaverTimerFramesBackup:: ; 0xd4a6