Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2025-01-19 11:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

braille puzzle stuff

Browse Source
This commit is contained in:
YamaArashi 2017-01-01 22:39:54 -08:00
parent 8ce0fb4b20
commit 80e95a2047
11 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
asm/rom_81473B8.s → asm/braille_puzzles.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_81473B8
sub_81473B8: @ 81473B8
thumb_func_start ShouldDoBrailleDigEffect
ShouldDoBrailleDigEffect: @ 81473B8
push {lr}
ldr r0, _081473E8 @ =0x0000084f
bl FlagGet
@ -44,10 +44,10 @@ _08147400:
_08147402:
pop {r1}
bx r1
thumb_func_end sub_81473B8
thumb_func_end ShouldDoBrailleDigEffect
thumb_func_start sub_8147408
sub_8147408: @ 8147408
thumb_func_start DoBrailleDigEffect
DoBrailleDigEffect: @ 8147408
push {lr}
ldr r2, _08147460 @ =0x0000022a
movs r0, 0x10
@ -89,10 +89,10 @@ _08147468: .4byte 0x00000e32
_0814746C: .4byte 0x00000233
_08147470: .4byte 0x00000e34
_08147474: .4byte 0x0000084f
thumb_func_end sub_8147408
thumb_func_end DoBrailleDigEffect
thumb_func_start sub_8147478
sub_8147478: @ 8147478
thumb_func_start CheckRelicanthWailord
CheckRelicanthWailord: @ 8147478
push {r4,lr}
ldr r4, _081474B4 @ =gPlayerParty
adds r0, r4, 0
@ -129,10 +129,10 @@ _081474C2:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8147478
thumb_func_end CheckRelicanthWailord
thumb_func_start sub_81474C8
sub_81474C8: @ 81474C8
thumb_func_start ShouldDoBrailleStrengthEffect
ShouldDoBrailleStrengthEffect: @ 81474C8
push {lr}
movs r0, 0x85
lsls r0, 4
@ -169,10 +169,10 @@ _0814750C:
_0814750E:
pop {r1}
bx r1
thumb_func_end sub_81474C8
thumb_func_end ShouldDoBrailleStrengthEffect
thumb_func_start sub_8147514
sub_8147514: @ 8147514
thumb_func_start DoBrailleStrengthEffect
DoBrailleStrengthEffect: @ 8147514
push {lr}
movs r0, 0x28
bl FieldEffectActiveListRemove
@ -216,10 +216,10 @@ _08147578: .4byte 0x0000022b
_0814757C: .4byte 0x00000e32
_08147580: .4byte 0x00000233
_08147584: .4byte 0x00000e34
thumb_func_end sub_8147514
thumb_func_end DoBrailleStrengthEffect
thumb_func_start sub_8147588
sub_8147588: @ 8147588
thumb_func_start ShouldDoBrailleFlyEffect
ShouldDoBrailleFlyEffect: @ 8147588
push {lr}
ldr r0, _081475AC @ =0x00000852
bl FlagGet
@ -247,10 +247,10 @@ _081475BC:
_081475BE:
pop {r1}
bx r1
thumb_func_end sub_8147588
thumb_func_end ShouldDoBrailleFlyEffect
thumb_func_start sub_81475C4
sub_81475C4: @ 81475C4
thumb_func_start DoBrailleFlyEffect
DoBrailleFlyEffect: @ 81475C4
push {lr}
ldr r0, _081475D8 @ =gUnknown_0202FF84
ldr r1, _081475DC @ =gUnknown_03005CE0
@ -263,7 +263,7 @@ sub_81475C4: @ 81475C4
.align 2, 0
_081475D8: .4byte gUnknown_0202FF84
_081475DC: .4byte gUnknown_03005CE0
thumb_func_end sub_81475C4
thumb_func_end DoBrailleFlyEffect
thumb_func_start FldEff_UseFlyAncientTomb
FldEff_UseFlyAncientTomb: @ 81475E0
@ -276,7 +276,7 @@ FldEff_UseFlyAncientTomb: @ 81475E0
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _08147608 @ =sub_814760C
ldr r2, _08147608 @ =UseFlyAncientTomb_Callback
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
@ -285,21 +285,21 @@ FldEff_UseFlyAncientTomb: @ 81475E0
bx r1
.align 2, 0
_08147604: .4byte gTasks
_08147608: .4byte sub_814760C
_08147608: .4byte UseFlyAncientTomb_Callback
thumb_func_end FldEff_UseFlyAncientTomb
thumb_func_start sub_814760C
sub_814760C: @ 814760C
thumb_func_start UseFlyAncientTomb_Callback
UseFlyAncientTomb_Callback: @ 814760C
push {lr}
movs r0, 0x3C
bl FieldEffectActiveListRemove
bl sub_814761C
bl UseFlyAncientTomb_Finish
pop {r0}
bx r0
thumb_func_end sub_814760C
thumb_func_end UseFlyAncientTomb_Callback
thumb_func_start sub_814761C
sub_814761C: @ 814761C
thumb_func_start UseFlyAncientTomb_Finish
UseFlyAncientTomb_Finish: @ 814761C
push {lr}
ldr r2, _08147674 @ =0x0000022a
movs r0, 0xE
@ -341,17 +341,17 @@ _0814767C: .4byte 0x00000e32
_08147680: .4byte 0x00000233
_08147684: .4byte 0x00000e34
_08147688: .4byte 0x00000852
thumb_func_end sub_814761C
thumb_func_end UseFlyAncientTomb_Finish
thumb_func_start sub_814768C
sub_814768C: @ 814768C
thumb_func_start DoBrailleWait
DoBrailleWait: @ 814768C
push {lr}
ldr r0, _081476A8 @ =0x00000851
bl FlagGet
lsls r0, 24
cmp r0, 0
bne _081476A2
ldr r0, _081476AC @ =sub_81476B0
ldr r0, _081476AC @ =Task_BrailleWait
movs r1, 0x50
bl CreateTask
_081476A2:
@ -359,11 +359,11 @@ _081476A2:
bx r0
.align 2, 0
_081476A8: .4byte 0x00000851
_081476AC: .4byte sub_81476B0
thumb_func_end sub_814768C
_081476AC: .4byte Task_BrailleWait
thumb_func_end DoBrailleWait
thumb_func_start sub_81476B0
sub_81476B0: @ 81476B0
thumb_func_start Task_BrailleWait
Task_BrailleWait: @ 81476B0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@ -400,7 +400,7 @@ _081476F0:
strh r0, [r4]
b _0814776A
_081476FE:
bl sub_8147774
bl BrailleWait_CheckButtonPress
cmp r0, 0
beq _08147716
bl MenuZeroFillScreen
@ -423,7 +423,7 @@ _08147716:
strh r0, [r4, 0x2]
b _0814776A
_08147730:
bl sub_8147774
bl BrailleWait_CheckButtonPress
cmp r0, 0
beq _08147748
bl sub_8064E2C
@ -453,10 +453,10 @@ _0814776A:
bx r0
.align 2, 0
_08147770: .4byte gUnknown_0815EF19
thumb_func_end sub_81476B0
thumb_func_end Task_BrailleWait
thumb_func_start sub_8147774
sub_8147774: @ 8147774
thumb_func_start BrailleWait_CheckButtonPress
BrailleWait_CheckButtonPress: @ 8147774
push {lr}
movs r1, 0xFF
ldr r0, _081477A4 @ =gSaveBlock2
@ -490,12 +490,12 @@ _081477AC:
_081477AE:
pop {r1}
bx r1
thumb_func_end sub_8147774
thumb_func_end BrailleWait_CheckButtonPress
thumb_func_start sub_81477B4
sub_81477B4: @ 81477B4
thumb_func_start DoSealedChamberShakingEffect1
DoSealedChamberShakingEffect1: @ 81477B4
push {lr}
ldr r0, _081477E8 @ =sub_814782C
ldr r0, _081477E8 @ =SealedChamberShakingEffect
movs r1, 0x9
bl CreateTask
lsls r0, 24
@ -519,14 +519,14 @@ sub_81477B4: @ 81477B4
pop {r0}
bx r0
.align 2, 0
_081477E8: .4byte sub_814782C
_081477E8: .4byte SealedChamberShakingEffect
_081477EC: .4byte gTasks
thumb_func_end sub_81477B4
thumb_func_end DoSealedChamberShakingEffect1
thumb_func_start sub_81477F0
sub_81477F0: @ 81477F0
thumb_func_start DoSealedChamberShakingEffect2
DoSealedChamberShakingEffect2: @ 81477F0
push {lr}
ldr r0, _08147824 @ =sub_814782C
ldr r0, _08147824 @ =SealedChamberShakingEffect
movs r1, 0x9
bl CreateTask
lsls r0, 24
@ -550,12 +550,12 @@ sub_81477F0: @ 81477F0
pop {r0}
bx r0
.align 2, 0
_08147824: .4byte sub_814782C
_08147824: .4byte SealedChamberShakingEffect
_08147828: .4byte gTasks
thumb_func_end sub_81477F0
thumb_func_end DoSealedChamberShakingEffect2
thumb_func_start sub_814782C
sub_814782C: @ 814782C
thumb_func_start SealedChamberShakingEffect
SealedChamberShakingEffect: @ 814782C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@ -601,6 +601,6 @@ _08147884:
bx r0
.align 2, 0
_0814788C: .4byte gTasks
thumb_func_end sub_814782C
thumb_func_end SealedChamberShakingEffect
.align 2, 0 @ Don't pad with nop.

