Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into field_poison

This commit is contained in:
PikalaxALT 2017-11-29 08:19:54 -05:00
parent 1ac177723d 54da963091
commit 10068b0345
8 changed files with 86 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
asm/coins.s
View File

@ -1,74 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GiveCoins
@ bool8 GiveCoins(u16 toAdd)
GiveCoins: @ 8145C80
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl GetCoins
lsls r0, 16
lsrs r1, r0, 16
ldr r0, =0x0000270e
cmp r1, r0
bls _08145C9C
movs r0, 0
b _08145CC0
.pool
_08145C9C:
adds r0, r1, r4
cmp r1, r0
ble _08145CAC
ldr r0, =0x0000270f
b _08145CBA
.pool
_08145CAC:
lsls r0, 16
lsrs r1, r0, 16
ldr r0, =0x0000270f
cmp r1, r0
bls _08145CB8
adds r1, r0, 0
_08145CB8:
adds r0, r1, 0
_08145CBA:
bl SetCoins
movs r0, 0x1
_08145CC0:
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end GiveCoins
thumb_func_start TakeCoins
@ bool8 TakeCoins(u16 toSub)
TakeCoins: @ 8145CCC
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl GetCoins
lsls r0, 16
lsrs r0, 16
cmp r0, r4
bcs _08145CE2
movs r0, 0
b _08145CEE
_08145CE2:
subs r0, r4
lsls r0, 16
lsrs r0, 16
bl SetCoins
movs r0, 0x1
_08145CEE:
pop {r4}
pop {r1}
bx r1
thumb_func_end TakeCoins
.align 2, 0 @ Don't pad with nop.

57
asm/unk_81BAD84.s
View File

@ -1,57 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81BAD84
sub_81BAD84: @ 81BAD84
push {r4-r6,lr}
movs r6, 0x80
lsls r6, 19
movs r2, 0
strh r2, [r6]
ldr r1, =0x04000010
strh r2, [r1]
adds r1, 0x2
strh r2, [r1]
adds r1, 0x3E
strh r2, [r1]
ldr r5, =gUnknown_08617128
lsls r4, r0, 1
adds r4, r0
lsls r4, 2
adds r0, r4, r5
ldr r0, [r0]
movs r1, 0xC0
lsls r1, 19
bl LZ77UnCompVram
adds r0, r5, 0x4
adds r0, r4, r0
ldr r0, [r0]
ldr r1, =0x0600f800
bl LZ77UnCompVram
adds r5, 0x8
adds r4, r5
ldr r0, [r4]
movs r1, 0xA0
lsls r1, 19
movs r4, 0x80
lsls r4, 1
adds r2, r4, 0
bl CpuSet
ldr r1, =0x04000008
movs r2, 0xF8
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
strh r4, [r6]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81BAD84
.align 2, 0 @ Don't pad with nop.

7
data/unk_81BAD84.s
View File

@ -1,7 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_08617128:: @ 8617128
.incbin "baserom.gba", 0x617128, 0x48

18
include/graphics.h
View File

@ -91,5 +91,23 @@ extern const u8 gUnknown_08DB9F08[];
extern const u8 gUnknown_08DB9FFC[];
extern const u8 gUnknown_08DBA020[];
extern const u8 gUnknown_08DBA12C[];
extern const u8 gUnknown_08DD87C0[];
extern const u8 gUnknown_08DD8EE0[];
extern const u16 gUnknown_08DD8780[];
extern const u8 gUnknown_08DD90E0[];
extern const u8 gUnknown_08DD9718[];
extern const u16 gUnknown_08DD9080[];
extern const u8 gUnknown_08DD98B4[];
extern const u8 gUnknown_08DD9E58[];
extern const u16 gUnknown_08DD9874[];
extern const u8 gUnknown_08DDA02C[];
extern const u8 gUnknown_08DDA63C[];
extern const u16 gUnknown_08DD9FEC[];
extern const u8 gUnknown_08DDA840[];
extern const u8 gUnknown_08DDAE40[];
extern const u16 gUnknown_08DDA800[];
extern const u8 gUnknown_08DDB020[];
extern const u8 gUnknown_08DDB2C4[];
extern const u16 gUnknown_08DDAFE0[];
#endif //GUARD_GRAPHICS_H

1
include/strings.h
View File

@ -83,5 +83,6 @@ extern const u8 gText_OkayToDeleteFromRegistry[];
extern const u8 gText_RegisteredDataDeleted[];
extern const u8 gUnknown_085EA79D[];
extern const u8 gText_PkmnFainted3[];
extern const u8 gText_Coins[];
#endif //GUARD_STRINGS_H

