Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-05-21 11:20:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hram.asm

Browse Source
This commit is contained in:
pikalaxalt 2016-06-16 11:38:22 -04:00
parent e5b8d367e3
commit cac0d5ade9
3 changed files with 115 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
home/vblank.asm
View File

@ -3,7 +3,7 @@ VBlank::
push bc ; 151
push de ; 152
push hl ; 153
ld a, [hMenuReturn] ; 154
ld a, [hVBlank] ; 154
and $7 ; 156
ld e, a ; 158
ld d, $0 ; 159
@ -68,7 +68,7 @@ Function180::
call Function162b ; 1bc
call Function1642 ; 1bf
Function1c2::
ld a, [hBGMapUpdate] ; 1c2
ld a, [hOAMUpdate] ; 1c2
and a ; 1c4
jr nz, Function1ca ; 1c5
call hPushOAM ; 1c7
@ -88,9 +88,9 @@ Function1d8::
ld [$cee9], a ; 1df
Function1e2::
call Function8e6 ; 1e2
ld a, $3a ; 1e5
ld a, BANK(Functione805c) ; 1e5
rst Bankswitch ; 1e7
call $405c ; 1e8
call Functione805c ; 1e8
ld a, [$d155] ; 1eb
rst Bankswitch ; 1ee
ld a, [$ff9a] ; 1ef
@ -111,7 +111,7 @@ Function1f4::
call Function15d0 ; 209
call hPushOAM ; 20c
Function20f::
ld a, [$ffc8] ; 20f
ld a, [hLCDCPointer] ; 20f
or a ; 211
jr z, Function219 ; 212
ld c, a ; 214
@ -131,9 +131,9 @@ Function219::
or $2 ; 22a
ld [rIF], a ; 22c
ei ; 22e
ld a, $3a ; 22f
ld a, BANK(Functione805c) ; 22f
rst Bankswitch ; 231
call $405c ; 232
call Functione805c ; 232
ld a, [$d155] ; 235
rst Bankswitch ; 238
ld a, $1f ; 239
@ -142,15 +142,15 @@ Function219::
; 23e
Function23e::
ld a, [$ffe8] ; 23e
ld a, [hCGB] ; 23e
and a ; 240
jp nz, Functionbe3 ; 241
ld a, [$cf43] ; 244
ld [$ff47], a ; 247
ld [rBGP], a ; 247
ld a, [$cf44] ; 249
ld [$ff48], a ; 24c
ld [rOBP0], a ; 24c
ld a, [$cf45] ; 24e
ld [$ff49], a ; 251
ld [rOBP1], a ; 251
and a ; 253
ret ; 254
; 255
@ -165,9 +165,9 @@ Function255::
xor a ; 266
ld [$ceea], a ; 267
call Function1ebf ; 26a
ld a, $3a ; 26d
ld a, BANK(Functione805c) ; 26d
rst Bankswitch ; 26f
call $405c ; 270
call Functione805c ; 270
ld a, [$d155] ; 273
rst Bankswitch ; 276
ret ; 277
@ -192,9 +192,9 @@ Function28c::
ld [rIE], a ; 298
ld [rIF], a ; 29a
ei ; 29c
ld a, $3a ; 29d
ld a, BANK(Functione805c) ; 29d
rst Bankswitch ; 29f
call $405c ; 2a0
call Functione805c ; 2a0
ld a, [$d155] ; 2a3
rst Bankswitch ; 2a6
di ; 2a7
@ -208,9 +208,9 @@ Function28c::
Function2b0::
ld a, [hROMBank] ; 2b0
ld [$d155], a ; 2b2
ld a, $3a ; 2b5
ld a, BANK(Functione805c) ; 2b5
rst Bankswitch ; 2b7
call $405c ; 2b8
call Functione805c ; 2b8
ld a, [$d155] ; 2bb
rst Bankswitch ; 2be
xor a ; 2bf
@ -263,9 +263,9 @@ Function311::
ld [rIE], a ; 316
ld [rIF], a ; 318
ei ; 31a
ld a, $3a ; 31b
ld a, BANK(Functione805c) ; 31b
rst Bankswitch ; 31d
call $405c ; 31e
call Functione805c ; 31e
ld a, [$d155] ; 321
rst Bankswitch ; 324
di ; 325

