Update to RGBDS 0.7.0 (#447)

pret · Jan 3, 2024 · b5bf00e · b5bf00e
1 parent dd01313
commit b5bf00e
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 82 deletions.
diff --git a/pokeblue.map b/pokeblue.map
@@ -1,3 +1,10 @@
+SUMMARY:
+	ROM0: 16228 bytes used / 156 free
+	ROMX: 559182 bytes used / 161714 free in 44 banks
+	SRAM: 25122 bytes used / 7646 free in 4 banks
+	WRAM0: 8162 bytes used / 30 free
+	HRAM: 127 bytes used / 0 free
+
 ROM0 bank #0:
 	SECTION: $0000 (0 bytes) ["NULL"]
 	         $0000 = NULL
@@ -1244,7 +1251,7 @@ ROMX bank #1:
 	         $4bed = WriteDMACodeToHRAM
 	         $4bf4 = WriteDMACodeToHRAM.copy
 	         $4bfb = DMARoutine
-	         $4c05 = DMARoutineEnd
+	         $4c05 = DMARoutine.End
 	         $4c05 = PrintWaitingText
 	         $4c17 = PrintWaitingText.trade
 	         $4c1a = PrintWaitingText.border_done
@@ -20399,10 +20406,3 @@ HRAM bank #0:
 	         $fff8 = hJoyInput
 	         $fff9 = hDisableJoypadPolling
 	TOTAL EMPTY: $0000 bytes
-
-SUMMARY:
-	ROM0: 16228 bytes used / 156 free
-	ROMX: 559182 bytes used / 161714 free in 44 banks
-	SRAM: 25122 bytes used / 7646 free in 4 banks
-	WRAM0: 8162 bytes used / 30 free
-	HRAM: 127 bytes used / 0 free
diff --git a/pokeblue.sym b/pokeblue.sym
@@ -1221,7 +1221,7 @@
 01:4bed WriteDMACodeToHRAM
 01:4bf4 WriteDMACodeToHRAM.copy
 01:4bfb DMARoutine
-01:4c05 DMARoutineEnd
+01:4c05 DMARoutine.End
 01:4c05 PrintWaitingText
 01:4c17 PrintWaitingText.trade
 01:4c1a PrintWaitingText.border_done
@@ -2019,8 +2019,8 @@
 02:4393 Audio1_WavePointers.wave2
 02:43a3 Audio1_WavePointers.wave3
 02:43b3 Audio1_WavePointers.wave4
-02:43c3 SFX_Start_Menu_1_Ch8
 02:43c3 Audio1_WavePointers.wave5
+02:43c3 SFX_Start_Menu_1_Ch8
 02:43ca SFX_Pokeflute_Ch3
 02:43e1 SFX_Cut_1_Ch8
 02:43f1 SFX_Go_Inside_1_Ch8
@@ -5096,8 +5096,8 @@
 08:4393 Audio2_WavePointers.wave2
 08:43a3 Audio2_WavePointers.wave3
 08:43b3 Audio2_WavePointers.wave4
-08:43c3 SFX_Press_AB_2_Ch5
 08:43c3 Audio2_WavePointers.wave5
+08:43c3 SFX_Press_AB_2_Ch5
 08:43d6 SFX_Start_Menu_2_Ch8
 08:43dd SFX_Tink_2_Ch5
 08:43ee SFX_Heal_HP_2_Ch5
@@ -8117,8 +8117,8 @@
 11:5741 RocketHideoutElevatorScript
 11:5754 RocketHideoutElavatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
-11:575f RocketHideoutElevatorShakeScript
 11:575f RocketHideoutElevatorWarpMaps.End
+11:575f RocketHideoutElevatorShakeScript
 11:576b RocketHideoutElevator_TextPointers
 11:576d RocketHideoutElevatorText
 11:5782 RocketHideoutElevatorText.no_key
@@ -8133,8 +8133,8 @@
 11:57f1 SilphCoElevatorCopyWarpMapsScript
 11:5804 SilphCoElevatorFloors
 11:5811 SilphCoElevatorWarpMaps
-11:5827 SilphCoElevatorShakeScript
 11:5827 SilphCoElevatorWarpMaps.End
+11:5827 SilphCoElevatorShakeScript
 11:5833 SilphCoElevator_TextPointers
 11:5835 SilphCoElevatorElevatorText
 11:5844 SilphCoElevator_Object
@@ -8537,8 +8537,8 @@
 12:4631 CeladonMartElevatorCopyWarpMapsScript
 12:4643 CeladonMartElevatorFloors
 12:464a CeladonMartElevatorWarpMaps
-12:4654 CeladonMartElevatorShakeScript
 12:4654 CeladonMartElevatorWarpMaps.End
+12:4654 CeladonMartElevatorShakeScript
 12:465c CeladonMartElevator_TextPointers
 12:465e CeladonMartElevatorText
 12:466d CeladonMartElevator_Object
@@ -11126,8 +11126,8 @@
 17:45d1 PewterPokecenterJigglypuffText.spinMovementLoop
 17:4603 PewterPokecenterJigglypuffText.Text
 17:4608 PewterPokecenterJigglypuffText.FacingDirections
-17:460c PewterPokecenterLinkReceptionistText
 17:460c PewterPokecenterJigglypuffText.FacingDirectionsEnd
+17:460c PewterPokecenterLinkReceptionistText
 17:460d PewterPokecenter_Object
 17:4639 CeruleanPokecenter_h
 17:4645 CeruleanPokecenter_Script
@@ -14329,8 +14329,8 @@
 1f:4393 Audio3_WavePointers.wave2
 1f:43a3 Audio3_WavePointers.wave3
 1f:43b3 Audio3_WavePointers.wave4
-1f:43c3 SFX_Start_Menu_3_Ch8
 1f:43c3 Audio3_WavePointers.wave5
+1f:43c3 SFX_Start_Menu_3_Ch8
 1f:43ca SFX_Cut_3_Ch8
 1f:43da SFX_Go_Inside_3_Ch8
 1f:43e1 SFX_Swap_3_Ch5

diff --git a/pokeblue_debug.map b/pokeblue_debug.map
@@ -1,3 +1,10 @@
+SUMMARY:
+	ROM0: 16248 bytes used / 136 free
+	ROMX: 559516 bytes used / 161380 free in 44 banks
+	SRAM: 25122 bytes used / 7646 free in 4 banks
+	WRAM0: 8162 bytes used / 30 free
+	HRAM: 127 bytes used / 0 free
+
 ROM0 bank #0:
 	SECTION: $0000 (0 bytes) ["NULL"]
 	         $0000 = NULL
@@ -1245,7 +1252,7 @@ ROMX bank #1:
 	         $4bf3 = WriteDMACodeToHRAM
 	         $4bfa = WriteDMACodeToHRAM.copy
 	         $4c01 = DMARoutine
-	         $4c0b = DMARoutineEnd
+	         $4c0b = DMARoutine.End
 	         $4c0b = PrintWaitingText
 	         $4c1d = PrintWaitingText.trade
 	         $4c20 = PrintWaitingText.border_done
@@ -20409,10 +20416,3 @@ HRAM bank #0:
 	         $fff8 = hJoyInput
 	         $fff9 = hDisableJoypadPolling
 	TOTAL EMPTY: $0000 bytes
-
-SUMMARY:
-	ROM0: 16248 bytes used / 136 free
-	ROMX: 559516 bytes used / 161380 free in 44 banks
-	SRAM: 25122 bytes used / 7646 free in 4 banks
-	WRAM0: 8162 bytes used / 30 free
-	HRAM: 127 bytes used / 0 free
diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym
@@ -1222,7 +1222,7 @@
 01:4bf3 WriteDMACodeToHRAM
 01:4bfa WriteDMACodeToHRAM.copy
 01:4c01 DMARoutine
-01:4c0b DMARoutineEnd
+01:4c0b DMARoutine.End
 01:4c0b PrintWaitingText
 01:4c1d PrintWaitingText.trade
 01:4c20 PrintWaitingText.border_done
@@ -2029,8 +2029,8 @@
 02:4393 Audio1_WavePointers.wave2
 02:43a3 Audio1_WavePointers.wave3
 02:43b3 Audio1_WavePointers.wave4
-02:43c3 SFX_Start_Menu_1_Ch8
 02:43c3 Audio1_WavePointers.wave5
+02:43c3 SFX_Start_Menu_1_Ch8
 02:43ca SFX_Pokeflute_Ch3
 02:43e1 SFX_Cut_1_Ch8
 02:43f1 SFX_Go_Inside_1_Ch8
@@ -5106,8 +5106,8 @@
 08:4393 Audio2_WavePointers.wave2
 08:43a3 Audio2_WavePointers.wave3
 08:43b3 Audio2_WavePointers.wave4
-08:43c3 SFX_Press_AB_2_Ch5
 08:43c3 Audio2_WavePointers.wave5
+08:43c3 SFX_Press_AB_2_Ch5
 08:43d6 SFX_Start_Menu_2_Ch8
 08:43dd SFX_Tink_2_Ch5
 08:43ee SFX_Heal_HP_2_Ch5
@@ -8127,8 +8127,8 @@
 11:5741 RocketHideoutElevatorScript
 11:5754 RocketHideoutElavatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
-11:575f RocketHideoutElevatorShakeScript
 11:575f RocketHideoutElevatorWarpMaps.End
+11:575f RocketHideoutElevatorShakeScript
 11:576b RocketHideoutElevator_TextPointers
 11:576d RocketHideoutElevatorText
 11:5782 RocketHideoutElevatorText.no_key
@@ -8143,8 +8143,8 @@
 11:57f1 SilphCoElevatorCopyWarpMapsScript
 11:5804 SilphCoElevatorFloors
 11:5811 SilphCoElevatorWarpMaps
-11:5827 SilphCoElevatorShakeScript
 11:5827 SilphCoElevatorWarpMaps.End
+11:5827 SilphCoElevatorShakeScript
 11:5833 SilphCoElevator_TextPointers
 11:5835 SilphCoElevatorElevatorText
 11:5844 SilphCoElevator_Object
@@ -8547,8 +8547,8 @@
 12:4631 CeladonMartElevatorCopyWarpMapsScript
 12:4643 CeladonMartElevatorFloors
 12:464a CeladonMartElevatorWarpMaps
-12:4654 CeladonMartElevatorShakeScript
 12:4654 CeladonMartElevatorWarpMaps.End
+12:4654 CeladonMartElevatorShakeScript
 12:465c CeladonMartElevator_TextPointers
 12:465e CeladonMartElevatorText
 12:466d CeladonMartElevator_Object
@@ -11136,8 +11136,8 @@
 17:45d1 PewterPokecenterJigglypuffText.spinMovementLoop
 17:4603 PewterPokecenterJigglypuffText.Text
 17:4608 PewterPokecenterJigglypuffText.FacingDirections
-17:460c PewterPokecenterLinkReceptionistText
 17:460c PewterPokecenterJigglypuffText.FacingDirectionsEnd
+17:460c PewterPokecenterLinkReceptionistText
 17:460d PewterPokecenter_Object
 17:4639 CeruleanPokecenter_h
 17:4645 CeruleanPokecenter_Script
@@ -14339,8 +14339,8 @@
 1f:4393 Audio3_WavePointers.wave2
 1f:43a3 Audio3_WavePointers.wave3
 1f:43b3 Audio3_WavePointers.wave4
-1f:43c3 SFX_Start_Menu_3_Ch8
 1f:43c3 Audio3_WavePointers.wave5
+1f:43c3 SFX_Start_Menu_3_Ch8
 1f:43ca SFX_Cut_3_Ch8
 1f:43da SFX_Go_Inside_3_Ch8
 1f:43e1 SFX_Swap_3_Ch5

diff --git a/pokeblue_vc.map b/pokeblue_vc.map
@@ -1,3 +1,10 @@
+SUMMARY:
+	ROM0: 16228 bytes used / 156 free
+	ROMX: 559182 bytes used / 161714 free in 44 banks
+	SRAM: 25122 bytes used / 7646 free in 4 banks
+	WRAM0: 8162 bytes used / 30 free
+	HRAM: 127 bytes used / 0 free
+
 ROM0 bank #0:
 	SECTION: $0000 (0 bytes) ["NULL"]
 	         $0000 = NULL
@@ -1250,7 +1257,7 @@ ROMX bank #1:
 	         $4bed = WriteDMACodeToHRAM
 	         $4bf4 = WriteDMACodeToHRAM.copy
 	         $4bfb = DMARoutine
-	         $4c05 = DMARoutineEnd
+	         $4c05 = DMARoutine.End
 	         $4c05 = PrintWaitingText
 	         $4c17 = PrintWaitingText.trade
 	         $4c1a = PrintWaitingText.border_done
@@ -20451,10 +20458,3 @@ HRAM bank #0:
 	         $fff8 = hJoyInput
 	         $fff9 = hDisableJoypadPolling
 	TOTAL EMPTY: $0000 bytes
-
-SUMMARY:
-	ROM0: 16228 bytes used / 156 free
-	ROMX: 559182 bytes used / 161714 free in 44 banks
-	SRAM: 25122 bytes used / 7646 free in 4 banks
-	WRAM0: 8162 bytes used / 30 free
-	HRAM: 127 bytes used / 0 free
diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym
@@ -1227,7 +1227,7 @@
 01:4bed WriteDMACodeToHRAM
 01:4bf4 WriteDMACodeToHRAM.copy
 01:4bfb DMARoutine
-01:4c05 DMARoutineEnd
+01:4c05 DMARoutine.End
 01:4c05 PrintWaitingText
 01:4c17 PrintWaitingText.trade
 01:4c1a PrintWaitingText.border_done
@@ -2035,8 +2035,8 @@
 02:4393 Audio1_WavePointers.wave2
 02:43a3 Audio1_WavePointers.wave3
 02:43b3 Audio1_WavePointers.wave4
-02:43c3 SFX_Start_Menu_1_Ch8
 02:43c3 Audio1_WavePointers.wave5
+02:43c3 SFX_Start_Menu_1_Ch8
 02:43ca SFX_Pokeflute_Ch3
 02:43e1 SFX_Cut_1_Ch8
 02:43f1 SFX_Go_Inside_1_Ch8
@@ -5112,8 +5112,8 @@
 08:4393 Audio2_WavePointers.wave2
 08:43a3 Audio2_WavePointers.wave3
 08:43b3 Audio2_WavePointers.wave4
-08:43c3 SFX_Press_AB_2_Ch5
 08:43c3 Audio2_WavePointers.wave5
+08:43c3 SFX_Press_AB_2_Ch5
 08:43d6 SFX_Start_Menu_2_Ch8
 08:43dd SFX_Tink_2_Ch5
 08:43ee SFX_Heal_HP_2_Ch5
@@ -8144,8 +8144,8 @@
 11:5741 RocketHideoutElevatorScript
 11:5754 RocketHideoutElavatorFloors
 11:5759 RocketHideoutElevatorWarpMaps
-11:575f RocketHideoutElevatorShakeScript
 11:575f RocketHideoutElevatorWarpMaps.End
+11:575f RocketHideoutElevatorShakeScript
 11:576b RocketHideoutElevator_TextPointers
 11:576d RocketHideoutElevatorText
 11:5782 RocketHideoutElevatorText.no_key
@@ -8160,8 +8160,8 @@
 11:57f1 SilphCoElevatorCopyWarpMapsScript
 11:5804 SilphCoElevatorFloors
 11:5811 SilphCoElevatorWarpMaps
-11:5827 SilphCoElevatorShakeScript
 11:5827 SilphCoElevatorWarpMaps.End
+11:5827 SilphCoElevatorShakeScript
 11:5833 SilphCoElevator_TextPointers
 11:5835 SilphCoElevatorElevatorText
 11:5844 SilphCoElevator_Object
@@ -8564,8 +8564,8 @@
 12:4631 CeladonMartElevatorCopyWarpMapsScript
 12:4643 CeladonMartElevatorFloors
 12:464a CeladonMartElevatorWarpMaps
-12:4654 CeladonMartElevatorShakeScript
 12:4654 CeladonMartElevatorWarpMaps.End
+12:4654 CeladonMartElevatorShakeScript
 12:465c CeladonMartElevator_TextPointers
 12:465e CeladonMartElevatorText
 12:466d CeladonMartElevator_Object
@@ -11153,8 +11153,8 @@
 17:45d1 PewterPokecenterJigglypuffText.spinMovementLoop
 17:4603 PewterPokecenterJigglypuffText.Text
 17:4608 PewterPokecenterJigglypuffText.FacingDirections
-17:460c PewterPokecenterLinkReceptionistText
 17:460c PewterPokecenterJigglypuffText.FacingDirectionsEnd
+17:460c PewterPokecenterLinkReceptionistText
 17:460d PewterPokecenter_Object
 17:4639 CeruleanPokecenter_h
 17:4645 CeruleanPokecenter_Script
@@ -14379,8 +14379,8 @@
 1f:4393 Audio3_WavePointers.wave2
 1f:43a3 Audio3_WavePointers.wave3
 1f:43b3 Audio3_WavePointers.wave4
-1f:43c3 SFX_Start_Menu_3_Ch8
 1f:43c3 Audio3_WavePointers.wave5
+1f:43c3 SFX_Start_Menu_3_Ch8
 1f:43ca SFX_Cut_3_Ch8
 1f:43da SFX_Go_Inside_3_Ch8
 1f:43e1 SFX_Swap_3_Ch5
@@ -17095,8 +17095,8 @@
 28:6969 _CableClubNPCWelcomeText
 28:6985 _CableClubNPCPleaseApplyHereHaveToSaveText
 28:69cc _CableClubNPCPleaseWaitText
-28:69db _CableClubNPCLinkClosedBecauseOfInactivityText.VC_Change_link_closed_inactivity_message
 28:69db _CableClubNPCLinkClosedBecauseOfInactivityText
+28:69db _CableClubNPCLinkClosedBecauseOfInactivityText.VC_Change_link_closed_inactivity_message
 28:6a0b _CableClubNPCLinkClosedBecauseOfInactivityText.VC_Change_link_closed_inactivity_message_End
 29:4000 _CableClubNPCPleaseComeAgainText
 29:4014 _CableClubNPCMakingPreparationsText

diff --git a/pokered.map b/pokered.map
@@ -1,3 +1,10 @@
+SUMMARY:
+	ROM0: 16228 bytes used / 156 free
+	ROMX: 559197 bytes used / 161699 free in 44 banks
+	SRAM: 25122 bytes used / 7646 free in 4 banks
+	WRAM0: 8162 bytes used / 30 free
+	HRAM: 127 bytes used / 0 free
+
 ROM0 bank #0:
 	SECTION: $0000 (0 bytes) ["NULL"]
 	         $0000 = NULL
@@ -1244,7 +1251,7 @@ ROMX bank #1:
 	         $4bed = WriteDMACodeToHRAM
 	         $4bf4 = WriteDMACodeToHRAM.copy
 	         $4bfb = DMARoutine
-	         $4c05 = DMARoutineEnd
+	         $4c05 = DMARoutine.End
 	         $4c05 = PrintWaitingText
 	         $4c17 = PrintWaitingText.trade
 	         $4c1a = PrintWaitingText.border_done
@@ -20399,10 +20406,3 @@ HRAM bank #0:
 	         $fff8 = hJoyInput
 	         $fff9 = hDisableJoypadPolling
 	TOTAL EMPTY: $0000 bytes
-
-SUMMARY:
-	ROM0: 16228 bytes used / 156 free
-	ROMX: 559197 bytes used / 161699 free in 44 banks
-	SRAM: 25122 bytes used / 7646 free in 4 banks
-	WRAM0: 8162 bytes used / 30 free
-	HRAM: 127 bytes used / 0 free