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

To do: engine/{menus, overworld}
2025-09-08 08:13:02 -07:00 · 2020-06-17 17:03:38 -04:00
parent be93ab33a7
commit cc460a17b0
62 changed files with 395 additions and 395 deletions
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1127,7 +1127,7 @@ BillsPC_LoadMonStats:
 	ld b, a
 	call GetBoxPointer
 	ld a, b
-	call GetSRAMBank
+	call OpenSRAM
 	push hl
 	ld bc, sBoxMon1Level - sBox
 	add hl, bc
@@ -1187,7 +1187,7 @@ BillsPC_LoadMonStats:

 .sBox
 	ld a, BANK(sBox)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxMon1Level
 	ld bc, BOXMON_STRUCT_LENGTH
 	ld a, e
@@ -1282,7 +1282,7 @@ BillsPC_RefreshTextboxes:
 	push hl
 	call GetBoxPointer
 	ld a, b
-	call GetSRAMBank
+	call OpenSRAM
 	push hl
 	ld bc, sBoxMons - sBox
 	add hl, bc
@@ -1339,7 +1339,7 @@ BillsPC_RefreshTextboxes:
 .sBox
 	push hl
 	ld a, BANK(sBox)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxSpecies
 	ld d, $0
 	add hl, de
@@ -1421,7 +1421,7 @@ CopyBoxmonSpecies:
 	ld b, a
 	call GetBoxPointer
 	ld a, b
-	call GetSRAMBank
+	call OpenSRAM
 	inc hl
 	copy_box_data 1
 	ret
@@ -1433,7 +1433,7 @@ CopyBoxmonSpecies:

 .sBox
 	ld a, BANK(sBox)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxSpecies
 	copy_box_data 1
 	ret
@@ -1652,7 +1652,7 @@ BillsPC_IsMonAnEgg:
 BillsPC_StatsScreen:
 	call LowVolume
 	call BillsPC_CopyMon
-	ld a, $3
+	ld a, TEMPMON
 	ld [wMonType], a
 	predef StatsScreenInit
 	call BillsPC_InitGFX
@@ -1704,7 +1704,7 @@ BillsPC_CopyMon:
 	cp NUM_BOXES + 1
 	jr nz, .box
 	ld a, BANK(sBox)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxSpecies
 	call CopySpeciesToTemp
 	ld hl, sBoxMonNicknames
@@ -1742,7 +1742,7 @@ BillsPC_CopyMon:
 	ld b, a
 	call GetBoxPointer
 	ld a, b
-	call GetSRAMBank
+	call OpenSRAM
 	push hl
 	inc hl
 	call CopySpeciesToTemp
@@ -1823,7 +1823,7 @@ TryWithdrawPokemon:
 	add [hl]
 	ld [wCurPartyMon], a
 	ld a, BANK(sBoxMonNicknames)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [wCurPartyMon]
 	ld hl, sBoxMonNicknames
 	call GetNick
@@ -2046,7 +2046,7 @@ MovePKMNWitoutMail_InsertMon:
 	add [hl]
 	ld [wCurPartyMon], a
 	ld a, BANK(sBox)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxSpecies
 	call CopySpeciesToTemp
 	ld hl, sBoxMonNicknames
@@ -2348,7 +2348,7 @@ GetBoxCount:
 	add hl, bc
 	ld a, [hli]
 	ld b, a
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -2368,7 +2368,7 @@ GetBoxCount:
 .activebox
 	ld a, BANK(sBoxCount)
 	ld b, a
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxCount
 	ld a, [hl]
 	call CloseSRAM
--- a/engine/pokemon/bills_pc_top.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -209,11 +209,11 @@ BillsPC_WithdrawMenu:
 Unreferenced_Functione56d:
 	ld a, [wPartyCount]
 	cp PARTY_LENGTH
-	jr nc, .asm_e576
+	jr nc, .party_full
 	and a
 	ret

-.asm_e576
+.party_full
 	ld hl, PCCantTakeText
 	call MenuTextboxBackup
 	scf
@@ -256,7 +256,7 @@ CopyBoxmonToTempMon:
 	ld de, wTempMonSpecies
 	ld bc, BOXMON_STRUCT_LENGTH
 	ld a, BANK(sBoxMon1Species)
-	call GetSRAMBank
+	call OpenSRAM
 	call CopyBytes
 	call CloseSRAM
 	ret
