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

Merge branch 'master' into link

Browse Source
This commit is contained in:
PikalaxALT
2019-10-06 18:06:24 -04:00
parent 5620b0ed1a fb9b695f9a
commit 736b89ae3d
46 changed files with 297 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_tower.s
+2 -2
View File
@@ -2799,7 +2799,7 @@ _080E6F0E:
ldr r4, _080E6FA4 @ =gSaveBlock2Ptr
ldr r1, [r4]
adds r1, 0xA
bl CopyUnalignedWord
bl CopyTrainerId
adds r0, r5, 0x4
ldr r1, [r4]
bl StringCopy7
@@ -3369,7 +3369,7 @@ _080E7372:
adds r0, 0xC
ldr r1, [r5]
adds r1, 0xA
bl CopyUnalignedWord
bl CopyTrainerId
adds r0, r7, 0x4
ldr r1, [r5]
bl StringCopy7
asm/easy_chat.s
+3 -3
View File
@@ -868,8 +868,8 @@ _080BDD2C: .4byte gUnknown_83ECED4
_080BDD30: .4byte 0x0000ffff
thumb_func_end sub_80BDCB8
thumb_func_start sub_80BDD34
sub_80BDD34: @ 80BDD34
thumb_func_start InitEasyChatPhrases
InitEasyChatPhrases: @ 80BDD34
push {r4-r7,lr}
movs r4, 0
ldr r5, _080BDE00 @ =gSaveBlock1Ptr
@@ -988,7 +988,7 @@ _080BDE18: .4byte 0x0000ffff
_080BDE1C: .4byte 0x00002cc4
_080BDE20: .4byte 0x00002cd0
_080BDE24: .4byte 0x00002f10
thumb_func_end sub_80BDD34
thumb_func_end InitEasyChatPhrases
thumb_func_start sub_80BDE28
sub_80BDE28: @ 80BDE28
asm/event_data.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_806E0D0
sub_806E0D0: @ 806E0D0
thumb_func_start InitEventData
InitEventData: @ 806E0D0
push {r4,lr}
ldr r4, _0806E108 @ =gSaveBlock1Ptr
ldr r0, [r4]
@@ -35,7 +35,7 @@ sub_806E0D0: @ 806E0D0
.align 2, 0
_0806E108: .4byte gSaveBlock1Ptr
_0806E10C: .4byte gUnknown_20370E0
thumb_func_end sub_806E0D0
thumb_func_end InitEventData
thumb_func_start sub_806E110
sub_806E110: @ 806E110
asm/hall_of_fame.s
+1 -1
View File
@@ -1458,7 +1458,7 @@ sub_80F2934: @ 80F2934
movs r0, 0x3 @ MAP_GROUP(INDIGO_PLATEAU_EXTERIOR)
movs r1, 0x9 @ MAP_NUM(INDIGO_PLATEAU_EXTERIOR)
movs r3, 0xB
bl Overworld_SetWarpDestination
bl SetWarpDestination
bl DoWarp
bl ResetInitialPlayerAvatarState
add sp, 0x4
asm/link_rfu_3.s
+2 -2
View File
@@ -3356,7 +3356,7 @@ sub_8117440: @ 8117440
asrs r5, 24
str r5, [sp]
adds r3, r4, 0
bl Overworld_SetWarpDestination
bl SetWarpDestination
ldr r0, [r6]
movs r1, 0x4
ldrsb r1, [r0, r1]
@@ -3423,7 +3423,7 @@ sub_81174B4: @ 81174B4
adds r0, r4, 0
adds r1, r5, 0
mov r3, r8
bl Overworld_SetWarpDestination
bl SetWarpDestination
bl WarpIntoMap
add sp, 0x4
pop {r3}
asm/new_game.s
-340
View File
@@ -1,340 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start WriteUnalignedWord
WriteUnalignedWord: @ 80548FC
strb r0, [r1]
lsrs r2, r0, 8
strb r2, [r1, 0x1]
lsrs r2, r0, 16
strb r2, [r1, 0x2]
lsrs r0, 24
strb r0, [r1, 0x3]
bx lr
thumb_func_end WriteUnalignedWord
thumb_func_start CopyUnalignedWord
CopyUnalignedWord: @ 805490C
push {r4,lr}
adds r4, r0, 0
adds r3, r1, 0
movs r2, 0
_08054914:
adds r0, r4, r2
adds r1, r3, r2
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x3
ble _08054914
pop {r4}
pop {r0}
bx r0
thumb_func_end CopyUnalignedWord
thumb_func_start InitPlayerTrainerId
InitPlayerTrainerId: @ 8054928
push {r4,lr}
bl Random
adds r4, r0, 0
bl GetGeneratedTrainerIdLower
lsls r4, 16
lsls r0, 16
lsrs r0, 16
orrs r4, r0
ldr r0, _08054950 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
bl WriteUnalignedWord
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08054950: .4byte gSaveBlock2Ptr
thumb_func_end InitPlayerTrainerId
thumb_func_start SetDefaultOptions
SetDefaultOptions: @ 8054954
ldr r3, _080549A8 @ =gSaveBlock2Ptr
ldr r2, [r3]
ldrb r1, [r2, 0x14]
movs r0, 0x8
negs r0, r0
ands r0, r1
movs r1, 0x1
orrs r0, r1
strb r0, [r2, 0x14]
ldr r2, [r3]
ldrb r1, [r2, 0x14]
movs r0, 0x7
ands r0, r1
strb r0, [r2, 0x14]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x2
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x3
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r2, [r3]
ldrb r1, [r2, 0x15]
movs r0, 0x9
negs r0, r0
ands r0, r1
strb r0, [r2, 0x15]
ldr r1, [r3]
movs r0, 0
strb r0, [r1, 0x13]
bx lr
.align 2, 0
_080549A8: .4byte gSaveBlock2Ptr
thumb_func_end SetDefaultOptions
thumb_func_start sub_80549AC
sub_80549AC: @ 80549AC
push {r4,lr}
ldr r4, _080549D0 @ =gSaveBlock2Ptr
ldr r0, [r4]
adds r0, 0x28
movs r1, 0
movs r2, 0x34
bl memset
ldr r0, [r4]
adds r0, 0x5C
movs r1, 0
movs r2, 0x34
bl memset
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080549D0: .4byte gSaveBlock2Ptr
thumb_func_end sub_80549AC
thumb_func_start sub_80549D4
sub_80549D4: @ 80549D4
push {lr}
sub sp, 0x4
movs r0, 0
str r0, [sp]
ldr r0, _080549F0 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r1, 0xB0
ldr r2, _080549F4 @ =0x050001fa
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_080549F0: .4byte gSaveBlock2Ptr
_080549F4: .4byte 0x050001fa
thumb_func_end sub_80549D4
thumb_func_start sub_80549F8
sub_80549F8: @ 80549F8
push {lr}
sub sp, 0x4
movs r2, 0x1
negs r2, r2
movs r0, 0x6
str r0, [sp]
movs r0, 0x4
movs r1, 0x1
movs r3, 0x6
bl Overworld_SetWarpDestination
bl WarpIntoMap
add sp, 0x4
pop {r0}
bx r0
thumb_func_end sub_80549F8
thumb_func_start Sav2_ClearSetDefault
Sav2_ClearSetDefault: @ 8054A18
push {lr}
bl ClearSav2
bl SetDefaultOptions
pop {r0}
bx r0
thumb_func_end Sav2_ClearSetDefault
thumb_func_start ResetMenuAndMonGlobals
ResetMenuAndMonGlobals: @ 8054A28
push {lr}
ldr r1, _08054A5C @ =gUnknown_2031DB0
movs r0, 0
strb r0, [r1]
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl sub_81089BC
bl ResetTMCaseCursorPos
bl BerryPouch_CursorResetToTop
bl sub_811089C
bl Random
lsls r0, 16
lsrs r0, 16
bl sub_8083214
bl sub_806E6FC
pop {r0}
bx r0
.align 2, 0
_08054A5C: .4byte gUnknown_2031DB0
thumb_func_end ResetMenuAndMonGlobals
thumb_func_start sub_8054A60
sub_8054A60: @ 8054A60
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x8
ldr r6, _08054B50 @ =gSaveBlock1Ptr
ldr r1, [r6]
ldr r0, _08054B54 @ =0x00003a4c
mov r8, r0
add r1, r8
mov r0, sp
bl StringCopy
ldr r1, _08054B58 @ =gUnknown_2031DB0
movs r0, 0x1
strb r0, [r1]
ldr r4, _08054B5C @ =gSaveBlock2Ptr
ldr r0, [r4]
movs r1, 0xF2
lsls r1, 4
adds r0, r1
movs r5, 0
str r5, [r0]
bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl sub_80549D4
bl ClearSav1
bl ClearMailData
ldr r0, [r4]
strb r5, [r0, 0x9]
ldr r0, [r4]
adds r1, r0, 0
adds r1, 0xA8
str r5, [r1]
adds r0, 0xAC
movs r1, 0x1
strb r1, [r0]
ldr r0, [r4]
adds r0, 0xAD
strb r5, [r0]
bl InitPlayerTrainerId
bl PlayTimeCounter_Reset
bl sub_80549AC
bl sub_806E0D0
bl ResetFameChecker
ldr r0, [r6]
movs r1, 0xA4
lsls r1, 2
adds r0, r1
ldr r1, _08054B60 @ =0x00000bb8
bl SetMoney
bl sub_8054E68
bl InitLinkBattleRecords
bl sub_80A0904
bl sub_80A0958
bl sub_806E190
ldr r0, _08054B64 @ =gPlayerPartyCount
strb r5, [r0]
bl ZeroPlayerPartyMons
bl sub_808C7E0
bl ClearRoamerData
ldr r0, [r6]
ldr r1, _08054B68 @ =0x00000296
adds r0, r1
strh r5, [r0]
bl ClearItemSlotsInAllBagPockets
bl sub_80EB658
bl sub_809C794
bl sub_80BDD34
bl sub_8113044
bl copy_strings_to_sav1
bl sub_8054B70
bl sub_8143D24
bl sub_815D838
bl sub_80549F8
ldr r0, _08054B6C @ =gUnknown_81A6481
bl ScriptContext2_RunNewScript
ldr r0, [r6]
add r0, r8
mov r1, sp
bl StringCopy
bl sub_815EE0C
add sp, 0x8
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08054B50: .4byte gSaveBlock1Ptr
_08054B54: .4byte 0x00003a4c
_08054B58: .4byte gUnknown_2031DB0
_08054B5C: .4byte gSaveBlock2Ptr
_08054B60: .4byte 0x00000bb8
_08054B64: .4byte gPlayerPartyCount
_08054B68: .4byte 0x00000296
_08054B6C: .4byte gUnknown_81A6481
thumb_func_end sub_8054A60
thumb_func_start sub_8054B70
sub_8054B70: @ 8054B70
push {r4-r6,lr}
sub sp, 0x4
mov r0, sp
movs r5, 0
strh r5, [r0]
ldr r4, _08054BBC @ =gSaveBlock2Ptr
ldr r1, [r4]
movs r0, 0xAF
lsls r0, 4
adds r1, r0
ldr r6, _08054BC0 @ =0x01000008
mov r0, sp
adds r2, r6, 0
bl CpuSet
ldr r0, [r4]
ldr r1, _08054BC4 @ =0x00000af8
adds r0, r1
movs r1, 0
bl sub_815EE54
bl ResetPokeJumpResults
mov r0, sp
adds r0, 0x2
strh r5, [r0]
ldr r1, [r4]
movs r2, 0xB1
lsls r2, 4
adds r1, r2
adds r2, r6, 0
bl CpuSet
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08054BBC: .4byte gSaveBlock2Ptr
_08054BC0: .4byte 0x01000008
_08054BC4: .4byte 0x00000af8
thumb_func_end sub_8054B70
.align 2, 0 @ Don't pad with nop.
asm/overworld.s
+12 -12
View File
@@ -289,8 +289,8 @@ sub_8054E40: @ 8054E40
_08054E64: .4byte 0x0000406e
thumb_func_end sub_8054E40
thumb_func_start sub_8054E68
sub_8054E68: @ 8054E68
thumb_func_start ResetGameStats
ResetGameStats: @ 8054E68
push {r4,r5,lr}
movs r2, 0
ldr r5, _08054E8C @ =gSaveBlock1Ptr
@@ -311,7 +311,7 @@ _08054E74:
bx r0
.align 2, 0
_08054E8C: .4byte gSaveBlock1Ptr
thumb_func_end sub_8054E68
thumb_func_end ResetGameStats
thumb_func_start IncrementGameStat
IncrementGameStat: @ 8054E90
@@ -1003,8 +1003,8 @@ WarpIntoMap: @ 8055378
bx r0
thumb_func_end WarpIntoMap
thumb_func_start Overworld_SetWarpDestination
Overworld_SetWarpDestination: @ 805538C
thumb_func_start SetWarpDestination
SetWarpDestination: @ 805538C
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -1034,7 +1034,7 @@ Overworld_SetWarpDestination: @ 805538C
bx r0
.align 2, 0
_080553C4: .4byte gUnknown_2031DBC
thumb_func_end Overworld_SetWarpDestination
thumb_func_end SetWarpDestination
thumb_func_start warp1_set_2
warp1_set_2: @ 80553C8
@@ -1049,7 +1049,7 @@ warp1_set_2: @ 80553C8
movs r3, 0x1
negs r3, r3
str r3, [sp]
bl Overworld_SetWarpDestination
bl SetWarpDestination
add sp, 0x4
pop {r0}
bx r0
@@ -1151,7 +1151,7 @@ sub_805546C: @ 805546C
lsls r4, 24
asrs r4, 24
str r4, [sp]
bl Overworld_SetWarpDestination
bl SetWarpDestination
_0805549A:
add sp, 0x4
pop {r4}
@@ -1458,7 +1458,7 @@ _080556BC:
lsls r4, r6, 24
asrs r4, 24
str r4, [sp]
bl Overworld_SetWarpDestination
bl SetWarpDestination
_080556D6:
add sp, 0x4
pop {r4-r6}
@@ -1627,7 +1627,7 @@ sub_80557C4: @ 80557C4
lsls r4, r5, 24
asrs r4, 24
str r4, [sp]
bl Overworld_SetWarpDestination
bl SetWarpDestination
b _08055818
_080557FC:
bl mapheader_run_script_with_tag_x6
@@ -1700,7 +1700,7 @@ sub_8055864: @ 8055864
negs r3, r3
str r3, [sp]
adds r2, r3, 0
bl Overworld_SetWarpDestination
bl SetWarpDestination
bl sub_8055E94
bl warp_shift
bl set_current_map_header_from_sav1_save_old_name
@@ -3493,7 +3493,7 @@ CB2_NewGame: @ 8056644
bl sub_80569BC
bl StopMapMusic
bl sub_8056420
bl sub_8054A60
bl NewGameInitData
bl ResetInitialPlayerAvatarState
bl PlayTimeCounter_Start
bl ScriptContext1_Init
asm/player_pc.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80EB658
sub_80EB658: @ 80EB658
thumb_func_start NewGameInitPCItems
NewGameInitPCItems: @ 80EB658
push {r4-r6,lr}
movs r4, 0
bl ClearPCItemSlots
@@ -48,7 +48,7 @@ _080EB6A0:
bx r0
.align 2, 0
_080EB6A8: .4byte gUnknown_8402220
thumb_func_end sub_80EB658
thumb_func_end NewGameInitPCItems
thumb_func_start sub_80EB6AC
sub_80EB6AC: @ 80EB6AC
asm/pokemon_storage_system.s
+3 -3
View File
@@ -1897,8 +1897,8 @@ _0808C7D8: .4byte mapldr_0808C6D8
_0808C7DC: .4byte CB2_ReturnToField
thumb_func_end sub_808C7B4
thumb_func_start sub_808C7E0
sub_808C7E0: @ 808C7E0
thumb_func_start ResetPokemonStorageSystem
ResetPokemonStorageSystem: @ 808C7E0
push {r4-r6,lr}
movs r0, 0
bl sub_808BA00
@@ -1954,7 +1954,7 @@ _0808C832:
bx r0
.align 2, 0
_0808C850: .4byte gUnknown_84186CD
thumb_func_end sub_808C7E0
thumb_func_end ResetPokemonStorageSystem
thumb_func_start sub_808C854
sub_808C854: @ 808C854
asm/start_menu.s
+6 -6
View File
@@ -1386,7 +1386,7 @@ _0806F81A:
cmp r0, 0x2
bne _0806F82E
_0806F826:
ldr r0, _0806F83C @ =gUnknown_2031DB0
ldr r0, _0806F83C @ =gDifferentSaveFile
ldrb r0, [r0]
cmp r0, 0
bne _0806F848
@@ -1397,7 +1397,7 @@ _0806F82E:
b _0806F864
.align 2, 0
_0806F838: .4byte gSaveFileStatus
_0806F83C: .4byte gUnknown_2031DB0
_0806F83C: .4byte gDifferentSaveFile
_0806F840: .4byte gUnknown_3000FA4
_0806F844: .4byte sub_806F86C
_0806F848:
@@ -1423,7 +1423,7 @@ _0806F866:
thumb_func_start sub_806F86C
sub_806F86C: @ 806F86C
push {lr}
ldr r0, _0806F880 @ =gUnknown_2031DB0
ldr r0, _0806F880 @ =gDifferentSaveFile
ldrb r0, [r0]
cmp r0, 0x1
bne _0806F88C
@@ -1432,7 +1432,7 @@ sub_806F86C: @ 806F86C
bl sub_806F69C
b _0806F894
.align 2, 0
_0806F880: .4byte gUnknown_2031DB0
_0806F880: .4byte gDifferentSaveFile
_0806F884: .4byte gUnknown_81C566A
_0806F888: .4byte sub_806F8C0
_0806F88C:
@@ -1537,7 +1537,7 @@ sub_806F940: @ 806F940
push {r4,lr}
movs r0, 0
bl IncrementGameStat
ldr r4, _0806F95C @ =gUnknown_2031DB0
ldr r4, _0806F95C @ =gDifferentSaveFile
ldrb r0, [r4]
cmp r0, 0x1
bne _0806F960
@@ -1547,7 +1547,7 @@ sub_806F940: @ 806F940
strb r0, [r4]
b _0806F966
.align 2, 0
_0806F95C: .4byte gUnknown_2031DB0
_0806F95C: .4byte gDifferentSaveFile
_0806F960:
movs r0, 0
bl TrySavingData