mirror of https://github.com/zeldaret/tmc.git
Merge pull request #47 from notyouraveragehooman/master
strings, initializeLink.c OK
This commit is contained in:
notyouraveragehooman
GitHub
commit
4b31d95660
|
|
@ -1,174 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.text
|
||||
.syntax unified
|
||||
|
||||
thumb_func_start InitializeLink
|
||||
InitializeLink: @ 0x080524A8
|
||||
push {r4, r5, r6, lr}
|
||||
bl sub_080784C8
|
||||
ldr r0, _08052510 @ =gUnk_03000B80
|
||||
movs r1, #0x70
|
||||
bl _DmaZero
|
||||
ldr r6, _08052514 @ =gLinkState
|
||||
adds r0, r6, #0
|
||||
movs r1, #0xb0
|
||||
bl _DmaZero
|
||||
movs r0, #1
|
||||
rsbs r0, r0, #0
|
||||
adds r1, r6, #0
|
||||
adds r1, #0x40
|
||||
movs r2, #0x40
|
||||
bl _DmaFill32
|
||||
ldr r4, _08052518 @ =gLinkEntity
|
||||
adds r0, r4, #0
|
||||
movs r1, #0x88
|
||||
bl _DmaZero
|
||||
ldr r0, _0805251C @ =gRoomControls
|
||||
str r4, [r0, #0x30]
|
||||
ldr r1, _08052520 @ =gUnk_080FCAC8
|
||||
ldr r5, _08052524 @ =gScreenTransition
|
||||
ldrb r0, [r5, #0xf]
|
||||
adds r0, r0, r1
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r6, #0xc]
|
||||
movs r0, #0x14
|
||||
bl CheckGlobalFlag
|
||||
cmp r0, #0
|
||||
bne _080524FA
|
||||
ldr r0, [r6, #0x30]
|
||||
movs r1, #8
|
||||
orrs r0, r1
|
||||
str r0, [r6, #0x30]
|
||||
_080524FA:
|
||||
ldrb r0, [r5, #0xf]
|
||||
subs r0, #2
|
||||
adds r2, r5, #0
|
||||
cmp r0, #0xa
|
||||
bhi _080525C2
|
||||
lsls r0, r0, #2
|
||||
ldr r1, _08052528 @ =_0805252C
|
||||
adds r0, r0, r1
|
||||
ldr r0, [r0]
|
||||
mov pc, r0
|
||||
.align 2, 0
|
||||
_08052510: .4byte gUnk_03000B80
|
||||
_08052514: .4byte gLinkState
|
||||
_08052518: .4byte gLinkEntity
|
||||
_0805251C: .4byte gRoomControls
|
||||
_08052520: .4byte gUnk_080FCAC8
|
||||
_08052524: .4byte gScreenTransition
|
||||
_08052528: .4byte _0805252C
|
||||
_0805252C: @ jump table
|
||||
.4byte _08052558 @ case 0
|
||||
.4byte _08052576 @ case 1
|
||||
.4byte _08052564 @ case 2
|
||||
.4byte _080525C2 @ case 3
|
||||
.4byte _08052558 @ case 4
|
||||
.4byte _08052584 @ case 5
|
||||
.4byte _08052584 @ case 6
|
||||
.4byte _080525C2 @ case 7
|
||||
.4byte _080525A0 @ case 8
|
||||
.4byte _080525AC @ case 9
|
||||
.4byte _080525B8 @ case 10
|
||||
_08052558:
|
||||
ldr r0, _08052560 @ =0x0000FF40
|
||||
strh r0, [r4, #0x36]
|
||||
b _080525C0
|
||||
.align 2, 0
|
||||
_08052560: .4byte 0x0000FF40
|
||||
_08052564:
|
||||
ldr r0, _0805257C @ =gLinkState
|
||||
adds r0, #0x38
|
||||
movs r1, #0x10
|
||||
strb r1, [r0]
|
||||
ldr r1, _08052580 @ =gScreenTransition
|
||||
ldrb r0, [r1, #0xe]
|
||||
lsls r0, r0, #2
|
||||
strb r0, [r4, #0x15]
|
||||
adds r2, r1, #0
|
||||
_08052576:
|
||||
movs r0, #0xe0
|
||||
strh r0, [r4, #0x24]
|
||||
b _080525C2
|
||||
.align 2, 0
|
||||
_0805257C: .4byte gLinkState
|
||||
_08052580: .4byte gScreenTransition
|
||||
_08052584:
|
||||
ldr r1, _08052598 @ =gLinkState
|
||||
adds r2, r1, #0
|
||||
adds r2, #0x38
|
||||
movs r0, #1
|
||||
strb r0, [r2]
|
||||
ldr r2, _0805259C @ =gScreenTransition
|
||||
ldrb r0, [r2, #0xf]
|
||||
adds r1, #0x39
|
||||
strb r0, [r1]
|
||||
b _080525C2
|
||||
.align 2, 0
|
||||
_08052598: .4byte gLinkState
|
||||
_0805259C: .4byte gScreenTransition
|
||||
_080525A0:
|
||||
ldr r0, _080525A8 @ =gLinkState
|
||||
adds r0, #0x38
|
||||
movs r1, #1
|
||||
b _080525BE
|
||||
.align 2, 0
|
||||
_080525A8: .4byte gLinkState
|
||||
_080525AC:
|
||||
ldr r0, _080525B4 @ =gLinkState
|
||||
adds r0, #0x38
|
||||
movs r1, #3
|
||||
b _080525BE
|
||||
.align 2, 0
|
||||
_080525B4: .4byte gLinkState
|
||||
_080525B8:
|
||||
ldr r0, _08052614 @ =gLinkState
|
||||
adds r0, #0x38
|
||||
movs r1, #4
|
||||
_080525BE:
|
||||
strb r1, [r0]
|
||||
_080525C0:
|
||||
ldr r2, _08052618 @ =gScreenTransition
|
||||
_080525C2:
|
||||
movs r0, #1
|
||||
strb r0, [r4, #8]
|
||||
ldrb r1, [r4, #0x10]
|
||||
movs r0, #0xa0
|
||||
orrs r0, r1
|
||||
strb r0, [r4, #0x10]
|
||||
adds r3, r4, #0
|
||||
adds r3, #0x29
|
||||
ldrb r1, [r3]
|
||||
movs r0, #8
|
||||
rsbs r0, r0, #0
|
||||
ands r0, r1
|
||||
movs r1, #4
|
||||
orrs r0, r1
|
||||
strb r0, [r3]
|
||||
ldr r0, _0805261C @ =gUnk_02002A40
|
||||
adds r0, #0xaa
|
||||
ldrb r0, [r0]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x45
|
||||
strb r0, [r1]
|
||||
ldrh r0, [r2, #0x10]
|
||||
strh r0, [r4, #0x2e]
|
||||
ldrh r0, [r2, #0x12]
|
||||
strh r0, [r4, #0x32]
|
||||
ldrb r0, [r2, #0xe]
|
||||
strb r0, [r4, #0x14]
|
||||
ldrb r1, [r2, #0x14]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x38
|
||||
strb r1, [r0]
|
||||
adds r0, r4, #0
|
||||
bl UpdateSpriteForCollisionLayer
|
||||
adds r0, r4, #0
|
||||
movs r1, #1
|
||||
bl sub_0805EA2C
|
||||
bl sub_08017640
|
||||
pop {r4, r5, r6, pc}
|
||||
.align 2, 0
|
||||
_08052614: .4byte gLinkState
|
||||
_08052618: .4byte gScreenTransition
|
||||
_0805261C: .4byte gUnk_02002A40
|
||||
BIN
baserom.gba.pal
BIN
baserom.gba.pal
Binary file not shown.
BIN
baserom.gba.spr
BIN
baserom.gba.spr
Binary file not shown.
57
charmap.txt
57
charmap.txt
|
|
@ -101,6 +101,7 @@ UNK_0105 = 01 05
|
|||
UNK_0106 = 01 06
|
||||
UNK_0107 = 01 07
|
||||
COLOR = 02 @ use a color listed below right after
|
||||
UNK_0300DB = 03 00 DB
|
||||
UNK_03005F = 03 00 5F
|
||||
UNK_03008D = 03 00 8D
|
||||
UNK_03008E = 03 00 8E
|
||||
|
|
@ -180,6 +181,7 @@ UNK_03020C = 03 02 0C
|
|||
UNK_03020D = 03 02 0D
|
||||
UNK_03020E = 03 02 0E
|
||||
UNK_03021A = 03 02 1A
|
||||
UNK_0300CC = 03 00 CC
|
||||
@ UNK_030D = 03 0D
|
||||
@ UNK_0412 = 04 12
|
||||
UNK_0413 = 04 13
|
||||
|
|
@ -190,7 +192,12 @@ UNK_041006 = 04 10 06
|
|||
UNK_041007 = 04 10 07
|
||||
UNK_04100C = 04 10 0C
|
||||
UNK_041206 = 04 12 06
|
||||
UNK_041506 = 04 15 06
|
||||
CHOICE_UNK = 05 1D 06
|
||||
CHOICE_3003 = 05 30 03
|
||||
CHOICE_3109 = 05 31 09
|
||||
CHOICE_310A = 05 31 0A
|
||||
CHOICE_310B = 05 31 0B
|
||||
CHOICE_030D = 05 03 0D
|
||||
CHOICE_0309 = 05 03 09
|
||||
CHOICE_0301 = 05 03 01
|
||||
|
|
@ -248,9 +255,33 @@ CHOICE_058F = 05 05 8F
|
|||
CHOICE_057C = 05 05 7C
|
||||
CHOICE_057D = 05 05 7D
|
||||
CHOICE_057E = 05 05 7E
|
||||
CHOICE_2C0C = 05 2C 0C
|
||||
CHOICE_2C17 = 05 2C 17
|
||||
CHOICE_2C1D = 05 2C 1D
|
||||
CHOICE_2D0A = 05 2D 0A
|
||||
CHOICE_311A = 05 31 1A
|
||||
CHOICE_3120 = 05 31 20
|
||||
CHOICE_3126 = 05 31 26
|
||||
CHOICE_3208 = 05 32 08
|
||||
CHOICE_465F = 05 46 5F
|
||||
CHOICE_463F = 05 46 3F
|
||||
CHOICE_4636 = 05 46 36
|
||||
CHOICE_460B = 05 46 0B
|
||||
CHOICE_4613 = 05 46 13
|
||||
CHOICE_461B = 05 46 1B
|
||||
CHOICE_4624 = 05 46 24
|
||||
CHOICE_462D = 05 46 2D
|
||||
CHOICE_4603 = 05 46 03
|
||||
CHOICE_4006 = 05 40 06
|
||||
CHOICE_4205 = 05 42 05
|
||||
CHOICE_4219 = 05 42 19
|
||||
CHOICE_421A = 05 42 1A
|
||||
CHOICE_431E = 05 43 1E
|
||||
CHOICE_4317 = 05 43 17
|
||||
PLAYER = 06 00
|
||||
STR_VAR_1 = 06 01
|
||||
STR_VAR_2 = 06 02
|
||||
STR_VAR_3 = 06 03
|
||||
UNK_070584 = 07 05 84
|
||||
UNK_070506 = 07 05 06
|
||||
UNK_070585 = 07 05 85
|
||||
|
|
@ -269,12 +300,33 @@ UNK_072913 = 07 29 13
|
|||
UNK_072915 = 07 29 15
|
||||
UNK_072B0F = 07 2B 0F
|
||||
UNK_072C14 = 07 2C 14
|
||||
UNK_072D00 = 07 2D 00
|
||||
UNK_073102 = 07 31 02
|
||||
UNK_07310E = 07 31 0E
|
||||
UNK_073128 = 07 31 28
|
||||
UNK_073129 = 07 31 29
|
||||
UNK_07312A = 07 31 2A
|
||||
UNK_074902 = 07 49 02
|
||||
UNK_074A04 = 07 4A 04
|
||||
UNK_074667 = 07 46 67
|
||||
UNK_074666 = 07 46 66
|
||||
UNK_074660 = 07 46 60
|
||||
UNK_074661 = 07 46 61
|
||||
UNK_074662 = 07 46 62
|
||||
UNK_074663 = 07 46 63
|
||||
UNK_074664 = 07 46 64
|
||||
UNK_074665 = 07 46 65
|
||||
UNK_074502 = 07 45 02
|
||||
UNK_074506 = 07 45 06
|
||||
UNK_074302 = 07 43 02
|
||||
UNK_074402 = 07 44 02
|
||||
UNK_08FF = 08 FF
|
||||
BUTTON_A = 0C 00
|
||||
BUTTON_B = 0C 01
|
||||
LEFT = 0C 02
|
||||
RIGHT = 0C 03
|
||||
UNK_BUTTON = 0C05
|
||||
BUTTON_UP = 0C 04
|
||||
UNK_BUTTON = 0C 05
|
||||
DPAD = 0C 08
|
||||
T_07 = 0F 07
|
||||
T_08 = 0F 08
|
||||
|
|
@ -289,12 +341,15 @@ T_10 = 0F 10
|
|||
T_11 = 0F 11
|
||||
'&' = 0F 0D
|
||||
'/' = 0F 15
|
||||
SYM_SHELL = 0F 12
|
||||
SYM_UNK = 0F 16
|
||||
SYM_UNK2 = 0F 1F
|
||||
@ colors
|
||||
|
||||
WHITE = 00
|
||||
GREEN = 01
|
||||
RED = 02
|
||||
YELLOW = 03
|
||||
BLUE = 04
|
||||
|
||||
@ sound and music
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@
|
|||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_089FB780:: @ 089FB780
|
||||
.incbin "baserom.gba", 0x9FB780, 0x0000F44
|
||||
|
||||
gUnk_089FC6C4:: @ 089FC6C4
|
||||
.incbin "baserom.gba", 0x9FC6C4, 0x0000090
|
||||
|
||||
|
|
|
|||
2192
data/strings.s
2192
data/strings.s
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
|
@ -41,6 +41,7 @@ extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
|
|||
extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
|
||||
extern u32 LoadFixedGFX(Entity*, u32);
|
||||
extern void ExecuteScriptCommandSet(Entity*, void *);
|
||||
extern void _DmaFill32(u32, void*, u32);
|
||||
|
||||
// Unidentified
|
||||
extern void sub_0806ED78(Entity*);
|
||||
|
|
@ -228,4 +229,6 @@ extern u32 sub_0806F3E4(Entity*);
|
|||
extern void sub_0804A7D4(Entity*);
|
||||
extern void sub_08033744(Entity*);
|
||||
extern void sub_0800417E(Entity*, u32);
|
||||
extern void sub_080784C8();
|
||||
extern void sub_08017640();
|
||||
#endif
|
||||
|
|
@ -62,7 +62,8 @@ typedef struct {
|
|||
u8 playerState;
|
||||
u8 field_0xf;
|
||||
Coords playerStartPos;
|
||||
u16 playerLayer;
|
||||
u8 playerLayer;
|
||||
u8 field_0x13;
|
||||
u8 field_0x14[0xa];
|
||||
u16 field_0x20;
|
||||
u16 field_0x22;
|
||||
|
|
|
|||
|
|
@ -448,9 +448,7 @@ SECTIONS {
|
|||
src/sub_08050024.o(.text);
|
||||
asm/code_08050038.o(.text);
|
||||
asm/sub_08052418.o(.text);
|
||||
asm/initializeLink.o(.text);
|
||||
src/sub_08052620.o(.text);
|
||||
src/sub_08052638.o(.text);
|
||||
src/initializeLink.o(.text);
|
||||
src/area.o(.text);
|
||||
src/modHealth.o(.text);
|
||||
src/modRupees.o(.text);
|
||||
|
|
|
|||
11
src/area.c
11
src/area.c
|
|
@ -1,6 +1,17 @@
|
|||
#include "global.h"
|
||||
#include "entity.h"
|
||||
|
||||
extern u8 gArea;
|
||||
extern u8 gUnk_08127D30[];
|
||||
|
||||
bool32 sub_08052620(u32 r0) {
|
||||
return gArea == 0x81;
|
||||
}
|
||||
|
||||
bool32 sub_08052638(u32 r0) {
|
||||
|
||||
return gUnk_08127D30[r0 * 4] == 0x81;
|
||||
}
|
||||
|
||||
u32 sub_08052654() {
|
||||
return (gArea >> 7) & 1;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
#include "global.h"
|
||||
#include "entity.h"
|
||||
#include "link.h"
|
||||
#include "structures.h"
|
||||
#include "functions.h"
|
||||
#include "room.h"
|
||||
#include "flags.h"
|
||||
|
||||
extern u32 gUnk_03000B80;
|
||||
extern u32 gUnk_03003FC0;
|
||||
|
||||
extern Entity gLinkEntity;
|
||||
|
||||
extern u8 gUnk_080FCAC8[];
|
||||
|
||||
void InitializeLink(void)
|
||||
{
|
||||
Entity* pl;
|
||||
|
||||
sub_080784C8();
|
||||
_DmaZero((void *)&gUnk_03000B80, 0x70);
|
||||
_DmaZero((void *)&gLinkState, 0xb0);
|
||||
|
||||
_DmaFill32(0xffffffff, &gLinkState.field_0x40, 0x40);
|
||||
pl = &gLinkEntity;
|
||||
_DmaZero((void *)pl, 0x88);
|
||||
gRoomControls.cameraTarget = pl;
|
||||
gLinkState.linkAction = gUnk_080FCAC8[gScreenTransition.field_0xf];
|
||||
if (!CheckGlobalFlag(0x14)) {
|
||||
gLinkState.flags.all |= 8;
|
||||
}
|
||||
switch (gScreenTransition.field_0xf) {
|
||||
case 0x2:
|
||||
case 0x6:
|
||||
pl->height.HALF.HI = -0xc0;
|
||||
break;
|
||||
case 0x4:
|
||||
gLinkState.field_0x34[4] = 0x10;
|
||||
pl->direction = gScreenTransition.playerState << 2;
|
||||
case 0x3:
|
||||
pl->nonPlanarMovement = 0xe0;
|
||||
break;
|
||||
case 0x7:
|
||||
case 0x8:
|
||||
gLinkState.field_0x34[4] = 1;
|
||||
gLinkState.field_0x34[5] = gScreenTransition.field_0xf;
|
||||
break;
|
||||
case 0xa:
|
||||
gLinkState.field_0x34[4] = 1;
|
||||
break;
|
||||
case 0xb:
|
||||
gLinkState.field_0x34[4] = 3;
|
||||
break;
|
||||
case 0xc:
|
||||
gLinkState.field_0x34[4] = 4;
|
||||
}
|
||||
pl->entityType.type = 1;
|
||||
pl->flags |= 0xa0;
|
||||
pl->spritePriority.b0 = 4;
|
||||
pl->currentHealth = gUnk_02002A40.stats.health;
|
||||
pl->x.HALF.HI = gScreenTransition.playerStartPos.HALF.x;
|
||||
pl->y.HALF.HI = gScreenTransition.playerStartPos.HALF.y;
|
||||
pl->animationState = gScreenTransition.playerState;
|
||||
pl->collisionLayer = gScreenTransition.playerLayer;
|
||||
UpdateSpriteForCollisionLayer(pl);
|
||||
sub_0805EA2C(pl, 1);
|
||||
sub_08017640();
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#include "global.h"
|
||||
|
||||
extern u8 gArea;
|
||||
|
||||
bool32 sub_08052620(u32 r0) {
|
||||
return gArea == 0x81;
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#include "global.h"
|
||||
|
||||
extern u8 gUnk_08127D30[69];
|
||||
|
||||
u32 sub_08052638(u32 r0) {
|
||||
// u32 r1 = gUnk_08127D30;
|
||||
// u32 r1 = gUnk_08127D30;
|
||||
|
||||
return gUnk_08127D30[r0 * 4] == 129;
|
||||
}
|
||||
Loading…
Reference in New Issue