diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s index bc6170a26..6c935b712 100644 --- a/asm/code_8045A00.s +++ b/asm/code_8045A00.s @@ -291,7 +291,7 @@ _08045FE8: bl SendMessage _08045FF2: ldrb r0, [r5, 0x2] - bl sub_8052EC0 + bl HandleOnPickupTutorial b _080460E0 .align 2, 0 _08045FFC: .4byte gPickedUpItemToolbox @@ -397,7 +397,7 @@ _080460C0: bl SendMessage _080460DA: ldrb r0, [r5, 0x2] - bl sub_8052EC0 + bl HandleOnPickupTutorial _080460E0: add sp, 0xB8 pop {r3-r5} diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index a2e6bb397..535565cc8 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -1277,21 +1277,21 @@ sub_8052DD0: ldr r6, _08052E68 ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 beq _08052E46 ldr r6, _08052E6C ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 beq _08052E46 ldr r6, _08052E70 ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 beq _08052E46 @@ -1305,27 +1305,27 @@ sub_8052DD0: ldr r6, _08052E7C ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 beq _08052E46 ldr r6, _08052E80 ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 beq _08052E46 ldr r6, _08052E84 ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 bne _08052E88 _08052E46: adds r0, r4, 0 - bl sub_8098170 + bl SetTutorialFlag bl sub_8083E28 ldr r4, [r6, 0x4] movs r0, 0 @@ -1344,17 +1344,17 @@ _08052E74: .4byte gDungeon _08052E78: .4byte 0x00000644 _08052E7C: .4byte gUnknown_80FF13C _08052E80: .4byte gUnknown_80FF1B4 -_08052E84: .4byte gUnknown_80FF22C +_08052E84: .4byte gMovementTutorial _08052E88: ldr r6, _08052EBC ldr r4, [r6] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 bne _08052EB6 adds r0, r4, 0 - bl sub_8098170 + bl SetTutorialFlag bl sub_8083E28 ldr r4, [r6, 0x4] movs r0, 0 @@ -1369,11 +1369,11 @@ _08052EB6: pop {r0} bx r0 .align 2, 0 -_08052EBC: .4byte gUnknown_80FF290 +_08052EBC: .4byte gHungerTutorial thumb_func_end sub_8052DD0 - thumb_func_start sub_8052EC0 -sub_8052EC0: + thumb_func_start HandleOnPickupTutorial +HandleOnPickupTutorial: push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -1387,28 +1387,28 @@ sub_8052EC0: ldr r5, _08052EDC b _08052F22 .align 2, 0 -_08052EDC: .4byte gUnknown_80FF310 +_08052EDC: .4byte gFoodTutorial _08052EE0: cmp r4, 0x37 bne _08052EEC ldr r5, _08052EE8 b _08052F22 .align 2, 0 -_08052EE8: .4byte gUnknown_80FF394 +_08052EE8: .4byte gOranTutorial _08052EEC: cmp r4, 0x43 bne _08052EF8 ldr r5, _08052EF4 b _08052F22 .align 2, 0 -_08052EF4: .4byte gUnknown_80FF3E8 +_08052EF4: .4byte gCheriTutorial _08052EF8: cmp r4, 0x48 bne _08052F04 ldr r5, _08052F00 b _08052F22 .align 2, 0 -_08052F00: .4byte gUnknown_80FF440 +_08052F00: .4byte gBlastSeedTutorial _08052F04: cmp r4, 0x7 bne _08052F10 @@ -1422,7 +1422,7 @@ _08052F10: ldr r5, _08052F18 b _08052F22 .align 2, 0 -_08052F18: .4byte gUnknown_80FF518 +_08052F18: .4byte gPechaTutorial _08052F1C: cmp r4, 0x45 bne _08052F4C @@ -1430,12 +1430,12 @@ _08052F1C: _08052F22: ldr r4, [r5] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 bne _08052F74 adds r0, r4, 0 - bl sub_8098170 + bl SetTutorialFlag bl sub_8083E28 ldr r1, [r5, 0x4] movs r0, 0 @@ -1443,19 +1443,19 @@ _08052F22: bl PrintFieldMessage b _08052F74 .align 2, 0 -_08052F48: .4byte gUnknown_80FF57C +_08052F48: .4byte gSleepSeedTutorial _08052F4C: cmp r5, 0x69 bne _08052F74 ldr r5, _08052F7C ldr r4, [r5] adds r0, r4, 0 - bl sub_80981A0 + bl GetTutorialFlag lsls r0, 24 cmp r0, 0 bne _08052F74 adds r0, r4, 0 - bl sub_8098170 + bl SetTutorialFlag bl sub_8083E28 ldr r1, [r5, 0x4] movs r0, 0 @@ -1466,8 +1466,8 @@ _08052F74: pop {r0} bx r0 .align 2, 0 -_08052F7C: .4byte gUnknown_80FF5E8 - thumb_func_end sub_8052EC0 +_08052F7C: .4byte gMoneyTutorial + thumb_func_end HandleOnPickupTutorial thumb_func_start sub_8052F80 sub_8052F80: diff --git a/data/data_80F59C8.s b/data/data_80F59C8.s index a51af4c4f..9e9ff2346 100644 --- a/data/data_80F59C8.s +++ b/data/data_80F59C8.s @@ -9605,8 +9605,8 @@ gUnknown_80FF1BC: @ 80FF1BC .string "Cooperation with partners is the key!\0" .align 2, 0 -.global gUnknown_80FF22C -gUnknown_80FF22C: @ 80FF22C +.global gMovementTutorial +gMovementTutorial: @ 80FF22C @ replacing .incbin "baserom.gba", 0xFF22C, 0x64 .byte 0x0e, 0x00, 0x00, 0x00 .4byte gUnknown_80FF234 @@ -9618,8 +9618,8 @@ gUnknown_80FF234: @ 80FF234 .string "to move only diagonally.\0" .align 2, 0 -.global gUnknown_80FF290 -gUnknown_80FF290: @ 80FF290 +.global gHungerTutorial +gHungerTutorial: @ 80FF290 @ replacing .incbin "baserom.gba", 0xFF290, 0x80 .byte 0x0f, 0x00, 0x00, 0x00 .4byte gUnknown_80FF298 @@ -9631,8 +9631,8 @@ gUnknown_80FF298: @ 80FF298 .string "fainting, so check your Belly in the menu.\0" .align 2, 0 -.global gUnknown_80FF310 -gUnknown_80FF310: @ 80FF310 +.global gFoodTutorial +gFoodTutorial: @ 80FF310 @ replacing .incbin "baserom.gba", 0xFF310, 0x84 .byte 0x03, 0x00, 0x00, 0x00 .4byte gUnknown_80FF318 @@ -9644,8 +9644,8 @@ gUnknown_80FF318: @ 80FF318 .string "and eat one before your Belly gets empty.\0" .align 2, 0 -.global gUnknown_80FF394 -gUnknown_80FF394: @ 80FF394 +.global gOranTutorial +gOranTutorial: @ 80FF394 @ replacing .incbin "baserom.gba", 0xFF394, 0x54 .byte 0x04, 0x00, 0x00, 0x00 .4byte gUnknown_80FF39C @@ -9657,8 +9657,8 @@ gUnknown_80FF39C: @ 80FF39C .string "select it under Items.\0" .align 2, 0 -.global gUnknown_80FF3E8 -gUnknown_80FF3E8: @ 80FF3E8 +.global gCheriTutorial +gCheriTutorial: @ 80FF3E8 @ replacing .incbin "baserom.gba", 0xFF3E8, 0x58 .byte 0x05, 0x00, 0x00, 0x00 .4byte gUnknown_80FF3F0 @@ -9670,8 +9670,8 @@ gUnknown_80FF3F0: @ 80FF3F0 .string "select it under Items.\0" .align 2, 0 -.global gUnknown_80FF440 -gUnknown_80FF440: @ 80FF440 +.global gBlastSeedTutorial +gBlastSeedTutorial: @ 80FF440 @ replacing .incbin "baserom.gba", 0xFF440, 0x60 .byte 0x06, 0x00, 0x00, 0x00 .4byte gUnknown_80FF448 @@ -9696,8 +9696,8 @@ gUnknown_80FF4A8: @ 80FF4A8 .string "Hold {L_BUTTON} then press {R_BUTTON} to throw them.\0" .align 2, 0 -.global gUnknown_80FF518 -gUnknown_80FF518: @ 80FF518 +.global gPechaTutorial +gPechaTutorial: @ 80FF518 @ replacing .incbin "baserom.gba", 0xFF518, 0x64 .byte 0x09, 0x00, 0x00, 0x00 .4byte gUnknown_80FF520 @@ -9709,8 +9709,8 @@ gUnknown_80FF520: @ 80FF520 .string "select it under Items.\0" .align 2, 0 -.global gUnknown_80FF57C -gUnknown_80FF57C: @ 80FF57C +.global gSleepSeedTutorial +gSleepSeedTutorial: @ 80FF57C @ replacing .incbin "baserom.gba", 0xFF57C, 0x6C .byte 0x0a, 0x00, 0x00, 0x00 .4byte gUnknown_80FF584 @@ -9722,8 +9722,8 @@ gUnknown_80FF584: @ 80FF584 .string "Eating it will put you to sleep!\0" .align 2, 0 -.global gUnknown_80FF5E8 -gUnknown_80FF5E8: @ 80FF5E8 +.global gMoneyTutorial +gMoneyTutorial: @ 80FF5E8 @ replacing .incbin "baserom.gba", 0xFF5E8, 0x8C .byte 0x0b, 0x00, 0x00, 0x00 .4byte gUnknown_80FF5F0 diff --git a/include/exclusive_pokemon.h b/include/exclusive_pokemon.h index 14d00b945..02e038308 100644 --- a/include/exclusive_pokemon.h +++ b/include/exclusive_pokemon.h @@ -53,8 +53,8 @@ u32 sub_80980A4(void); void sub_80980B4(s16 pokeID); bool8 sub_8098100(u8 param_1); bool8 sub_8098134(s16 pokeID); -void sub_8098170(s32 param_1); -bool32 sub_80981A0(s32 param_1); +void SetTutorialFlag(s32 param_1); +bool32 GetTutorialFlag(s32 param_1); bool8 IsExclusivePokemonUnlocked(s16 pokeID); void UnlockExclusivePokemon(s16 pokeID); void WriteExclusivePokemon(struct unkStruct_8094924 *r0); diff --git a/src/exclusive_pokemon.c b/src/exclusive_pokemon.c index caae7613f..00388e751 100644 --- a/src/exclusive_pokemon.c +++ b/src/exclusive_pokemon.c @@ -163,7 +163,7 @@ bool8 sub_8098134(s16 pokeID) return ((ptr->unk4[(index >> 5)] & (1 << (s16)(pokeID_s32_1 - ((index >> 5) * 0x20)))) != 0) ? TRUE : FALSE; } -void sub_8098170(s32 param_1) +void SetTutorialFlag(s32 param_1) { s32 index; struct ExclusivePokemonData *ptr; @@ -179,7 +179,7 @@ void sub_8098170(s32 param_1) ptr->unk54[(index >> 5)] |= 1 << (param_1 - ((index >> 5) * 0x20)); } -bool32 sub_80981A0(s32 param_1) +bool32 GetTutorialFlag(s32 param_1) { s32 index; bool32 flag; @@ -262,7 +262,7 @@ void WriteExclusivePokemon(struct unkStruct_8094924 *r0) } for(index = 0; index < 31; index++) { - stack_2 = sub_80981A0(index); + stack_2 = GetTutorialFlag(index); SaveIntegerBits(r0, &stack_2, 1); } for(index = 0; index < NUM_EXCLUSIVE_POKEMON; index++) @@ -301,7 +301,7 @@ void ReadExclusivePokemon(struct unkStruct_8094924 *r0) { RestoreIntegerBits(r0, &stack_2, 1); if(stack_2) - sub_8098170(index); + SetTutorialFlag(index); } for(index = 0; index < NUM_EXCLUSIVE_POKEMON; index++) { diff --git a/tmp/renames.sed b/tmp/renames.sed new file mode 100644 index 000000000..d1cd647a2 --- /dev/null +++ b/tmp/renames.sed @@ -0,0 +1,13 @@ +s/gUnknown_80FF22C/gMovementTutorial/g +s/gUnknown_80FF290/gHungerTutorial/g +s/gUnknown_80FF310/gFoodTutorial/g +s/gUnknown_80FF394/gOranTutorial/g +s/gUnknown_80FF3E8/gCheriTutorial/g +s/gUnknown_80FF440/gBlastSeedTutorial/g +s/gUnknown_80FF490/gGravelerockTutorial/g +s/gUnknown_80FF518/gPechaTutorial/g +s/gUnknown_80FF57C/gSleepSeedTutorial/g +s/gUnknown_80FF5E8/gMoneyTutorial/g +s/sub_8052EC0/HandleOnPickupTutorial/g +s/sub_80981A0/GetTutorialFlag/g +s/sub_8098170/SetTutorialFlag/g