pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix miscellaneous points made in #658

Browse Source
This commit is contained in:
Rangi 2019-11-23 20:56:22 -05:00
parent ef48ae98b5
commit 0e311ad709
11 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/bugs_and_glitches.md
View File

@ -811,10 +811,10 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
([Video](https://www.youtube.com/watch?v=o54VjpAEoO8)) ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8))
**Fix:** Edit `_ABoostedStringBuffer2ExpPointsText` and `_StringBuffer2ExpPointsText` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm): **Fix:** Edit `_BoostedExpPointsText` and `_ExpPointsText` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm):
```diff ```diff
_ABoostedStringBuffer2ExpPointsText:: _BoostedExpPointsText::
text_start text_start
line "a boosted" line "a boosted"
cont "@" cont "@"
@ -823,7 +823,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
text " EXP. Points!" text " EXP. Points!"
prompt prompt
_StringBuffer2ExpPointsText:: _ExpPointsText::
text_start text_start
line "@" line "@"
- text_decimal wStringBuffer2, 2, 4 - text_decimal wStringBuffer2, 2, 4
@ -1264,7 +1264,7 @@ Finally, edit [engine/battle/read_trainer_party.asm](https://github.com/pret/pok
([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I)) ([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I))
**Fix:** Edit `Slots_PayoutAnim` in [engine/games/slot_machine.asm](https://github.com/pret/pokecrystal/blob/master/engine/games/slot_machine.asm): **Fix:** Edit `SlotsAction_PayoutAnim` in [engine/games/slot_machine.asm](https://github.com/pret/pokecrystal/blob/master/engine/games/slot_machine.asm):
```diff ```diff
.okay .okay

2
engine/events/halloffame.asm
View File

@ -449,7 +449,7 @@ DisplayHOFMon:
ld bc, MON_NAME_LENGTH - 1 ld bc, MON_NAME_LENGTH - 1
call CopyBytes call CopyBytes
ld a, "@" ld a, "@"
ld [wStringBuffer2 + 10], a ld [wStringBuffer2 + MON_NAME_LENGTH - 1], a
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " " ld a, " "

2
engine/events/lucky_number.asm
View File

@ -148,7 +148,7 @@ CheckForLuckyNumberWinners:
.done .done
pop hl pop hl
push hl push hl
ld de, -6 ld de, MON_SPECIES - MON_ID
add hl, de add hl, de
ld a, [hl] ld a, [hl]
pop hl pop hl

10
engine/pokemon/bills_pc_top.asm
View File

@ -261,7 +261,7 @@ CopyBoxmonToTempMon:
call CloseSRAM call CloseSRAM
ret ret
Unreferenced_Functione5d9: Unreferenced_LoadBoxMonListing:
ld a, [wCurBox] ld a, [wCurBox]
cp b cp b
jr z, .same_box jr z, .same_box
@ -284,11 +284,11 @@ Unreferenced_Functione5d9:
.okay .okay
call GetSRAMBank call GetSRAMBank
ld a, [hl] ld a, [hl]
ld bc, 1 + MONS_PER_BOX + 1 ld bc, sBoxMons - sBox
add hl, bc add hl, bc
ld b, a ld b, a
ld c, $0 ld c, $0
ld de, wc608 ld de, wBoxPartialData
ld a, b ld a, b
and a and a
jr z, .empty_box jr z, .empty_box
@ -296,7 +296,7 @@ Unreferenced_Functione5d9:
push hl push hl
push bc push bc
ld a, c ld a, c
ld bc, 0 ld bc, sBoxMon1Species - sBoxMons
add hl, bc add hl, bc
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
@ -311,7 +311,7 @@ Unreferenced_Functione5d9:
push hl push hl
push bc push bc
ld a, c ld a, c
ld bc, MONS_PER_BOX * (BOXMON_STRUCT_LENGTH + NAME_LENGTH) ld bc, sBoxMonNicknames - sBoxMons
add hl, bc add hl, bc
call SkipNames call SkipNames
call CopyBytes call CopyBytes

4
engine/pokemon/search.asm
View File

@ -113,7 +113,7 @@ CheckOwnMonAnywhere:
jr z, .loopbox jr z, .loopbox
; Load the box. ; Load the box.
ld hl, BoxAddressTable1 ld hl, BoxAddressTable
ld b, 0 ld b, 0
add hl, bc add hl, bc
add hl, bc add hl, bc
@ -244,7 +244,7 @@ endr
scf scf
ret ret
BoxAddressTable1: BoxAddressTable:
dba sBox1 dba sBox1
dba sBox2 dba sBox2
dba sBox3 dba sBox3

2
engine/pokemon/search2.asm
View File

@ -117,7 +117,7 @@ FindThatSpecies:
ret ret
RetroactivelyIgnoreEggs: RetroactivelyIgnoreEggs:
ld e, -2 ld e, %11111110
ld hl, wPartySpecies ld hl, wPartySpecies
.loop .loop
ld a, [hli] ld a, [hli]

4
home/farcall.asm
View File

@ -23,7 +23,7 @@ FarCall_hl::
push af push af
ldh a, [hBuffer] ldh a, [hBuffer]
rst Bankswitch rst Bankswitch
call FarJump_hl call FarCall_JumpToHL
ReturnFarCall:: ReturnFarCall::
; We want to retain the contents of f. ; We want to retain the contents of f.
@ -45,5 +45,5 @@ ReturnFarCall::
ld c, a ld c, a
ret ret
FarJump_hl:: FarCall_JumpToHL::
jp hl jp hl

2
hram.asm
View File

@ -4,7 +4,7 @@ hTransferVirtualOAM:: ds 10 ; ff80
hROMBankBackup:: db ; ff8a hROMBankBackup:: db ; ff8a
hBuffer:: db ; ff8b hBuffer:: db ; ff8b
hFF8C:: db ; ff8c hSRAMBank:: db ; ff8c
hRTCDayHi:: db ; ff8d hRTCDayHi:: db ; ff8d
hRTCDayLo:: db ; ff8e hRTCDayLo:: db ; ff8e

8
mobile/mobile_12_2.asm
View File

@ -17,7 +17,7 @@ MobileCheckOwnMonAnywhere:
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc add hl, bc
pop bc pop bc
call .CopyName call .AdvanceOTName
dec d dec d
jr nz, .asm_4a851 jr nz, .asm_4a851
ld a, BANK(sBoxCount) ld a, BANK(sBoxCount)
@ -39,7 +39,7 @@ MobileCheckOwnMonAnywhere:
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
add hl, bc add hl, bc
pop bc pop bc
call .CopyName call .AdvanceOTName
dec d dec d
jr nz, .asm_4a873 jr nz, .asm_4a873
@ -90,7 +90,7 @@ MobileCheckOwnMonAnywhere:
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
add hl, bc add hl, bc
pop bc pop bc
call .CopyName call .AdvanceOTName
dec d dec d
jr nz, .asm_4a8ba jr nz, .asm_4a8ba
pop bc pop bc
@ -146,7 +146,7 @@ MobileCheckOwnMonAnywhere:
dba sBox13 dba sBox13
dba sBox14 dba sBox14
.CopyName: .AdvanceOTName:
push hl push hl
ld hl, NAME_LENGTH ld hl, NAME_LENGTH
add hl, bc add hl, bc

90
mobile/mobile_45.asm
View File

@ -129,7 +129,7 @@ popc
Function114243:: Function114243::
ld a, SRAM_ENABLE ld a, SRAM_ENABLE
ld [MBC3SRamEnable], a ld [MBC3SRamEnable], a
ldh a, [hFF8C] ldh a, [hSRAMBank]
push af ; if [$dc02] == 0, this is popped to pc. push af ; if [$dc02] == 0, this is popped to pc.
push de push de
ld a, [$dc02] ld a, [$dc02]
@ -147,8 +147,8 @@ Function114243::
Function11425c: Function11425c:
ld [$dc02], a ld [$dc02], a
pop af pop af
ldh [hFF8C], a ldh [hSRAMBank], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ret ret
@ -163,7 +163,7 @@ Function114269:
ld [$dc03], a ld [$dc03], a
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -360,7 +360,7 @@ Function11433c:
pop bc pop bc
ld a, [$dc03] ld a, [$dc03]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
call Function114c0b call Function114c0b
ld hl, String_114004 ld hl, String_114004
@ -418,7 +418,7 @@ Function1143b7:
push af push af
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -473,7 +473,7 @@ Function1143f3:
Function114412: Function114412:
ld a, c ld a, c
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, Unknown_11417f ld hl, Unknown_11417f
ld a, b ld a, b
@ -660,7 +660,7 @@ Function1144d1:
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -677,7 +677,7 @@ Function1144d1:
ld hl, $dc06 ld hl, $dc06
ld a, [hl] ld a, [hl]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, $dc09 ld hl, $dc09
ld e, [hl] ld e, [hl]
@ -735,7 +735,7 @@ Function114576:
jr nz, .asm_1145b4 jr nz, .asm_1145b4
ld a, h ld a, h
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
push hl push hl
push de push de
@ -753,7 +753,7 @@ Function114576:
jr nz, .asm_1145ba jr nz, .asm_1145ba
ld a, h ld a, h
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, String_114218 ld hl, String_114218
call Function114acf call Function114acf
@ -925,7 +925,7 @@ Function11463c:
pop de pop de
pop af pop af
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
xor a xor a
ld [wDecoCarpet], a ld [wDecoCarpet], a
@ -946,7 +946,7 @@ Function1146a4:
ld hl, $dc03 ld hl, $dc03
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -960,7 +960,7 @@ Function1146a4:
ld hl, $dc03 ld hl, $dc03
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1003,7 +1003,7 @@ Function1146fa:
ld hl, $dc03 ld hl, $dc03
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1017,7 +1017,7 @@ Function1146fa:
ld a, $1 ld a, $1
ld [$dc0e], a ld [$dc0e], a
ld a, [$dc00] ld a, [$dc00]
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, $1 ld a, $1
ld [wDecoRightOrnament], a ld [wDecoRightOrnament], a
@ -1044,7 +1044,7 @@ Function1146fa:
ld hl, $dc03 ld hl, $dc03
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1098,7 +1098,7 @@ Function1146fa:
ld hl, $dc03 ld hl, $dc03
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
call Function114a7a call Function114a7a
and a and a
@ -1208,7 +1208,7 @@ Function114843:
ld a, [$dc00] ld a, [$dc00]
push af push af
push de push de
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
call Function114a18 call Function114a18
and a and a
@ -1231,7 +1231,7 @@ Function114867:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1296,7 +1296,7 @@ Function1148c2:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1394,7 +1394,7 @@ Function11494d:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1484,7 +1484,7 @@ Function1149cc:
ld hl, $dc06 ld hl, $dc06
ld a, [hl] ld a, [hl]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
push de push de
ld hl, $dc09 ld hl, $dc09
@ -1831,7 +1831,7 @@ endr
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1869,7 +1869,7 @@ Function114bbc:
jr nz, .asm_114bff jr nz, .asm_114bff
ld a, h ld a, h
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
call Function114c0b call Function114c0b
ld hl, $dc24 ld hl, $dc24
@ -1880,7 +1880,7 @@ Function114bbc:
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -2086,7 +2086,7 @@ Function114cd9:
ld [$dc04], a ld [$dc04], a
ld a, h ld a, h
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, $dc24 ld hl, $dc24
call Function114d39 call Function114d39
@ -2105,7 +2105,7 @@ endr
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -2403,7 +2403,7 @@ Function114ea0:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -2603,7 +2603,7 @@ Function114f59:
inc hl inc hl
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -2681,7 +2681,7 @@ Function115020:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -2738,7 +2738,7 @@ Function115062:
ld c, a ld c, a
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -2889,7 +2889,7 @@ Function115136:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -2942,7 +2942,7 @@ Function115179:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -3060,7 +3060,7 @@ Function115217:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -3153,7 +3153,7 @@ Function11528f:
inc hl inc hl
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -3402,7 +3402,7 @@ Function1153d2:
.asm_1153f5 .asm_1153f5
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -3536,7 +3536,7 @@ Function1153d2:
ld hl, wDecoRightOrnament ld hl, wDecoRightOrnament
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -3769,7 +3769,7 @@ Function11560a:
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ld a, [$dc17] ld a, [$dc17]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, $dc1a ld hl, $dc1a
ld c, [hl] ld c, [hl]
@ -3842,7 +3842,7 @@ Function11560a:
ld [hl], d ld [hl], d
pop bc pop bc
ld a, [wCurMapBGEventCount] ld a, [wCurMapBGEventCount]
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, wCurMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld e, [hl] ld e, [hl]
@ -4148,7 +4148,7 @@ Function11581e:
ld hl, $dc02 ld hl, $dc02
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -4202,7 +4202,7 @@ Function11581e:
ld hl, wCurMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -4669,7 +4669,7 @@ Function115b00:
ld hl, $dc02 ld hl, $dc02
ld a, [hli] ld a, [hli]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -4757,7 +4757,7 @@ Function115b00:
ld hl, wCurMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld a, [hli] ld a, [hli]
ld [wCurMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -5150,7 +5150,7 @@ Function115d80:
ld a, [bc] ld a, [bc]
inc a inc a
ld [bc], a ld [bc], a
ldh [hFF8C], a ldh [hSRAMBank], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, e ld a, e
ld d, $a0 ld d, $a0

2
sram.asm
View File

@ -218,7 +218,7 @@ sBTMonPrevPrevTrainer2:: db
sBTMonPrevPrevTrainer3:: db sBTMonPrevPrevTrainer3:: db
SECTION "Boxes 1-7", SRAM, BANK [2] SECTION "Boxes 1-7", SRAM
sBox1:: box sBox1 sBox1:: box sBox1
sBox2:: box sBox2 sBox2:: box sBox2