summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-11-12 18:41:04 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-11-12 18:41:04 +0100
commitc967ba1d5f82c69e75f8a697fee60ceae6ef3218 (patch)
tree5dd3aa13db5128c4d70802b98a897974200c7961 /data
parent99e697223f86356ef178e4af90f3a3b4b7132591 (diff)
dump couple of baseroms review changes
Diffstat (limited to 'data')
-rw-r--r--data/graphics.s2
-rw-r--r--data/item_menu.s38
-rw-r--r--data/mauville_old_man.s2
-rw-r--r--data/save.s1
-rw-r--r--data/script_menu.s2
5 files changed, 22 insertions, 23 deletions
diff --git a/data/graphics.s b/data/graphics.s
index 3e4df7d9c..26347ea7b 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1226,7 +1226,7 @@ gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
gBerryBlenderStartTiles:: @ 8DCA588
.incbin "baserom.gba" , 0xdca588, 1024
- .space 512
+ .space 0x200
.align 2
gBerryBlenderArrowTiles:: @ 8DCAB88
diff --git a/data/item_menu.s b/data/item_menu.s
index c63b33396..b160200e8 100644
--- a/data/item_menu.s
+++ b/data/item_menu.s
@@ -16,21 +16,21 @@ gUnknown_08613F9C:: @ 8613F9C
.4byte 0x7003011
gUnknown_08613FB4:: @ 8613FB4
- .4byte gMenuText_Use, ItemMenu_UseOutOfBattle
- .4byte gMenuText_Toss, ItemMenu_Toss
- .4byte gMenuText_Register, ItemMenu_Register
- .4byte gMenuText_Give, ItemMenu_Give
- .4byte gText_Cancel2, ItemMenu_Cancel
- .4byte gMenuText_Use, ItemMenu_UseInBattle
- .4byte gMenuText_Check, ItemMenu_UseOutOfBattle
- .4byte gMenuText_Walk, ItemMenu_UseOutOfBattle
- .4byte gMenuText_Deselect, ItemMenu_Register
- .4byte gMenuText_CheckTag, ItemMenu_CheckTag
- .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm
- .4byte gMenuText_Show, unknown_ItemMenu_Show
- .4byte gMenuText_Give2, unknown_ItemMenu_Give2
- .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2
- .4byte gText_EmptyString2, 0
+ .4byte gMenuText_Use, ItemMenu_UseOutOfBattle
+ .4byte gMenuText_Toss, ItemMenu_Toss
+ .4byte gMenuText_Register, ItemMenu_Register
+ .4byte gMenuText_Give, ItemMenu_Give
+ .4byte gText_Cancel2, ItemMenu_Cancel
+ .4byte gMenuText_Use, ItemMenu_UseInBattle
+ .4byte gMenuText_Check, ItemMenu_UseOutOfBattle
+ .4byte gMenuText_Walk, ItemMenu_UseOutOfBattle
+ .4byte gMenuText_Deselect, ItemMenu_Register
+ .4byte gMenuText_CheckTag, ItemMenu_CheckTag
+ .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm
+ .4byte gMenuText_Show, unknown_ItemMenu_Show
+ .4byte gMenuText_Give2, unknown_ItemMenu_Give2
+ .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2
+ .4byte gText_EmptyString2, NULL
gUnknown_0861402C:: @ 861402C
.byte 0, 3, 1, 4
@@ -68,7 +68,7 @@ gUnknown_0861404D:: @ 861404D
gUnknown_0861404F:: @ 861404F
.byte 13, 4
-.align 2
+ .align 2
gUnknown_08614054:: @ 8614054
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
@@ -80,10 +80,10 @@ gUnknown_08614054:: @ 8614054
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
- .4byte 0
+ .4byte NULL
.4byte item_menu_type_b
-.align 2
+ .align 2
gUnknown_08614084:: @ 8614084
.4byte BagMenuActuallyToss
.4byte BagMenuCancelToss
@@ -92,7 +92,7 @@ gUnknown_0861408C:: @ 861408C
.4byte sub_81AD84C
.4byte sub_81AD6FC
-@probably a struct
+@ probably a struct
gUnknown_08614094:: @ 8614094
.4byte 0x1101C00
.4byte 0xFFFF1064
diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s
index 13e26f513..c9e096f19 100644
--- a/data/mauville_old_man.s
+++ b/data/mauville_old_man.s
@@ -6,7 +6,7 @@
gUnknown_0859EFE4:: @ 859EFE4
.2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
-
+
gUnknown_0859EFF0:: @ 859EFF0
.incbin "baserom.gba", 0x59eff0, 0x20
diff --git a/data/save.s b/data/save.s
index c0b0e007f..15e201baa 100644
--- a/data/save.s
+++ b/data/save.s
@@ -18,4 +18,3 @@ gSaveSectionOffsets:: @ 85CDC00
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0
- \ No newline at end of file
diff --git a/data/script_menu.s b/data/script_menu.s
index 0afe3579a..cf4a5df01 100644
--- a/data/script_menu.s
+++ b/data/script_menu.s
@@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0
gUnknown_0858BB68:: @ 858BB68
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
-.align 2
+ .align 2
gUnknown_0858BB70:: @ 858BB70
.4byte gText_SomeonesPC
.4byte gText_LanettesPC