Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM)

To do: engine/{menus, overworld}
This commit is contained in:
Rangi
2020-06-17 17:03:38 -04:00
parent be93ab33a7
commit cc460a17b0
62 changed files with 395 additions and 395 deletions

View File

@@ -302,7 +302,7 @@ Function17d0f3:
ld [wLinkMode], a
farcall SaveAfterLinkTrade
ld a, $5
call GetSRAMBank
call OpenSRAM
ld a, $5
ld [$a800], a
call CloseSRAM
@@ -508,7 +508,7 @@ Function17d2c0:
Function17d2ce:
ld a, BANK(s5_aa72)
call GetSRAMBank
call OpenSRAM
ld a, [s5_aa72]
call CloseSRAM
and a
@@ -543,13 +543,13 @@ Function17d2ce:
Function17d314:
ld a, $5
call GetSRAMBank
call OpenSRAM
ld a, [$b1b1]
call CloseSRAM
cp $21
jr nc, .asm_17d354
ld a, $6
call GetSRAMBank
call OpenSRAM
ld l, $0
ld h, l
ld de, $a006
@@ -582,7 +582,7 @@ Function17d314:
.asm_17d354
call CloseSRAM
ld a, $5
call GetSRAMBank
call OpenSRAM
xor a
ld hl, $aa73
ld bc, $c
@@ -636,7 +636,7 @@ Function17d370:
ld a, $d0
ld [wcd21], a
ld a, $6
call GetSRAMBank
call OpenSRAM
ld hl, $a006
ld de, wBGPals1
ld bc, $1000
@@ -948,7 +948,7 @@ Function17d5f6:
Function17d60b:
ld a, $5
call GetSRAMBank
call OpenSRAM
ld hl, $b1d3
ld de, wc608
ld bc, $20
@@ -963,7 +963,7 @@ Function17d60b:
ld h, a
call CloseSRAM
ld a, $6
call GetSRAMBank
call OpenSRAM
ld de, wc708
ld a, c
and a
@@ -1023,7 +1023,7 @@ Function17d60b:
.asm_17d684
call CloseSRAM
ld a, $5
call GetSRAMBank
call OpenSRAM
ld hl, wc708
ld de, $b1b3
ld a, [$b1b1]
@@ -1040,7 +1040,7 @@ Function17d6a1:
ld c, a
ld b, $0
ld a, $5
call GetSRAMBank
call OpenSRAM
ld hl, $b1d3
add hl, bc
add hl, bc
@@ -1058,7 +1058,7 @@ Function17d6a1:
ld l, c
call CloseSRAM
ld a, $6
call GetSRAMBank
call OpenSRAM
ld a, l
ld [wcd5e], a
ld a, h
@@ -1177,7 +1177,7 @@ Function17d78d:
ld b, a
call HlToCrashCheckPointer
ld a, $6
call GetSRAMBank
call OpenSRAM
ld hl, $a006
add hl, bc
ld de, wBGPals1
@@ -1330,7 +1330,7 @@ Function17d85d:
.asm_17d89b
ld a, [wcd4f]
call GetSRAMBank
call OpenSRAM
.asm_17d8a1
push hl
@@ -1511,7 +1511,7 @@ Function17d9e3:
.asm_17da01
ld a, [wc70c]
call GetSRAMBank
call OpenSRAM
.asm_17da07
ld a, [wc708]
@@ -1556,7 +1556,7 @@ Function17da31:
.asm_17da4f
ld a, [wc70a]
call GetSRAMBank
call OpenSRAM
.asm_17da55
ld a, [wc708]
@@ -2021,7 +2021,7 @@ Function17dd49:
.sram
ld a, [wc708]
call GetSRAMBank
call OpenSRAM
.got_bank
ld a, [wc709]
@@ -2097,7 +2097,7 @@ Function17ddcd:
.asm_17dde7
ld a, [wc708]
call GetSRAMBank
call OpenSRAM
.asm_17dded
ld a, [wc709]
@@ -2154,7 +2154,7 @@ Function17de32:
ld b, $0
call CopyBytes
ld a, $6
call GetSRAMBank
call OpenSRAM
call Function17f4f6
ld a, [wc708]
ld e, a
@@ -2208,7 +2208,7 @@ Function17de91:
ld bc, $7
call CopyBytes
ld a, $6
call GetSRAMBank
call OpenSRAM
call Function17f4f6
ld a, [wc708]
ld e, a
@@ -2452,7 +2452,7 @@ Function17ded9:
Function17e026:
ld a, BANK(sBoxCount)
call GetSRAMBank
call OpenSRAM
ld a, [sBoxCount]
call CloseSRAM
cp $14
@@ -2467,7 +2467,7 @@ Function17e026:
pop hl
pop bc
ld a, BANK(sBoxMonNicknames)
call GetSRAMBank
call OpenSRAM
bit 1, b
jr z, .asm_17e067
push bc
@@ -2494,7 +2494,7 @@ Function17e026:
call CloseSRAM
farcall SetGiftBoxMonCaughtData
ld a, $1
call GetSRAMBank
call OpenSRAM
pop hl
pop bc
jr .asm_17e092
@@ -2696,7 +2696,7 @@ Function17e1a1:
.asm_17e1bb
ld a, [wc708]
call GetSRAMBank
call OpenSRAM
.asm_17e1c1
ld a, [wc709]
@@ -2728,7 +2728,7 @@ Function17e1a1:
.asm_17e1f3
ld a, [wc70c]
call GetSRAMBank
call OpenSRAM
.asm_17e1f9
ld a, [wc70d]
@@ -2890,7 +2890,7 @@ Function17e2a7:
xor a
ld [wcd7a], a
ld a, $5
call GetSRAMBank
call OpenSRAM
ld hl, $aa73
ld de, $aa7f
ld bc, $c
@@ -2926,7 +2926,7 @@ Function17e309:
Function17e32b:
ld a, $5
call GetSRAMBank
call OpenSRAM
ld hl, wc608
ld de, $b0b1
ld bc, $40
@@ -2939,7 +2939,7 @@ Function17e32b:
Function17e349:
ld a, $5
call GetSRAMBank
call OpenSRAM
ld hl, $b0b1
ld de, wc608
ld bc, $40
@@ -3541,7 +3541,7 @@ INCLUDE "gfx/mobile/pokemon_news.pal"
RunMobileScript::
ld a, $6
call GetSRAMBank
call OpenSRAM
inc de
.loop
call _RunMobileScript
@@ -4082,13 +4082,13 @@ MobileScript_Prefecture:
bit 7, a
jr nz, .asm_17f355
ld a, BANK(sCrystalData)
call GetSRAMBank
call OpenSRAM
ld a, [sCrystalData + 2]
jr .asm_17f35d
.asm_17f355
ld a, BANK(s5_b2f3)
call GetSRAMBank
call OpenSRAM
ld a, [s5_b2f3]
.asm_17f35d
@@ -4125,13 +4125,13 @@ Function17f382:
bit 7, a
jr nz, .asm_17f3a3
ld a, BANK(sCrystalData)
call GetSRAMBank
call OpenSRAM
ld de, sCrystalData + 3
jr .asm_17f3ab
.asm_17f3a3
ld a, BANK(s5_b2f4)
call GetSRAMBank
call OpenSRAM
ld de, s5_b2f4
.asm_17f3ab
@@ -4299,7 +4299,7 @@ Function17f44f:
.asm_17f488
ld a, [wcd54]
call GetSRAMBank
call OpenSRAM
.asm_17f48e
ld a, [wcd55]
@@ -4321,7 +4321,7 @@ Function17f44f:
.asm_17f4af
call CloseSRAM
ld a, $6
call GetSRAMBank
call OpenSRAM
.asm_17f4b7
ld de, wc608
@@ -4491,7 +4491,7 @@ DisplayMobileError:
.asm_17f5a1
ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
call OpenSRAM
xor a
ld [sMobileLoginPassword], a
call CloseSRAM