2
asm/mystery_event_script.s
View File

@ -527,7 +527,7 @@ sub_8126524: @ 8126524
sub_812658C: @ 812658C
push {r4,lr}
adds r4, r0, 0
bl sub_80690F0
bl UnlockNationalPokedex
ldr r0, _081265A8 @ =gStringVar4
ldr r1, _081265AC @ =gOtherText_DexUpgraded
bl StringExpandPlaceholders

6
asm/rom6.s
View File

@ -423,7 +423,7 @@ FldEff_UseDig: @ 810B5F8
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
bl sub_81473B8
bl ShouldDoBrailleDigEffect
lsls r0, 24
cmp r0, 0
bne _0810B624
@ -443,12 +443,12 @@ sub_810B634: @ 810B634
push {r4,lr}
movs r0, 0x26
bl FieldEffectActiveListRemove
bl sub_81473B8
bl ShouldDoBrailleDigEffect
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
beq _0810B64E
bl sub_8147408
bl DoBrailleDigEffect
b _0810B666
_0810B64E:
ldr r0, _0810B66C @ =task08_080A1C44

12
asm/rom_8065394.s
View File

@ -2342,8 +2342,8 @@ sub_80690B4: @ 80690B4
_080690C4: .4byte gSaveBlock1 + 0x1338
thumb_func_end sub_80690B4
thumb_func_start sub_80690C8
sub_80690C8: @ 80690C8
thumb_func_start LockNationalPokedex
LockNationalPokedex: @ 80690C8
push {lr}
ldr r0, _080690E4 @ =0x00004046
bl GetVarPointer
@ -2359,10 +2359,10 @@ sub_80690C8: @ 80690C8
_080690E4: .4byte 0x00004046
_080690E8: .4byte gSaveBlock2
_080690EC: .4byte 0x00000836
thumb_func_end sub_80690C8
thumb_func_end LockNationalPokedex
thumb_func_start sub_80690F0
sub_80690F0: @ 80690F0
thumb_func_start UnlockNationalPokedex
UnlockNationalPokedex: @ 80690F0
push {r4,r5,lr}
ldr r0, _0806911C @ =0x00004046
bl GetVarPointer
@ -2387,7 +2387,7 @@ _0806911C: .4byte 0x00004046
_08069120: .4byte gSaveBlock2
_08069124: .4byte 0x00000302
_08069128: .4byte 0x00000836
thumb_func_end sub_80690F0
thumb_func_end UnlockNationalPokedex
thumb_func_start IsNationalPokedex
IsNationalPokedex: @ 806912C