181
hram.asm
View File

@ -1,125 +1,128 @@
HRAM_START EQU $ff80
hPushOAM EQU $ff80
hPushOAM EQU $ff80 ; 10 bytes
hROMBankBackup EQU $ff8a
hBuffer EQU $ff8b
hFF8C EQU $ff8c
hRTCDayHi EQU $ff8d
hRTCDayLo EQU $ff8e
hRTCHours EQU $ff8f
hRTCMinutes EQU $ff90
hRTCSeconds EQU $ff91
hROMBankBackup EQU $ff8c
hBuffer EQU $ff8d
hFF8C EQU $ff8e
hRTCDayHi EQU $ff8f
hRTCDayLo EQU $ff90
hRTCHours EQU $ff91
hRTCMinutes EQU $ff92
hRTCSeconds EQU $ff93
hHours EQU $ff94
hHours EQU $ff96
hMinutes EQU $ff96
hMinutes EQU $ff98
hSeconds EQU $ff98
hSeconds EQU $ff9a
hVBlankCounter EQU $ff9d
hROMBank EQU $ff9f
hVBlank EQU $ff9e
hMapEntryMethod EQU $ff9f
hMenuReturn EQU $ffa0
hVBlank EQU $ffa0
hMapEntryMethod EQU $ffa1
hMenuReturn EQU $ffa2
hJoypadReleased EQU $ffa2
hJoypadPressed EQU $ffa3
hJoypadDown EQU $ffa4
hJoypadSum EQU $ffa5
hJoyReleased EQU $ffa6
hJoyPressed EQU $ffa7
hJoyDown EQU $ffa8
hJoyLast EQU $ffa9
hInMenu EQU $ffaa
hJoypadReleased EQU $ffa4
hJoypadPressed EQU $ffa5
hJoypadDown EQU $ffa6
hJoypadSum EQU $ffa7
hJoyReleased EQU $ffa8
hJoyPressed EQU $ffa9
hJoyDown EQU $ffaa
hJoyLast EQU $ffab
hInMenu EQU $ffac
hPrinter EQU $ffac
hGraphicStartTile EQU $ffad
hMoveMon EQU $ffae
hMapObjectIndexBuffer EQU $ffaf
hObjectStructIndexBuffer EQU $ffb0
hPrinter EQU $ffae
hGraphicStartTile EQU $ffaf
hMoveMon EQU $ffb0
hMapObjectIndexBuffer EQU $ffb1
hObjectStructIndexBuffer EQU $ffb2
hConnectionStripLength EQU $ffaf
hConnectedMapWidth EQU $ffb0
hConnectionStripLength EQU $ffb1
hConnectedMapWidth EQU $ffb2
hPastLeadingZeroes EQU $ffb3
hPastLeadingZeroes EQU $ffb5
hStringCmpString1 EQU $ffb1
hStringCmpString2 EQU $ffb5
hStringCmpString1 EQU $ffb3
hStringCmpString2 EQU $ffb7
hDividend EQU $ffb3 ; length in b register, before 'call Divide' (max 4 bytes)
hDivisor EQU $ffb7 ; 1 byte long
hQuotient EQU $ffb4 ; result (3 bytes long)
hDividend EQU $ffb5 ; length in b register, before 'call Divide' (max 4 bytes)
hDivisor EQU $ffb9 ; 1 byte long
hQuotient EQU $ffb6 ; result (3 bytes long)
hRemainder EQU $ffb9
hMultiplicand EQU $ffb4 ; 3 bytes long
hMultiplier EQU $ffb7 ; 1 byte long
hProduct EQU $ffb3 ; result (4 bytes long)
hMultiplicand EQU $ffb6 ; 3 bytes long
hMultiplier EQU $ffb9 ; 1 byte long
hProduct EQU $ffb5 ; result (4 bytes long)
hMathBuffer EQU $ffb8
hMathBuffer EQU $ffba
hPrintNum1 EQU $ffb3
hPrintNum2 EQU $ffb4
hPrintNum3 EQU $ffb5
hPrintNum4 EQU $ffb6
hPrintNum5 EQU $ffb7
hPrintNum6 EQU $ffb8
hPrintNum7 EQU $ffb9
hPrintNum8 EQU $ffba
hPrintNum9 EQU $ffbb
hPrintNum10 EQU $ffbc
hPrintNum1 EQU $ffb5
hPrintNum2 EQU $ffb6
hPrintNum3 EQU $ffb7
hPrintNum4 EQU $ffb8
hPrintNum5 EQU $ffb9
hPrintNum6 EQU $ffba
hPrintNum7 EQU $ffbb
hPrintNum8 EQU $ffbc
hPrintNum9 EQU $ffbd
hPrintNum10 EQU $ffbe
hUsedSpriteIndex EQU $ffbd
hUsedSpriteTile EQU $ffbe
hFFBF EQU $ffbf
hFFC0 EQU $ffc0
hFFC1 EQU $ffc1
hMGStatusFlags EQU $ffbe
hUsedSpriteIndex EQU $ffbf
hUsedSpriteTile EQU $ffc0
hFFBF EQU $ffc1
hFFC2 EQU $ffc2
hMoneyTemp EQU $ffc3
hFFC3 EQU $ffc3
hFFC4 EQU $ffc4
hMoneyTemp EQU $ffc5
hFFC6 EQU $ffc6
hFFC7 EQU $ffc7
hFFC8 EQU $ffc8
hMobileReceive EQU $ffc9
hFFCA EQU $ffca
hLinkPlayerNumber EQU $ffcb
hFFCC EQU $ffcc
hSerialSend EQU $ffcd
hSerialReceive EQU $ffce
hMGJoypadPressed EQU $ffc5
hMGJoypadReleased EQU $ffc6
hLCDCPointer EQU $ffc8
hLYOverrideStart EQU $ffc9
hLYOverrideEnd EQU $ffca
hMobileReceive EQU $ffcb
hFFCA EQU $ffcc
hLinkPlayerNumber EQU $ffcd
hFFCC EQU $ffce
hSerialSend EQU $ffcf
hSerialReceive EQU $ffd0
hSCX EQU $ffd1
hSCY EQU $ffd2
hWX EQU $ffd3
hWY EQU $ffd4
hTilesPerCycle EQU $ffd3
hBGMapMode EQU $ffd4
hBGMapThird EQU $ffd5
hBGMapAddress EQU $ffd6
hTilesPerCycle EQU $ffd5
hBGMapMode EQU $ffd6
hBGMapThird EQU $ffd7
hBGMapAddress EQU $ffd8
hOAMUpdate EQU $ffd8
hSPBuffer EQU $ffd9
hOAMUpdate EQU $ffda
hSPBuffer EQU $ffdb
hBGMapUpdate EQU $ffda
hFFDC EQU $ffdc
hBGMapUpdate EQU $ffdd
hFFDC EQU $ffde
hMapAnims EQU $ffde
hTileAnimFrame EQU $ffdf
hMapAnims EQU $ffe0
hTileAnimFrame EQU $ffe1
hLastTalked EQU $ffe0
hLastTalked EQU $ffe2
hRandom EQU $ffe3
hRandomAdd EQU $ffe3
hRandomSub EQU $ffe4
hSecondsBackup EQU $ffe3
hBattleTurn EQU $ffe4 ; Which trainers turn is it? 0: Player, 1: Opponent Trainer
hCGBPalUpdate EQU $ffe5
hCGB EQU $ffe6
hSGB EQU $ffe7
hDMATransfer EQU $ffe8
hMobile EQU $ffe9
hFFEA EQU $ffea
hClockResetTrigger EQU $ffeb
hSecondsBackup EQU $ffe5
hBattleTurn EQU $ffe6 ; Which trainers turn is it? 0: Player, 1: Opponent Trainer
hCGBPalUpdate EQU $ffe7
hCGB EQU $ffe8
hSGB EQU $ffe9
hDMATransfer EQU $ffea
hMobile EQU $ffeb
hFFEA EQU $ffec
hClockResetTrigger EQU $ffed
HRAM_END EQU $ffff

5
main.asm
View File

@ -172,7 +172,10 @@ SECTION "bank39", DATA, BANK[$39]
dr $e4000, $e8000
SECTION "bank3a", DATA, BANK[$3a]
dr $e8000, $ec000
dr $e8000, $e805c
Functione805c::
dr $e805c, $ec000
SECTION "bank3b", DATA, BANK[$3b]
dr $ec000, $f0000