dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
ProjectRevoTPP
2017-09-27 00:48:11 -04:00
parent d740eabb3c 3c8091393c
commit 04c8eff882
123 changed files with 9837 additions and 4539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asm/cable_car.s
View File

@@ -242,7 +242,7 @@ _0814FE96:
bls _0814FE96
ldr r0, =gUnknown_085CDB74
bl LoadSpritePalettes
ldr r0, =gUnknown_085CD67C
ldr r0, =gCableCarMtChimneyTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r4, =gUnknown_0203ABAC
@@ -250,7 +250,7 @@ _0814FE96:
ldr r2, =0x000040fc
adds r1, r2
str r0, [r1]
ldr r0, =gUnknown_085CD7D4
ldr r0, =gCableCarTreeTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
@@ -258,14 +258,14 @@ _0814FE96:
lsls r3, 7
adds r1, r3
str r0, [r1]
ldr r0, =gUnknown_085CD958
ldr r0, =gCableCarMountainTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
ldr r2, =0x00004104
adds r1, r2
str r0, [r1]
ldr r0, =gUnknown_085CDB30
ldr r0, =gCableCarPylonStemTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
@@ -274,7 +274,7 @@ _0814FE96:
str r0, [r2]
ldr r0, =0x00004108
adds r1, r0
ldr r0, =gUnknown_085CDB1C
ldr r0, =gCableCarPylonHookTilemapEntries
str r0, [r1]
ldr r1, =gUnknown_08DBA5B8
movs r0, 0
@@ -1908,7 +1908,7 @@ sub_8150D28: @ 8150D28
mov r5, r8
push {r5-r7}
sub sp, 0x28
ldr r1, =gUnknown_085CDBE4
ldr r1, =gCableCarPlayerGraphicsIDs
add r0, sp, 0xC
movs r2, 0x2
bl memcpy
@@ -1917,17 +1917,17 @@ sub_8150D28: @ 8150D28
lsrs r0, 16
mov r9, r0
add r6, sp, 0x10
ldr r1, =gUnknown_085CDBE6
ldr r1, =gMtChimneyHikerGraphicsIDs
adds r0, r6, 0
movs r2, 0x4
bl memcpy
add r5, sp, 0x14
ldr r1, =gUnknown_085CDBEA
ldr r1, =gMtChimneyHikerCoords
adds r0, r5, 0
movs r2, 0x8
bl memcpy
add r4, sp, 0x1C
ldr r1, =gUnknown_085CDBF2
ldr r1, =gMtChimneyHikerMovementDelayTable
adds r0, r4, 0
movs r2, 0x4
bl memcpy
@@ -1982,7 +1982,7 @@ _08150D86:
movs r0, 0x49
strh r0, [r1, 0x30]
_08150DD0:
ldr r4, =gUnknown_085CDB9C
ldr r4, =gSpriteTemplate_85CDB9C
adds r0, r4, 0
movs r1, 0xB0
movs r2, 0x2B
@@ -2088,7 +2088,7 @@ _08150E68:
movs r0, 0x27
strh r0, [r1, 0x30]
_08150ED4:
ldr r4, =gUnknown_085CDB9C
ldr r4, =gSpriteTemplate_85CDB9C
adds r0, r4, 0
movs r1, 0x68
movs r2, 0x9
@@ -2149,7 +2149,7 @@ _08150F3E:
ldr r3, =0xfff80000
adds r2, r3
asrs r2, 16
ldr r0, =gUnknown_085CDBCC
ldr r0, =gSpriteTemplate_85CDBCC
movs r3, 0x68
bl CreateSprite
lsls r0, 24

4
asm/decoration.s
View File

@@ -1264,7 +1264,7 @@ sub_8127454: @ 8127454
ldr r1, =gStringVar1
bl StringCopy
lsls r4, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r4, r0
adds r0, r5, 0
adds r1, r4, 0
@@ -7083,7 +7083,7 @@ sub_812A3D4: @ 812A3D4
adds r1, r2
ldrb r1, [r1]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4

31
asm/macros.inc
View File

