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

Add enums for help system text, label help context

Browse Source
This commit is contained in:
GriffinR
2020-03-04 10:42:40 -05:00
parent 13e06bf7f8
commit 4df660dc76
33 changed files with 1634 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_player_avatar.s
+1 -1
View File
@@ -4157,7 +4157,7 @@ sub_805D240: @ 805D240
bl DestroySprite
adds r0, r5, 0
bl DestroyTask
bl sub_812B35C
bl SetHelpContextForMap
_0805D2AE:
pop {r4-r6}
pop {r0}
asm/naming_screen.s
+4 -4
View File
@@ -491,9 +491,9 @@ sub_809DD60: @ 809DD60
bl CreateTask
ldr r0, _0809DD84 @ =sub_809FB70
bl SetMainCallback2
bl HelpSystem_BackupSomeVariable
movs r0, 0x3
bl HelpSystem_SetSomeVariable2
bl BackupHelpContext
movs r0, 0x3 @ HELPCONTEXT_NAMING_SCREEN
bl SetHelpContext
pop {r0}
bx r0
.align 2, 0
@@ -868,7 +868,7 @@ _0809E06C:
ldr r0, [r4]
bl Free
str r5, [r4]
bl HelpSystem_RestoreSomeVariable
bl RestoreHelpContext
_0809E096:
movs r0, 0
pop {r4,r5}
asm/overworld.s
+4 -4
View File
@@ -4012,7 +4012,7 @@ _08056ACE:
bl sub_8057074
bl sub_80571A8
bl sub_8057140
bl sub_812B35C
bl SetHelpContextForMap
b _08056B62
_08056AE4:
bl InitCurrentFlashLevelScanlineEffect
@@ -4152,7 +4152,7 @@ _08056BFE:
bl sub_80CC534
bl sub_80CC59C
_08056C16:
bl sub_812B35C
bl SetHelpContextForMap
b _08056CCA
.align 2, 0
_08056C1C: .4byte gQuestLogState
@@ -4275,7 +4275,7 @@ _08056D04:
b _08056D30
_08056D1C:
bl sub_8056F08
bl sub_812B35C
bl SetHelpContextForMap
b _08056D30
_08056D26:
bl map_post_load_hook_exec
@@ -4343,7 +4343,7 @@ _08056DAE:
bl sub_8057230
bl sub_8057100
bl sub_805715C
bl sub_812B35C
bl SetHelpContextForMap
b _08056E3E
_08056DC0:
bl InitCurrentFlashLevelScanlineEffect
asm/pokemon_storage_system.s
+6 -6
View File
@@ -1411,8 +1411,8 @@ _0808C3CC:
.4byte _0808C5A6
.4byte _0808C680
_0808C3E0:
movs r0, 0x1C
bl HelpSystem_SetSomeVariable2
movs r0, 0x1C @ HELPCONTEXT_BILLS_PC
bl SetHelpContext
ldrb r0, [r5, 0xA]
adds r1, r5, 0
adds r1, 0x26
@@ -2715,8 +2715,8 @@ _0808CE18:
bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x4]
movs r0, 0x1C
bl HelpSystem_SetSomeVariable2
movs r0, 0x1C @ HELPCONTEXT_BILLS_PC
bl SetHelpContext
bl StorageGetCurrentBox
ldr r1, _0808CE58 @ =gUnknown_20397B8
strb r0, [r1]
@@ -2766,8 +2766,8 @@ _0808CE8C:
bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x4]
movs r0, 0x1C
bl HelpSystem_SetSomeVariable2
movs r0, 0x1C @ HELPCONTEXT_BILLS_PC
bl SetHelpContext
ldr r0, _0808CEC4 @ =c2_Box
bl SetMainCallback2
_0808CEB6:
asm/pokemon_summary_screen.s
+10 -10
View File
@@ -106,8 +106,8 @@ _081345D0:
cmp r0, 0x5
beq _08134604
_081345D4:
movs r0, 0x6
bl HelpSystem_SetSomeVariable2
movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO
bl SetHelpContext
ldr r2, _081345F8 @ =gUnknown_203B140
ldr r0, [r2]
ldr r3, _081345FC @ =0x00003214
@@ -127,8 +127,8 @@ _081345F8: .4byte gUnknown_203B140
_081345FC: .4byte 0x00003214
_08134600: .4byte 0x00003234
_08134604:
movs r0, 0x6
bl HelpSystem_SetSomeVariable2
movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO
bl SetHelpContext
ldr r0, [r4]
ldr r3, _08134628 @ =0x00003214
adds r0, r3
@@ -148,8 +148,8 @@ _08134628: .4byte 0x00003214
_0813462C: .4byte 0x0000321c
_08134630: .4byte 0x00003234
_08134634:
movs r0, 0x8
bl HelpSystem_SetSomeVariable2
movs r0, 0x8 @ HELPCONTEXT_POKEMON_MOVES
bl SetHelpContext
ldr r0, [r4]
ldr r3, _08134710 @ =0x00003214
adds r0, r3
@@ -7600,15 +7600,15 @@ _08138460: .4byte 0x00003214
_08138464:
cmp r0, 0x3
bgt _08138476
movs r0, 0x8
movs r0, 0x8 @ HELPCONTEXT_POKEMON_MOVES
b _08138472
_0813846C:
movs r0, 0x6
movs r0, 0x6 @ HELPCONTEXT_POKEMON_INFO
b _08138472
_08138470:
movs r0, 0x7
movs r0, 0x7 @ HELPCONTEXT_POKEMON_SKILLS
_08138472:
bl HelpSystem_SetSomeVariable2
bl SetHelpContext
_08138476:
pop {r0}
bx r0