5
ld_script.txt
View File

@ -184,7 +184,6 @@ SECTIONS {
asm/roulette.o(.text);
asm/pokedex_cry_screen.o(.text);
src/coins.o(.text);
asm/coins.o(.text);
asm/landmark.o(.text);
asm/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
@ -249,7 +248,7 @@ SECTIONS {
asm/battle_tent.o(.text);
src/unk_text_util_2.o(.text);
src/multiboot.o(.text);
asm/unk_81BAD84.o(.text);
src/unk_81BAD84.o(.text);
src/battle_controller_player_partner.o(.text);
asm/fldeff_groundshake.o(.text);
asm/fossil_specials.o(.text);
@ -470,7 +469,7 @@ SECTIONS {
data/party_menu.o(.rodata);
data/battle_tent.o(.rodata);
src/unk_text_util_2.o(.rodata);
data/unk_81BAD84.o(.rodata);
src/unk_81BAD84.o(.rodata);
src/battle_controller_player_partner.o(.rodata);
data/fossil_special_fldeff_groundshake.o(.rodata);
src/berry_fix_program.o(.rodata);

28
src/coins.c
View File

@ -2,8 +2,9 @@
#include "coins.h"
#include "text.h"
#include "window.h"
#include "text_window.h"
#include "strings.h"
#include "string_util.h"
#include "new_menu_helpers.h"
#include "menu.h"
#include "international_string_util.h"
@ -11,10 +12,6 @@
EWRAM_DATA u8 sCoinsWindowId = 0;
extern void sub_819746C(u8 windowId, bool8 copyToVram);
extern const u8 gText_Coins[];
void PrintCoinsString(u32 coinAmount)
{
u32 xAlign;
@ -53,7 +50,6 @@ void SetCoins(u16 coinAmount)
gSaveBlock1Ptr->coins = coinAmount ^ gSaveBlock2Ptr->encryptionKey;
}
/* Can't match it lol
bool8 GiveCoins(u16 toAdd)
{
u16 newAmount;
@ -67,10 +63,22 @@ bool8 GiveCoins(u16 toAdd)
}
else
{
newAmount = ownedCoins + toAdd;
if (newAmount > MAX_COINS)
newAmount = MAX_COINS;
ownedCoins += toAdd;
if (ownedCoins > MAX_COINS)
ownedCoins = MAX_COINS;
newAmount = ownedCoins;
}
SetCoins(newAmount);
return TRUE;
}*/
}
bool8 TakeCoins(u16 toSub)
{
u16 ownedCoins = GetCoins();
if (ownedCoins >= toSub)
{
SetCoins(ownedCoins - toSub);
return TRUE;
}
return FALSE;
}

47
src/unk_81BAD84.c Normal file
View File

@ -0,0 +1,47 @@
#include "global.h"
#include "graphics.h"
const struct {
const u8 *gfx;
const u8 *tileMap;
const u16 *pltt;
} gUnknown_08617128[] = {
{
gUnknown_08DD87C0,
gUnknown_08DD8EE0,
gUnknown_08DD8780
}, {
gUnknown_08DD90E0,
gUnknown_08DD9718,
gUnknown_08DD9080
}, {
gUnknown_08DD98B4,
gUnknown_08DD9E58,
gUnknown_08DD9874
}, {
gUnknown_08DDA02C,
gUnknown_08DDA63C,
gUnknown_08DD9FEC
}, {
gUnknown_08DDA840,
gUnknown_08DDAE40,
gUnknown_08DDA800
}, {
gUnknown_08DDB020,
gUnknown_08DDB2C4,
gUnknown_08DDAFE0
}
};
void sub_81BAD84(u32 idx)
{
REG_DISPCNT = 0x0000;
REG_BG0HOFS = 0x0000;
REG_BG0VOFS = 0x0000;
REG_BLDCNT = 0x0000;
LZ77UnCompVram(gUnknown_08617128[idx].gfx, (void *)BG_CHAR_ADDR(0));
LZ77UnCompVram(gUnknown_08617128[idx].tileMap, (void *)BG_SCREEN_ADDR(31));
CpuCopy16(gUnknown_08617128[idx].pltt, (void *)PLTT, 0x200);
REG_BG0CNT = 0x1f00;
REG_DISPCNT = DISPCNT_BG0_ON;
}