@@ -20,12 +20,43 @@
.2byte \tag
.endm
.macro null_obj_tiles
obj_tiles 0, 0, 0
.endm
.macro obj_pal address, tag
.4byte \address
.2byte \tag
.2byte 0@ padding
.endm
.macro null_obj_pal
obj_pal 0, 0
.endm
.macro paired_pals tag, address
.2byte \tag
.2byte 0 @ padding
.4byte \address
.endm
@ For object animation frames.
.macro obj_frame_tiles address, uncompressed_size
.4byte \address
.2byte \uncompressed_size
.2byte 0 @ padding
.endm
.macro spr_template tile_tag, pal_tag, oam, anims, images, affine_anims, callback
.2byte \tile_tag
.2byte \pal_tag
.4byte \oam
.4byte \anims
.4byte \images
.4byte \affine_anims
.4byte \callback
.endm
@ Berry trees have a table defining the palette slot used for each of their 5
@ stages. However, the first 2 stages always use the same slots regardless of
@ the type of tree and the slots of the last 3 stages always equal each other.

4
asm/macros/window.inc
View File

@@ -8,6 +8,10 @@
.2byte \vram_tile_offset
.endm
.macro window_template_terminator
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm
.macro glyph_width_func font_id, func
.4byte \font_id
.4byte \func

2
asm/pokenav.s
View File

@@ -28559,7 +28559,7 @@ _081D5268:
ldr r0, =gUnknown_085EE097
bl sub_8018884
ldr r0, =gUnknown_03006370
ldr r1, =gUnknown_089A6550
ldr r1, =gMultiBootProgram_BerryGlitchFix_Start
ldr r2, =gUnknown_089A3470
subs r1, r2
bl sub_81D4D50

2
asm/scrcmd.s
View File

@@ -3977,7 +3977,7 @@ sub_809B114: @ 809B114
adds r4, r0
ldr r0, [r4]
lsrs r1, 11
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
movs r0, 0

4
asm/shop.s
View File

@@ -657,7 +657,7 @@ BuyMenuSetListEntry: @ 80E0000
.pool
_080E0020:
lsls r1, r4, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r1, r0
adds r0, r5, 0
bl StringCopy
@@ -2106,7 +2106,7 @@ _080E0C28:
_080E0C38:
ldr r0, =gStringVar1
lsls r1, r5, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldr r0, =gStringVar2

6
asm/trader.s
View File

@@ -113,7 +113,7 @@ _08133AC2:
_08133AF0:
ldrb r1, [r1]
lsls r1, 5
ldr r0, =gUnknown_085A5C09
ldr r0, =gDecorations + 1
adds r1, r0
movs r0, 0x1
movs r2, 0
@@ -172,7 +172,7 @@ _08133B70:
ldrb r0, [r7, 0x6]
ldrb r2, [r1]
lsls r2, 5
ldr r1, =gUnknown_085A5C09
ldr r1, =gDecorations + 1
adds r2, r1
lsls r1, r5, 4
adds r1, 0x1
@@ -450,7 +450,7 @@ sub_8133DA0: @ 8133DA0
ldr r1, =gSpecialVar_0x8004
ldrh r1, [r1]
lsls r1, 5
ldr r4, =gUnknown_085A5C09
ldr r4, =gDecorations + 1
adds r1, r4
bl StringCopy
ldr r0, =gStringVar2

8
asm/tv.s
View File

@@ -14911,7 +14911,7 @@ _080F4414:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x4]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldrb r0, [r5, 0x3]
@@ -14932,7 +14932,7 @@ _080F4448:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x5]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
bl StringCopy
ldrb r1, [r5, 0x3]
@@ -14970,7 +14970,7 @@ _080F449C:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x6]
lsls r1, 5
ldr r4, =gUnknown_085A5C09
ldr r4, =gDecorations + 1
adds r1, r4
bl StringCopy
ldr r0, =gStringVar3
@@ -14983,7 +14983,7 @@ _080F44C0:
ldr r0, =gStringVar2
ldrb r1, [r5, 0x6]
lsls r1, 5
ldr r2, =gUnknown_085A5C09
ldr r2, =gDecorations + 1
adds r1, r2
_080F44CA:
bl StringCopy