From 5dd0e98cfeac217f004f8cbbccc49360873bfde5 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Thu, 23 May 2024 01:03:55 +0000 Subject: [PATCH] Use constants for VBlank handlers --- pokecrystal.map | 32 ++++++++++++++++---------------- pokecrystal.sym | 32 ++++++++++++++++---------------- pokecrystal11.map | 32 ++++++++++++++++---------------- pokecrystal11.sym | 32 ++++++++++++++++---------------- pokecrystal11_debug.map | 32 ++++++++++++++++---------------- pokecrystal11_debug.sym | 32 ++++++++++++++++---------------- pokecrystal11_vc.map | 32 ++++++++++++++++---------------- pokecrystal11_vc.sym | 32 ++++++++++++++++---------------- pokecrystal_au.map | 32 ++++++++++++++++---------------- pokecrystal_au.sym | 32 ++++++++++++++++---------------- pokecrystal_debug.map | 32 ++++++++++++++++---------------- pokecrystal_debug.sym | 32 ++++++++++++++++---------------- 12 files changed, 192 insertions(+), 192 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index 27859ddc369..1385554d029 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -53,23 +53,23 @@ ROM0 bank #0: $025c = ClearWRAM.bank_loop $0270 = ClearsScratch $0283 = VBlank - $02a1 = VBlank.VBlanks - $02b1 = VBlank0 - $02f4 = VBlank0.done - $02fc = VBlank0.done_oam - $030a = VBlank0.ok - $0314 = VBlank0.ok2 - $0325 = VBlank2 - $0337 = VBlank1 - $0351 = VBlank1.done + $02a1 = VBlankHandlers + $02b1 = VBlank_Normal + $02f4 = VBlank_Normal.done + $02fc = VBlank_Normal.done_oam + $030a = VBlank_Normal.ok + $0314 = VBlank_Normal.ok2 + $0325 = VBlank_SoundOnly + $0337 = VBlank_Cutscene + $0351 = VBlank_Cutscene.done $037f = UpdatePals - $0396 = VBlank3 - $03b3 = VBlank3.done - $03df = VBlank4 - $0400 = VBlank5 - $0413 = VBlank5.done - $0436 = VBlank6 - $044c = VBlank6.done + $0396 = VBlank_CutsceneCGB + $03b3 = VBlank_CutsceneCGB.done + $03df = VBlank_Serial + $0400 = VBlank_Credits + $0413 = VBlank_Credits.done + $0436 = VBlank_DMATransfer + $044c = VBlank_DMATransfer.done $045a = DelayFrame $045f = DelayFrame.halt $0468 = DelayFrames diff --git a/pokecrystal.sym b/pokecrystal.sym index 3880be10cf7..4f90a08c8aa 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -18,23 +18,23 @@ 00:025c ClearWRAM.bank_loop 00:0270 ClearsScratch 00:0283 VBlank -00:02a1 VBlank.VBlanks -00:02b1 VBlank0 -00:02f4 VBlank0.done -00:02fc VBlank0.done_oam -00:030a VBlank0.ok -00:0314 VBlank0.ok2 -00:0325 VBlank2 -00:0337 VBlank1 -00:0351 VBlank1.done +00:02a1 VBlankHandlers +00:02b1 VBlank_Normal +00:02f4 VBlank_Normal.done +00:02fc VBlank_Normal.done_oam +00:030a VBlank_Normal.ok +00:0314 VBlank_Normal.ok2 +00:0325 VBlank_SoundOnly +00:0337 VBlank_Cutscene +00:0351 VBlank_Cutscene.done 00:037f UpdatePals -00:0396 VBlank3 -00:03b3 VBlank3.done -00:03df VBlank4 -00:0400 VBlank5 -00:0413 VBlank5.done -00:0436 VBlank6 -00:044c VBlank6.done +00:0396 VBlank_CutsceneCGB +00:03b3 VBlank_CutsceneCGB.done +00:03df VBlank_Serial +00:0400 VBlank_Credits +00:0413 VBlank_Credits.done +00:0436 VBlank_DMATransfer +00:044c VBlank_DMATransfer.done 00:045a DelayFrame 00:045f DelayFrame.halt 00:0468 DelayFrames diff --git a/pokecrystal11.map b/pokecrystal11.map index 65982f5dd8d..c626569a29f 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -53,23 +53,23 @@ ROM0 bank #0: $025c = ClearWRAM.bank_loop $0270 = ClearsScratch $0283 = VBlank - $02a1 = VBlank.VBlanks - $02b1 = VBlank0 - $02f4 = VBlank0.done - $02fc = VBlank0.done_oam - $030a = VBlank0.ok - $0314 = VBlank0.ok2 - $0325 = VBlank2 - $0337 = VBlank1 - $0351 = VBlank1.done + $02a1 = VBlankHandlers + $02b1 = VBlank_Normal + $02f4 = VBlank_Normal.done + $02fc = VBlank_Normal.done_oam + $030a = VBlank_Normal.ok + $0314 = VBlank_Normal.ok2 + $0325 = VBlank_SoundOnly + $0337 = VBlank_Cutscene + $0351 = VBlank_Cutscene.done $037f = UpdatePals - $0396 = VBlank3 - $03b3 = VBlank3.done - $03df = VBlank4 - $0400 = VBlank5 - $0413 = VBlank5.done - $0436 = VBlank6 - $044c = VBlank6.done + $0396 = VBlank_CutsceneCGB + $03b3 = VBlank_CutsceneCGB.done + $03df = VBlank_Serial + $0400 = VBlank_Credits + $0413 = VBlank_Credits.done + $0436 = VBlank_DMATransfer + $044c = VBlank_DMATransfer.done $045a = DelayFrame $045f = DelayFrame.halt $0468 = DelayFrames diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 88aecfeb966..f1a061edc05 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -18,23 +18,23 @@ 00:025c ClearWRAM.bank_loop 00:0270 ClearsScratch 00:0283 VBlank -00:02a1 VBlank.VBlanks -00:02b1 VBlank0 -00:02f4 VBlank0.done -00:02fc VBlank0.done_oam -00:030a VBlank0.ok -00:0314 VBlank0.ok2 -00:0325 VBlank2 -00:0337 VBlank1 -00:0351 VBlank1.done +00:02a1 VBlankHandlers +00:02b1 VBlank_Normal +00:02f4 VBlank_Normal.done +00:02fc VBlank_Normal.done_oam +00:030a VBlank_Normal.ok +00:0314 VBlank_Normal.ok2 +00:0325 VBlank_SoundOnly +00:0337 VBlank_Cutscene +00:0351 VBlank_Cutscene.done 00:037f UpdatePals -00:0396 VBlank3 -00:03b3 VBlank3.done -00:03df VBlank4 -00:0400 VBlank5 -00:0413 VBlank5.done -00:0436 VBlank6 -00:044c VBlank6.done +00:0396 VBlank_CutsceneCGB +00:03b3 VBlank_CutsceneCGB.done +00:03df VBlank_Serial +00:0400 VBlank_Credits +00:0413 VBlank_Credits.done +00:0436 VBlank_DMATransfer +00:044c VBlank_DMATransfer.done 00:045a DelayFrame 00:045f DelayFrame.halt 00:0468 DelayFrames diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index fc813700b2a..dce226b10ea 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -53,23 +53,23 @@ ROM0 bank #0: $025c = ClearWRAM.bank_loop $0270 = ClearsScratch $0283 = VBlank - $02a1 = VBlank.VBlanks - $02b1 = VBlank0 - $02f4 = VBlank0.done - $02fc = VBlank0.done_oam - $030a = VBlank0.ok - $0314 = VBlank0.ok2 - $0325 = VBlank2 - $0337 = VBlank1 - $0351 = VBlank1.done + $02a1 = VBlankHandlers + $02b1 = VBlank_Normal + $02f4 = VBlank_Normal.done + $02fc = VBlank_Normal.done_oam + $030a = VBlank_Normal.ok + $0314 = VBlank_Normal.ok2 + $0325 = VBlank_SoundOnly + $0337 = VBlank_Cutscene + $0351 = VBlank_Cutscene.done $037f = UpdatePals - $0396 = VBlank3 - $03b3 = VBlank3.done - $03df = VBlank4 - $0400 = VBlank5 - $0413 = VBlank5.done - $0436 = VBlank6 - $044c = VBlank6.done + $0396 = VBlank_CutsceneCGB + $03b3 = VBlank_CutsceneCGB.done + $03df = VBlank_Serial + $0400 = VBlank_Credits + $0413 = VBlank_Credits.done + $0436 = VBlank_DMATransfer + $044c = VBlank_DMATransfer.done $045a = DelayFrame $045f = DelayFrame.halt $0468 = DelayFrames diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index e0fecfe85ff..6e7bd72a59f 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -18,23 +18,23 @@ 00:025c ClearWRAM.bank_loop 00:0270 ClearsScratch 00:0283 VBlank -00:02a1 VBlank.VBlanks -00:02b1 VBlank0 -00:02f4 VBlank0.done -00:02fc VBlank0.done_oam -00:030a VBlank0.ok -00:0314 VBlank0.ok2 -00:0325 VBlank2 -00:0337 VBlank1 -00:0351 VBlank1.done +00:02a1 VBlankHandlers +00:02b1 VBlank_Normal +00:02f4 VBlank_Normal.done +00:02fc VBlank_Normal.done_oam +00:030a VBlank_Normal.ok +00:0314 VBlank_Normal.ok2 +00:0325 VBlank_SoundOnly +00:0337 VBlank_Cutscene +00:0351 VBlank_Cutscene.done 00:037f UpdatePals -00:0396 VBlank3 -00:03b3 VBlank3.done -00:03df VBlank4 -00:0400 VBlank5 -00:0413 VBlank5.done -00:0436 VBlank6 -00:044c VBlank6.done +00:0396 VBlank_CutsceneCGB +00:03b3 VBlank_CutsceneCGB.done +00:03df VBlank_Serial +00:0400 VBlank_Credits +00:0413 VBlank_Credits.done +00:0436 VBlank_DMATransfer +00:044c VBlank_DMATransfer.done 00:045a DelayFrame 00:045f DelayFrame.halt 00:0468 DelayFrames diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 155884d200c..9a6345bfc37 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -53,23 +53,23 @@ ROM0 bank #0: $025c = ClearWRAM.bank_loop $0270 = ClearsScratch $0283 = VBlank - $02a1 = VBlank.VBlanks - $02b1 = VBlank0 - $02f4 = VBlank0.done - $02fc = VBlank0.done_oam - $030a = VBlank0.ok - $0314 = VBlank0.ok2 - $0325 = VBlank2 - $0337 = VBlank1 - $0351 = VBlank1.done + $02a1 = VBlankHandlers + $02b1 = VBlank_Normal + $02f4 = VBlank_Normal.done + $02fc = VBlank_Normal.done_oam + $030a = VBlank_Normal.ok + $0314 = VBlank_Normal.ok2 + $0325 = VBlank_SoundOnly + $0337 = VBlank_Cutscene + $0351 = VBlank_Cutscene.done $037f = UpdatePals - $0396 = VBlank3 - $03b3 = VBlank3.done - $03df = VBlank4 - $0400 = VBlank5 - $0413 = VBlank5.done - $0436 = VBlank6 - $044c = VBlank6.done + $0396 = VBlank_CutsceneCGB + $03b3 = VBlank_CutsceneCGB.done + $03df = VBlank_Serial + $0400 = VBlank_Credits + $0413 = VBlank_Credits.done + $0436 = VBlank_DMATransfer + $044c = VBlank_DMATransfer.done $045a = DelayFrame $045f = DelayFrame.halt $0468 = DelayFrames diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 54464a30ae4..2aa9bf9a05f 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -18,23 +18,23 @@ 00:025c ClearWRAM.bank_loop 00:0270 ClearsScratch 00:0283 VBlank -00:02a1 VBlank.VBlanks -00:02b1 VBlank0 -00:02f4 VBlank0.done -00:02fc VBlank0.done_oam -00:030a VBlank0.ok -00:0314 VBlank0.ok2 -00:0325 VBlank2 -00:0337 VBlank1 -00:0351 VBlank1.done +00:02a1 VBlankHandlers +00:02b1 VBlank_Normal +00:02f4 VBlank_Normal.done +00:02fc VBlank_Normal.done_oam +00:030a VBlank_Normal.ok +00:0314 VBlank_Normal.ok2 +00:0325 VBlank_SoundOnly +00:0337 VBlank_Cutscene +00:0351 VBlank_Cutscene.done 00:037f UpdatePals -00:0396 VBlank3 -00:03b3 VBlank3.done -00:03df VBlank4 -00:0400 VBlank5 -00:0413 VBlank5.done -00:0436 VBlank6 -00:044c VBlank6.done +00:0396 VBlank_CutsceneCGB +00:03b3 VBlank_CutsceneCGB.done +00:03df VBlank_Serial +00:0400 VBlank_Credits +00:0413 VBlank_Credits.done +00:0436 VBlank_DMATransfer +00:044c VBlank_DMATransfer.done 00:045a DelayFrame 00:045f DelayFrame.halt 00:0468 DelayFrames diff --git a/pokecrystal_au.map b/pokecrystal_au.map index 3b3060d5e85..b6365a65149 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -53,23 +53,23 @@ ROM0 bank #0: $025c = ClearWRAM.bank_loop $0270 = ClearsScratch $0283 = VBlank - $02a1 = VBlank.VBlanks - $02b1 = VBlank0 - $02f4 = VBlank0.done - $02fc = VBlank0.done_oam - $030a = VBlank0.ok - $0314 = VBlank0.ok2 - $0325 = VBlank2 - $0337 = VBlank1 - $0351 = VBlank1.done + $02a1 = VBlankHandlers + $02b1 = VBlank_Normal + $02f4 = VBlank_Normal.done + $02fc = VBlank_Normal.done_oam + $030a = VBlank_Normal.ok + $0314 = VBlank_Normal.ok2 + $0325 = VBlank_SoundOnly + $0337 = VBlank_Cutscene + $0351 = VBlank_Cutscene.done $037f = UpdatePals - $0396 = VBlank3 - $03b3 = VBlank3.done - $03df = VBlank4 - $0400 = VBlank5 - $0413 = VBlank5.done - $0436 = VBlank6 - $044c = VBlank6.done + $0396 = VBlank_CutsceneCGB + $03b3 = VBlank_CutsceneCGB.done + $03df = VBlank_Serial + $0400 = VBlank_Credits + $0413 = VBlank_Credits.done + $0436 = VBlank_DMATransfer + $044c = VBlank_DMATransfer.done $045a = DelayFrame $045f = DelayFrame.halt $0468 = DelayFrames diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index b1c5b3fcfed..dd5287c8d87 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -18,23 +18,23 @@ 00:025c ClearWRAM.bank_loop 00:0270 ClearsScratch 00:0283 VBlank -00:02a1 VBlank.VBlanks -00:02b1 VBlank0 -00:02f4 VBlank0.done -00:02fc VBlank0.done_oam -00:030a VBlank0.ok -00:0314 VBlank0.ok2 -00:0325 VBlank2 -00:0337 VBlank1 -00:0351 VBlank1.done +00:02a1 VBlankHandlers +00:02b1 VBlank_Normal +00:02f4 VBlank_Normal.done +00:02fc VBlank_Normal.done_oam +00:030a VBlank_Normal.ok +00:0314 VBlank_Normal.ok2 +00:0325 VBlank_SoundOnly +00:0337 VBlank_Cutscene +00:0351 VBlank_Cutscene.done 00:037f UpdatePals -00:0396 VBlank3 -00:03b3 VBlank3.done -00:03df VBlank4 -00:0400 VBlank5 -00:0413 VBlank5.done -00:0436 VBlank6 -00:044c VBlank6.done +00:0396 VBlank_CutsceneCGB +00:03b3 VBlank_CutsceneCGB.done +00:03df VBlank_Serial +00:0400 VBlank_Credits +00:0413 VBlank_Credits.done +00:0436 VBlank_DMATransfer +00:044c VBlank_DMATransfer.done 00:045a DelayFrame 00:045f DelayFrame.halt 00:0468 DelayFrames diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index 1eed73f956b..8052cf31ff9 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -53,23 +53,23 @@ ROM0 bank #0: $025c = ClearWRAM.bank_loop $0270 = ClearsScratch $0283 = VBlank - $02a1 = VBlank.VBlanks - $02b1 = VBlank0 - $02f4 = VBlank0.done - $02fc = VBlank0.done_oam - $030a = VBlank0.ok - $0314 = VBlank0.ok2 - $0325 = VBlank2 - $0337 = VBlank1 - $0351 = VBlank1.done + $02a1 = VBlankHandlers + $02b1 = VBlank_Normal + $02f4 = VBlank_Normal.done + $02fc = VBlank_Normal.done_oam + $030a = VBlank_Normal.ok + $0314 = VBlank_Normal.ok2 + $0325 = VBlank_SoundOnly + $0337 = VBlank_Cutscene + $0351 = VBlank_Cutscene.done $037f = UpdatePals - $0396 = VBlank3 - $03b3 = VBlank3.done - $03df = VBlank4 - $0400 = VBlank5 - $0413 = VBlank5.done - $0436 = VBlank6 - $044c = VBlank6.done + $0396 = VBlank_CutsceneCGB + $03b3 = VBlank_CutsceneCGB.done + $03df = VBlank_Serial + $0400 = VBlank_Credits + $0413 = VBlank_Credits.done + $0436 = VBlank_DMATransfer + $044c = VBlank_DMATransfer.done $045a = DelayFrame $045f = DelayFrame.halt $0468 = DelayFrames diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 0869b568770..afd08735123 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -18,23 +18,23 @@ 00:025c ClearWRAM.bank_loop 00:0270 ClearsScratch 00:0283 VBlank -00:02a1 VBlank.VBlanks -00:02b1 VBlank0 -00:02f4 VBlank0.done -00:02fc VBlank0.done_oam -00:030a VBlank0.ok -00:0314 VBlank0.ok2 -00:0325 VBlank2 -00:0337 VBlank1 -00:0351 VBlank1.done +00:02a1 VBlankHandlers +00:02b1 VBlank_Normal +00:02f4 VBlank_Normal.done +00:02fc VBlank_Normal.done_oam +00:030a VBlank_Normal.ok +00:0314 VBlank_Normal.ok2 +00:0325 VBlank_SoundOnly +00:0337 VBlank_Cutscene +00:0351 VBlank_Cutscene.done 00:037f UpdatePals -00:0396 VBlank3 -00:03b3 VBlank3.done -00:03df VBlank4 -00:0400 VBlank5 -00:0413 VBlank5.done -00:0436 VBlank6 -00:044c VBlank6.done +00:0396 VBlank_CutsceneCGB +00:03b3 VBlank_CutsceneCGB.done +00:03df VBlank_Serial +00:0400 VBlank_Credits +00:0413 VBlank_Credits.done +00:0436 VBlank_DMATransfer +00:044c VBlank_DMATransfer.done 00:045a DelayFrame 00:045f DelayFrame.halt 00:0468 DelayFrames