ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

dump couple of baseroms review changes

Browse Source
This commit is contained in:
DizzyEggg 2017-11-12 18:41:04 +01:00
parent 99e697223f
commit c967ba1d5f
7 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/berry_blender.s
View File

@ -5555,7 +5555,7 @@ _080826EC:
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, =sText_someonesPokeblockCaseIsFull ldr r1, =ApostropheSPokeblockCaseIsFull
b _08082740 b _08082740
.pool .pool
_0808271C: _0808271C:
@ -5575,7 +5575,7 @@ _0808271C:
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, =sText_hasNoBerriesToPut ldr r1, =sText_HasNoBerriesToPut
_08082740: _08082740:
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
@ -7682,7 +7682,7 @@ sub_80838AC: @ 80838AC
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
ldr r1, =gText_wasMade ldr r1, =gText_WasMade
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
ldr r1, =sText_NewLine ldr r1, =sText_NewLine

2
data/graphics.s
View File

@ -1226,7 +1226,7 @@ gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
gBerryBlenderStartTiles:: @ 8DCA588 gBerryBlenderStartTiles:: @ 8DCA588
.incbin "baserom.gba" , 0xdca588, 1024 .incbin "baserom.gba" , 0xdca588, 1024
.space 512 .space 0x200
.align 2 .align 2
gBerryBlenderArrowTiles:: @ 8DCAB88 gBerryBlenderArrowTiles:: @ 8DCAB88

38
data/item_menu.s
View File

@ -16,21 +16,21 @@ gUnknown_08613F9C:: @ 8613F9C
.4byte 0x7003011 .4byte 0x7003011
gUnknown_08613FB4:: @ 8613FB4 gUnknown_08613FB4:: @ 8613FB4
.4byte gMenuText_Use, ItemMenu_UseOutOfBattle .4byte gMenuText_Use, ItemMenu_UseOutOfBattle
.4byte gMenuText_Toss, ItemMenu_Toss .4byte gMenuText_Toss, ItemMenu_Toss
.4byte gMenuText_Register, ItemMenu_Register .4byte gMenuText_Register, ItemMenu_Register
.4byte gMenuText_Give, ItemMenu_Give .4byte gMenuText_Give, ItemMenu_Give
.4byte gText_Cancel2, ItemMenu_Cancel .4byte gText_Cancel2, ItemMenu_Cancel
.4byte gMenuText_Use, ItemMenu_UseInBattle .4byte gMenuText_Use, ItemMenu_UseInBattle
.4byte gMenuText_Check, ItemMenu_UseOutOfBattle .4byte gMenuText_Check, ItemMenu_UseOutOfBattle
.4byte gMenuText_Walk, ItemMenu_UseOutOfBattle .4byte gMenuText_Walk, ItemMenu_UseOutOfBattle
.4byte gMenuText_Deselect, ItemMenu_Register .4byte gMenuText_Deselect, ItemMenu_Register
.4byte gMenuText_CheckTag, ItemMenu_CheckTag .4byte gMenuText_CheckTag, ItemMenu_CheckTag
.4byte gMenuText_Confirm, unknown_ItemMenu_Confirm .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm
.4byte gMenuText_Show, unknown_ItemMenu_Show .4byte gMenuText_Show, unknown_ItemMenu_Show
.4byte gMenuText_Give2, unknown_ItemMenu_Give2 .4byte gMenuText_Give2, unknown_ItemMenu_Give2
.4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2 .4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2
.4byte gText_EmptyString2, 0 .4byte gText_EmptyString2, NULL
gUnknown_0861402C:: @ 861402C gUnknown_0861402C:: @ 861402C
.byte 0, 3, 1, 4 .byte 0, 3, 1, 4
@ -68,7 +68,7 @@ gUnknown_0861404D:: @ 861404D
gUnknown_0861404F:: @ 861404F gUnknown_0861404F:: @ 861404F
.byte 13, 4 .byte 13, 4
.align 2 .align 2
gUnknown_08614054:: @ 8614054 gUnknown_08614054:: @ 8614054
.4byte unknown_item_menu_type .4byte unknown_item_menu_type
.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 unknown_item_menu_type
.4byte unknown_item_menu_type .4byte unknown_item_menu_type
.4byte 0 .4byte NULL
.4byte item_menu_type_b .4byte item_menu_type_b
.align 2 .align 2
gUnknown_08614084:: @ 8614084 gUnknown_08614084:: @ 8614084
.4byte BagMenuActuallyToss .4byte BagMenuActuallyToss
.4byte BagMenuCancelToss .4byte BagMenuCancelToss
@ -92,7 +92,7 @@ gUnknown_0861408C:: @ 861408C
.4byte sub_81AD84C .4byte sub_81AD84C
.4byte sub_81AD6FC .4byte sub_81AD6FC
@probably a struct @ probably a struct
gUnknown_08614094:: @ 8614094 gUnknown_08614094:: @ 8614094
.4byte 0x1101C00 .4byte 0x1101C00
.4byte 0xFFFF1064 .4byte 0xFFFF1064

