mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-18 07:25:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
theo3
2021-03-22 01:27:45 -07:00
parent 72dbd29bb9 ed3cf7d025
commit 1c99c78d74
786 changed files with 22698 additions and 10886 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CONTRIBUTING.md
+2 -2
View File
@@ -182,7 +182,7 @@ typedef struct Entity
u32 * field_0x4;
EntityType entityType;
u8 action;
u8 previousActionFlag;
u8 subAction;
u8 actionDelay;
u8 field_0xf;
u8 flags;
@@ -199,7 +199,7 @@ What's the 12th byte in this struct?
u32 * field_0x4; //4-7
EntityType entityType; //8-11
u8 action; //12
u8 previousActionFlag; //13
u8 subAction; //13
```
---
Jenkinsfile
Vendored
+5 -9
View File
@@ -5,16 +5,12 @@ pipeline {
stage('Setup') {
steps {
echo 'Setting up...'
sh 'cp /usr/local/etc/roms/baserom_tmc.gba baserom.gba'
sh 'cd ${AGBCC} && ./install.sh ${WORKSPACE} && cd ${WORKSPACE}'
sh 'cp /usr/local/etc/roms/tmc.us.gba baserom.gba'
sh 'make -j setup'
}
}
stage('Build') {
when {
not {
branch 'master'
}
}
steps {
sh 'make -j'
}
@@ -24,8 +20,8 @@ pipeline {
branch 'master'
}
steps {
sh 'python3 progress.py -c >> /var/www/html/reports/progress.csv'
sh 'python3 progress.py -mc >> /var/www/html/reports/progress_matching.csv'
sh 'python3 progress.py >> /var/www/html/reports/progress_tmc.csv'
sh 'python3 progress.py -m >> /var/www/html/reports/progress_tmc_matching.csv'
}
}
}
@@ -34,4 +30,4 @@ pipeline {
cleanWs()
}
}
}
}
Makefile
+1
View File
@@ -84,6 +84,7 @@ endif
#$(C_BUILDDIR)/need_interworking_file_name.o: CFLAGS += -mthumb-interwork
$(C_BUILDDIR)/arm_proxy.o: CFLAGS += -mthumb-interwork
$(C_BUILDDIR)/eeprom.o: CFLAGS = -O1 -mthumb-interwork -Wimplicit -Wparentheses -Werror -Wno-multichar
C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# The Legend of Zelda: The Minish Cap
**Progress:** [⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 25%
**Progress:** [⬛⬛⬛⬛⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 30%
```diff
- WARNING! -
asm/bigBarrel.s
+2 -2
View File
@@ -176,7 +176,7 @@ _08088B82:
subs r1, #0x50
movs r2, #0xa0
movs r3, #0x30
bl sub_0806FBFC
bl CheckPlayerProximity
cmp r0, #0
beq _08088BBA
ldrb r0, [r5]
@@ -194,7 +194,7 @@ _08088BBA:
adds r1, #0x30
movs r2, #0xa0
movs r3, #0x30
bl sub_0806FBFC
bl CheckPlayerProximity
cmp r0, #0
beq _08088BDE
ldrb r0, [r5]
asm/bigGoron.s
+18 -18
View File
@@ -95,7 +95,7 @@ sub_0806D0B0: @ 0x0806D0B0
movs r1, #0x80
lsls r1, r1, #6
adds r0, r5, #0
bl MemClear32
bl MemClear
cmp r4, #0
beq _0806D0DA
adds r0, r4, #0
@@ -120,7 +120,7 @@ sub_0806D0F8: @ 0x0806D0F8
movs r0, #7
movs r1, #0x4c
movs r2, #7
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
beq _0806D10C
bl sub_0806D0B0
@@ -517,9 +517,9 @@ _0806D3F4:
strh r0, [r4, #0x2e]
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
_0806D408:
pop {r4, pc}
.align 2, 0
@@ -566,9 +566,9 @@ sub_0806D41C: @ 0x0806D41C
_0806D45E:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
_0806D46C:
ldr r0, _0806D4A8 @ =gScreenTransition
ldr r0, [r0]
@@ -583,7 +583,7 @@ _0806D46C:
ldrsh r1, [r4, r2]
movs r2, #0x40
movs r3, #0x40
bl sub_0806FBFC
bl CheckPlayerProximity
cmp r0, #0
beq _0806D4AC
adds r2, r4, #0
@@ -724,7 +724,7 @@ _0806D540:
ldrsh r1, [r4, r2]
movs r2, #0x18
movs r3, #0x40
bl sub_0806FBFC
bl CheckPlayerProximity
cmp r0, #0
beq _0806D5B4
_0806D590:
@@ -928,7 +928,7 @@ sub_0806D6D0: @ 0x0806D6D0
movs r1, #0x4c
movs r2, #7
movs r3, #2
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D6EE
@@ -940,7 +940,7 @@ _0806D6EE:
movs r1, #0x4c
movs r2, #7
movs r3, #1
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D706
@@ -961,7 +961,7 @@ sub_0806D70C: @ 0x0806D70C
movs r1, #0x4c
movs r2, #7
movs r3, #2
bl FindEntityInListByForm
bl FindEntity
adds r2, r0, #0
cmp r2, #0
beq _0806D728
@@ -972,7 +972,7 @@ _0806D728:
movs r1, #0x4c
movs r2, #7
movs r3, #1
bl FindEntityInListByForm
bl FindEntity
adds r2, r0, #0
cmp r2, #0
beq _0806D746
@@ -996,7 +996,7 @@ sub_0806D74C: @ 0x0806D74C
movs r1, #0x4c
movs r2, #7
movs r3, #2
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D76A
@@ -1008,7 +1008,7 @@ _0806D76A:
movs r1, #0x4c
movs r2, #7
movs r3, #1
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D782
@@ -1029,7 +1029,7 @@ sub_0806D788: @ 0x0806D788
movs r1, #0x4c
movs r2, #7
movs r3, #2
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D7A6
@@ -1041,7 +1041,7 @@ _0806D7A6:
movs r1, #0x4c
movs r2, #7
movs r3, #1
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D7BE
@@ -1070,7 +1070,7 @@ sub_0806D7C4: @ 0x0806D7C4
movs r1, #0x4c
movs r2, #7
movs r3, #2
bl FindEntityInListByForm
bl FindEntity
cmp r0, #0
beq _0806D7FC
movs r1, #0x2e
@@ -1098,7 +1098,7 @@ sub_0806D804: @ 0x0806D804
movs r1, #0x4c
movs r2, #7
movs r3, #2
bl FindEntityInListByForm
bl FindEntity
adds r1, r0, #0
cmp r1, #0
beq _0806D83A
asm/bird.s
+3 -3
View File
@@ -515,7 +515,7 @@ _0809D5E6:
adds r4, r0, #0
cmp r4, #0
beq _0809D62E
ldr r1, _0809D668 @ =gUnk_0800B0AC
ldr r1, _0809D668 @ =script_0800B0AC
bl StartCutscene
adds r1, r4, #0
adds r1, #0x84
@@ -545,7 +545,7 @@ _0809D658: .4byte gPlayerEntity
_0809D65C: .4byte 0xFFF80000
_0809D660: .4byte gRoomControls
_0809D664: .4byte gUnk_02034490
_0809D668: .4byte gUnk_0800B0AC
_0809D668: .4byte script_0800B0AC
thumb_func_start sub_0809D66C
sub_0809D66C: @ 0x0809D66C
@@ -639,7 +639,7 @@ CreateBird: @ 0x0809D700
movs r1, #0x95
movs r2, #6
movs r3, #8
bl FindEntityInListByForm
bl FindEntity
adds r4, r0, #0
cmp r4, #0
bne _0809D732
asm/book.s
+1 -1
View File
@@ -327,7 +327,7 @@ _0809B606:
movs r0, #7
movs r1, #0x1a
movs r2, #7
bl FindEntityInListBySubtype
bl FindEntityByID
adds r2, r0, #0
cmp r2, #0
beq _0809B682
asm/brocco.s
+2 -2
View File
@@ -208,9 +208,9 @@ _080636A0: .4byte gPlayerEntity
_080636A4:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl UpdateAnimationSingleFrame
b _080636D4
asm/businessScrubPrologue.s
+2 -2
View File
@@ -142,14 +142,14 @@ sub_08045C3C: @ 0x08045C3C
bl sub_08046030
adds r0, r4, #0
bl sub_08095C48
ldr r1, _08045CA0 @ =gUnk_08015AC4
ldr r1, _08045CA0 @ =script_08015AC4
adds r0, r4, #0
bl StartCutscene
adds r0, r4, #0
bl sub_0807DD50
pop {r4, pc}
.align 2, 0
_08045CA0: .4byte gUnk_08015AC4
_08045CA0: .4byte script_08015AC4
thumb_func_start sub_08045CA4
sub_08045CA4: @ 0x08045CA4
asm/castleMaid.s
+2 -2
View File
@@ -343,10 +343,10 @@ _08064776:
lsls r0, r0, #0x10
cmp r0, #0
beq _08064788
ldr r1, _0806478C @ =gUnk_02033280
ldr r1, _0806478C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08064788:
pop {r4, r5, r6, pc}
.align 2, 0
_0806478C: .4byte gUnk_02033280
_0806478C: .4byte gActiveScriptInfo
asm/castorWildsStatue.s
+2 -2
View File
@@ -503,13 +503,13 @@ _08067734:
cmp r0, #0
beq _08067748
_08067742:
ldr r1, _0806774C @ =gUnk_02033280
ldr r1, _0806774C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08067748:
pop {pc}
.align 2, 0
_0806774C: .4byte gUnk_02033280
_0806774C: .4byte gActiveScriptInfo
thumb_func_start CastorWildsStatue_Fusion
CastorWildsStatue_Fusion: @ 0x08067750
asm/code_08000108.s
+6 -6
View File
@@ -33,7 +33,7 @@ _08000136:
pop {r4, pc}
_08000138:
_08000138: .4byte gUnk_030056F1
_0800013C: .4byte sub_0807D280
_0800013C: .4byte sub_0807D280 @ layer 1, 2, 3?
_08000140: .4byte sub_0807D46C
_08000144: .4byte sub_0807D6D8
@@ -55,8 +55,8 @@ sub_08000152: @ 0x08000152
lsrs r2, r2, #2
non_word_aligned_thumb_func_start SetTile
SetTile: @ 0x0800015E
push {r4, r5, r6, r7, lr}
SetTile: @ r0 = tile type, r1, = tile position, r2 = layer
push {r4-r7, lr}
lsls r3, r2, #3
ldr r4, _08000208 @ =gUnk_08000228
ldr r5, [r4, r3]
@@ -75,7 +75,7 @@ SetTile: @ 0x0800015E
ldrb r0, [r3, r4]
lsrs r2, r2, #2
bl sub_08000148
pop {r0, r1}
pop {r0, r1} @ tilepos, layer
push {r0, r1}
bl DeleteLoadedTileEntity
adds r0, r7, #0
@@ -170,8 +170,8 @@ gUnk_08000278::
@ call 0x80B19CC
@ ========
@ Unused? Doesn't seem to be called by anything in Ghidra.
thumb_func_start sub_08000288
sub_08000288: @ 0x08000288
thumb_func_start GetTileAtEntityPos
GetTileAtEntityPos: @ 0x08000288
ldr r3, _080002F4 @ =gUnk_03005740
bx r3
asm/code_080011C4.s
+2 -2
View File
@@ -1238,7 +1238,7 @@ _08002812:
cmp r0, #0
beq _08002834
adds r6, #1
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #8
_08002834:
adds r4, r0, #0
@@ -1256,7 +1256,7 @@ _0800283E:
cmp r0, #0
beq _08002856
adds r6, #2
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #8
_08002856:
adds r4, r0, #0
asm/code_080043E8.s
+8 -2
View File
@@ -378,10 +378,16 @@ gUnk_0800476A:: @ 0800476A
.incbin "baserom.gba", 0x00476A, 0x000008C
gUnk_080047F6:: @ 080047F6
.incbin "baserom.gba", 0x0047F6, 0x0000200
.incbin "baserom.gba", 0x0047F6, 0x00001E0
gUnk_080049D6:: @ 080049D6
.incbin "baserom.gba", 0x0049D6, 0x0000020
gUnk_080049F6:: @ 080049F6
.incbin "baserom.gba", 0x0049F6, 0x000000A
.incbin "baserom.gba", 0x0049F6, 0x0000008
gUnk_080049FE:: @ gUnk_080049FE
.incbin "baserom.gba", 0x0049FE, 0x0000002
gUnk_08004A00:: @ 08004A00
.incbin "baserom.gba", 0x004A00, 0x000000C
asm/code_0800857C.s
+1 -3343
View File
File diff suppressed because it is too large Load Diff
asm/code_08016984.s
+144
View File
@@ -0,0 +1,144 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
gUnk_08016984:: @ 08016984
.incbin "baserom.gba", 0x016984, 0x0000002
.text
non_word_aligned_thumb_func_start GetNextScriptCommandHalfword
GetNextScriptCommandHalfword: @ 0x08016986
ldrh r0, [r0]
bx lr
non_word_aligned_thumb_func_start GetNextScriptCommandHalfwordAfterCommandMetadata
GetNextScriptCommandHalfwordAfterCommandMetadata: @ 0x0801698A
ldrh r0, [r0, #2]
bx lr
non_word_aligned_thumb_func_start GetNextScriptCommandWord
GetNextScriptCommandWord: @ 0x0801698E
ldrh r1, [r0]
ldrh r0, [r0, #2]
lsls r0, r0, #0x10
orrs r0, r1
bx lr
thumb_func_start GetNextScriptCommandWordAfterCommandMetadata
GetNextScriptCommandWordAfterCommandMetadata: @ 0x08016998
ldrh r1, [r0, #2]
ldrh r0, [r0, #4]
lsls r0, r0, #0x10
orrs r0, r1
bx lr
.align 2, 0
gUnk_080169A4::
.byte 0x01, 0xFF, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x00
.byte 0xFF, 0x01, 0x00, 0x00, 0x02, 0xFF, 0x01, 0xFE, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0xFF, 0x02
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0xFF, 0x02, 0xFE, 0xFE, 0x02, 0xFF, 0x03, 0xFD, 0xFF, 0xFE, 0x01
.byte 0x01, 0xFD, 0xFF, 0xFF, 0x03, 0xFE, 0x02, 0x00, 0x00, 0xFF, 0xFE, 0x03, 0xFD, 0x02, 0xFF, 0x00
.byte 0x00, 0xFD, 0x02, 0x00, 0x00, 0xFF, 0x00, 0xFE, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02
.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
.byte 0x00, 0x00, 0x01, 0x00
thumb_func_start UpdateSpriteForCollisionLayer
UpdateSpriteForCollisionLayer: @ 0x08016A04
movs r1, #0x38
ldrb r1, [r0, r1]
lsls r1, r1, #1
add r3, pc, #0x1C
adds r1, r1, r3
movs r3, #0xc0
ldrb r2, [r0, #0x19]
bics r2, r3
ldrb r3, [r1]
orrs r2, r3
strb r2, [r0, #0x19]
movs r3, #0xc0
ldrb r2, [r0, #0x1b]
bics r2, r3
ldrb r3, [r1, #1]
orrs r2, r3
strb r2, [r0, #0x1b]
bx lr
_08016A28:
.byte 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40
thumb_func_start sub_08016A30
sub_08016A30: @ 0x08016A30
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #0x38
ldrb r0, [r4, r5]
cmp r0, #0
bne _08016A64
ldrh r0, [r4, #0x2e]
ldrh r1, [r4, #0x32]
movs r2, #2
bl GetTileTypeByPos
movs r3, #1
cmp r0, #0
beq _08016A62
bl sub_080002E4
movs r3, #2
add r1, pc, #0x40
_08016A54:
adds r1, #4
ldrh r2, [r1]
cmp r2, #0
beq _08016A62
cmp r0, r2
bne _08016A54
ldrb r3, [r1, #3]
_08016A62:
strb r3, [r4, r5]
_08016A64:
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
pop {r4, r5, pc}
thumb_func_start sub_08016A6C
sub_08016A6C: @ 0x08016A6C
push {r4, r5, lr}
adds r4, r0, #0
bl sub_080002B8
add r1, pc, #0x38
_08016A76:
adds r1, #4
ldrh r2, [r1]
cmp r2, #0
beq _08016A90
cmp r2, r0
bne _08016A76
movs r2, #0x38
ldrb r3, [r4, r2]
ldrb r5, [r1, #2]
cmp r3, r5
beq _08016A90
ldrb r5, [r1, #3]
strb r5, [r4, r2]
_08016A90:
pop {r4, r5, pc}
.align 2, 0
_08016A94:
.byte 0x2A, 0x00, 0x03, 0x03, 0x2D, 0x00, 0x03, 0x03, 0x2B, 0x00, 0x03, 0x03
.byte 0x2C, 0x00, 0x03, 0x03, 0x4C, 0x00, 0x03, 0x03, 0x4E, 0x00, 0x03, 0x03, 0x4D, 0x00, 0x03, 0x03
.byte 0x4F, 0x00, 0x03, 0x03, 0x0A, 0x00, 0x02, 0x01, 0x09, 0x00, 0x02, 0x01, 0x0C, 0x00, 0x01, 0x02
.byte 0x0B, 0x00, 0x01, 0x02, 0x52, 0x00, 0x03, 0x03, 0x27, 0x00, 0x03, 0x03, 0x26, 0x00, 0x03, 0x03
.byte 0x00, 0x00
non_word_aligned_thumb_func_start sub_08016AD2
sub_08016AD2: @ 0x08016AD2
push {r4, lr}
adds r4, r0, #0
bl sub_08016A6C
push {r0}
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
pop {r0, r4, pc}
asm/code_08016B30.s
+2 -2
View File
@@ -13,7 +13,7 @@ sub_08016B30: @ 0x08016B30
thumb_func_start sub_08016B34
sub_08016B34: @ 0x08016B34
ldr r1, _08016B54 @ =0x03007FFC
ldr r0, _08016B58 @ =gUnk_03005D90
ldr r0, _08016B58 @ =IntrMain
str r0, [r1]
ldr r1, _08016B5C @ =0x04000004
ldr r2, _08016B60 @ =0x00005028
@@ -29,7 +29,7 @@ sub_08016B34: @ 0x08016B34
bx lr
.align 2, 0
_08016B54: .4byte 0x03007FFC
_08016B58: .4byte gUnk_03005D90
_08016B58: .4byte IntrMain
_08016B5C: .4byte 0x04000004
_08016B60: .4byte 0x00005028
_08016B64: .4byte 0x04000200
asm/code_08018500.s
+1 -1
View File
@@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C
ldr r4, _08018570 @ =gUnk_02033AB8
adds r0, r4, #0
movs r1, #0x14
bl MemClear32
bl MemClear
adds r5, r4, #0
ldr r4, _08018574 @ =gUnk_080B3D20
movs r6, #0
asm/code_0801C370.s
+3 -3
View File
@@ -32,7 +32,7 @@ _0801C398:
movs r1, #0xcd
lsls r1, r1, #2
adds r0, r5, #0
bl MemClear32
bl MemClear
strb r6, [r5, #3]
strh r4, [r5, #0xe]
ldr r0, _0801C474 @ =gSave
@@ -48,7 +48,7 @@ _0801C398:
movs r1, #0x80
lsls r1, r1, #4
adds r0, r4, #0
bl MemClear32
bl MemClear
ldr r1, _0801C47C @ =gScreen
str r4, [r1, #0x10]
ldr r0, _0801C480 @ =0x00001F0C
@@ -93,7 +93,7 @@ _0801C398:
adds r0, #0x34
movs r1, #0xc0
lsls r1, r1, #2
bl MemClear32
bl MemClear
movs r0, #5
movs r1, #9
bl sub_0801CA6C
asm/code_0801CEC0.s
+1 -1
View File
@@ -12,7 +12,7 @@ sub_0801CFA8: @ 0x0801CFA8
adds r5, r0, #0
ldr r0, _0801CFCC @ =gUnk_02001A00
movs r1, #0x40
bl MemClear32
bl MemClear
movs r4, #0
_0801CFB6:
adds r0, r4, #0
asm/code_0801D79C.s
+19 -19
View File
@@ -203,7 +203,7 @@ _0801D9D8:
strh r0, [r3]
adds r0, r4, #0
mov r1, ip
bl MemClear32
bl MemClear
adds r0, r4, #0
b _0801DA02
.align 2, 0
@@ -217,8 +217,8 @@ _0801DA02:
mov sl, r5
pop {r4, r5, r6, r7, pc}
thumb_func_start sub_0801DA0C
sub_0801DA0C: @ 0x0801DA0C
thumb_func_start zFree
zFree: @ 0x0801DA0C
push {r4, r5, lr}
ldr r3, _0801DA44 @ =gzHeap
subs r1, r0, r3
@@ -282,13 +282,13 @@ zMallocInit: @ 0x0801DA7C
ldr r0, _0801DA8C @ =gzHeap
movs r1, #0x80
lsls r1, r1, #5
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_0801DA8C: .4byte gzHeap
thumb_func_start sub_0801DA90
sub_0801DA90: @ 0x0801DA90
thumb_func_start DispReset
DispReset: @ 0x0801DA90
push {r4, r5, lr}
adds r4, r0, #0
ldr r1, _0801DAEC @ =gMain
@@ -319,15 +319,15 @@ sub_0801DA90: @ 0x0801DA90
movs r0, #0x80
lsls r0, r0, #0x13
strh r3, [r0]
bl sub_0801DB10
bl ClearOAM
bl sub_0801DB34
ldr r0, _0801DB08 @ =0x0600C000
movs r1, #0x20
bl MemClear32
bl MemClear
ldr r0, _0801DB0C @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
strh r4, [r5, #0xe]
pop {r4, r5, pc}
.align 2, 0
@@ -341,8 +341,8 @@ _0801DB04: .4byte 0x00007FFF
_0801DB08: .4byte 0x0600C000
_0801DB0C: .4byte gBG0Buffer
thumb_func_start sub_0801DB10
sub_0801DB10: @ 0x0801DB10
thumb_func_start ClearOAM
ClearOAM: @ 0x0801DB10
push {r4, lr}
ldr r3, _0801DB30 @ =gUnk_03000020
movs r1, #0xe0
@@ -369,7 +369,7 @@ sub_0801DB34: @ 0x0801DB34
ldr r4, _0801DB6C @ =gScreen
adds r0, r4, #0
movs r1, #0x7c
bl MemClear32
bl MemClear
ldr r0, _0801DB70 @ =gBG0Buffer
str r0, [r4, #0x10]
ldr r0, _0801DB74 @ =0x00001F0C
@@ -424,7 +424,7 @@ sub_0801DBA0: @ 0x0801DBA0
adds r5, r1, #0
adds r1, r2, #0
adds r0, r5, #0
bl MemClear32
bl MemClear
movs r0, #1
strb r0, [r5]
ldr r2, _0801DBE4 @ =gScreenTransition
@@ -699,7 +699,7 @@ _0801DDB8:
ldr r0, _0801DDE0 @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #8
bl MemClear32
bl MemClear
b _0801DEE2
.align 2, 0
_0801DDD8: .4byte gUnk_080C9C50
@@ -968,7 +968,7 @@ sub_0801DFB4: @ 0x0801DFB4
ldr r7, _0801E004 @ =gUnk_02022740
adds r0, r7, #0
movs r1, #0x10
bl MemClear32
bl MemClear
strh r4, [r7, #6]
strh r5, [r7, #8]
strh r6, [r7, #0xa]
@@ -1209,7 +1209,7 @@ sub_0801E160: @ 0x0801E160
adds r0, r0, r4
movs r1, #0xa0
lsls r1, r1, #4
bl MemClear32
bl MemClear
adds r0, r6, #0
mov r1, r8
mov r2, sb
@@ -1279,7 +1279,7 @@ sub_0801E1EC: @ 0x0801E1EC
adds r0, r0, r5
movs r1, #0xa0
lsls r1, r1, #4
bl MemClear32
bl MemClear
adds r0, r4, #0
movs r1, #0
bl sub_0801E24C
@@ -1443,7 +1443,7 @@ sub_0801E31C: @ 0x0801E31C
adds r0, r0, r1
movs r1, #0xa0
lsls r1, r1, #4
bl MemClear32
bl MemClear
cmp sl, sb
bge _0801E3DC
movs r6, #0
@@ -1738,7 +1738,7 @@ sub_0801E49C: @ 0x0801E49C
adds r0, r0, r6
movs r1, #0xa0
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r2, _0801E5E8 @ =gUnk_02018EE0
ldrb r1, [r5]
lsls r0, r1, #2
asm/code_0804AA84.s
+1 -1
View File
@@ -9,7 +9,7 @@
sub_0804AB70: @ 0x0804AB70
push {r4, r5, lr}
movs r0, #0
bl sub_0801DA90
bl DispReset
ldr r1, _0804ABF8 @ =gScreen
movs r2, #0
movs r0, #0x92
asm/code_0804B9F8.s
+2 -2
View File
@@ -50,10 +50,10 @@ sub_0804FFE4: @ 0x0804FFE4
ldr r4, _08050000 @ =gFadeControl
adds r0, r4, #0
movs r1, #0x1c
bl MemClear32
bl MemClear
ldr r0, _08050004 @ =gUnk_020354C0
movs r1, #0x80
bl MemClear32
bl MemClear
movs r0, #1
rsbs r0, r0, #0
str r0, [r4, #4]
asm/code_080526F8.s
+17 -17
View File
@@ -791,7 +791,7 @@ sub_08052CFC: @ 0x08052CFC
ldr r4, _08052D44 @ =gArea
ldr r1, _08052D48 @ =0x00000894
adds r0, r4, #0
bl MemClear32
bl MemClear
ldr r0, _08052D4C @ =gRoomControls
ldrb r1, [r0, #4]
lsls r1, r1, #2
@@ -996,7 +996,7 @@ sub_08052EA0: @ 0x08052EA0
ldr r4, _08052EE4 @ =gRoomVars
adds r0, r4, #0
movs r1, #0xcc
bl MemClear32
bl MemClear
movs r0, #0xff
strb r0, [r4, #0x10]
strb r0, [r4, #0x11]
@@ -1013,7 +1013,7 @@ sub_08052EA0: @ 0x08052EA0
ldrb r0, [r0, #1]
strb r0, [r2, #1]
bl sub_08049D30
bl sub_0807DA70
bl InitScriptData
bl sub_08054524
bl sub_080186D4
bl sub_0806F364
@@ -1178,7 +1178,7 @@ sub_08052FF4: @ 0x08052FF4
ldr r5, _08053074 @ =gUnk_020342CC
adds r0, r5, #0
movs r1, #0x20
bl MemClear32
bl MemClear
str r5, [r5, #0x20]
ldr r0, _08053078 @ =gAreaRoomHeaders
lsls r6, r6, #2
@@ -1570,17 +1570,17 @@ sub_08053320: @ 0x08053320
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _08053380 @ =gBG1Buffer
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _08053384 @ =gBG2Buffer
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _08053388 @ =gBG3Buffer
movs r1, #0x80
lsls r1, r1, #5
bl MemClear32
bl MemClear
movs r0, #0x10
bl LoadGfxGroup
movs r0, #0x17
@@ -2013,7 +2013,7 @@ sub_0805368C: @ 0x0805368C
movs r0, #6
movs r1, #0x5d
movs r2, #6
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
beq _080536A6
bl DeleteEntity
@@ -2139,7 +2139,7 @@ sub_08053758: @ 0x08053758
strh r2, [r0, #0xa]
bl sub_0801B170
movs r0, #0
bl sub_0801DA90
bl DispReset
ldr r2, _080537F0 @ =gScreen
movs r0, #0x99
lsls r0, r0, #6
@@ -2222,7 +2222,7 @@ sub_08053800: @ 0x08053800
ldr r0, _08053888 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r0, _0805388C @ =0x00000F01
adds r5, r5, r0
ldr r1, [r4]
@@ -2380,7 +2380,7 @@ sub_08053974: @ 0x08053974
bne _080539A8
bl sub_0804FFE4
movs r0, #1
bl sub_0801DA90
bl DispReset
bl sub_080197AC
bl sub_08051F78
ldr r0, _080539B0 @ =gUnk_080FCBC4
@@ -2437,7 +2437,7 @@ sub_080539F4: @ 0x080539F4
cmp r0, #0
bne _08053A10
movs r0, #1
bl sub_0801DA90
bl DispReset
ldr r0, _08053A18 @ =gMenu
ldrb r1, [r0, #6]
adds r1, #1
@@ -2587,7 +2587,7 @@ sub_08053B10: @ 0x08053B10
adds r1, #1
strb r1, [r0, #5]
movs r0, #1
bl sub_0801DA90
bl DispReset
movs r1, #0x80
lsls r1, r1, #1
movs r0, #4
@@ -2673,7 +2673,7 @@ sub_08053BBC: @ 0x08053BBC
adds r1, #1
strb r1, [r0, #5]
movs r0, #1
bl sub_0801DA90
bl DispReset
movs r1, #0x80
lsls r1, r1, #1
movs r0, #4
@@ -3187,8 +3187,8 @@ GetSaleItemConfirmMessageID: @ 0x08053FD0
.align 2, 0
_08053FDC: .4byte gUnk_080FD964
thumb_func_start sub_08053FE0
sub_08053FE0: @ 0x08053FE0
thumb_func_start GetItemPrice
GetItemPrice: @ 0x08053FE0
lsls r0, r0, #3
ldr r1, _08053FEC @ =gUnk_080FD964
adds r0, r0, r1
asm/code_0805436C.s
+4 -4
View File
@@ -33,7 +33,7 @@ sub_0805488C: @ 0x0805488C
lsls r0, r0, #1
strh r0, [r2, #8]
movs r0, #0
bl sub_0801DA90
bl DispReset
ldrb r0, [r4, #3]
movs r1, #1
bl sub_08054974
@@ -875,7 +875,7 @@ _08054F60: .4byte 0x00004074
sub_08054F64: @ 0x08054F64
push {lr}
ldrb r0, [r0, #0xb]
ldr r3, _08054F7C @ =gUnk_02033280
ldr r3, _08054F7C @ =gActiveScriptInfo
ldr r2, [r3]
adds r1, r2, #0
ands r1, r0
@@ -885,7 +885,7 @@ sub_08054F64: @ 0x08054F64
strb r0, [r3, #6]
b _08054F8C
.align 2, 0
_08054F7C: .4byte gUnk_02033280
_08054F7C: .4byte gActiveScriptInfo
_08054F80:
bics r2, r1
str r2, [r3]
@@ -2571,7 +2571,7 @@ _08055C6C:
movs r1, #0x9e
movs r2, #6
movs r3, #0
bl FindEntityInListByForm
bl FindEntity
adds r4, r0, #0
cmp r4, #0
beq _08055C8C
asm/code_08056418.s
+3 -3
View File
@@ -267,11 +267,11 @@ _080568B2:
beq _080568D2
adds r0, r6, #0
movs r1, #4
bl MemClear32
bl MemClear
ldr r4, _08056910 @ =gUnk_02024030
adds r0, r4, #0
movs r1, #0x18
bl MemClear32
bl MemClear
movs r0, #1
strb r0, [r4]
strb r0, [r6]
@@ -472,7 +472,7 @@ _08056A30:
movs r1, #3
strb r1, [r2]
movs r1, #0x18
bl MemClear32
bl MemClear
movs r0, #0x6a
bl SoundReq
adds r1, r6, #0
asm/code_0805E3B0.s
+3 -3
View File
@@ -360,15 +360,15 @@ EraseAllEntities: @ 0x0805E60C
bl DeleteAllEntities
ldr r0, _0805E654 @ =gUnk_03003DC0
movs r1, #0xc
bl MemClear32
bl MemClear
ldr r0, _0805E658 @ =gPlayerEntity
movs r1, #0xaa
lsls r1, r1, #6
bl MemClear32
bl MemClear
ldr r0, _0805E65C @ =gUnk_02033290
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
bl sub_0805E98C
ldr r0, _0805E660 @ =gEntCount
movs r1, #0
asm/code_0805EC04.s
+4 -4
View File
@@ -751,7 +751,7 @@ _0805F2D0:
bne _0805F2F0
adds r0, r5, #0
movs r1, #0xc
bl MemClear32
bl MemClear
ldrb r0, [r4]
movs r1, #1
orrs r0, r1
@@ -781,7 +781,7 @@ _0805F308:
cmp r0, r2
bne _0805F318
movs r1, #0xc
bl MemClear32
bl MemClear
b _0805F320
.align 2, 0
_0805F314: .4byte gUnk_02036540
@@ -944,7 +944,7 @@ sub_0805F440: @ 0x0805F440
adds r4, r0, #0
adds r5, r1, #0
movs r1, #0x30
bl MemClear32
bl MemClear
ldr r0, _0805F45C @ =0x0000FFFF
cmp r5, r0
bls _0805F460
@@ -1122,7 +1122,7 @@ _0805F596:
_0805F59E:
ldr r0, _0805F5C8 @ =gUnk_02034330
movs r1, #0x18
bl MemClear32
bl MemClear
_0805F5A6:
mov r0, sb
mov r1, sp
asm/code_0806EC20.s
+1 -1
View File
@@ -27,7 +27,7 @@ sub_0806EC38: @ 0x0806EC38
movs r0, #7
movs r1, #0x58
movs r2, #7
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
beq _0806EC4C
bl DeleteEntity
asm/code_0806ED78.s
+13 -13
View File
@@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364
adds r1, r2, r3
adds r0, r0, r1
movs r1, #0x10
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_0806F384: .4byte gArea
@@ -1193,13 +1193,13 @@ sub_0806F5BC: @ 0x0806F5BC
lsls r5, r1, #0x10
asrs r5, r5, #0x10
adds r1, r5, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r6, #0x80
lsls r6, r6, #1
adds r1, r6, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r7, #0x2c]
@@ -1211,11 +1211,11 @@ sub_0806F5BC: @ 0x0806F5BC
movs r1, #0
ldrsh r0, [r4, r1]
adds r1, r5, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r6, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r7, #0x30]
@@ -1248,13 +1248,13 @@ sub_0806F62C: @ 0x0806F62C
lsls r5, r5, #0x10
asrs r5, r5, #0x10
adds r1, r5, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r1, #0x80
lsls r1, r1, #1
mov r8, r1
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r6, #0x2c]
@@ -1266,11 +1266,11 @@ sub_0806F62C: @ 0x0806F62C
movs r1, #0
ldrsh r0, [r4, r1]
adds r1, r5, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
mov r1, r8
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r6, #0x30]
@@ -1300,13 +1300,13 @@ sub_0806F69C: @ 0x0806F69C
ldrsh r0, [r0, r1]
movs r2, #0x24
ldrsh r1, [r6, r2]
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r4, #0x80
lsls r4, r4, #1
adds r1, r4, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r6, #0x2c]
@@ -1320,11 +1320,11 @@ sub_0806F69C: @ 0x0806F69C
ldrsh r0, [r0, r1]
movs r2, #0x24
ldrsh r1, [r6, r2]
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r4, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r6, #0x30]
asm/code_0806FA6C.s
+6 -6
View File
@@ -139,13 +139,13 @@ UnloadHitbox: @ 0x0806FBEC
push {r4, lr}
adds r4, r0, #0
ldr r0, [r4, #0x48]
bl sub_0801DA0C
bl zFree
movs r0, #0
str r0, [r4, #0x48]
pop {r4, pc}
thumb_func_start sub_0806FBFC
sub_0806FBFC: @ 0x0806FBFC
thumb_func_start CheckPlayerProximity
CheckPlayerProximity: @ 0x0806FBFC
push {r4, r5, r6, lr}
adds r5, r3, #0
ldr r4, _0806FC20 @ =gPlayerEntity
@@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C
ldr r0, _0806FD9C @ =gUnk_020000C0
movs r1, #0xc0
lsls r1, r1, #4
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_0806FD9C: .4byte gUnk_020000C0
@@ -534,7 +534,7 @@ _0806FE9E:
bls _0806FE9E
adds r0, r6, #0
movs r1, #0x40
bl MemClear32
bl MemClear
_0806FEB4:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C
push {lr}
ldr r0, _080705A8 @ =gUnk_02034490
movs r1, #0x18
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_080705A8: .4byte gUnk_02034490
asm/code_08070698.s
+18 -1331
View File
File diff suppressed because it is too large Load Diff
asm/code_080732D0.s
+19 -19
View File
@@ -175,8 +175,8 @@ _08073418:
.align 2, 0
_0807341C: .4byte gRoomControls
thumb_func_start sub_08073420
sub_08073420: @ 0x08073420
thumb_func_start PlayerParachute
PlayerParachute: @ 0x08073420
push {r4, lr}
adds r4, r0, #0
bl sub_08078EFC
@@ -1280,8 +1280,8 @@ _08073C58:
_08073C66:
pop {pc}
thumb_func_start sub_08073C68
sub_08073C68: @ 0x08073C68
thumb_func_start PlayerMinish
PlayerMinish: @ 0x08073C68
push {lr}
ldr r2, _08073C7C @ =gUnk_0811BC60
ldrb r1, [r0, #0xd]
@@ -2760,7 +2760,7 @@ _0807476C:
strb r0, [r1]
subs r0, #0x24
bl ModHealth
bl sub_08079458
bl RespawnPlayer
_08074792:
pop {r4, pc}
.align 2, 0
@@ -3501,7 +3501,7 @@ sub_08074CF8: @ 0x08074CF8
adds r4, r5, #0
adds r4, #0x84
ldr r1, [r4]
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r4]
adds r0, r5, #0
bl sub_08074D34
@@ -3818,7 +3818,7 @@ sub_08074F2C: @ 0x08074F2C
adds r5, r4, #0
adds r5, #0x84
ldr r1, [r5]
bl ExecuteScriptCommandSet
bl ExecuteScript
ldr r1, [r5]
adds r0, r4, #0
bl sub_08074D34
@@ -3874,7 +3874,7 @@ sub_08074F8C: @ 0x08074F8C
bne _08074FAC
movs r0, #0
strb r0, [r3]
ldr r2, _08074FDC @ =gUnk_02033280
ldr r2, _08074FDC @ =gActiveScriptInfo
ldr r0, [r2]
movs r1, #4
orrs r0, r1
@@ -3904,7 +3904,7 @@ _08074FAC:
lsls r0, r0, #3
b _08074FE8
.align 2, 0
_08074FDC: .4byte gUnk_02033280
_08074FDC: .4byte gActiveScriptInfo
_08074FE0: .4byte gPlayerState
_08074FE4:
movs r0, #0x80
@@ -4198,7 +4198,7 @@ sub_080751E8: @ 0x080751E8
ldr r4, _08075230 @ =gPlayerScriptExecutionContext
adds r0, r4, #0
movs r1, #0x24
bl MemClear32
bl MemClear
str r6, [r4]
ldr r0, _08075234 @ =gPlayerEntity
adds r0, #0x84
@@ -4223,16 +4223,16 @@ sub_080751E8: @ 0x080751E8
cmp r7, #0
bne _08075240
strb r7, [r3]
ldr r6, _0807523C @ =gUnk_08009ECC
ldr r6, _0807523C @ =script_08009ECC
b _08075244
.align 2, 0
_08075230: .4byte gPlayerScriptExecutionContext
_08075234: .4byte gPlayerEntity
_08075238: .4byte gPlayerState
_0807523C: .4byte gUnk_08009ECC
_0807523C: .4byte script_08009ECC
_08075240:
strb r4, [r3]
ldr r6, _08075290 @ =gUnk_08009EF0
ldr r6, _08075290 @ =script_08009EF0
_08075244:
ldr r0, _08075294 @ =gPlayerState
adds r0, #0x39
@@ -4270,7 +4270,7 @@ _08075270:
_0807528C:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08075290: .4byte gUnk_08009EF0
_08075290: .4byte script_08009EF0
_08075294: .4byte gPlayerState
_08075298: .4byte gPlayerEntity
@@ -4310,13 +4310,13 @@ _080752D0:
cmp r0, #0
beq _080752E2
_080752DC:
ldr r1, _080752E4 @ =gUnk_02033280
ldr r1, _080752E4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_080752E2:
pop {r4, r5, pc}
.align 2, 0
_080752E4: .4byte gUnk_02033280
_080752E4: .4byte gActiveScriptInfo
thumb_func_start sub_080752E8
sub_080752E8: @ 0x080752E8
@@ -4592,7 +4592,7 @@ _080754F2:
movs r0, #8
movs r1, #0xf
movs r2, #2
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
bne _08075538
adds r0, r4, #0
@@ -6017,7 +6017,7 @@ sub_08075FF8: @ 0x08075FF8
movs r0, #8
movs r1, #2
movs r2, #2
bl FindEntityInListBySubtype
bl FindEntityByID
b _08076026
.align 2, 0
_08076018: .4byte gPlayerState
@@ -6025,7 +6025,7 @@ _0807601C:
adds r5, #1
adds r0, r4, #0
movs r1, #2
bl FindNextEntityOfSameSubtype
bl FindNextDuplicateID
_08076026:
adds r4, r0, #0
cmp r4, #0
asm/code_08077B98.s
+1 -1
View File
@@ -642,7 +642,7 @@ sub_080784C8: @ 0x080784C8
movs r1, #0xc4
lsls r1, r1, #1
adds r0, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080784E0 @ =gUnk_0811C000
str r0, [r4, #4]
pop {r4, pc}
asm/code_08078778.s
+10 -10
View File
@@ -44,7 +44,7 @@ _080788BA:
movs r0, #6
movs r1, #9
movs r2, #6
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
bne _080788D6
movs r0, #9
@@ -70,7 +70,7 @@ sub_080788E0: @ 0x080788E0
ldr r1, _08078900 @ =gUnk_03003DF8
adds r0, r0, r1
movs r1, #0xc
bl MemClear32
bl MemClear
_080788FC:
pop {pc}
.align 2, 0
@@ -542,7 +542,7 @@ sub_08078C24: @ 0x08078C24
ldr r0, _08078CB0 @ =gUnk_03003DF0
movs r1, #0xc4
lsls r1, r1, #1
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_08078CAC: .4byte gPlayerState
@@ -866,7 +866,7 @@ sub_08078EFC: @ 0x08078EFC
strb r2, [r0, #0xc]
strb r1, [r0, #0xd]
strb r1, [r3, #0xc]
bl sub_08070680
bl DoPlayerAction
movs r0, #1
b _08078F22
.align 2, 0
@@ -1583,8 +1583,8 @@ _08079454:
_08079456:
pop {r4, r5, pc}
thumb_func_start sub_08079458
sub_08079458: @ 0x08079458
thumb_func_start RespawnPlayer
RespawnPlayer: @ 0x08079458
push {r4, r5, lr}
ldr r4, _08079498 @ =gPlayerEntity
movs r1, #0
@@ -1915,7 +1915,7 @@ _080796C8:
strb r1, [r0, #0x10]
movs r1, #0x81
strb r1, [r4, #2]
bl sub_08070680
bl DoPlayerAction
movs r0, #1
b _080796FE
.align 2, 0
@@ -2537,7 +2537,7 @@ sub_08079B24: @ 0x08079B24
ldrb r0, [r0]
cmp r0, #0
beq _08079B6C
bl sub_08079458
bl RespawnPlayer
b _08079BC0
.align 2, 0
_08079B60: .4byte gPlayerEntity
@@ -5401,8 +5401,8 @@ sub_0807B0C8: @ 0x0807B0C8
.align 2, 0
_0807B0F8: .4byte gPlayerEntity
thumb_func_start sub_0807B0FC
sub_0807B0FC: @ 0x0807B0FC
thumb_func_start PlayerWarp
PlayerWarp: @ 0x0807B0FC
push {lr}
ldr r2, _0807B110 @ =gUnk_0811C27C
ldrb r1, [r0, #0xd]
asm/code_0807B9B8.s
+13 -13
View File
@@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC
lsls r6, r6, #6
adds r0, r5, #0
adds r1, r6, #0
bl MemClear32
bl MemClear
adds r0, r5, r6
movs r1, #0x80
lsls r1, r1, #5
bl MemClear32
bl MemClear
ldr r0, _0807C160 @ =gUnk_02019EE0
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _0807C164 @ =gMapDataTopSpecial
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _0807C168 @ =gArea
ldr r1, _0807C16C @ =0x0000085C
adds r0, r0, r1
@@ -999,7 +999,7 @@ _0807C174: .4byte 0x0000FFFF
_0807C178:
adds r0, r2, #4
adds r1, r6, #0
bl MemClear32
bl MemClear
movs r3, #1
mov sb, r3
_0807C184:
@@ -1167,7 +1167,7 @@ _0807C2E4:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl MemClear32
bl MemClear
ldr r4, _0807C350 @ =gMapDataTopSpecial
adds r5, r4, r6
adds r0, r4, #0
@@ -1179,7 +1179,7 @@ _0807C2E4:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl MemClear32
bl MemClear
_0807C326:
mov r1, sb
cmp r1, #0
@@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _0807C59C @ =gMapDataTopSpecial
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r5, _0807C5A0 @ =gUnk_02022830
ldr r0, _0807C5A4 @ =gArea
ldr r1, _0807C5A8 @ =0x0000085C
@@ -1455,7 +1455,7 @@ _0807C54A:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl MemClear32
bl MemClear
ldr r4, _0807C59C @ =gMapDataTopSpecial
adds r5, r4, r6
adds r0, r4, #0
@@ -1467,7 +1467,7 @@ _0807C54A:
bl sub_0807C5F4
adds r0, r5, #0
adds r1, r6, #0
bl MemClear32
bl MemClear
_0807C592:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -1694,7 +1694,7 @@ _0807C710:
_0807C726:
adds r0, r4, #0
movs r1, #0x40
bl MemClear32
bl MemClear
adds r4, #0x40
adds r5, #1
cmp r5, r7
@@ -1984,7 +1984,7 @@ _0807C92E:
_0807C946:
adds r0, r4, #0
movs r1, #0x80
bl MemClear32
bl MemClear
adds r4, #0x80
adds r5, #1
cmp r5, r6
asm/code_0807F0D8.s
+58 -58
View File
@@ -125,7 +125,7 @@ sub_0807F1A0: @ 0x0807F1A0
movs r4, #0x32
ldrsh r3, [r3, r4]
bl sub_0807DEDC
ldr r2, _0807F1C0 @ =gUnk_02033280
ldr r2, _0807F1C0 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -133,7 +133,7 @@ sub_0807F1A0: @ 0x0807F1A0
pop {r4, pc}
.align 2, 0
_0807F1BC: .4byte gPlayerEntity
_0807F1C0: .4byte gUnk_02033280
_0807F1C0: .4byte gActiveScriptInfo
thumb_func_start sub_0807F1C4
sub_0807F1C4: @ 0x0807F1C4
@@ -271,7 +271,7 @@ sub_0807F2A8: @ 0x0807F2A8
ldr r0, [r0]
cmp r0, #0
bne _0807F2C8
ldr r2, _0807F2C4 @ =gUnk_02033280
ldr r2, _0807F2C4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -279,15 +279,15 @@ sub_0807F2A8: @ 0x0807F2A8
b _0807F2CE
.align 2, 0
_0807F2C0: .4byte gPlayerState
_0807F2C4: .4byte gUnk_02033280
_0807F2C4: .4byte gActiveScriptInfo
_0807F2C8:
ldr r1, _0807F2D0 @ =gUnk_02033280
ldr r1, _0807F2D0 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F2CE:
pop {pc}
.align 2, 0
_0807F2D0: .4byte gUnk_02033280
_0807F2D0: .4byte gActiveScriptInfo
thumb_func_start sub_0807F2D4
sub_0807F2D4: @ 0x0807F2D4
@@ -300,21 +300,21 @@ sub_0807F2D4: @ 0x0807F2D4
lsrs r1, r0, #0x18
cmp r1, #0
beq _0807F2F8
ldr r2, _0807F2F4 @ =gUnk_02033280
ldr r2, _0807F2F4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
b _0807F2FC
.align 2, 0
_0807F2F4: .4byte gUnk_02033280
_0807F2F4: .4byte gActiveScriptInfo
_0807F2F8:
ldr r0, _0807F300 @ =gUnk_02033280
ldr r0, _0807F300 @ =gActiveScriptInfo
strb r1, [r0, #6]
_0807F2FC:
pop {pc}
.align 2, 0
_0807F300: .4byte gUnk_02033280
_0807F300: .4byte gActiveScriptInfo
thumb_func_start sub_0807F304
sub_0807F304: @ 0x0807F304
@@ -328,7 +328,7 @@ sub_0807F304: @ 0x0807F304
lsrs r1, r0, #0x18
cmp r1, #0
beq _0807F32C
ldr r2, _0807F328 @ =gUnk_02033280
ldr r2, _0807F328 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -336,14 +336,14 @@ sub_0807F304: @ 0x0807F304
b _0807F330
.align 2, 0
_0807F324: .4byte gPlayerEntity
_0807F328: .4byte gUnk_02033280
_0807F328: .4byte gActiveScriptInfo
_0807F32C:
ldr r0, _0807F334 @ =gUnk_02033280
ldr r0, _0807F334 @ =gActiveScriptInfo
strb r1, [r0, #6]
_0807F330:
pop {pc}
.align 2, 0
_0807F334: .4byte gUnk_02033280
_0807F334: .4byte gActiveScriptInfo
thumb_func_start sub_0807F338
sub_0807F338: @ 0x0807F338
@@ -509,14 +509,14 @@ _0807F44C:
strb r0, [r3]
str r2, [r1, #4]
_0807F452:
ldr r2, _0807F460 @ =gUnk_02033280
ldr r2, _0807F460 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807F460: .4byte gUnk_02033280
_0807F460: .4byte gActiveScriptInfo
thumb_func_start sub_0807F464
sub_0807F464: @ 0x0807F464
@@ -589,13 +589,13 @@ _0807F4BC:
strh r0, [r4, #0x2e]
b _0807F4F0
_0807F4EA:
ldr r1, _0807F4F4 @ =gUnk_02033280
ldr r1, _0807F4F4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F4F0:
pop {r4, r5, r6, pc}
.align 2, 0
_0807F4F4: .4byte gUnk_02033280
_0807F4F4: .4byte gActiveScriptInfo
thumb_func_start sub_0807F4F8
sub_0807F4F8: @ 0x0807F4F8
@@ -665,13 +665,13 @@ _0807F548:
strh r0, [r4, #0x32]
b _0807F57C
_0807F576:
ldr r1, _0807F580 @ =gUnk_02033280
ldr r1, _0807F580 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F57C:
pop {r4, r5, pc}
.align 2, 0
_0807F580: .4byte gUnk_02033280
_0807F580: .4byte gActiveScriptInfo
thumb_func_start sub_0807F584
sub_0807F584: @ 0x0807F584
@@ -691,14 +691,14 @@ sub_0807F594: @ 0x0807F594
ldrb r0, [r0]
cmp r0, #0
beq _0807F5A6
ldr r1, _0807F5AC @ =gUnk_02033280
ldr r1, _0807F5AC @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F5A6:
pop {pc}
.align 2, 0
_0807F5A8: .4byte gPlayerState
_0807F5AC: .4byte gUnk_02033280
_0807F5AC: .4byte gActiveScriptInfo
thumb_func_start sub_0807F5B0
sub_0807F5B0: @ 0x0807F5B0
@@ -757,7 +757,7 @@ _0807F602:
ldrsh r0, [r4, r2]
cmp r3, r0
bne _0807F628
ldr r2, _0807F624 @ =gUnk_02033280
ldr r2, _0807F624 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -765,15 +765,15 @@ _0807F602:
b _0807F62E
.align 2, 0
_0807F620: .4byte gRoomControls
_0807F624: .4byte gUnk_02033280
_0807F624: .4byte gActiveScriptInfo
_0807F628:
ldr r1, _0807F630 @ =gUnk_02033280
ldr r1, _0807F630 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807F62E:
pop {r4, pc}
.align 2, 0
_0807F630: .4byte gUnk_02033280
_0807F630: .4byte gActiveScriptInfo
thumb_func_start sub_0807F634
sub_0807F634: @ 0x0807F634
@@ -831,7 +831,7 @@ sub_0807F680: @ 0x0807F680
movs r3, #1
_0807F69A:
str r3, [r2, #0x14]
ldr r2, _0807F6B0 @ =gUnk_02033280
ldr r2, _0807F6B0 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -840,7 +840,7 @@ _0807F69A:
.align 2, 0
_0807F6A8: .4byte gPlayerEntity
_0807F6AC: .4byte gRoomControls
_0807F6B0: .4byte gUnk_02033280
_0807F6B0: .4byte gActiveScriptInfo
thumb_func_start sub_0807F6B4
sub_0807F6B4: @ 0x0807F6B4
@@ -859,7 +859,7 @@ sub_0807F6B4: @ 0x0807F6B4
movs r3, #1
_0807F6CE:
str r3, [r2, #0x14]
ldr r2, _0807F6E4 @ =gUnk_02033280
ldr r2, _0807F6E4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -868,7 +868,7 @@ _0807F6CE:
.align 2, 0
_0807F6DC: .4byte gPlayerEntity
_0807F6E0: .4byte gRoomControls
_0807F6E4: .4byte gUnk_02033280
_0807F6E4: .4byte gActiveScriptInfo
thumb_func_start sub_0807F6E8
sub_0807F6E8: @ 0x0807F6E8
@@ -984,7 +984,7 @@ _0807F79A:
bl GetSaleItemConfirmMessageID
adds r4, r0, #0
adds r0, r5, #0
bl sub_08053FE0
bl GetItemPrice
adds r5, r0, #0
adds r0, r4, #0
adds r1, r6, #0
@@ -1008,7 +1008,7 @@ sub_0807F7C4: @ 0x0807F7C4
ldr r0, _0807F7F4 @ =gRoomVars
ldrb r0, [r0, #6]
_0807F7D2:
bl sub_08053FE0
bl GetItemPrice
movs r2, #0
ldr r1, _0807F7F8 @ =gSave
adds r1, #0xc0
@@ -1018,7 +1018,7 @@ _0807F7D2:
movs r2, #1
_0807F7E4:
str r2, [r4, #0x14]
ldr r2, _0807F7FC @ =gUnk_02033280
ldr r2, _0807F7FC @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -1027,7 +1027,7 @@ _0807F7E4:
.align 2, 0
_0807F7F4: .4byte gRoomVars
_0807F7F8: .4byte gSave
_0807F7FC: .4byte gUnk_02033280
_0807F7FC: .4byte gActiveScriptInfo
thumb_func_start sub_0807F800
sub_0807F800: @ 0x0807F800
@@ -1039,7 +1039,7 @@ sub_0807F800: @ 0x0807F800
ldrb r4, [r0, #6]
_0807F80C:
adds r0, r4, #0
bl sub_08053FE0
bl GetItemPrice
rsbs r0, r0, #0
bl ModRupees
adds r0, r4, #0
@@ -1049,7 +1049,7 @@ _0807F80C:
ldr r1, _0807F834 @ =gRoomVars
movs r0, #0
strb r0, [r1, #6]
ldr r2, _0807F838 @ =gUnk_02033280
ldr r2, _0807F838 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -1057,7 +1057,7 @@ _0807F80C:
pop {r4, pc}
.align 2, 0
_0807F834: .4byte gRoomVars
_0807F838: .4byte gUnk_02033280
_0807F838: .4byte gActiveScriptInfo
thumb_func_start sub_0807F83C
sub_0807F83C: @ 0x0807F83C
@@ -1144,14 +1144,14 @@ sub_0807F8D0: @ 0x0807F8D0
push {lr}
ldr r1, [r1, #4]
bl sub_08003FC4
ldr r2, _0807F8E4 @ =gUnk_02033280
ldr r2, _0807F8E4 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
strb r0, [r2, #7]
pop {pc}
.align 2, 0
_0807F8E4: .4byte gUnk_02033280
_0807F8E4: .4byte gActiveScriptInfo
thumb_func_start sub_0807F8E8
sub_0807F8E8: @ 0x0807F8E8
@@ -1228,7 +1228,7 @@ sub_0807F950: @ 0x0807F950
movs r1, #0x56
movs r2, #6
movs r3, #0
bl FindEntityInListByForm
bl FindEntity
cmp r0, #0
beq _0807F96C
bl DeleteEntity
@@ -1314,14 +1314,14 @@ _0807F9C4: @ jump table
.4byte _0807FA24 @ case 22
.4byte _0807FA24 @ case 23
_0807FA24:
ldr r1, _0807FA2C @ =gUnk_02033280
ldr r1, _0807FA2C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
b _0807FA3A
.align 2, 0
_0807FA2C: .4byte gUnk_02033280
_0807FA2C: .4byte gActiveScriptInfo
_0807FA30:
ldr r2, _0807FA3C @ =gUnk_02033280
ldr r2, _0807FA3C @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -1329,7 +1329,7 @@ _0807FA30:
_0807FA3A:
pop {pc}
.align 2, 0
_0807FA3C: .4byte gUnk_02033280
_0807FA3C: .4byte gActiveScriptInfo
thumb_func_start sub_0807FA40
sub_0807FA40: @ 0x0807FA40
@@ -1374,14 +1374,14 @@ _0807FA60: @ jump table
.4byte _0807FAC0 @ case 22
.4byte _0807FAC0 @ case 23
_0807FAC0:
ldr r1, _0807FAC8 @ =gUnk_02033280
ldr r1, _0807FAC8 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
b _0807FAD6
.align 2, 0
_0807FAC8: .4byte gUnk_02033280
_0807FAC8: .4byte gActiveScriptInfo
_0807FACC:
ldr r2, _0807FAD8 @ =gUnk_02033280
ldr r2, _0807FAD8 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -1389,7 +1389,7 @@ _0807FACC:
_0807FAD6:
pop {pc}
.align 2, 0
_0807FAD8: .4byte gUnk_02033280
_0807FAD8: .4byte gActiveScriptInfo
thumb_func_start sub_0807FADC
sub_0807FADC: @ 0x0807FADC
@@ -1427,13 +1427,13 @@ _0807FB16:
bl sub_0808C688
b _0807FB22
_0807FB1C:
ldr r1, _0807FB24 @ =gUnk_02033280
ldr r1, _0807FB24 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807FB22:
pop {r4, pc}
.align 2, 0
_0807FB24: .4byte gUnk_02033280
_0807FB24: .4byte gActiveScriptInfo
thumb_func_start sub_0807FB28
sub_0807FB28: @ 0x0807FB28
@@ -1460,13 +1460,13 @@ _0807FB3A:
.align 2, 0
_0807FB54: .4byte 0x00007FFF
_0807FB58:
ldr r1, _0807FB60 @ =gUnk_02033280
ldr r1, _0807FB60 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807FB5E:
pop {r4, pc}
.align 2, 0
_0807FB60: .4byte gUnk_02033280
_0807FB60: .4byte gActiveScriptInfo
thumb_func_start sub_0807FB64
sub_0807FB64: @ 0x0807FB64
@@ -1552,13 +1552,13 @@ sub_0807FBD4: @ 0x0807FBD4
bl sub_080040A8
cmp r0, #0
beq _0807FBF4
ldr r1, _0807FBF8 @ =gUnk_02033280
ldr r1, _0807FBF8 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0807FBF4:
pop {r4, pc}
.align 2, 0
_0807FBF8: .4byte gUnk_02033280
_0807FBF8: .4byte gActiveScriptInfo
thumb_func_start sub_0807FBFC
sub_0807FBFC: @ 0x0807FBFC
@@ -2934,11 +2934,11 @@ sub_08080668: @ 0x08080668
ldr r5, _080806A4 @ =gRoomControls
adds r0, r5, #0
movs r1, #0x38
bl MemClear32
bl MemClear
ldr r4, _080806A8 @ =gUnk_03004030
adds r0, r4, #0
movs r1, #0xc
bl MemClear32
bl MemClear
ldr r0, _080806AC @ =0x0000FFFF
strh r0, [r5, #0x22]
movs r0, #0xff
@@ -2950,10 +2950,10 @@ sub_08080668: @ 0x08080668
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080806B8 @ =gMapDataTopSpecial
adds r1, r4, #0
bl MemClear32
bl MemClear
pop {r4, r5, pc}
.align 2, 0
_080806A4: .4byte gRoomControls
asm/code_080A29BC.s
+5 -5
View File
@@ -96,13 +96,13 @@ sub_080A2AF4: @ 0x080A2AF4
lsls r4, r4, #0x18
asrs r4, r4, #0x10
adds r1, r4, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r5, #0x80
lsls r5, r5, #1
adds r1, r5, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r6, #0x2c]
@@ -115,11 +115,11 @@ sub_080A2AF4: @ 0x080A2AF4
movs r1, #0
ldrsh r0, [r0, r1]
adds r1, r4, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r5, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r6, #0x30]
@@ -995,7 +995,7 @@ sub_080A3210: @ 0x080A3210
ldr r4, _080A3230 @ =gUnk_02021EE0
adds r0, r4, #0
movs r1, #0x18
bl MemClear32
bl MemClear
bl sub_080A35C8
movs r0, #0x80
lsls r0, r0, #1
asm/code_080A3480.s
+8 -8
View File
@@ -266,7 +266,7 @@ _080A365C:
_080A365E:
str r0, [r2, #0xc]
movs r0, #0
bl sub_0801DA90
bl DispReset
movs r0, #0xb
bl LoadPaletteGroup
movs r0, #0xc
@@ -354,7 +354,7 @@ sub_080A36F8: @ 0x080A36F8
ldr r0, _080A3760 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r1, _080A3764 @ =gScreen
movs r2, #0
movs r0, #1
@@ -410,7 +410,7 @@ _080A378A:
ldr r0, _080A37B8 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
movs r1, #0x10
ldrsh r0, [r4, r1]
ldr r2, _080A37BC @ =gUnk_081272E0
@@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0
movs r6, #0x80
lsls r6, r6, #4
adds r1, r6, #0
bl MemClear32
bl MemClear
ldr r4, _080A3924 @ =gScreen
movs r0, #0
mov r8, r0
@@ -588,7 +588,7 @@ sub_080A38D0: @ 0x080A38D0
strh r5, [r4, #0x1a]
ldr r0, _080A3928 @ =gBG2Buffer
adds r1, r6, #0
bl MemClear32
bl MemClear
strh r5, [r4, #0x26]
adds r4, #0x68
movs r0, #0x80
@@ -699,7 +699,7 @@ _080A39C8:
strh r0, [r2, #8]
strb r4, [r2, #3]
movs r0, #1
bl sub_0801DA90
bl DispReset
bl sub_080A3210
bl sub_080A4D34
movs r0, #0xa
@@ -712,7 +712,7 @@ _080A39C8:
movs r0, #0xc0
lsls r0, r0, #0x13
movs r1, #0x20
bl MemClear32
bl MemClear
movs r0, #0
movs r1, #0
bl sub_08052418
@@ -807,7 +807,7 @@ _080A3A9A:
_080A3AB4: .4byte gMenu
_080A3AB8:
movs r0, #0
bl sub_0807CDA4
bl HandleSave
adds r1, r0, #0
ldr r4, _080A3AD8 @ =gMenu
strb r1, [r4]
asm/code_080A3BD0.s
+13 -13
View File
@@ -935,7 +935,7 @@ sub_080A4398: @ 0x080A4398
push {lr}
ldr r0, _080A43A4 @ =gUnk_02019EE0
movs r1, #0x40
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_080A43A4: .4byte gUnk_02019EE0
@@ -1119,7 +1119,7 @@ sub_080A44E0: @ 0x080A44E0
mov r8, r0
ldr r0, [r4, #8]
mov r1, r8
bl MemClear32
bl MemClear
adds r0, r6, #0
adds r1, r4, #0
bl sub_0805F76C
@@ -1269,11 +1269,11 @@ sub_080A4608: @ 0x080A4608
ldr r0, _080A46A4 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r0, _080A46A8 @ =gBG3Buffer
movs r1, #0x80
lsls r1, r1, #5
bl MemClear32
bl MemClear
ldr r2, _080A46AC @ =gScreen
adds r1, r2, #0
adds r1, #0x58
@@ -1976,7 +1976,7 @@ sub_080A4BA0: @ 0x080A4BA0
adds r6, r1, #0
add r0, sp, #0x18
movs r1, #0x30
bl MemClear32
bl MemClear
ldr r0, _080A4C08 @ =gUnk_0812816C
mov r1, sp
movs r2, #0x18
@@ -2123,7 +2123,7 @@ sub_080A4CBC: @ 0x080A4CBC
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl MemClear32
bl MemClear
ldr r1, _080A4D14 @ =0x0600E000
adds r0, r4, #0
adds r2, r5, #0
@@ -2217,7 +2217,7 @@ sub_080A4D88: @ 0x080A4D88
push {lr}
ldr r0, _080A4DA4 @ =gUnk_020344A0
movs r1, #8
bl MemClear32
bl MemClear
movs r0, #1
movs r1, #0
bl MenuFadeIn
@@ -2245,21 +2245,21 @@ sub_080A4DB8: @ 0x080A4DB8
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080A4E5C @ =gBG1Buffer
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080A4E60 @ =gBG2Buffer
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080A4E64 @ =gUnk_0200AF34
movs r1, #0xc0
lsls r1, r1, #2
bl MemClear32
bl MemClear
ldr r4, _080A4E68 @ =gMenu
adds r0, r4, #0
movs r1, #0x30
bl MemClear32
bl MemClear
ldr r0, _080A4E6C @ =0x0000FFFF
strh r0, [r4, #0x2e]
ldr r0, _080A4E70 @ =gUnk_02034490
@@ -2580,7 +2580,7 @@ _080A5080:
ldr r0, _080A5098 @ =gBG0Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r1, _080A509C @ =gScreen
movs r0, #1
strh r0, [r1, #0xe]
asm/code_080A5574.s
+20 -20
View File
@@ -631,7 +631,7 @@ _080A5A52:
sub_080A5A54: @ 0x080A5A54
push {lr}
movs r0, #0
bl sub_0807CDA4
bl HandleSave
adds r1, r0, #0
cmp r1, #0
beq _080A5A8A
@@ -2442,7 +2442,7 @@ _080A6886:
ldr r0, _080A68D0 @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #3
bl MemClear32
bl MemClear
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080A68AC: .4byte gUnk_02032EC0
@@ -3307,7 +3307,7 @@ sub_080A6F6C: @ 0x080A6F6C
ldr r0, _080A6FA8 @ =gUnk_020350F0
movs r1, #0x80
lsls r1, r1, #1
bl MemClear32
bl MemClear
movs r0, #0xff
ands r0, r4
cmp r0, #0
@@ -3376,7 +3376,7 @@ _080A6FFA:
ldr r0, _080A7038 @ =gUnk_020350F0
movs r1, #0x80
lsls r1, r1, #1
bl MemClear32
bl MemClear
movs r0, #0xff
ands r0, r4
cmp r0, #0
@@ -3413,7 +3413,7 @@ sub_080A7040: @ 0x080A7040
movs r1, #0xc0
lsls r1, r1, #2
adds r0, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080A7098 @ =0xFFFFFE00
adds r4, r4, r0
ldr r1, _080A709C @ =0x0600E000
@@ -3456,7 +3456,7 @@ sub_080A70AC: @ 0x080A70AC
movs r1, #0xc0
lsls r1, r1, #2
adds r0, r4, #0
bl MemClear32
bl MemClear
adds r2, r4, #0
subs r2, #0x34
movs r0, #0x7f
@@ -3519,7 +3519,7 @@ sub_080A7124: @ 0x080A7124
ldr r0, _080A7134 @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_080A7134: .4byte gUnk_02032EC0
@@ -3536,7 +3536,7 @@ MenuFadeIn: @ 0x080A7138
movs r1, #0xed
lsls r1, r1, #2
adds r0, r4, #0
bl MemClear32
bl MemClear
strb r5, [r4, #2]
strb r6, [r4, #3]
ldr r0, _080A7160 @ =gMain
@@ -3709,7 +3709,7 @@ sub_080A7250: @ 0x080A7250
movs r2, #0x80
lsls r2, r2, #1
bl MemCopy
ldr r0, _080A7310 @ =gUnk_02033280
ldr r0, _080A7310 @ =gActiveScriptInfo
movs r2, #0xd5
lsls r2, r2, #2
adds r1, r4, r2
@@ -3750,7 +3750,7 @@ _080A7300: .4byte gUnk_02032F14
_080A7304: .4byte gUnk_02001A00
_080A7308: .4byte gRoomControls
_080A730C: .4byte gUnk_03000420
_080A7310: .4byte gUnk_02033280
_080A7310: .4byte gActiveScriptInfo
_080A7314: .4byte gScreenTransition
_080A7318: .4byte gPlayerState
_080A731C: .4byte gUnk_02017654
@@ -3767,22 +3767,22 @@ sub_080A7328: @ 0x080A7328
bl DeleteAllEntities
ldr r0, _080A738C @ =gMenu
movs r1, #0x30
bl MemClear32
bl MemClear
ldr r0, _080A7390 @ =gRoomControls
movs r1, #0x38
bl MemClear32
bl MemClear
ldr r0, _080A7394 @ =gUnk_03000420
movs r1, #0x80
lsls r1, r1, #1
bl MemClear32
ldr r4, _080A7398 @ =gUnk_02033280
bl MemClear
ldr r4, _080A7398 @ =gActiveScriptInfo
adds r0, r4, #0
movs r1, #0xc
bl MemClear32
bl MemClear
movs r0, #8
strb r0, [r4, #8]
movs r0, #1
bl sub_0801DA90
bl DispReset
bl MessageInitialize
bl sub_080ADD30
movs r0, #0
@@ -3803,7 +3803,7 @@ _080A7388: .4byte gFadeControl
_080A738C: .4byte gMenu
_080A7390: .4byte gRoomControls
_080A7394: .4byte gUnk_03000420
_080A7398: .4byte gUnk_02033280
_080A7398: .4byte gActiveScriptInfo
_080A739C: .4byte gUnk_02024490
_080A73A0: .4byte gUnk_02032EC0
_080A73A4: .4byte gScreenTransition
@@ -3836,7 +3836,7 @@ _080A73B4:
movs r1, #0xea
lsls r1, r1, #2
adds r0, r5, r1
ldr r1, _080A7480 @ =gUnk_02033280
ldr r1, _080A7480 @ =gActiveScriptInfo
movs r2, #0xc
bl MemCopy
movs r1, #0xaa
@@ -3899,7 +3899,7 @@ _080A7470: .4byte gUnk_02032EC0
_080A7474: .4byte gPlayerState
_080A7478: .4byte gUnk_02025EB0
_080A747C: .4byte gUnk_0200B650
_080A7480: .4byte gUnk_02033280
_080A7480: .4byte gActiveScriptInfo
_080A7484: .4byte gUnk_03000420
_080A7488: .4byte gUnk_02001A00
_080A748C: .4byte gUnk_02024490
@@ -4943,7 +4943,7 @@ sub_080A7C7C: @ 0x080A7C7C
push {lr}
ldr r0, _080A7C88 @ =gUnk_02017660
movs r1, #0x40
bl MemClear32
bl MemClear
pop {pc}
.align 2, 0
_080A7C88: .4byte gUnk_02017660
asm/code_080AD90C.s
+4 -4
View File
@@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30
movs r1, #0x85
lsls r1, r1, #2
adds r0, r4, #0
bl MemClear32
bl MemClear
movs r5, #0
adds r4, #4
movs r0, #0x10
@@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494
_080ADE58:
adds r0, r1, #0
movs r1, #0xc
bl MemClear32
bl MemClear
_080ADE60:
adds r5, #0xc
adds r4, #1
@@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104
adds r1, r1, r5
lsls r1, r1, #2
adds r0, r4, #0
bl MemClear32
bl MemClear
strb r5, [r4, #1]
strh r6, [r4, #4]
adds r0, r4, #0
@@ -1396,7 +1396,7 @@ _080AE350:
stm r0!, {r2, r3, r7}
adds r0, r6, #0
movs r1, #0xc
bl MemClear32
bl MemClear
adds r6, #0xc
adds r5, #0xc
movs r0, #0xc
asm/code_080B1520.s
-551
View File
@@ -1,551 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_080B1520
sub_080B1520: @ 0x080B1520
push {lr}
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
movs r2, #0
cmp r0, #4
bne _080B153C
ldr r1, _080B1534 @ =gUnk_02036A50
ldr r0, _080B1538 @ =gUnk_08DE7D40
str r0, [r1]
b _080B1558
.align 2, 0
_080B1534: .4byte gUnk_02036A50
_080B1538: .4byte gUnk_08DE7D40
_080B153C:
cmp r0, #0x40
bne _080B1550
ldr r1, _080B1548 @ =gUnk_02036A50
ldr r0, _080B154C @ =gUnk_08DE7D4C
str r0, [r1]
b _080B1558
.align 2, 0
_080B1548: .4byte gUnk_02036A50
_080B154C: .4byte gUnk_08DE7D4C
_080B1550:
ldr r1, _080B1560 @ =gUnk_02036A50
ldr r0, _080B1564 @ =gUnk_08DE7D40
str r0, [r1]
movs r2, #1
_080B1558:
adds r0, r2, #0
pop {r1}
bx r1
.align 2, 0
_080B1560: .4byte gUnk_02036A50
_080B1564: .4byte gUnk_08DE7D40
thumb_func_start sub_080B1568
sub_080B1568: @ 0x080B1568
push {r4, r5, r6, lr}
lsls r2, r2, #0x10
lsrs r2, r2, #0x10
ldr r4, _080B15C8 @ =0x04000208
ldrh r3, [r4]
adds r6, r3, #0
movs r3, #0
strh r3, [r4]
ldr r5, _080B15CC @ =0x04000204
ldrh r4, [r5]
ldr r3, _080B15D0 @ =0x0000F8FF
ands r4, r3
ldr r3, _080B15D4 @ =gUnk_02036A50
ldr r3, [r3]
ldrh r3, [r3, #6]
orrs r4, r3
strh r4, [r5]
ldr r3, _080B15D8 @ =0x040000D4
str r0, [r3]
ldr r0, _080B15DC @ =0x040000D8
str r1, [r0]
ldr r1, _080B15E0 @ =0x040000DC
movs r0, #0x80
lsls r0, r0, #0x18
orrs r2, r0
str r2, [r1]
adds r1, #2
movs r2, #0x80
lsls r2, r2, #8
adds r0, r2, #0
ldrh r1, [r1]
ands r0, r1
cmp r0, #0
beq _080B15BC
ldr r2, _080B15E4 @ =0x040000DE
movs r0, #0x80
lsls r0, r0, #8
adds r1, r0, #0
_080B15B4:
ldrh r0, [r2]
ands r0, r1
cmp r0, #0
bne _080B15B4
_080B15BC:
ldr r0, _080B15C8 @ =0x04000208
strh r6, [r0]
pop {r4, r5, r6}
pop {r0}
bx r0
.align 2, 0
_080B15C8: .4byte 0x04000208
_080B15CC: .4byte 0x04000204
_080B15D0: .4byte 0x0000F8FF
_080B15D4: .4byte gUnk_02036A50
_080B15D8: .4byte 0x040000D4
_080B15DC: .4byte 0x040000D8
_080B15E0: .4byte 0x040000DC
_080B15E4: .4byte 0x040000DE
thumb_func_start sub_080B15E8
sub_080B15E8: @ 0x080B15E8
push {r4, r5, r6, lr}
sub sp, #0x88
adds r5, r1, #0
lsls r0, r0, #0x10
lsrs r3, r0, #0x10
ldr r0, _080B1600 @ =gUnk_02036A50
ldr r0, [r0]
ldrh r0, [r0, #4]
cmp r3, r0
blo _080B1608
ldr r0, _080B1604 @ =0x000080FF
b _080B168A
.align 2, 0
_080B1600: .4byte gUnk_02036A50
_080B1604: .4byte 0x000080FF
_080B1608:
ldr r0, _080B1694 @ =gUnk_02036A50
adds r6, r0, #0
ldr r0, [r0]
ldrb r1, [r0, #8]
lsls r0, r1, #1
mov r4, sp
adds r2, r0, r4
adds r2, #2
movs r4, #0
cmp r4, r1
bhs _080B1632
_080B161E:
strh r3, [r2]
subs r2, #2
lsrs r3, r3, #1
adds r0, r4, #1
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
ldr r0, [r6]
ldrb r0, [r0, #8]
cmp r4, r0
blo _080B161E
_080B1632:
movs r0, #1
strh r0, [r2]
subs r2, #2
strh r0, [r2]
movs r4, #0xd0
lsls r4, r4, #0x14
ldr r0, _080B1694 @ =gUnk_02036A50
ldr r0, [r0]
ldrb r2, [r0, #8]
adds r2, #3
mov r0, sp
adds r1, r4, #0
bl sub_080B1568
adds r0, r4, #0
mov r1, sp
movs r2, #0x44
bl sub_080B1568
add r2, sp, #8
adds r5, #6
movs r4, #0
movs r6, #1
_080B1660:
movs r1, #0
movs r3, #0
_080B1664:
lsls r1, r1, #0x11
ldrh r0, [r2]
ands r0, r6
lsrs r1, r1, #0x10
orrs r1, r0
adds r2, #2
adds r0, r3, #1
lsls r0, r0, #0x18
lsrs r3, r0, #0x18
cmp r3, #0xf
bls _080B1664
strh r1, [r5]
subs r5, #2
adds r0, r4, #1
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
cmp r4, #3
bls _080B1660
movs r0, #0
_080B168A:
add sp, #0x88
pop {r4, r5, r6}
pop {r1}
bx r1
.align 2, 0
_080B1694: .4byte gUnk_02036A50
thumb_func_start sub_080B1698
sub_080B1698: @ 0x080B1698
push {lr}
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
movs r2, #1
bl sub_080B16AC
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
pop {r1}
bx r1
thumb_func_start sub_080B16AC
sub_080B16AC: @ 0x080B16AC
push {r4, r5, r6, r7, lr}
sub sp, #0xb0
adds r5, r1, #0
lsls r0, r0, #0x10
lsrs r1, r0, #0x10
lsls r2, r2, #0x18
lsrs r7, r2, #0x18
ldr r0, _080B16C8 @ =gUnk_02036A50
ldr r0, [r0]
ldrh r0, [r0, #4]
cmp r1, r0
blo _080B16D0
ldr r0, _080B16CC @ =0x000080FF
b _080B1804
.align 2, 0
_080B16C8: .4byte gUnk_02036A50
_080B16CC: .4byte 0x000080FF
_080B16D0:
ldr r0, _080B1710 @ =gUnk_02036A50
ldr r0, [r0]
ldrb r0, [r0, #8]
lsls r0, r0, #1
mov r2, sp
adds r3, r0, r2
adds r3, #0x84
movs r0, #0
strh r0, [r3]
subs r3, #2
movs r4, #0
_080B16E6:
ldrh r2, [r5]
adds r5, #2
movs r0, #0
_080B16EC:
strh r2, [r3]
subs r3, #2
lsrs r2, r2, #1
adds r0, #1
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0xf
bls _080B16EC
adds r0, r4, #1
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
cmp r4, #3
bls _080B16E6
movs r4, #0
ldr r0, _080B1710 @ =gUnk_02036A50
adds r2, r0, #0
ldr r0, [r0]
b _080B1722
.align 2, 0
_080B1710: .4byte gUnk_02036A50
_080B1714:
strh r1, [r3]
subs r3, #2
lsrs r1, r1, #1
adds r0, r4, #1
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
ldr r0, [r2]
_080B1722:
ldrb r0, [r0, #8]
cmp r4, r0
blo _080B1714
movs r0, #0
strh r0, [r3]
subs r3, #2
movs r6, #1
strh r6, [r3]
movs r4, #0xd0
lsls r4, r4, #0x14
ldr r0, _080B1794 @ =gUnk_02036A50
ldr r0, [r0]
ldrb r2, [r0, #8]
adds r2, #0x43
mov r0, sp
adds r1, r4, #0
bl sub_080B1568
movs r5, #0
add r2, sp, #0xa4
strh r5, [r2]
mov r1, sp
adds r1, #0xa6
ldr r0, _080B1798 @ =0x04000006
ldrh r0, [r0]
strh r0, [r1]
add r0, sp, #0xac
str r5, [r0]
ldrh r0, [r2]
cmp r0, #0
bne _080B1768
ldrh r0, [r4]
ands r0, r6
cmp r0, #0
bne _080B17F8
_080B1768:
add r3, sp, #0xa8
ldr r0, _080B1798 @ =0x04000006
ldrh r0, [r0]
strh r0, [r3]
mov r4, sp
adds r4, #0xa6
ldrh r1, [r3]
ldrh r0, [r4]
cmp r1, r0
beq _080B17E2
ldrh r1, [r3]
ldrh r0, [r4]
cmp r1, r0
bls _080B179C
add r2, sp, #0xac
ldrh r1, [r3]
ldrh r0, [r4]
subs r1, r1, r0
ldr r0, [r2]
adds r1, r1, r0
str r1, [r2]
b _080B17B2
.align 2, 0
_080B1794: .4byte gUnk_02036A50
_080B1798: .4byte 0x04000006
_080B179C:
add r2, sp, #0xac
add r0, sp, #0xa8
ldrh r0, [r0]
adds r0, #0xe4
mov r1, sp
adds r1, #0xa6
ldrh r1, [r1]
subs r0, r0, r1
ldr r1, [r2]
adds r0, r0, r1
str r0, [r2]
_080B17B2:
add r0, sp, #0xac
ldr r0, [r0]
cmp r0, #0x88
bls _080B17D8
add r0, sp, #0xa4
ldrh r0, [r0]
cmp r0, #0
bne _080B1802
movs r0, #0xd0
lsls r0, r0, #0x14
ldrh r0, [r0]
movs r1, #1
ands r0, r1
cmp r0, #0
bne _080B1802
ldr r5, _080B17D4 @ =0x0000C001
b _080B1802
.align 2, 0
_080B17D4: .4byte 0x0000C001
_080B17D8:
mov r0, sp
adds r0, #0xa6
add r1, sp, #0xa8
ldrh r1, [r1]
strh r1, [r0]
_080B17E2:
add r2, sp, #0xa4
ldrh r0, [r2]
cmp r0, #0
bne _080B1768
movs r0, #0xd0
lsls r0, r0, #0x14
movs r1, #1
ldrh r0, [r0]
ands r1, r0
cmp r1, #0
beq _080B1768
_080B17F8:
ldrh r0, [r2]
adds r0, #1
strh r0, [r2]
cmp r7, #0
bne _080B1768
_080B1802:
adds r0, r5, #0
_080B1804:
add sp, #0xb0
pop {r4, r5, r6, r7}
pop {r1}
bx r1
thumb_func_start sub_080B180C
sub_080B180C: @ 0x080B180C
push {r4, r5, lr}
sub sp, #8
adds r4, r1, #0
lsls r0, r0, #0x10
lsrs r1, r0, #0x10
movs r5, #0
ldr r0, _080B1828 @ =gUnk_02036A50
ldr r0, [r0]
ldrh r0, [r0, #4]
cmp r1, r0
blo _080B1830
ldr r0, _080B182C @ =0x000080FF
b _080B185A
.align 2, 0
_080B1828: .4byte gUnk_02036A50
_080B182C: .4byte 0x000080FF
_080B1830:
adds r0, r1, #0
mov r1, sp
bl sub_080B15E8
mov r2, sp
movs r3, #0
b _080B1848
_080B183E:
adds r0, r3, #1
lsls r0, r0, #0x18
lsrs r3, r0, #0x18
cmp r3, #3
bhi _080B1858
_080B1848:
ldrh r1, [r4]
ldrh r0, [r2]
adds r2, #2
adds r4, #2
cmp r1, r0
beq _080B183E
movs r5, #0x80
lsls r5, r5, #8
_080B1858:
adds r0, r5, #0
_080B185A:
add sp, #8
pop {r4, r5}
pop {r1}
bx r1
.align 2, 0
thumb_func_start sub_080B1864
sub_080B1864: @ 0x080B1864
push {r4, r5, r6, lr}
adds r5, r1, #0
lsls r0, r0, #0x10
lsrs r4, r0, #0x10
movs r6, #0
b _080B1876
_080B1870:
adds r0, r6, #1
lsls r0, r0, #0x18
lsrs r6, r0, #0x18
_080B1876:
cmp r6, #2
bhi _080B189A
adds r0, r4, #0
adds r1, r5, #0
bl sub_080B1698
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
cmp r2, #0
bne _080B1870
adds r0, r4, #0
adds r1, r5, #0
bl sub_080B180C
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
cmp r2, #0
bne _080B1870
_080B189A:
adds r0, r2, #0
pop {r4, r5, r6}
pop {r1}
bx r1
.align 2, 0
thumb_func_start sub_080B18A4
sub_080B18A4: @ 0x080B18A4
push {lr}
adds r3, r1, #0
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
ldr r0, _080B18CC @ =gUnk_02036A50
ldr r0, [r0]
ldr r1, [r0]
movs r0, #0x80
lsls r0, r0, #2
cmp r1, r0
beq _080B18D0
adds r0, r2, #0
adds r1, r3, #0
movs r2, #0
bl sub_080B16AC
lsls r0, r0, #0x10
lsrs r0, r0, #0x10
b _080B18D2
.align 2, 0
_080B18CC: .4byte gUnk_02036A50
_080B18D0:
ldr r0, _080B18D8 @ =0x00008080
_080B18D2:
pop {r1}
bx r1
.align 2, 0
_080B18D8: .4byte 0x00008080
thumb_func_start sub_080B18DC
sub_080B18DC: @ 0x080B18DC
push {r4, r5, r6, lr}
adds r5, r1, #0
lsls r0, r0, #0x10
lsrs r4, r0, #0x10
movs r6, #0
b _080B18EE
_080B18E8:
adds r0, r6, #1
lsls r0, r0, #0x18
lsrs r6, r0, #0x18
_080B18EE:
cmp r6, #2
bhi _080B1912
adds r0, r4, #0
adds r1, r5, #0
bl sub_080B18A4
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
cmp r2, #0
bne _080B18E8
adds r0, r4, #0
adds r1, r5, #0
bl sub_080B180C
lsls r0, r0, #0x10
lsrs r2, r0, #0x10
cmp r2, #0
bne _080B18E8
_080B1912:
adds r0, r2, #0
pop {r4, r5, r6}
pop {r1}
bx r1
.align 2, 0
asm/crt0.s
+16 -17
View File
@@ -1,32 +1,31 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
arm_func_start __start
__start: @ 0x08000000
b _080000C0
_08000004:
__start:
b start_vector
header:
.include "asm/rom_header.inc"
_080000C0:
start_vector:
mov r0, #0x12
msr cpsr_fc, r0
ldr sp, _080000F4 @ =gUnk_03007FA0
ldr sp, sp_irq
mov r0, #0x1f
msr cpsr_fc, r0
ldr sp, _080000F8 @ =gUnk_03007F00
ldr r1, _080000FC @ =0x03007FFC
ldr r0, _08000100 @ =gUnk_03005D90
ldr sp, sp_usr
ldr r1, INTR_VECTOR_BUF
ldr r0, intr_main
str r0, [r1]
ldr r1, _08000104 @ =MainLoop
ldr r1, =AgbMain
mov lr, pc
bx r1
_080000F0:
b _080000C0
_080000F4: .4byte gUnk_03007FA0
_080000F8: .4byte gUnk_03007F00
_080000FC: .4byte 0x03007FFC
_08000100: .4byte gUnk_03005D90
_08000104: .4byte MainLoop
b start_vector
sp_irq: .4byte gUnk_03007FA0
sp_usr: .4byte gUnk_03007F00
INTR_VECTOR_BUF: .4byte 0x03007FFC
intr_main: .4byte IntrMain
asm/drLeft.s
+2 -2
View File
@@ -26,9 +26,9 @@ DrLeft: @ 0x0806BF80
_0806BFA2:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
asm/dust.s
+1 -1
View File
@@ -160,7 +160,7 @@ _080441F2:
cmp r2, #0
bne _08044248
ldr r0, [r4, #0x64]
bl sub_0801DA0C
bl zFree
b _0804429A
.align 2, 0
_08044244: .4byte 0x000001EB
asm/evilSpirit.s
+8 -8
View File
@@ -341,13 +341,13 @@ _080864EE:
ldrsh r0, [r0, r1]
movs r1, #0x80
lsls r1, r1, #6
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r4, #0x80
lsls r4, r4, #1
adds r1, r4, #0
bl sub_0806FA04
bl FixedDiv
adds r1, r6, #0
adds r1, #0x80
lsls r0, r0, #0x10
@@ -363,11 +363,11 @@ _080864EE:
ldrsh r0, [r0, r3]
movs r1, #0x80
lsls r1, r1, #5
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r4, #0
bl sub_0806FA04
bl FixedDiv
adds r1, r6, #0
adds r1, #0x84
lsls r0, r0, #0x10
@@ -520,13 +520,13 @@ _0808663A:
ldrsh r0, [r0, r1]
movs r1, #0x80
lsls r1, r1, #6
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r5, #0x80
lsls r5, r5, #1
adds r1, r5, #0
bl sub_0806FA04
bl FixedDiv
adds r1, r7, #0
adds r1, #0x80
lsls r0, r0, #0x10
@@ -541,11 +541,11 @@ _0808663A:
ldrsh r0, [r0, r1]
movs r1, #0x80
lsls r1, r1, #5
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r5, #0
bl sub_0806FA04
bl FixedDiv
adds r1, r7, #0
adds r1, #0x84
lsls r0, r0, #0x10
asm/farmers.s
+2 -2
View File
@@ -57,9 +57,9 @@ _0806BC2E:
_0806BC40:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
_0806BC54:
asm/festari.s
+1 -1
View File
@@ -71,7 +71,7 @@ _0805FF90:
_0805FF94:
adds r0, r4, #0
adds r1, r5, #0
bl sub_0807DB98
bl HandlePostScriptActions
pop {r4, r5, r6, pc}
.align 2, 0
asm/figurineDevice.s
+4 -4
View File
@@ -1386,7 +1386,7 @@ _0808863E:
movs r0, #0
str r0, [r4, #0x14]
_08088642:
ldr r2, _08088654 @ =gUnk_02033280
ldr r2, _08088654 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -1394,7 +1394,7 @@ _08088642:
pop {r4, pc}
.align 2, 0
_08088650: .4byte gPlayerEntity
_08088654: .4byte gUnk_02033280
_08088654: .4byte gActiveScriptInfo
thumb_func_start sub_08088658
sub_08088658: @ 0x08088658
@@ -1414,7 +1414,7 @@ sub_08088658: @ 0x08088658
movs r0, #0
str r0, [r4, #0x14]
_08088678:
ldr r2, _08088688 @ =gUnk_02033280
ldr r2, _08088688 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -1422,4 +1422,4 @@ _08088678:
pop {r4, pc}
.align 2, 0
_08088684: .4byte gPlayerEntity
_08088688: .4byte gUnk_02033280
_08088688: .4byte gActiveScriptInfo
asm/fileScreen.s
+11 -11
View File
@@ -33,7 +33,7 @@ sub_080519B0: @ 0x080519B0
cmp r5, #0
bne _08051A02
movs r0, #1
bl sub_0801DA90
bl DispReset
bl sub_080A3210
bl zMallocInit
bl sub_080A7124
@@ -41,7 +41,7 @@ sub_080519B0: @ 0x080519B0
ldr r4, _08051A08 @ =gScreenTransition
adds r0, r4, #0
movs r1, #0xb0
bl MemClear32
bl MemClear
bl sub_08049CD4
bl sub_080300AC
bl sub_0807CA18
@@ -69,18 +69,18 @@ _08051A10: .4byte gMain
sub_08051A14: @ 0x08051A14
push {lr}
movs r0, #1
bl sub_0801DA90
bl DispReset
ldr r1, _08051A70 @ =gFadeControl
movs r0, #1
rsbs r0, r0, #0
str r0, [r1, #4]
ldr r0, _08051A74 @ =gUnk_03000000
ldr r1, _08051A78 @ =0x00000B74
bl MemClear32
bl MemClear
ldr r0, _08051A7C @ =gUnk_02032EC0
movs r1, #0xed
lsls r1, r1, #2
bl MemClear32
bl MemClear
bl EraseAllEntities
bl sub_080197AC
bl sub_08080668
@@ -368,7 +368,7 @@ sub_08051CF0: @ 0x08051CF0
cmp r4, #0
bne _08051D1E
movs r0, #1
bl sub_0801DA90
bl DispReset
strb r6, [r5, #3]
strb r4, [r5, #4]
ldr r0, _08051D28 @ =gScreenTransition
@@ -729,15 +729,15 @@ sub_08052010: @ 0x08052010
bl sub_080A3210
bl MessageInitialize
movs r0, #1
bl sub_0801DA90
bl DispReset
ldr r0, _0805207C @ =gBG1Buffer
movs r4, #0x80
lsls r4, r4, #4
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _08052080 @ =gBG2Buffer
adds r1, r4, #0
bl MemClear32
bl MemClear
bl sub_080A4D34
movs r0, #0xa
bl LoadPaletteGroup
@@ -749,10 +749,10 @@ sub_08052010: @ 0x08052010
movs r0, #0xc0
lsls r0, r0, #0x13
movs r1, #0x20
bl MemClear32
bl MemClear
ldr r0, _08052084 @ =gMenu
movs r1, #0x30
bl MemClear32
bl MemClear
ldr r1, _08052088 @ =gScreen
ldrh r2, [r1]
movs r3, #0x80
asm/fourElements.s
+5 -5
View File
@@ -78,7 +78,7 @@ sub_080A01E0: @ 0x080A01E0
adds r0, #0x38
strb r3, [r0]
_080A0246:
ldr r0, _080A028C @ =gUnk_0800A0B4
ldr r0, _080A028C @ =script_0800A0B4
bl StartPlayerScript
ldr r1, _080A0284 @ =gScreen
adds r2, r1, #0
@@ -108,13 +108,13 @@ _080A027C: .4byte gUnk_080FD1A0
_080A0280: .4byte 0x0000FF40
_080A0284: .4byte gScreen
_080A0288: .4byte 0x0000FDFF
_080A028C: .4byte gUnk_0800A0B4
_080A028C: .4byte script_0800A0B4
thumb_func_start sub_080A0290
sub_080A0290: @ 0x080A0290
push {r4, r5, lr}
adds r4, r0, #0
ldr r5, _080A02BC @ =gUnk_02033280
ldr r5, _080A02BC @ =gActiveScriptInfo
ldr r0, [r5]
movs r1, #4
ands r0, r1
@@ -133,7 +133,7 @@ sub_080A0290: @ 0x080A0290
strh r0, [r4, #0x36]
b _080A02CA
.align 2, 0
_080A02BC: .4byte gUnk_02033280
_080A02BC: .4byte gActiveScriptInfo
_080A02C0:
movs r1, #2
strb r1, [r4, #0xc]
@@ -355,7 +355,7 @@ sub_080A0464: @ 0x080A0464
movs r0, #6
movs r1, #0xac
movs r2, #6
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
beq _080A048A
movs r1, #0x2e
asm/gleerok.s
+6 -6
View File
@@ -2824,11 +2824,11 @@ _0802E580:
ldrb r1, [r6]
lsls r1, r1, #0x18
asrs r1, r1, #0x10
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r7, #0
bl sub_0806FA04
bl FixedDiv
adds r1, r0, #0
ldrb r0, [r4, #1]
lsls r0, r0, #4
@@ -2838,11 +2838,11 @@ _0802E580:
ldrsh r0, [r0, r2]
lsls r1, r1, #0x10
asrs r1, r1, #0x10
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r7, #0
bl sub_0806FA04
bl FixedDiv
ldr r2, [r5]
lsls r0, r0, #0x10
asrs r0, r0, #8
@@ -2859,11 +2859,11 @@ _0802E580:
ldrb r1, [r6]
lsls r1, r1, #0x18
asrs r1, r1, #0x10
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r7, #0
bl sub_0806FA04
bl FixedDiv
ldr r2, [r5]
lsls r0, r0, #0x10
asrs r0, r0, #8
asm/gorman.s
+4 -4
View File
@@ -272,7 +272,7 @@ sub_0806991C: @ 0x0806991C
ldrb r0, [r0]
orrs r1, r0
strb r1, [r5, #0x14]
ldr r2, _080699A8 @ =gUnk_02033280
ldr r2, _080699A8 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -282,7 +282,7 @@ sub_0806991C: @ 0x0806991C
_0806999C: .4byte gUnk_08111C5C
_080699A0: .4byte gRoomControls
_080699A4: .4byte gUnk_08111C74
_080699A8: .4byte gUnk_02033280
_080699A8: .4byte gActiveScriptInfo
thumb_func_start sub_080699AC
sub_080699AC: @ 0x080699AC
@@ -342,7 +342,7 @@ sub_080699AC: @ 0x080699AC
ldrb r0, [r0]
orrs r1, r0
strb r1, [r5, #0x14]
ldr r2, _08069A38 @ =gUnk_02033280
ldr r2, _08069A38 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -352,7 +352,7 @@ sub_080699AC: @ 0x080699AC
_08069A2C: .4byte gUnk_08111C84
_08069A30: .4byte gRoomControls
_08069A34: .4byte gUnk_08111C8C
_08069A38: .4byte gUnk_02033280
_08069A38: .4byte gActiveScriptInfo
thumb_func_start sub_08069A3C
sub_08069A3C: @ 0x08069A3C
asm/goronMerchant.s
+2 -2
View File
@@ -50,7 +50,7 @@ _08069766:
movs r0, #0
_0806976E:
str r0, [r7, #0x14]
ldr r2, _08069780 @ =gUnk_02033280
ldr r2, _08069780 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -58,4 +58,4 @@ _0806976E:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_0806977C: .4byte 0x00002C1E
_08069780: .4byte gUnk_02033280
_08069780: .4byte gActiveScriptInfo
asm/gregal.s
+4 -4
View File
@@ -74,9 +74,9 @@ _0806CB4E:
_0806CB66:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r5, #0
bl GetNextFrame
pop {r4, r5, pc}
@@ -219,9 +219,9 @@ _0806CC7C: .4byte gPlayerEntity
_0806CC80:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
b _0806CCB0
asm/guardWithSpear.s
+3 -3
View File
@@ -139,13 +139,13 @@ _08064168:
lsls r0, r0, #0x10
cmp r0, #0
beq _0806417A
ldr r1, _0806417C @ =gUnk_02033280
ldr r1, _0806417C @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_0806417A:
pop {r4, r5, r6, pc}
.align 2, 0
_0806417C: .4byte gUnk_02033280
_0806417C: .4byte gActiveScriptInfo
thumb_func_start sub_08064180
sub_08064180: @ 0x08064180
@@ -153,7 +153,7 @@ sub_08064180: @ 0x08064180
movs r0, #7
movs r1, #0x15
movs r2, #7
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
beq _08064194
bl DeleteEntity
asm/gyorgFemale.s
+5 -5
View File
@@ -112,10 +112,10 @@ sub_0804614C: @ 0x0804614C
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _08046250 @ =gMapDataTopSpecial
adds r1, r4, #0
bl MemClear32
bl MemClear
adds r0, r6, #0
movs r1, #0
bl sub_0804660C
@@ -445,10 +445,10 @@ sub_08046498: @ 0x08046498
movs r4, #0x80
lsls r4, r4, #8
adds r1, r4, #0
bl MemClear32
bl MemClear
ldr r0, _080464BC @ =gMapDataTopSpecial
adds r1, r4, #0
bl MemClear32
bl MemClear
adds r0, r5, #0
bl sub_080464C0
pop {r4, r5, pc}
@@ -486,7 +486,7 @@ _080464DE:
ldr r0, _0804650C @ =gUnk_02019EE0
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r1, _08046514 @ =gUnk_02000070
movs r0, #1
strb r0, [r1]
asm/intr.s
+9 -8
View File
@@ -49,16 +49,17 @@ _080B19C0: .4byte gRoomControls
_080B19C4: .4byte 0x80000020
_080B19C8: .4byte 0x040000D4
arm_func_start sub_080B19CC
sub_080B19CC: @ 0x080B19CC
ldrb r2, [r0, #0x38]
ldrh r1, [r0, #0x32]
ldrh r0, [r0, #0x2e]
@ r0 = entity*
arm_func_start _GetTileAtEntityPos
_GetTileAtEntityPos: @ 0x080B19CC
ldrb r2, [r0, #0x38] @ obj layer
ldrh r1, [r0, #0x32] @ obj y
ldrh r0, [r0, #0x2e] @ obj x
ldr ip, _080B1C10 @ =gRoomControls
ldrh r3, [ip, #6]
sub r0, r0, r3
sub r0, r0, r3 @ obj x - room x
ldrh r3, [ip, #8]
sub r1, r1, r3
sub r1, r1, r3 @ obj y - room y
lsl r0, r0, #0x16
lsr r0, r0, #0x1a
lsl r1, r1, #0x16
@@ -102,7 +103,7 @@ _080B1A64:
ldr r1, [r2]
lsl r0, r0, #1
ldrh r0, [r1, r0]
cmp r0, #0x4000
cmp r0, #0x4000 @ return tile index is OOB
bxhs lr
ldr r1, [r2, #4]
lsl r0, r0, #1
asm/jarPortal.s
+1 -1
View File
@@ -230,7 +230,7 @@ sub_0808C01C: @ 0x0808C01C
subs r1, #0x18
movs r2, #0x30
movs r3, #0x30
bl sub_0806FBFC
bl CheckPlayerProximity
cmp r0, #0
beq _0808C0A6
ldr r2, _0808C06C @ =gArea
asm/kid.s
+6 -6
View File
@@ -656,7 +656,7 @@ sub_0806252C: @ 0x0806252C
lsls r0, r1, #0x10
asrs r0, r0, #0x10
movs r1, #0x14
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #0x10
mov sl, r0
@@ -664,7 +664,7 @@ sub_0806252C: @ 0x0806252C
lsls r0, r2, #0x10
asrs r0, r0, #0x10
movs r1, #0x14
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #0x10
mov r8, r0
@@ -897,13 +897,13 @@ _0806274A:
.align 2, 0
_08062778: .4byte gRoomControls
_0806277C:
ldr r1, _08062784 @ =gUnk_02033280
ldr r1, _08062784 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08062782:
pop {r4, r5, pc}
.align 2, 0
_08062784: .4byte gUnk_02033280
_08062784: .4byte gActiveScriptInfo
thumb_func_start sub_08062788
sub_08062788: @ 0x08062788
@@ -1228,13 +1228,13 @@ _08062A30:
lsls r0, r0, #0x10
cmp r0, #0
beq _08062A42
ldr r1, _08062A44 @ =gUnk_02033280
ldr r1, _08062A44 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_08062A42:
pop {r4, r5, r6, pc}
.align 2, 0
_08062A44: .4byte gUnk_02033280
_08062A44: .4byte gActiveScriptInfo
thumb_func_start sub_08062A48
sub_08062A48: @ 0x08062A48
asm/librarians.s
+2 -2
View File
@@ -31,9 +31,9 @@ Librarians: @ 0x0806B9F0
_0806BA18:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
pop {r4, pc}
asm/lilypadLarge.s
+10 -10
View File
@@ -73,7 +73,7 @@ _08085566:
b _0808557A
_0808556C:
adds r0, r4, #0
bl DoesSimilarEntityExist
bl EntityHasDuplicateID
cmp r0, #0
beq _0808557A
bl DeleteThisEntity
@@ -349,13 +349,13 @@ _08085774:
lsls r4, r4, #0x10
asrs r4, r4, #0x18
adds r1, r4, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
movs r5, #0x80
lsls r5, r5, #1
adds r1, r5, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r7, #0x6c]
@@ -368,11 +368,11 @@ _08085774:
movs r2, #0
ldrsh r0, [r0, r2]
adds r1, r4, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
adds r1, r5, #0
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #8
ldr r1, [r7, #0x70]
@@ -441,7 +441,7 @@ _0808581A:
movs r4, #0x80
lsls r4, r4, #1
adds r1, r4, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
ldr r5, _080858A8 @ =gSineTable
@@ -450,13 +450,13 @@ _0808581A:
adds r1, r1, r5
movs r2, #0
ldrsh r1, [r1, r2]
bl sub_0806FA04
bl FixedDiv
strh r0, [r7, #0x24]
ldr r0, [r7, #0x70]
lsls r0, r0, #8
asrs r0, r0, #0x10
adds r1, r4, #0
bl sub_0806F9EC
bl FixedMul
lsls r0, r0, #0x10
asrs r0, r0, #0x10
ldrb r1, [r7, #0x15]
@@ -465,7 +465,7 @@ _0808581A:
adds r1, r1, r5
movs r2, #0
ldrsh r1, [r1, r2]
bl sub_0806FA04
bl FixedDiv
lsls r0, r0, #0x10
asrs r0, r0, #0x10
rsbs r4, r0, #0
@@ -1072,7 +1072,7 @@ _08085D0C:
sub_08085D10: @ 0x08085D10
push {r4, lr}
adds r4, r0, #0
bl DoesSimilarEntityExist
bl EntityHasDuplicateID
cmp r0, #0
beq _08085D26
ldrb r0, [r4, #0xb]
asm/loadRoomEntity.s
+2 -2
View File
@@ -19,14 +19,14 @@ LoadRoomEntity: @ 0x0804ADF8
bne _0804AE1C
ldrb r1, [r4, #2]
adds r0, r6, #0
bl FindEntityBySubtype
bl DeepFindEntityByID
cmp r0, #0
beq _0804AE1C
movs r0, #0
b _0804AEAC
_0804AE1C:
adds r0, r6, #0
bl GetEmptyEntityByType
bl GetEmptyEntityByKind
adds r5, r0, #0
cmp r5, #0
beq _0804AEAA
asm/macroBook.s
+2 -2
View File
@@ -360,7 +360,7 @@ sub_0809AA00: @ 0x0809AA00
movs r0, #7
movs r1, #0x38
movs r2, #7
bl FindEntityInListBySubtype
bl FindEntityByID
adds r4, r0, #0
adds r7, r5, #0
adds r7, #0x78
@@ -380,7 +380,7 @@ _0809AA30:
_0809AA3A:
adds r0, r4, #0
movs r1, #7
bl FindNextEntityOfSameSubtype
bl FindNextDuplicateID
adds r4, r0, #0
cmp r4, #0
bne _0809AA30
asm/macros/scripts.inc
+734
View File
@@ -0,0 +1,734 @@
@ All the macro functions for scripts
@ helper macros
.macro RecursiveOpcodeN count:req, opcode:req, size:req, arg:req, args:vararg
.ifnb \args
RecursiveOpcodeN \count + 1 \opcode \size \args
.else
.2byte 0x400 * (((\count) * \size) + 1) + \opcode
.endif
.endm
.macro RecursiveOpcode opcode:req, size:req, args:vararg
RecursiveOpcodeN 1 \opcode \size \args
.endm
.macro RecursiveArgs size:req, arg:req, args:vararg
\size \arg
.ifnb \args
RecursiveArgs \size \args
.endif
.endm
@ script macros
.macro SCRIPT_START name
.globl \name
.section .text
\name:
.endm
.macro SCRIPT_END
.2byte 0xffff
.endm
.macro Nop
.2byte 0x0400
.endm
.macro BeginBlock
.2byte 0x0401
.endm
.macro EndBlock
.2byte 0x0402
.endm
.macro Jump label:req
.2byte 0x0803
1: .2byte \label - 1b
.endm
.macro JumpIf label:req
.2byte 0x0804
1: .2byte \label - 1b
.endm
.macro JumpIfNot label:req
.2byte 0x0805
1: .2byte \label - 1b
.endm
.macro JumpTableLabel temp:req, label:req, labels:vararg
.2byte \label - \temp
.ifnb \labels
JumpTableLabel \temp - 2 \labels
.endif
.endm
.macro JumpTable labels:vararg
RecursiveOpcode 0x6 1 \labels
1:
JumpTableLabel 1b \labels
.endm
.macro JumpAbsolute label:req
.2byte 0x0c07
.4byte \label
.endm
.macro JumpAbsoluteIf label:req
.2byte 0x0c08
.4byte \label
.endm
.macro JumpAbsoluteIfNot label:req
.2byte 0x0c09
.4byte \label
.endm
.macro JumpAbsoluteTable labels:vararg
RecursiveOpcode 0xa 2 \labels
RecursiveArgs .4byte \labels
.endm
.macro Call function:req
.2byte 0x0c0b
.4byte \function
.endm
@this shouldn't be use without an argument
.macro CallWithArg function:req, argument
.ifnb \argument
.2byte 0x140c
.4byte \function
.4byte \argument
.else
.2byte 0x0c0c
.4byte \function
.endif
.endm
.macro LoadRoomEntityList entityDataList:req
.2byte 0x0c0d
.4byte \entityDataList
.endm
.macro TestBit bitmask:req
.2byte 0x0c0e
.4byte \bitmask
.endm
.macro CheckInventory1 s:req
.2byte 0x080f
.2byte \s
.endm
.macro CheckInventory2 s:req
.2byte 0x0810
.2byte \s
.endm
.macro HasRoomItemForSale
.2byte 0x0411
.endm
.macro CheckLocalFlag s:req
.2byte 0x0812
.2byte \s
.endm
.macro CheckLocalFlagByOffset a:req, b:req
.2byte 0x0c13
.2byte \a
.2byte \b
.endm
.macro CheckGlobalFlag s:req
.2byte 0x0814
.2byte \s
.endm
.macro CheckRoomFlag s:req
.2byte 0x0815
.2byte \s
.endm
.macro CheckPlayerInRegion x:req, y:req, dimension:req
.2byte 0x1016
.2byte \x
.2byte \y
.2byte \dimension
.endm
.macro CheckPlayerInRegion2 dimension:req
.2byte 0x0817
.2byte \dimension
.endm
.macro CheckEntityInteractType
.2byte 0x0418
.endm
.macro _0807E30C
.2byte 0x0419
.endm
.macro HasRupees amount:req
.2byte 0x081a
.2byte \amount
.endm
.macro _0807E3BC s:req
.2byte 0x081b
.2byte \s
.endm
.macro _0807E3E8
.2byte 0x041c
.endm
.macro CheckKinstoneFused s:req
.2byte 0x081d
.2byte \s
.endm
.macro BuyItem item, b
.2byte 0x0c1e
.ifnb \item
.2byte \item
.2byte \b
.else
.4byte 0
.endif
.endm
.macro _0807E48C s:req
.2byte 0x081f
.2byte \s
.endm
.macro _0807E4CC w:req
.2byte 0x0c20
.4byte \w
.endm
.macro _0807E4EC w:req
.2byte 0x0c21
.4byte \w
.endm
.macro _0807E514 w:req
.2byte 0x0c22
.4byte \w
.endm
.macro CheckPlayerFlags w:req
.2byte 0x0c23
.4byte \w
.endm
.macro _0807E564
.2byte 0x0424
.endm
.macro EntityHasHeight
.2byte 0x0425
.endm
.macro ComparePlayerAction s:req
.2byte 0x0826
.2byte \s
.endm
.macro ComparePlayerAnimationState s:req
.2byte 0x0827
.2byte \s
.endm
.macro _0807E5F8 w:req
.2byte 0x0c28
.4byte \w
.endm
.macro _0807E610 w:req
.2byte 0x0c29
.4byte \w
.endm
.macro SetLocalFlag s:req
.2byte 0x082a
.2byte \s
.endm
.macro SetLocalFlagByOffset a:req, b:req
.2byte 0x0c2b
.2byte \a
.2byte \b
.endm
.macro ClearLocalFlag s:req
.2byte 0x082c
.2byte \s
.endm
.macro SetGlobalFlag s:req
.2byte 0x082d
.2byte \s
.endm
.macro ClearGlobalFlag s:req
.2byte 0x082e
.2byte \s
.endm
.macro SetRoomFlag s:req
.2byte 0x082f
.2byte \s
.endm
.macro ClearRoomFlag s:req
.2byte 0x0830
.2byte \s
.endm
.macro Wait frames:req
.2byte 0x0831
.2byte \frames
.endm
.macro WaitForSomething w:req
.2byte 0x0c32
.4byte \w
.endm
.macro WaitForSomething2 w:req
.2byte 0x0c33
.4byte \w
.endm
.macro WaitPlayerAction8
.2byte 0x0434
.endm
.macro WaitForPlayerAction0x17
.2byte 0x0435
.endm
.macro WaitFor_1
.2byte 0x0436
.endm
.macro WaitFor_2
.2byte 0x0437
.endm
.macro _0807E778 s:req
.2byte 0x0838
.2byte \s
.endm
.macro _0807E788 w:req
.2byte 0x0c39
.4byte \w
.endm
.macro _0807E79C
.2byte 0x043a
.endm
.macro Nop2 s:req
.2byte 0x083b
.2byte \s
.endm
.macro DoFade4
.2byte 0x043c
.endm
.macro DoFade5
.2byte 0x043d
.endm
.macro DoFade6
.2byte 0x043e
.endm
.macro DoFade7
.2byte 0x043f
.endm
.macro _0807E800 w:req
.2byte 0x0c40
.4byte \w
.endm
.macro _0807E80C w:req
.2byte 0x0c41
.4byte \w
.endm
.macro _0807E858 s:req
.2byte 0x0842
.2byte \s
.endm
.macro _0807E858_0
.2byte 0x0442
.endm
.macro _0807E864
.2byte 0x0443
.endm
.macro _0807E878
.2byte 0x0444
.endm
.macro _0807E888
.2byte 0x0445
.endm
.macro SetPlayerAction w:req
.2byte 0x0c46
.4byte \w
.endm
.macro StartPlayerScript script:req
.2byte 0x0c47
.4byte \script
.endm
.macro _0807E8D4 s:req
.2byte 0x0848
.2byte \s
.endm
.macro _0807E8E4_0
.2byte 0x0449
.endm
.macro _0807E8E4_1
.2byte 0x044a
.endm
.macro _0807E8E4_2
.2byte 0x044b
.endm
.macro _0807E8E4_3
.2byte 0x044c
.endm
.macro _0807E908 s:req
.2byte 0x084d
.2byte \s
.endm
.macro SetIntVariable value:req
.2byte 0x0c4e
.4byte \value
.endm
.macro _0807E924
.2byte 0x044f
.endm
.macro _0807E930 s:req
.2byte 0x0850
.2byte \s
.endm
.macro _0807E944
.2byte 0x0451
.endm
.macro _0807E974 s:req
.2byte 0x0852
.2byte \s
.endm
.macro _0807E9D4
.2byte 0x0453
.endm
.macro _0807E9DC
.2byte 0x0454
.endm
.macro _0807E9E4 s:req
.2byte 0x0855
.2byte \s
.endm
.macro _0807E9F0
.2byte 0x0456
.endm
.macro _0807EA4C
.2byte 0x0457
.endm
.macro _0807EA88 s:req
.2byte 0x0858
.2byte \s
.endm
.macro _0807EA94
.2byte 0x0459
.endm
.macro TextboxNoOverlapFollow s:req
.2byte 0x085a
.2byte \s
.endm
.macro TextboxNoOverlap s:req
.2byte 0x085b
.2byte \s
.endm
.macro TextboxNoOverlapFollowPos a:req, b:req
.2byte 0x0c5c
.2byte \a
.2byte \b
.endm
.macro TextboxNoOverlapFollowPos_1 s:req
.2byte 0x085c
.2byte \s
.endm
.macro TextboxNoOverlapFollowTable labels:vararg
RecursiveOpcode 0x5d 1 \labels
RecursiveArgs .2byte \labels
.endm
.macro TextboxNoOverlapVar
.2byte 0x045e
.endm
.macro _0807EB28 s:req
.2byte 0x085f
.2byte \s
.endm
.macro _0807EB38
.2byte 0x0460
.endm
.macro _0807EB44 s:req
.2byte 0x0861
.2byte \s
.endm
.macro _0807EB4C a:req, b:req
.2byte 0x0c62
.2byte \a
.2byte \b
.endm
.macro _0807EB74
.2byte 0x0463
.endm
.macro _0807EB8C
.2byte 0x0464
.endm
.macro SetEntityDirection direction:req
.2byte 0x0865
.2byte \direction
.endm
.macro SetEntityDirectionWithAnimationState direction:req
.2byte 0x0866
.2byte \direction
.endm
.macro SetEntitySpeed speed:req
.2byte 0x0867
.2byte \speed
.endm
.macro SetEntity0x20 value:req
.2byte 0x0c68
.4byte \value
.endm
.macro SetEntityPositionRelative xOffset:req, yOffset:req
.2byte 0x0c69
.2byte \xOffset
.2byte \yOffset
.endm
.macro SetEntityPosition x:req, y:req
.2byte 0x0c6a
.2byte \x
.2byte \y
.endm
.macro MoveEntityToPlayer
.2byte 0x046b
.endm
.macro Nop3
.2byte 0x046c
.endm
.macro _0807EC1C s:req
.2byte 0x086d
.2byte \s
.endm
.macro _0807EC64 s:req
.2byte 0x086e
.2byte \s
.endm
.macro _0807EC94 s:req
.2byte 0x086f
.2byte \s
.endm
.macro _0807ECC4 s:req
.2byte 0x0870
.2byte \s
.endm
.macro _0807ECF4 s:req
.2byte 0x0871
.2byte \s
.endm
.macro _0807ED24 a:req, b:req, c:req
.2byte 0x1072
.2byte \a
.2byte \b
.2byte \c
.endm
.macro _0807EDD4 a:req, b:req
.2byte 0x0c73
.2byte \a
.2byte \b
.endm
.macro _0807EE04 a:req, b:req
.2byte 0x0c74
.2byte \a
.2byte \b
.endm
.macro _0807EE30
.2byte 0x0475
.endm
.macro _0807EEB4
.2byte 0x0476
.endm
.macro _0807EEF4 a:req, b:req
.2byte 0x0c77
.2byte \a
.2byte \b
.endm
.macro _0807EF3C a:req, b:req
.2byte 0x0c78
.2byte \a
.2byte \b
.endm
.macro DoPostScriptAction action:req
.2byte 0x0879
.2byte \action
.endm
.macro DoPostScriptAction2 action:req
.2byte 0x087a
.2byte \action
.endm
.macro SoundReq s:req
.2byte 0x087b
.2byte \s
.endm
.macro SoundReq2 s:req
.2byte 0x087c
.2byte \s
.endm
.macro SoundReq3 w:req
.2byte 0x0c7d
.4byte \w
.endm
.macro SoundReq0x80100000
.2byte 0x047e
.endm
.macro ModRupees amount:req
.2byte 0x087f
.2byte \amount
.endm
.macro ModHealth amount:req
.2byte 0x0880
.2byte \amount
.endm
@ this command doesn't actually take an argument
.macro IncreaseMaxHealth
.2byte 0x0881
.2byte 8
.endm
.macro _0807F034 s:req
.2byte 0x0882
.2byte \s
.endm
.macro _0807F050 s:req
.2byte 0x0883
.2byte \s
.endm
.macro GetInventoryValue s:req
.2byte 0x0884
.2byte \s
.endm
.macro _0807F078 a:req, b:req
.2byte 0x0c85
.2byte \a
.2byte \b
.endm
.macro _0807F088 s:req
.2byte 0x0886
.2byte \s
.endm
.macro CameraTargetEntity
.2byte 0x0487
.endm
.macro CameraTargetPlayer
.2byte 0x0488
.endm
.macro _0807F0B4 s:req
.2byte 0x0889
.2byte \s
.endm
.macro _0807F0C8 a:req, b:req
.2byte 0x0c8a
.2byte \a
.2byte \b
.endm
asm/mama.s
+2 -2
View File
@@ -75,9 +75,9 @@ _0806C41C: .4byte gPlayerEntity
_0806C420:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
b _0806C450
asm/manager10.s
+1 -1
View File
@@ -338,7 +338,7 @@ _08059800:
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl MemClear32
bl MemClear
ldr r1, _08059820 @ =0x0600E800
adds r0, r4, #0
adds r2, r5, #0
asm/manager14.s
+1 -1
View File
@@ -30,7 +30,7 @@ _08059E7C: .4byte gUnk_081085A4
sub_08059E80: @ 0x08059E80
push {r4, r5, lr}
adds r4, r0, #0
bl DoesSimilarEntityExist
bl EntityHasDuplicateID
cmp r0, #0
beq _08059E90
bl DeleteThisEntity
asm/manager16.s
+1 -1
View File
@@ -175,7 +175,7 @@ _0805AC6A:
beq _0805ACA6
adds r0, r3, #0
mov r1, sb
bl sub_0807DAF0
bl InitScriptForEntity
_0805ACA6:
adds r4, #0x10
adds r5, #1
asm/manager1B.s
+1 -1
View File
@@ -10,7 +10,7 @@
sub_0805B3B4: @ 0x0805B3B4
push {r4, r5, lr}
adds r4, r0, #0
bl DoesSimilarEntityExist
bl EntityHasDuplicateID
cmp r0, #0
beq _0805B3C4
bl DeleteThisEntity
asm/manager22.s
+1 -1
View File
@@ -342,7 +342,7 @@ _0805BB82:
strh r1, [r2, #0xc]
movs r0, #9
movs r1, #0x22
bl FindEntityBySubtype
bl DeepFindEntityByID
cmp r0, #0
beq _0805BBAE
bl sub_0805B8EC
asm/manager2C.s
+1 -1
View File
@@ -44,7 +44,7 @@ _0805D184:
ldr r4, _0805D1F8 @ =gUnk_030010AC
adds r0, r4, #0
movs r1, #0x20
bl MemClear32
bl MemClear
subs r4, #0xc
movs r1, #0
movs r0, #1
asm/manager36.s
+1 -1
View File
@@ -72,7 +72,7 @@ sub_0805DE18: @ 0x0805DE18
movs r0, #9
movs r1, #0x36
movs r2, #6
bl FindEntityInListByForm
bl FindEntity
cmp r0, #0
beq _0805DE34
bl DeleteEntityAny
asm/managerF.s
+1 -1
View File
@@ -492,7 +492,7 @@ sub_08059278: @ 0x08059278
movs r0, #9
movs r1, #0xf
movs r2, #6
bl FindEntityInListBySubtype
bl FindEntityByID
cmp r0, #0
beq _0805928C
bl sub_08058ECC
asm/mazaalMacro.s
+4 -4
View File
@@ -300,7 +300,7 @@ _08034E8A:
beq _08034EBC
movs r0, #3
strb r0, [r4, #0xc]
ldr r1, _08034EB4 @ =gUnk_08012E20
ldr r1, _08034EB4 @ =script_08012E20
adds r0, r4, #0
bl StartCutscene
adds r1, r4, #0
@@ -309,7 +309,7 @@ _08034E8A:
b _08034EBC
.align 2, 0
_08034EB0: .4byte gScreenTransition
_08034EB4: .4byte gUnk_08012E20
_08034EB4: .4byte script_08012E20
_08034EB8:
bl DeleteThisEntity
_08034EBC:
@@ -334,7 +334,7 @@ _08034ED6:
sub_08034ED8: @ 0x08034ED8
push {lr}
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
pop {pc}
.align 2, 0
@@ -389,7 +389,7 @@ sub_08034EE4: @ 0x08034EE4
_08034F46:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
pop {r4, r5, pc}
.align 2, 0
_08034F50: .4byte gUnk_080CEEC8
asm/minishEzlo.s
+6 -6
View File
@@ -33,9 +33,9 @@ MinishEzlo: @ 0x08062F70
_08062FA0:
adds r0, r4, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r4, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
adds r0, r4, #0
bl GetNextFrame
adds r4, #0x5b
@@ -300,7 +300,7 @@ _08063186:
adds r1, #0x80
movs r0, #0x11
strh r0, [r1]
ldr r2, _080631B8 @ =gUnk_02033280
ldr r2, _080631B8 @ =gActiveScriptInfo
ldrb r1, [r2, #7]
movs r0, #1
orrs r0, r1
@@ -308,7 +308,7 @@ _08063186:
b _080631DC
.align 2, 0
_080631B4: .4byte 0x0000033F
_080631B8: .4byte gUnk_02033280
_080631B8: .4byte gActiveScriptInfo
_080631BC:
lsls r0, r3, #1
adds r0, r2, r0
@@ -324,11 +324,11 @@ _080631CA:
adds r0, r4, #0
movs r3, #0
bl sub_0805EC9C
ldr r1, _080631E4 @ =gUnk_02033280
ldr r1, _080631E4 @ =gActiveScriptInfo
movs r0, #0
strb r0, [r1, #6]
_080631DC:
pop {r4, r5, r6, pc}
.align 2, 0
_080631E0: .4byte 0xFFFE0000
_080631E4: .4byte gUnk_02033280
_080631E4: .4byte gActiveScriptInfo
asm/minishSizedArchway.s
-40
View File
@@ -1,40 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start MinishSizedArchway
MinishSizedArchway: @ 0x080973E4
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _0809741E
movs r0, #1
strb r0, [r4, #0xc]
ldrb r0, [r4, #0xa]
strb r0, [r4, #0x1e]
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
bl CheckIsDungeon
cmp r0, #0
beq _0809741E
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r2]
_0809741E:
pop {r4, pc}
asm/minishSizedEntrance.s
-62
View File
@@ -1,62 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_08090F00
sub_08090F00: @ 0x08090F00
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r1, [r4, #0xa]
cmp r1, #1
bne _08090F1C
ldr r0, [r4, #0x50]
ldrb r2, [r4, #0xf]
lsls r1, r2
ldr r0, [r0, #0x20]
ands r0, r1
cmp r0, #0
bne _08090F1C
bl DeleteThisEntity
_08090F1C:
ldr r6, _08090F64 @ =gPlayerState
ldr r0, [r6, #0x30]
movs r1, #0x80
ands r0, r1
cmp r0, #0
beq _08090F62
ldr r5, _08090F68 @ =gPlayerEntity
adds r0, r4, #0
adds r1, r5, #0
movs r2, #4
movs r3, #4
bl sub_080041A0
cmp r0, #0
beq _08090F62
movs r1, #0x36
ldrsh r0, [r5, r1]
cmp r0, #0
bne _08090F62
adds r2, r6, #0
adds r2, #0x90
ldr r1, _08090F6C @ =gUnk_0812225C
ldrb r0, [r4, #0xb]
lsls r0, r0, #1
adds r0, r0, r1
ldrh r1, [r2]
ldrh r0, [r0]
ands r0, r1
cmp r0, #0
beq _08090F62
ldrb r0, [r4, #0xe]
bl GetCurrentRoomProperty
bl DoExitTransition
_08090F62:
pop {r4, r5, r6, pc}
.align 2, 0
_08090F64: .4byte gPlayerState
_08090F68: .4byte gPlayerEntity
_08090F6C: .4byte gUnk_0812225C
asm/mountainMinish.s
+2 -2
View File
@@ -199,9 +199,9 @@ _08067F94: .4byte gPlayerEntity
_08067F98:
adds r0, r5, #0
movs r1, #0
bl sub_0807DDAC
bl ExecuteScriptForEntity
adds r0, r5, #0
bl sub_0807DDE4
bl HandleEntity0x82Actions
ldrb r0, [r5, #0xb]
cmp r0, #3
bne _0806801A
asm/non_matching/arm_proxy/ItemInit.inc
+1 -1
View File
@@ -127,4 +127,4 @@ _08017438:
.align 2, 0
_0801749C: .4byte 0x000003FF
_080174A0: .4byte gPlayerEntity
.syntax divided
.syntax divided
asm/non_matching/arm_proxy/sub_08017530.inc
+1 -1
View File
@@ -87,4 +87,4 @@ _080175D8: .4byte gUnk_020342F8
_080175DC: .4byte gNPCFunctions
_080175E0: .4byte gUnk_02031EC0
_080175E4: .4byte gRoomControls
.syntax divided
.syntax divided
asm/non_matching/arm_proxy/sub_0801766C.inc
+1 -1
View File
@@ -65,4 +65,4 @@ _080176DE:
pop {r4}
pop {r1}
bx r1
.syntax divided
.syntax divided
asm/non_matching/arm_proxy/sub_080176E4.inc
+1 -1
View File
@@ -51,4 +51,4 @@ _0801773A:
bx r1
.align 2, 0
_08017740: .4byte gUnk_03003C70
.syntax divided
.syntax divided
asm/non_matching/arm_proxy/sub_08017744.inc
+1 -1
View File
@@ -47,4 +47,4 @@ _0801779A:
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.syntax divided
.syntax divided
asm/non_matching/arm_proxy/sub_080177A0.inc
+1 -1
View File
@@ -92,4 +92,4 @@ _0801784A:
pop {r4, r5, r6}
pop {r1}
bx r1
.syntax divided
.syntax divided
asm/non_matching/code_080B1520/EEPROMWrite.inc
+192
View File
@@ -0,0 +1,192 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
sub sp, #0xb0
adds r5, r1, #0
lsls r0, r0, #0x10
lsrs r1, r0, #0x10
lsls r2, r2, #0x18
lsrs r7, r2, #0x18
ldr r0, _080B16C8 @ =gEEPROMConfig
ldr r0, [r0]
ldrh r0, [r0, #4]
cmp r1, r0
blo _080B16D0
ldr r0, _080B16CC @ =0x000080FF
b _080B1804
.align 2, 0
_080B16C8: .4byte gEEPROMConfig
_080B16CC: .4byte 0x000080FF
_080B16D0:
ldr r0, _080B1710 @ =gEEPROMConfig
ldr r0, [r0]
ldrb r0, [r0, #8]
lsls r0, r0, #1
mov r2, sp
adds r3, r0, r2
adds r3, #0x84
movs r0, #0
strh r0, [r3]
subs r3, #2
movs r4, #0
_080B16E6:
ldrh r2, [r5]
adds r5, #2
movs r0, #0
_080B16EC:
strh r2, [r3]
subs r3, #2
lsrs r2, r2, #1
adds r0, #1
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
cmp r0, #0xf
bls _080B16EC
adds r0, r4, #1
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
cmp r4, #3
bls _080B16E6
movs r4, #0
ldr r0, _080B1710 @ =gEEPROMConfig
adds r2, r0, #0
ldr r0, [r0]
b _080B1722
.align 2, 0
_080B1710: .4byte gEEPROMConfig
_080B1714:
strh r1, [r3]
subs r3, #2
lsrs r1, r1, #1
adds r0, r4, #1
lsls r0, r0, #0x18
lsrs r4, r0, #0x18
ldr r0, [r2]
_080B1722:
ldrb r0, [r0, #8]
cmp r4, r0
blo _080B1714
movs r0, #0
strh r0, [r3]
subs r3, #2
movs r6, #1
strh r6, [r3]
movs r4, #0xd0
lsls r4, r4, #0x14
ldr r0, _080B1794 @ =gEEPROMConfig
ldr r0, [r0]
ldrb r2, [r0, #8]
adds r2, #0x43
mov r0, sp
adds r1, r4, #0
bl DMA3Transfer
movs r5, #0
add r2, sp, #0xa4
strh r5, [r2]
mov r1, sp
adds r1, #0xa6
ldr r0, _080B1798 @ =0x04000006
ldrh r0, [r0]
strh r0, [r1]
add r0, sp, #0xac
str r5, [r0]
ldrh r0, [r2]
cmp r0, #0
bne _080B1768
ldrh r0, [r4]
ands r0, r6
cmp r0, #0
bne _080B17F8
_080B1768:
add r3, sp, #0xa8
ldr r0, _080B1798 @ =0x04000006
ldrh r0, [r0]
strh r0, [r3]
mov r4, sp
adds r4, #0xa6
ldrh r1, [r3]
ldrh r0, [r4]
cmp r1, r0
beq _080B17E2
ldrh r1, [r3]
ldrh r0, [r4]
cmp r1, r0
bls _080B179C
add r2, sp, #0xac
ldrh r1, [r3]
ldrh r0, [r4]
subs r1, r1, r0
ldr r0, [r2]
adds r1, r1, r0
str r1, [r2]
b _080B17B2
.align 2, 0
_080B1794: .4byte gEEPROMConfig
_080B1798: .4byte 0x04000006
_080B179C:
add r2, sp, #0xac
add r0, sp, #0xa8
ldrh r0, [r0]
adds r0, #0xe4
mov r1, sp
adds r1, #0xa6
ldrh r1, [r1]
subs r0, r0, r1
ldr r1, [r2]
adds r0, r0, r1
str r0, [r2]
_080B17B2:
add r0, sp, #0xac
ldr r0, [r0]
cmp r0, #0x88
bls _080B17D8
add r0, sp, #0xa4
ldrh r0, [r0]
cmp r0, #0
bne _080B1802
movs r0, #0xd0
lsls r0, r0, #0x14
ldrh r0, [r0]
movs r1, #1
ands r0, r1
cmp r0, #0
bne _080B1802
ldr r5, _080B17D4 @ =0x0000C001
b _080B1802
.align 2, 0
_080B17D4: .4byte 0x0000C001
_080B17D8:
mov r0, sp
adds r0, #0xa6
add r1, sp, #0xa8
ldrh r1, [r1]
strh r1, [r0]
_080B17E2:
add r2, sp, #0xa4
ldrh r0, [r2]
cmp r0, #0
bne _080B1768
movs r0, #0xd0
lsls r0, r0, #0x14
movs r1, #1
ldrh r0, [r0]
ands r1, r0
cmp r1, #0
beq _080B1768
_080B17F8:
ldrh r0, [r2]
adds r0, #1
strh r0, [r2]
cmp r7, #0
bne _080B1768
_080B1802:
adds r0, r5, #0
_080B1804:
add sp, #0xb0
pop {r4, r5, r6, r7}
pop {r1}
bx r1
.syntax divided
asm/non_matching/ezloCap/sub_0806D8A0.inc
-55
View File
@@ -1,55 +0,0 @@
.syntax unified
.text
push {r4, r5, lr}
adds r4, r0, #0
adds r3, r1, #0
movs r2, #0
movs r0, #8
strb r0, [r3, #0x19]
ldr r0, [r3, #8]
movs r1, #2
orrs r0, r1
str r0, [r3, #8]
str r2, [r3, #0x14]
movs r2, #0x10
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x19
cmp r0, #0
bge _0806D8C2
rsbs r2, r2, #0
_0806D8C2:
ldr r1, _0806D900 @ =gPlayerEntity
movs r5, #0x2e
ldrsh r0, [r1, r5]
adds r2, r2, r0
movs r0, #0x32
ldrsh r1, [r1, r0]
adds r1, #2
strh r2, [r3, #0x1e]
strh r1, [r3, #0x22]
movs r3, #0x2e
ldrsh r0, [r4, r3]
subs r2, r2, r0
movs r5, #0x32
ldrsh r0, [r4, r5]
subs r1, r1, r0
adds r0, r2, #0
bl sub_080045DA
strb r0, [r4, #0x15]
ldrb r2, [r4, #0x14]
movs r1, #0x80
ands r1, r2
ldr r2, _0806D904 @ =gUnk_08114134
lsls r0, r0, #0x18
lsrs r0, r0, #0x1c
adds r0, r0, r2
ldrb r0, [r0]
orrs r1, r0
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D900: .4byte gPlayerEntity
_0806D904: .4byte gUnk_08114134
.syntax divided
asm/non_matching/ezloCap/sub_0806D908.inc
-32
View File
@@ -1,32 +0,0 @@
.syntax unified
.text
push {r4, r5, lr}
adds r4, r0, #0
movs r1, #0x2e
ldrsh r0, [r4, r1]
movs r2, #0x32
ldrsh r1, [r4, r2]
ldr r3, _0806D93C @ =gPlayerEntity
movs r5, #0x2e
ldrsh r2, [r3, r5]
movs r5, #0x32
ldrsh r3, [r3, r5]
bl sub_080045D4
strb r0, [r4, #0x15]
ldrb r2, [r4, #0x14]
movs r1, #0x80
ands r1, r2
ldr r2, _0806D940 @ =gUnk_08114144
lsls r0, r0, #0x18
lsrs r0, r0, #0x19
adds r0, r0, r2
ldrb r0, [r0]
orrs r1, r0
strb r1, [r4, #0x14]
pop {r4, r5, pc}
.align 2, 0
_0806D93C: .4byte gPlayerEntity
_0806D940: .4byte gUnk_08114144
.syntax divided
asm/non_matching/ezloCap/sub_0806DA04.inc
-15
View File
@@ -1,15 +0,0 @@
.syntax unified
.text
push {lr}
ldr r3, [r1, #4]
lsls r3, r3, #3
ldr r1, _0806DA18 @ =gUnk_0811415C
adds r3, r3, r1
ldrb r2, [r3, #4]
movs r1, #1
bl sub_08078850
pop {pc}
.align 2, 0
_0806DA18: .4byte gUnk_0811415C
.syntax divided
asm/non_matching/fileScreen/sub_08050EF4.inc
+1 -1
View File
@@ -135,4 +135,4 @@ _08050FF4:
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
.syntax divided
asm/non_matching/fileScreen/sub_08051738.inc
+1 -1
View File
@@ -62,4 +62,4 @@ _080517A2:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080517B0: .4byte gMenu
.syntax divided
.syntax divided
asm/non_matching/fileScreen/sub_080517B4.inc
+1 -1
View File
@@ -29,4 +29,4 @@ _080517DE:
.align 2, 0
_080517E4: .4byte gUnk_02019EE0
_080517E8: .4byte gUnk_02000090
.syntax divided
.syntax divided
asm/non_matching/fileScreen/sub_080610B8.inc
+1 -1
View File
@@ -345,4 +345,4 @@ _0805134C:
.align 2, 0
_08051350: .4byte gSave
_08051354: .4byte gMenu
.syntax divided
.syntax divided
asm/non_matching/game/sub_08052418.inc
+2 -2
View File
@@ -6,7 +6,7 @@
ldr r0, _08052494 @ =gBG1Buffer
movs r1, #0x80
lsls r1, r1, #4
bl MemClear32
bl MemClear
ldr r0, _08052498 @ =gUnk_020227E8
movs r1, #0xf
str r1, [r0]
@@ -63,4 +63,4 @@ _08052498: .4byte gUnk_020227E8
_0805249C: .4byte gUnk_080FCA8C
_080524A0: .4byte gUnk_080FCAA4
_080524A4: .4byte gScreen
.syntax divided
.syntax divided
asm/non_matching/gibdo/sub_080376D0.inc
+1 -1
View File
@@ -54,4 +54,4 @@ _0803772C:
_0803773A:
pop {r4, pc}
.syntax divided
.syntax divided
asm/non_matching/gibdo/sub_08037810.inc
+1 -1
View File
@@ -83,4 +83,4 @@ _080378AC:
_080378AE:
pop {r4, r5, r6, pc}
.syntax divided
.syntax divided
asm/non_matching/gibdo/sub_0803797C.inc
+1 -1
View File
@@ -36,4 +36,4 @@
_080379BA:
pop {r4, r5, pc}
.syntax divided
.syntax divided
asm/non_matching/player/sub_08071634.s
+172
View File
@@ -0,0 +1,172 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r5, r0, #0
adds r0, #0x81
ldrb r0, [r0]
cmp r0, #0
beq _08071654
adds r1, r5, #0
adds r1, #0x80
ldr r0, [r1]
adds r0, #0x80
lsls r0, r0, #0x14
lsrs r7, r0, #0x17
adds r4, r1, #0
b _0807166A
_08071654:
adds r4, r5, #0
adds r4, #0x80
ldrb r1, [r4]
lsrs r1, r1, #6
movs r0, #3
eors r1, r0
adds r1, #1
movs r0, #0x10
bl __divsi3
asrs r7, r0, #1
_0807166A:
adds r0, r5, #0
adds r0, #0x84
ldr r3, [r0]
movs r1, #0x80
lsls r1, r1, #1
adds r2, r0, #0
cmp r3, r1
bls _08071684
adds r0, r3, #0
adds r0, #0x80
lsls r0, r0, #0x14
lsrs r3, r0, #0x17
b _08071694
_08071684:
cmp r3, r1
bne _0807168C
movs r3, #0x10
b _08071694
_0807168C:
ldr r1, _080716B0 @ =gUnk_0811BABC
lsrs r0, r3, #5
adds r0, r0, r1
ldrb r3, [r0]
_08071694:
movs r0, #0x80
lsls r0, r0, #9
mov r8, r0
adds r0, r5, #0
adds r0, #0x5a
ldrb r0, [r0]
cmp r0, #2
beq _080716EA
cmp r0, #2
bgt _080716B4
cmp r0, #1
beq _080716BA
b _08071754
.align 2, 0
_080716B0: .4byte gUnk_0811BABC
_080716B4:
cmp r0, #3
beq _0807171E
b _08071754
_080716BA:
movs r1, #0x29
adds r1, r1, r5
mov ip, r1
ldrb r1, [r1]
movs r0, #0x39
rsbs r0, r0, #0
ands r0, r1
mov r1, ip
strb r0, [r1]
ldr r0, [r4]
cmp r0, #0x80
bls _080716D6
subs r0, r0, r7
str r0, [r4]
_080716D6:
lsls r1, r3, #1
ldr r0, [r2]
adds r0, r0, r1
str r0, [r2]
mov r0, r8
lsls r1, r0, #1
ldr r0, [r5, #0x30]
adds r0, r0, r1
str r0, [r5, #0x30]
b _08071754
_080716EA:
ldr r0, [r4]
adds r0, r0, r7
str r0, [r4]
ldr r1, [r2]
movs r6, #0x80
lsls r6, r6, #1
cmp r1, r6
bls _08071710
ldr r0, _0807170C @ =0x0000017F
cmp r1, r0
bhi _08071702
lsrs r3, r3, #1
_08071702:
subs r0, r1, r3
cmp r0, #0xff
bhi _08071716
str r6, [r2]
b _08071718
.align 2, 0
_0807170C: .4byte 0x0000017F
_08071710:
cmp r1, #0x80
bls _08071718
subs r0, r1, r3
_08071716:
str r0, [r2]
_08071718:
ldr r0, [r5, #0x34]
mov r1, r8
b _08071750
_0807171E:
ldr r0, [r4]
ldr r6, _08071740 @ =0x0000033F
cmp r0, r6
bhi _0807172A
adds r0, r0, r7
str r0, [r4]
_0807172A:
ldr r1, [r2]
cmp r1, r6
bls _08071744
movs r0, #8
strb r0, [r5, #0xe]
movs r0, #0x1e
strb r0, [r5, #0xf]
movs r0, #6
strb r0, [r5, #0xd]
b _0807174A
.align 2, 0
_08071740: .4byte 0x0000033F
_08071744:
lsls r0, r3, #1
adds r0, r1, r0
str r0, [r2]
_0807174A:
mov r0, r8
lsls r1, r0, #1
ldr r0, [r5, #0x34]
_08071750:
subs r0, r0, r1
str r0, [r5, #0x34]
_08071754:
ldr r1, [r4]
ldr r2, [r2]
adds r0, r5, #0
movs r3, #0
bl sub_0805EC9C
adds r0, r5, #0
bl UpdateAnimationSingleFrame
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.syntax divided

Some files were not shown because too many files have changed in this diff Show More