@@ -282,7 +282,7 @@ Unreferenced_LoadBoxMonListing:
 	ld hl, sBoxCount

 .okay
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [hl]
 	ld bc, sBoxMons - sBox
 	add hl, bc
--- a/engine/pokemon/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
@@ -1,5 +1,5 @@
 CheckPartyFullAfterContest:
-	ld a, [wContestMon]
+	ld a, [wContestMonSpecies]
 	and a
 	jp z, .DidntCatchAnything
 	ld [wCurPartySpecies], a
@@ -14,7 +14,7 @@ CheckPartyFullAfterContest:
 	ld c, a
 	ld b, 0
 	add hl, bc
-	ld a, [wContestMon]
+	ld a, [wContestMonSpecies]
 	ld [hli], a
 	ld [wCurSpecies], a
 	ld a, -1
@@ -80,14 +80,14 @@ CheckPartyFullAfterContest:
 	or b
 	ld [hl], a
 	xor a
-	ld [wContestMon], a
+	ld [wContestMonSpecies], a
 	and a ; BUGCONTEST_CAUGHT_MON
 	ld [wScriptVar], a
 	ret

 .TryAddToBox:
 	ld a, BANK(sBoxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxCount
 	ld a, [hl]
 	cp MONS_PER_BOX
@@ -118,7 +118,7 @@ CheckPartyFullAfterContest:

 .Box_SkipNickname:
 	ld a, BANK(sBoxMonNicknames)
-	call GetSRAMBank
+	call OpenSRAM
 	ld de, sBoxMonNicknames
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
@@ -126,13 +126,13 @@ CheckPartyFullAfterContest:

 .BoxFull:
 	ld a, BANK(sBoxMon1Level)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [sBoxMon1Level]
 	ld [wCurPartyLevel], a
 	call CloseSRAM
 	call SetBoxMonCaughtData
 	ld a, BANK(sBoxMon1CaughtLocation)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxMon1CaughtLocation
 	ld a, [hl]
 	and CAUGHT_GENDER_MASK
@@ -200,7 +200,7 @@ SetBoxmonOrEggmonCaughtData:

 SetBoxMonCaughtData:
 	ld a, BANK(sBoxMon1CaughtLevel)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxMon1CaughtLevel
 	call SetBoxmonOrEggmonCaughtData
 	call CloseSRAM
@@ -209,7 +209,7 @@ SetBoxMonCaughtData:
 SetGiftBoxMonCaughtData:
 	push bc
 	ld a, BANK(sBoxMon1CaughtLevel)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxMon1CaughtLevel
 	pop bc
 	call SetGiftMonCaughtData
--- a/engine/pokemon/experience.asm
+++ b/engine/pokemon/experience.asm
@@ -93,7 +93,7 @@ CalcExpAtLevel:
 	ldh a, [hProduct + 3]
 	sub b
 	ldh [hMultiplicand + 2], a
-	ld b, $0
+	ld b, 0
 	ldh a, [hProduct + 2]
 	sbc b
 	ldh [hMultiplicand + 1], a
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -18,7 +18,7 @@ SendMailToPC:
 	call AddNTimes
 	push hl
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld bc, MAIL_STRUCT_LENGTH
 	call CopyBytes
 	pop hl
@@ -41,7 +41,7 @@ SendMailToPC:
 DeleteMailFromPC:
 ; Shift all mail messages in the mailbox
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, b
 	push bc
 	ld hl, sMailbox
@@ -83,7 +83,7 @@ ReadMailMessage:

 MoveMailFromPCToParty:
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	push bc
 	ld a, b
 	ld bc, MAIL_STRUCT_LENGTH
@@ -115,7 +115,7 @@ MoveMailFromPCToParty:

 GetMailboxCount:
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [sMailboxCount]
 	ld c, a
 	jp CloseSRAM
@@ -137,7 +137,7 @@ CheckPokeMail::
 	jr nc, .pop_return

 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [wCurPartyMon]
 	ld hl, sPartyMail
 	ld bc, MAIL_STRUCT_LENGTH
@@ -209,7 +209,7 @@ GivePokeMail::
 	ld hl, wd002
 	ld bc, MAIL_MSG_LENGTH + 1
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	call CopyBytes
 	pop af
 	push af
@@ -238,7 +238,7 @@ GivePokeMail::

 BackupPartyMonMail:
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sPartyMail
 	ld de, sPartyMailBackup
 	ld bc, 6 * MAIL_STRUCT_LENGTH
@@ -251,7 +251,7 @@ BackupPartyMonMail:

 RestorePartyMonMail:
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sPartyMailBackup
 	ld de, sPartyMail
 	ld bc, 6 * MAIL_STRUCT_LENGTH
@@ -264,7 +264,7 @@ RestorePartyMonMail:

 DeletePartyMonMail:
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	xor a
 	ld hl, sPartyMail
 	ld bc, 6 * MAIL_STRUCT_LENGTH
@@ -317,7 +317,7 @@ InitMail:
 ; initialize wMailboxCount and beyond with incrementing values, one per mail
 ; set z if no mail
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [sMailboxCount]
 	call CloseSRAM
 	ld hl, wMailboxCount
@@ -347,7 +347,7 @@ MailboxPC_GetMailAuthor:
 	ld bc, MAIL_STRUCT_LENGTH
 	call AddNTimes
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld de, wStringBuffer2
 	push de
 	ld bc, NAME_LENGTH - 1
@@ -467,7 +467,7 @@ MailboxPC:
 .GetMailType:
 	push af
 	ld a, BANK(sMailboxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	pop af
 	ld hl, sMailbox1Type
 	ld bc, MAIL_STRUCT_LENGTH
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -15,7 +15,7 @@ ReadAnyMail:
 	pop de
 	push de
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	farcall IsMailEuropean
 	call CloseSRAM
 	ld a, c
@@ -69,7 +69,7 @@ ReadAnyMail:
 	ld l, e
 	push hl
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	ld de, sPartyMon1MailAuthorID - sPartyMon1Mail
 	add hl, de
 	ld a, [hli]
@@ -680,7 +680,7 @@ MailGFX_PlaceMessage:
 	ld bc, MAIL_STRUCT_LENGTH
 	ld de, wTempMail
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	call CopyBytes
 	call CloseSRAM
 	ld hl, wTempMailAuthor
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -466,7 +466,7 @@ ComposeMailMessage:
 	ld hl, wTempMail
 	ld bc, MAIL_STRUCT_LENGTH
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	call CopyBytes
 	call CloseSRAM
 	ret
--- a/engine/pokemon/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -174,7 +174,7 @@ GetGender:
 	ld a, [wMonType]
 	cp BOXMON
 	ld a, BANK(sBox)
-	call z, GetSRAMBank
+	call z, OpenSRAM

 ; Attack DV
 	ld a, [hli]
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -485,7 +485,7 @@ SendGetMonIntoFromBox:
 ; wPokemonWithdrawDepositParameter == 3: put mon into DayCare

 	ld a, BANK(sBoxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .check_IfPartyIsFull
@@ -942,7 +942,7 @@ SendMonIntoBox:
 ; Sends the mon into one of Bills Boxes
 ; the data comes mainly from 'wEnemyMon:'
 	ld a, BANK(sBoxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld de, sBoxCount
 	ld a, [de]
 	cp MONS_PER_BOX
@@ -1226,7 +1226,7 @@ RemoveMonFromPartyOrBox:
 	jr z, .okay

 	ld a, BANK(sBoxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxCount

 .okay
@@ -1336,7 +1336,7 @@ RemoveMonFromPartyOrBox:
 	ret nz
 	; Shift mail
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	; If this is the last mon in our party, no need to shift mail.
 	ld hl, wPartyCount
 	ld a, [wCurPartyMon]
@@ -1735,7 +1735,7 @@ GivePoke::

 .send_to_box
 	ld a, BANK(sBoxMonOT)
-	call GetSRAMBank
+	call OpenSRAM
 	ld de, sBoxMonOT
 .loop
 	ld a, [wScriptBank]
@@ -1785,7 +1785,7 @@ GivePoke::
 	ld hl, WasSentToBillsPCText
 	call PrintText
 	ld a, BANK(sBoxMonNicknames)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, wMonOrItemNameBuffer
 	ld de, sBoxMonNicknames
 	ld bc, MON_NAME_LENGTH
--- a/engine/pokemon/move_mon_wo_mail.asm
+++ b/engine/pokemon/move_mon_wo_mail.asm
@@ -1,6 +1,6 @@
 InsertPokemonIntoBox:
 	ld a, BANK(sBoxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxCount
 	call InsertSpeciesIntoBoxOrParty
 	ld a, [sBoxCount]
--- a/engine/pokemon/search.asm
+++ b/engine/pokemon/search.asm
@@ -75,7 +75,7 @@ CheckOwnMonAnywhere:

 	; Run CheckOwnMon on each Pokémon in the PC.
 	ld a, BANK(sBoxCount)
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [sBoxCount]
 	and a
 	jr z, .boxes
@@ -119,7 +119,7 @@ CheckOwnMonAnywhere:
 	add hl, bc
 	add hl, bc
 	ld a, [hli]
-	call GetSRAMBank
+	call OpenSRAM
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -224,7 +224,7 @@ StatsScreenWaitCry:
 StatsScreen_CopyToTempMon:
 	ld a, [wMonType]
 	cp TEMPMON
-	jr nz, .breedmon
+	jr nz, .not_tempmon
 	ld a, [wBufferMonSpecies]
 	ld [wCurSpecies], a
 	call GetBaseData
@@ -234,7 +234,7 @@ StatsScreen_CopyToTempMon:
 	call CopyBytes
 	jr .done

-.breedmon
+.not_tempmon
 	farcall CopyMonToTempMon
 	ld a, [wCurPartySpecies]
 	cp EGG
@@ -251,7 +251,7 @@ StatsScreen_GetJoypad:
 	call GetJoypad
 	ld a, [wMonType]
 	cp TEMPMON
-	jr nz, .notbreedmon
+	jr nz, .not_tempmon
 	push hl
 	push de
 	push bc
@@ -263,11 +263,11 @@ StatsScreen_GetJoypad:
 	and D_DOWN | D_UP
 	jr nz, .set_carry
 	ld a, [wMenuJoypad]
-	jr .clear_flags
+	jr .clear_carry

-.notbreedmon
+.not_tempmon
 	ldh a, [hJoyPressed]
-.clear_flags
+.clear_carry
 	and a
 	ret

@@ -532,11 +532,11 @@ StatsScreen_LoadGFX:

 .Jumptable:
 ; entries correspond to *_PAGE constants
-	dw .PinkPage
-	dw .GreenPage
-	dw .BluePage
+	dw LoadPinkPage
+	dw LoadGreenPage
+	dw LoadBluePage

-.PinkPage:
+LoadPinkPage:
 	hlcoord 0, 9
 	ld b, $0
 	predef DrawPlayerHP
@@ -678,7 +678,7 @@ StatsScreen_LoadGFX:
 .PkrsStr:
 	db "#RUS@"

-.GreenPage:
+LoadGreenPage:
 	ld de, .Item
 	hlcoord 0, 8
 	call PlaceString
@@ -723,17 +723,17 @@ StatsScreen_LoadGFX:
 .Move:
 	db "MOVE@"

-.BluePage:
+LoadBluePage:
 	call .PlaceOTInfo
 	hlcoord 10, 8
 	ld de, SCREEN_WIDTH
 	ld b, 10
 	ld a, $31 ; vertical divider
-.BluePageVerticalDivider:
+.vertical_divider
 	ld [hl], a
 	add hl, de
 	dec b
-	jr nz, .BluePageVerticalDivider
+	jr nz, .vertical_divider
 	hlcoord 11, 8
 	ld bc, 6
 	predef PrintTempMonStats
@@ -890,7 +890,7 @@ StatsScreen_GetAnimationParam:
 	ld b, h
 	ld c, l
 	ld a, BANK(sBoxMons)
-	call GetSRAMBank
+	call OpenSRAM
 	call .CheckEggFaintedFrzSlp
 	push af
 	call CloseSRAM
@@ -1095,7 +1095,7 @@ CopyNickname:
 	cp BOXMON
 	jr nz, .partymon
 	ld a, BANK(sBoxMonNicknames)
-	call GetSRAMBank
+	call OpenSRAM
 	push de
 	call CopyBytes
 	pop de
--- a/engine/pokemon/switchpartymons.asm
+++ b/engine/pokemon/switchpartymons.asm
@@ -116,7 +116,7 @@ _SwitchPartyMons:
 	ld de, wd002
 	ld bc, MAIL_STRUCT_LENGTH
 	ld a, BANK(sPartyMail)
-	call GetSRAMBank
+	call OpenSRAM
 	call CopyBytes
 	ld hl, sPartyMail
 	ld a, [wBuffer3]
--- a/engine/pokemon/tempmon.asm
+++ b/engine/pokemon/tempmon.asm
@@ -107,7 +107,7 @@ GetMonSpecies:

 .boxmon
 	ld a, BANK(sBoxSpecies)
-	call GetSRAMBank
+	call OpenSRAM
 	ld hl, sBoxSpecies
 	call .done
 	call CloseSRAM