2
data/mauville_old_man.s
View File

@ -6,7 +6,7 @@
gUnknown_0859EFE4:: @ 859EFE4 gUnknown_0859EFE4:: @ 859EFE4
.2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
gUnknown_0859EFF0:: @ 859EFF0 gUnknown_0859EFF0:: @ 859EFF0
.incbin "baserom.gba", 0x59eff0, 0x20 .incbin "baserom.gba", 0x59eff0, 0x20

1
data/save.s
View File

@ -18,4 +18,3 @@ gSaveSectionOffsets:: @ 85CDC00
.2byte 0x5D00, 0xF80 .2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80 .2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0 .2byte 0x7C00, 0x7D0

2
data/script_menu.s
View File

@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0
gUnknown_0858BB68:: @ 858BB68 gUnknown_0858BB68:: @ 858BB68
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2 .align 2
gUnknown_0858BB70:: @ 858BB70 gUnknown_0858BB70:: @ 858BB70
.4byte gText_SomeonesPC .4byte gText_SomeonesPC
.4byte gText_LanettesPC .4byte gText_LanettesPC

8
src/berry_blender.c
View File

@ -49,7 +49,7 @@ static const u8 sUnusedText_LinkPartnerNotFound[] = _("Link partner(s) not found
const u8 gText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p"); const u8 gText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p");
const u8 gText_NewParagraph[] = _("\p"); const u8 gText_NewParagraph[] = _("\p");
const u8 gText_wasMade[] = _(" was made!"); const u8 gText_WasMade[] = _(" was made!");
static const u8 sText_Mister[] = _("MISTER"); static const u8 sText_Mister[] = _("MISTER");
static const u8 sText_Laddie[] = _("LADDIE"); static const u8 sText_Laddie[] = _("LADDIE");
static const u8 sText_Lassie[] = _("LASSIE"); static const u8 sText_Lassie[] = _("LASSIE");
@ -67,14 +67,14 @@ const u8* const sBlenderOpponentsNames[] =
sText_Miss sText_Miss
}; };
static const u8 sText_PressA_ToStart[] = _("Press the A Button to start."); static const u8 sText_PressAToStart[] = _("Press the A Button to start.");
static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while."); static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
const u8 sText_CommunicationStandby[] = _("Communication standby…"); const u8 sText_CommunicationStandby[] = _("Communication standby…");
const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?"); const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p"); const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p"); const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
const u8 sText_hasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER."); const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
const u8 sText_someonesPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p"); const u8 ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING"); const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
static const u8 sText_BerryUsed[] = _("BERRY USED"); static const u8 sText_BerryUsed[] = _("BERRY USED");
const u8 sText_SpaceBerry[] = _(" BERRY"); const u8 sText_SpaceBerry[] = _(" BERRY");