8
asm/rom_80859BC.s
View File

@ -10445,7 +10445,7 @@ sub_808AB34: @ 808AB34
ldrsh r0, [r1, r2]
cmp r0, 0x5
bne _0808AB62
bl sub_8147588
bl ShouldDoBrailleFlyEffect
lsls r0, 24
cmp r0, 0
beq _0808AB78
@ -10619,7 +10619,7 @@ _0808ACA4: .4byte gUnknown_03005CE0
thumb_func_start SetUpFieldMove_Fly
SetUpFieldMove_Fly: @ 808ACA8
push {lr}
bl sub_8147588
bl ShouldDoBrailleFlyEffect
lsls r0, 24
cmp r0, 0
beq _0808ACD0
@ -10627,13 +10627,13 @@ SetUpFieldMove_Fly: @ 808ACA8
ldr r0, _0808ACC4 @ =sub_808AB90
str r0, [r1]
ldr r1, _0808ACC8 @ =gUnknown_03005CE4
ldr r0, _0808ACCC @ =sub_81475C4
ldr r0, _0808ACCC @ =DoBrailleFlyEffect
b _0808ACF2
.align 2, 0
_0808ACC0: .4byte gUnknown_0300485C
_0808ACC4: .4byte sub_808AB90
_0808ACC8: .4byte gUnknown_03005CE4
_0808ACCC: .4byte sub_81475C4
_0808ACCC: .4byte DoBrailleFlyEffect
_0808ACD0:
ldr r0, _0808ACE4 @ =gMapHeader
ldrb r0, [r0, 0x17]

