dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-10 08:34:28 +08:00
parent 7b28a3ecfd c61603fb38
commit 89a377cdd3
582 changed files with 2932 additions and 4066 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+2 -2
View File
@@ -28,7 +28,7 @@ _0807F644:
bl FldEffPoison_IsActive
cmp r0, 0
bne _0807F686
bl sub_812B478
bl HelpSystem_Disable
ldrb r0, [r4, 0x2]
bl BT_StartOnField
ldrh r0, [r4]
@@ -41,7 +41,7 @@ _0807F65E:
lsrs r0, 24
cmp r0, 0x1
bne _0807F686
bl sub_812B484
bl HelpSystem_Enable
bl CleanupOverworldWindowsAndTilemaps
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
asm/bike.s
+2 -2
View File
@@ -738,8 +738,8 @@ _080BD5F4: .4byte gPlayerAvatar
_080BD5F8:
adds r0, r2, 0
bl SetPlayerAvatarTransitionFlags
movs r4, 0x8D @ BGM_FRLG_BICYCLE
lsls r4, 1 @ BGM_FRLG_BICYCLE
movs r4, 0x8D @ MUS_CYCLING
lsls r4, 1 @ MUS_CYCLING
adds r0, r4, 0
bl sub_8056124
cmp r0, 0
asm/dodrio_berry_picking.s
+2 -2
View File
@@ -8327,7 +8327,7 @@ sub_81546EC: @ 81546EC
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -8335,7 +8335,7 @@ sub_81546EC: @ 81546EC
movs r3, 0x1
bl LoadBgTiles
adds r0, r4, 0
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r0, [r0, 0x4]
movs r1, 0xA0
movs r2, 0x20
asm/event_data.s
+3 -3
View File
@@ -248,8 +248,8 @@ sub_806E2AC: @ 806E2AC
_0806E2B8: .4byte 0x00000839
thumb_func_end sub_806E2AC
thumb_func_start sub_806E2BC
sub_806E2BC: @ 806E2BC
thumb_func_start Flag_0x839_IsSet
Flag_0x839_IsSet: @ 806E2BC
push {lr}
ldr r0, _0806E2CC @ =0x00000839
bl FlagGet
@@ -259,7 +259,7 @@ sub_806E2BC: @ 806E2BC
bx r1
.align 2, 0
_0806E2CC: .4byte 0x00000839
thumb_func_end sub_806E2BC
thumb_func_end Flag_0x839_IsSet
thumb_func_start sub_806E2D0
sub_806E2D0: @ 806E2D0
asm/evolution_scene.s
+2 -2
View File
@@ -388,7 +388,7 @@ EvolutionScene: @ 80CDDF4
ldr r0, _080CE0E0 @ =sub_80D0050
bl SetVBlankCallback
bl m4aMPlayAllStop
bl sub_812B478
bl HelpSystem_Disable
ldr r0, _080CE0E4 @ =sub_80CE710
bl SetMainCallback2
add sp, 0x24
@@ -1852,7 +1852,7 @@ _080CEDB8:
beq _080CEDC6
b _080CF528
_080CEDC6:
bl sub_812B484
bl HelpSystem_Enable
ldr r1, _080CEE20 @ =gTasks
mov r2, r8
adds r0, r2, r7
asm/hall_of_fame.s
+3 -3
View File
@@ -56,7 +56,7 @@ _080F1E04:
.4byte _080F1E88
.4byte _080F1EC4
_080F1E18:
ldr r1, _080F1E40 @ =gUnknown_3005ECC
ldr r1, _080F1E40 @ =gHelpSystemEnabled
movs r0, 0
strb r0, [r1]
movs r0, 0
@@ -74,7 +74,7 @@ _080F1E18:
strb r1, [r0]
b _080F1EF0
.align 2, 0
_080F1E40: .4byte gUnknown_3005ECC
_080F1E40: .4byte gHelpSystemEnabled
_080F1E44: .4byte gUnknown_203AB3C
_080F1E48: .4byte 0x00002008
_080F1E4C: .4byte gMain
@@ -138,7 +138,7 @@ _080F1EC4:
bne _080F1EF0
ldr r0, _080F1EEC @ =sub_80F1DC0
bl SetMainCallback2
movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1
movs r0, 0x8F @ MUS_DENDOU >> 1
lsls r0, 1
bl PlayBGM
movs r0, 0
asm/main_menu.s
-1853
View File
File diff suppressed because it is too large Load Diff
asm/mon_markings.s
+1 -1
View File
@@ -22,7 +22,7 @@ sub_80BE478: @ 80BE478
ldr r0, [r0]
ldrb r0, [r0, 0x14]
lsrs r0, 3
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r3, _080BE4B4 @ =gUnknown_20399C0
ldr r2, [r3]
ldr r1, [r0]
asm/option_menu.s
+4 -4
View File
@@ -459,7 +459,7 @@ _0808870C:
b _08088768
_08088716:
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -470,7 +470,7 @@ _08088716:
b _0808876C
_0808872E:
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r0, [r0, 0x4]
movs r1, 0x20
b _0808874C
@@ -590,7 +590,7 @@ _08088824:
ldr r4, _08088854 @ =gUnknown_2039620
ldr r0, [r4]
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r1, [r0]
movs r2, 0x90
lsls r2, 1
@@ -600,7 +600,7 @@ _08088824:
bl LoadBgTiles
ldr r0, [r4]
ldrb r0, [r0, 0xA]
bl sub_8069788
bl GetUserFrameGraphicsInfo
ldr r0, [r0, 0x4]
movs r1, 0x20
movs r2, 0x20
asm/overworld.s
+2 -2
View File
@@ -2441,7 +2441,7 @@ _08055E40:
lsls r0, 24
cmp r0, 0
beq _08055E5A
ldr r5, _08055E74 @ =0x00000131 @ BGM_FRLG_SURF
ldr r5, _08055E74 @ =0x00000131 @ MUS_NAMINORI
adds r0, r5, 0
bl sub_8056124
cmp r0, 0
@@ -2511,7 +2511,7 @@ _08055EA8:
bl GetCurrentMapMusic
lsls r0, 16
lsrs r6, r0, 16
ldr r5, _08055F08 @ =0x00000131 @ BGM_FRLG_SURF
ldr r5, _08055F08 @ =0x00000131 @ MUS_NAMINORI
cmp r6, r5
beq _08055F14
movs r0, 0x8
asm/trade.s
+3 -3
View File
@@ -11140,7 +11140,7 @@ _0805230A:
ldr r0, _08052328 @ =CB2_ReturnToField
bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
bl HelpSystem_Enable
_08052318:
movs r0, 0
_0805231A:
@@ -13365,7 +13365,7 @@ _08053766:
ldr r0, _08053784 @ =CB2_ReturnToField
bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
bl HelpSystem_Enable
_08053774:
movs r0, 0
_08053776:
@@ -14854,7 +14854,7 @@ sub_8054440: @ 8054440
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
bl sub_812B478
bl HelpSystem_Disable
add sp, 0x4
pop {r0}
bx r0