2
asm/trade.s
View File

@ -7591,7 +7591,7 @@ sub_804BA64: @ 804BA64
lsls r0, 8
cmp r1, r0
bne _0804BA8C
bl sub_80690F0
bl UnlockNationalPokedex
_0804BA8C:
pop {r0}
bx r0

8
data/specials.inc
View File

@ -279,8 +279,8 @@ gSpecials::
.4byte RemoveCameraDummy
.4byte GetPokeblockNameByMonNature
.4byte GetSecretBaseNearbyMapName
.4byte sub_8147478
.4byte sub_814768C
.4byte CheckRelicanthWailord
.4byte DoBrailleWait
.4byte sub_80818A4
.4byte sub_80818FC
.4byte ShowBattleTowerRecords
@ -305,7 +305,7 @@ gSpecials::
.4byte IsStarterInParty
.4byte sub_80BC224
.4byte CheckFreePokemonStorageSpace
.4byte sub_81477B4
.4byte DoSealedChamberShakingEffect1
.4byte sub_810E944
.4byte GetShieldToyTVDecorationInfo
.4byte IsPokerusInParty
@ -315,7 +315,7 @@ gSpecials::
.4byte sub_8081BB8
.4byte sub_8081C50
.4byte sub_8082524
.4byte sub_81477F0
.4byte DoSealedChamberShakingEffect2
.4byte sub_810F828
.4byte sub_807E25C
.4byte sp13E_warp_to_last_warp

4
include/asm.inc.h
View File

@ -448,8 +448,8 @@ void InitIntroTorchicAttackAnim(u8);
void InitIntroMudkipAttackAnim(/*TODO: arg types*/);
// asm/rom_81473B8.o
bool8 sub_81474C8(void);
void sub_8147514(void);
bool8 ShouldDoBrailleStrengthEffect(void);
void DoBrailleStrengthEffect(void);
// asm/rom_8148B8C.o
void load_intro_part2_graphics(/*TODO: arg types*/);

2
ld_script.txt
View File

@ -209,7 +209,7 @@ SECTIONS {
src/berry_tag_screen.o(.text);
src/mystery_event_menu.o(.text);
src/save_failed_screen.o(.text);
asm/rom_81473B8.o(.text);
asm/braille_puzzles.o(.text);
asm/pokeblock_feed.o(.text);
src/clear_save_data_menu.o(.text);
asm/rom_8148B8C.o(.text);

6
src/fldeff_strength.c
View File

@ -20,7 +20,7 @@ extern u8 UseStrengthScript[];
bool8 SetUpFieldMove_Strength(void)
{
if (sub_81474C8())
if (ShouldDoBrailleStrengthEffect())
{
gScriptResult = gUnknown_03005CE0;
gUnknown_0300485C = sub_808AB90;
@ -62,9 +62,9 @@ bool8 FldEff_UseStrength(void)
static void sub_811AA9C(void)
{
if (sub_81474C8())
if (ShouldDoBrailleStrengthEffect())
{
sub_8147514();
DoBrailleStrengthEffect();
}
else
{

6
src/pokedex.c
View File

@ -109,7 +109,7 @@ extern void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBi
extern bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
extern void remove_some_task(void);
extern u8 sub_8091E3C(void);
extern void sub_80690C8(void);
extern void LockNationalPokedex(void);
extern void sub_805469C(void);
extern u16 HoennToNationalOrder(u16);
extern u16 NationalToHoennOrder(u16);
@ -144,7 +144,7 @@ void sub_808C02C(void)
gSaveBlock2.pokedex.unownPersonality = 0;
gSaveBlock2.pokedex.spindaPersonality = 0;
gSaveBlock2.pokedex.unknown3 = 0;
sub_80690C8();
LockNationalPokedex();
for(i = 0; i <= 51; i++)
{
gSaveBlock2.pokedex.owned[i] = 0;
@ -3186,4 +3186,4 @@ void sub_8090750(u8 taskId)
break;
}
}
*/
*/