Skip to content

Commit bfa5222

Browse files
FIX94FIX94
committed
-added error message if no game was found on NAND
-sorting game list before displaying it -better stack positions for kirby mass attack, super mario 64 ds, kirby canvas curse, zelda phantom hourglass, spirit tracks and pokemon ranger shadows of almia -added support for pokemon ranger, animal crossing wild world, pokemon mystery dungeon explorers of sky and pokemon ranger guardian signs
1 parent 3b4e51b commit bfa5222

22 files changed

+291
-298
lines changed

‎dsrom/Makefile

+48-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@ else
66
ZIP = zip
77
endif
88

9-
all: setup brainage dkjclimber kirby kirbymassattack mariokartds masterofdisguise newsmb_eur partnersintime sfcommand sm64ds yoshids zeldaph zeldast \
10-
brainage.zip dkjclimber.zip kirby.zip kirbymassattack.zip mariokartds.zip masterofdisguise.zip newsmb_eur.zip partnersintime.zip \
11-
sfcommand.zip sm64ds.zip yoshids.zip zeldaph.zip zeldast.zip
9+
all: setup animalcrossing brainage dkjclimber guardiansigns kirby kirbymassattack mariokartds masterofdisguise newsmb_eur partnersintime \
10+
pokemonranger sfcommand sm64ds yoshids zeldaph zeldast \
11+
animalcrossing.zip brainage.zip dkjclimber.zip guardiansigns.zip kirby.zip kirbymassattack.zip mariokartds.zip masterofdisguise.zip \
12+
newsmb_eur.zip partnersintime.zip pokemonranger.zip sfcommand.zip sm64ds.zip yoshids.zip zeldaph.zip zeldast.zip
13+
14+
animalcrossing: setup_animalcrossing animalcrossing.nds
1215

1316
brainage: setup_brainage brainage.nds
1417

1518
dkjclimber: setup_dkjclimber dkjclimber.nds
1619

20+
guardiansigns: setup_guardiansigns guardiansigns.nds
21+
1722
kirby: setup_kirby kirby.nds
1823

1924
kirbymassattack: setup_kirbymassattack kirbymassattack.nds
@@ -26,6 +31,8 @@ newsmb_eur: setup_newsmb_eur newsmb_eur.nds
2631

2732
partnersintime: setup_partnersintime partnersintime.nds
2833

34+
pokemonranger: setup_pokemonranger pokemonranger.nds
35+
2936
sfcommand: setup_sfcommand sfcommand.nds
3037

3138
sm64ds: setup_sm64ds sm64ds.nds
@@ -41,6 +48,10 @@ setup:
4148
@cd hbl_loader && make && cd ..
4249
@cd cfw_booter && make && cd ..
4350

51+
setup_animalcrossing:
52+
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
53+
@cp -f animalcrossing_defs.s defines.s
54+
4455
setup_brainage:
4556
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
4657
@cp -f brainage_defs.s defines.s
@@ -49,6 +60,10 @@ setup_dkjclimber:
4960
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
5061
@cp -f dkjclimber_defs.s defines.s
5162

63+
setup_guardiansigns:
64+
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
65+
@cp -f guardiansigns_defs.s defines.s
66+
5267
setup_kirby:
5368
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
5469
@cp -f kirby_defs.s defines.s
@@ -69,6 +84,10 @@ setup_newsmb_eur:
6984
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
7085
@cp -f newsmb_eur_defs.s defines.s
7186

87+
setup_pokemonranger:
88+
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
89+
@cp -f pokemonranger_defs.s defines.s
90+
7291
setup_partnersintime:
7392
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
7493
@cp -f partnersintime_defs.s defines.s
@@ -93,6 +112,11 @@ setup_zeldast:
93112
@rm -f defines.s haxchi_rop.bin haxchi_rop_hook.bin
94113
@cp -f zeldast_defs.s defines.s
95114

115+
animalcrossing.nds:
116+
@armips haxchi_rop.s
117+
@armips haxchi.s
118+
@mv rom.nds animalcrossing.nds
119+
96120
brainage.nds:
97121
@armips haxchi_rop.s
98122
@armips haxchi.s
@@ -104,6 +128,11 @@ dkjclimber.nds:
104128
@armips haxchi.s
105129
@mv rom.nds dkjclimber.nds
106130

131+
guardiansigns.nds:
132+
@armips haxchi_rop.s
133+
@armips haxchi.s
134+
@mv rom.nds guardiansigns.nds
135+
107136
kirby.nds:
108137
@armips haxchi_rop.s
109138
@armips haxchi.s
@@ -130,6 +159,11 @@ newsmb_eur.nds:
130159
@armips haxchi.s
131160
@mv rom.nds newsmb_eur.nds
132161

162+
pokemonranger.nds:
163+
@armips haxchi_rop.s
164+
@armips haxchi.s
165+
@mv rom.nds pokemonranger.nds
166+
133167
partnersintime.nds:
134168
@armips haxchi_rop.s
135169
@armips haxchi.s
@@ -162,15 +196,22 @@ zeldast.nds:
162196
@armips haxchi_rop.s
163197
@armips haxchi.s
164198
@mv rom.nds zeldast.nds
199+
@cp zeldast.nds explorersofsky.nds
165200
@cp zeldast.nds shadowsofalmia.nds
166201

202+
animalcrossing.zip:
203+
$(ZIP) -JXjq9 ../installer/data/animalcrossing.zip animalcrossing.nds
204+
167205
brainage.zip:
168206
$(ZIP) -JXjq9 ../installer/data/brainage.zip brainage.nds
169207
$(ZIP) -JXjq9 ../installer/data/yoshitouchandgo.zip yoshitouchandgo.nds
170208

171209
dkjclimber.zip:
172210
$(ZIP) -JXjq9 ../installer/data/dkjclimber.zip dkjclimber.nds
173211

212+
guardiansigns.zip:
213+
$(ZIP) -JXjq9 ../installer/data/guardiansigns.zip guardiansigns.nds
214+
174215
kirby.zip:
175216
$(ZIP) -JXjq9 ../installer/data/kirby.zip kirby.nds
176217

@@ -187,6 +228,9 @@ masterofdisguise.zip:
187228
newsmb_eur.zip:
188229
$(ZIP) -JXjq9 ../installer/data/newsmb_eur.zip newsmb_eur.nds
189230

231+
pokemonranger.zip:
232+
$(ZIP) -JXjq9 ../installer/data/pokemonranger.zip pokemonranger.nds
233+
190234
partnersintime.zip:
191235
$(ZIP) -JXjq9 ../installer/data/partnersintime.zip partnersintime.nds
192236

@@ -207,6 +251,7 @@ zeldaph.zip:
207251

208252
zeldast.zip:
209253
$(ZIP) -JXjq9 ../installer/data/zeldast.zip zeldast.nds
254+
$(ZIP) -JXjq9 ../installer/data/explorersofsky.zip explorersofsky.nds
210255
$(ZIP) -JXjq9 ../installer/data/shadowsofalmia.zip shadowsofalmia.nds
211256

212257
clean:

‎dsrom/animalcrossing_defs.s

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x1079B6A4-0xC8)
4+
; application memory pointer
5+
HACHI_APPLICATION_PTR equ (0x10C91938)
6+
; arm9 rom location address
7+
ARM9_ROM_LOCATION equ (0x16440F00)
8+
9+
; constants for position calcs
10+
RPX_OFFSET equ (0x01800000)
11+
ARM7_ROM_MEM2_START equ (0xF0000000 - ARM9_ROM_LOCATION + 0x12000000)
12+
13+
; rop-gadgets part 1 (used for all sorts of different things)
14+
LMW_R21R1xC_LWZ_R0R1x3C_MTLR_R0_ADDI_R1_x38_BLR equ (RPX_OFFSET + 0x0200369C)
15+
BCTRL equ (RPX_OFFSET + 0x020041D8)
16+
MTCTR_R27_ADDI_R31x2_MR_R3R31_R4R30_R5R29_R6R28_BCTRL_LMW_R26R1x18_MTLR_R1x34_ADDI_R1x30_BLR equ (RPX_OFFSET + 0x020A9DC4)
17+
LWZ_R0xAFC_MTLR_R0_ADDI_R1xAF8_BLR equ (RPX_OFFSET + 0x020A999C)
18+
LWZ_R0R1x14_LWZ_R30R1x8_R31R1xC_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x02001AF8)
19+
MR_R11R31_LMW_R26R1x8_LWZ_R0x24_MTLR_R0_ADDI_R1x20_CLRLWI_R3R11x18_BLR equ (RPX_OFFSET + 0x0217F924)
20+
LWZ_R0R11x4_R31R11xM4_MTLR_R0_MR_R1R11_BLR equ (RPX_OFFSET + 0x0227F310)
21+
22+
; rop-gadgets part 2 (only used to set up core 0 thread stack)
23+
LWZ_R3_8_R1_LWZ_R0x14_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x02018AB0)
24+
MR_R12_R3_CMPLW_R12_R0_LI_R3_0_BEQ_ADDI_R3_R12x10_LWZ_R0_R1x14_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x020B5204)
25+
LWZ_R5_R1x8_CMPLW_R5_R31_BNE_MR_R3_R5_LWZ_R0_R1x1C_LWZ_R30_R1x10_MTLR_R0_LWZ_R31_R1x14_ADDI_R1x18_BLR equ (RPX_OFFSET + 0x0200F624)
26+
LWZ_R4_R1xC_STW_R12_R1x8_LWZ_R3_R1x8_LWZ_R0_R1x1C_MTLR_R0_ADDI_R1x18_BLR equ (RPX_OFFSET + 0x020862CC)
27+
LWZ_R7_R1x10_LWZ_R8_R1x14_STW_R7_R31x0_STW_R8_R31x0_LWZ_R0_R1x2C_LWZ_R31_R0x24_MTLR_R0_LWZ_R30_R0x20_ADDI_R1x28_BLR equ (RPX_OFFSET + 0x0205A454)
28+
LWZ_R3_4_R3_LWZ_R0xC_MTLR_R0_ADDI_R1x8_BLR equ (RPX_OFFSET + 0x02018B38)
29+
LWZ_R0_R1x1C_LWZ_R30_R1x10_MTLR_R0_LWZ_R31_R1x14_ADDI_R1x18_ADD_R3_R7_BLR equ (RPX_OFFSET + 0x0214FA58)
30+
MTCTR_R12_BCTRL_LI_R3_0_LWZ_R0_R1x14_LWZ_R31_R1xC_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x020244B4)
31+
32+
; functions used from game
33+
NERD_CREATETHREAD equ (RPX_OFFSET + 0x022290AC)
34+
NERD_STARTTHREAD equ (RPX_OFFSET + 0x022294C8)
35+
NERD_JOINTHREAD equ (RPX_OFFSET + 0x02228F58)
36+
HACHI_APPLICATION_SHUTDOWNANDDESTROY equ (RPX_OFFSET + 0x02006E2C)
37+
NERD_FASTWIIU_SHUTDOWN equ (RPX_OFFSET + 0x0201FF0C)
38+
CORE_SHUTDOWN equ (RPX_OFFSET + 0x02228B9C)
39+
_START_EXIT equ (RPX_OFFSET + 0x020265DC)

‎dsrom/brainage_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x1076FAA4)
3+
HAX_TARGET_ADDRESS equ (0x1076FB5C-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10A6E038)
66
; arm9 rom location address

‎dsrom/dkjclimber_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x107968EC)
3+
HAX_TARGET_ADDRESS equ (0x107969A4-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C8C938)
66
; arm9 rom location address

‎dsrom/guardiansigns_defs.s

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x1079C564-0xC8)
4+
; application memory pointer
5+
HACHI_APPLICATION_PTR equ (0x10C92938)
6+
; arm9 rom location address
7+
ARM9_ROM_LOCATION equ (0x16441D00)
8+
9+
; constants for position calcs
10+
RPX_OFFSET equ (0x01800000)
11+
ARM7_ROM_MEM2_START equ (0xF0000000 - ARM9_ROM_LOCATION + 0x12000000)
12+
13+
; rop-gadgets part 1 (used for all sorts of different things)
14+
LMW_R21R1xC_LWZ_R0R1x3C_MTLR_R0_ADDI_R1_x38_BLR equ (RPX_OFFSET + 0x0200369C)
15+
BCTRL equ (RPX_OFFSET + 0x020041D8)
16+
MTCTR_R27_ADDI_R31x2_MR_R3R31_R4R30_R5R29_R6R28_BCTRL_LMW_R26R1x18_MTLR_R1x34_ADDI_R1x30_BLR equ (RPX_OFFSET + 0x020ABF88)
17+
LWZ_R0xAFC_MTLR_R0_ADDI_R1xAF8_BLR equ (RPX_OFFSET + 0x020ABB60)
18+
LWZ_R0R1x14_LWZ_R30R1x8_R31R1xC_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x02001AF8)
19+
MR_R11R31_LMW_R26R1x8_LWZ_R0x24_MTLR_R0_ADDI_R1x20_CLRLWI_R3R11x18_BLR equ (RPX_OFFSET + 0x02181AC0)
20+
LWZ_R0R11x4_R31R11xM4_MTLR_R0_MR_R1R11_BLR equ (RPX_OFFSET + 0x02281624)
21+
22+
; rop-gadgets part 2 (only used to set up core 0 thread stack)
23+
LWZ_R3_8_R1_LWZ_R0x14_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x02018A88)
24+
MR_R12_R3_CMPLW_R12_R0_LI_R3_0_BEQ_ADDI_R3_R12x10_LWZ_R0_R1x14_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x020B73C8)
25+
LWZ_R5_R1x8_CMPLW_R5_R31_BNE_MR_R3_R5_LWZ_R0_R1x1C_LWZ_R30_R1x10_MTLR_R0_LWZ_R31_R1x14_ADDI_R1x18_BLR equ (RPX_OFFSET + 0x0200F610)
26+
LWZ_R4_R1xC_STW_R12_R1x8_LWZ_R3_R1x8_LWZ_R0_R1x1C_MTLR_R0_ADDI_R1x18_BLR equ (RPX_OFFSET + 0x020882E0)
27+
LWZ_R7_R1x10_LWZ_R8_R1x14_STW_R7_R31x0_STW_R8_R31x0_LWZ_R0_R1x2C_LWZ_R31_R0x24_MTLR_R0_LWZ_R30_R0x20_ADDI_R1x28_BLR equ (RPX_OFFSET + 0x0205B0C8)
28+
LWZ_R3_4_R3_LWZ_R0xC_MTLR_R0_ADDI_R1x8_BLR equ (RPX_OFFSET + 0x02018B10)
29+
LWZ_R0_R1x1C_LWZ_R30_R1x10_MTLR_R0_LWZ_R31_R1x14_ADDI_R1x18_ADD_R3_R7_BLR equ (RPX_OFFSET + 0x02151BF4)
30+
MTCTR_R12_BCTRL_LI_R3_0_LWZ_R0_R1x14_LWZ_R31_R1xC_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x0202441C)
31+
32+
; functions used from game
33+
NERD_CREATETHREAD equ (RPX_OFFSET + 0x0222B2FC)
34+
NERD_STARTTHREAD equ (RPX_OFFSET + 0x0222B718)
35+
NERD_JOINTHREAD equ (RPX_OFFSET + 0x0222B1A8)
36+
HACHI_APPLICATION_SHUTDOWNANDDESTROY equ (RPX_OFFSET + 0x02006E2C)
37+
NERD_FASTWIIU_SHUTDOWN equ (RPX_OFFSET + 0x0201FE74)
38+
CORE_SHUTDOWN equ (RPX_OFFSET + 0x0222ADEC)
39+
_START_EXIT equ (RPX_OFFSET + 0x02026544)

‎dsrom/haxchi_rop.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ rop_start:
232232
call_func OSCODEGEN_SWITCHSECMODE, 0x1, 0x0, 0x0, 0x0
233233
call_func IC_INVALIDATERANGE, HBL_LOADER_ADR, 0xE000, 0x0, 0x0
234234

235-
; execute hbl_loader in codegen
235+
; execute option_select in codegen
236236
.word SELECTOR_ADDRESS
237237
core0rop_end:
238238

‎dsrom/kirby_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x107968AC)
3+
HAX_TARGET_ADDRESS equ (0x10796964-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C8C938)
66
; arm9 rom location address

‎dsrom/kirbymassattack_defs.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
; game stack return address (note: not ideal here)
3-
HAX_TARGET_ADDRESS equ (0x1079A38C)
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x1079A3E4-0xC0)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C90938)
66
; arm9 rom location address

‎dsrom/mariokartds_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x1077865C)
3+
HAX_TARGET_ADDRESS equ (0x1077870C-0xB0)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10A77038)
66
; arm9 rom location address

‎dsrom/masterofdisguise_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x1079B86C)
3+
HAX_TARGET_ADDRESS equ (0x1079B924-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C91938)
66
; arm9 rom location address

‎dsrom/newsmb_eur_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x1077855C)
3+
HAX_TARGET_ADDRESS equ (0x1077860C-0xB0)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10A77038)
66
; arm9 rom location address

‎dsrom/partnersintime_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x1079B56C)
3+
HAX_TARGET_ADDRESS equ (0x1079B624-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C91938)
66
; arm9 rom location address

‎dsrom/pokemonranger_defs.s

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x1079B664-0xB8)
4+
; application memory pointer
5+
HACHI_APPLICATION_PTR equ (0x10C91938)
6+
; arm9 rom location address
7+
ARM9_ROM_LOCATION equ (0x16440E00)
8+
9+
; constants for position calcs
10+
RPX_OFFSET equ (0x01800000)
11+
ARM7_ROM_MEM2_START equ (0xF0000000 - ARM9_ROM_LOCATION + 0x12000000)
12+
13+
; rop-gadgets part 1 (used for all sorts of different things)
14+
LMW_R21R1xC_LWZ_R0R1x3C_MTLR_R0_ADDI_R1_x38_BLR equ (RPX_OFFSET + 0x0204A6A0)
15+
BCTRL equ (RPX_OFFSET + 0x02003D2C)
16+
MTCTR_R27_ADDI_R31x2_MR_R3R31_R4R30_R5R29_R6R28_BCTRL_LMW_R26R1x18_MTLR_R1x34_ADDI_R1x30_BLR equ (RPX_OFFSET + 0x020AAB64)
17+
LWZ_R0xAFC_MTLR_R0_ADDI_R1xAF8_BLR equ (RPX_OFFSET + 0x020AA73C)
18+
LWZ_R0R1x14_LWZ_R30R1x8_R31R1xC_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x02001A8C)
19+
MR_R11R31_LMW_R26R1x8_LWZ_R0x24_MTLR_R0_ADDI_R1x20_CLRLWI_R3R11x18_BLR equ (RPX_OFFSET + 0x021806C4)
20+
LWZ_R0R11x4_R31R11xM4_MTLR_R0_MR_R1R11_BLR equ (RPX_OFFSET + 0x022800B0)
21+
22+
; rop-gadgets part 2 (only used to set up core 0 thread stack)
23+
LWZ_R3_8_R1_LWZ_R0x14_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x020187E8)
24+
MR_R12_R3_CMPLW_R12_R0_LI_R3_0_BEQ_ADDI_R3_R12x10_LWZ_R0_R1x14_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x020B5FA4)
25+
LWZ_R5_R1x8_CMPLW_R5_R31_BNE_MR_R3_R5_LWZ_R0_R1x1C_LWZ_R30_R1x10_MTLR_R0_LWZ_R31_R1x14_ADDI_R1x18_BLR equ (RPX_OFFSET + 0x0200F35C)
26+
LWZ_R4_R1xC_STW_R12_R1x8_LWZ_R3_R1x8_LWZ_R0_R1x1C_MTLR_R0_ADDI_R1x18_BLR equ (RPX_OFFSET + 0x020871A4)
27+
LWZ_R7_R1x10_LWZ_R8_R1x14_STW_R7_R31x0_STW_R8_R31x0_LWZ_R0_R1x2C_LWZ_R31_R0x24_MTLR_R0_LWZ_R30_R0x20_ADDI_R1x28_BLR equ (RPX_OFFSET + 0x0205B638)
28+
LWZ_R3_4_R3_LWZ_R0xC_MTLR_R0_ADDI_R1x8_BLR equ (RPX_OFFSET + 0x02018870)
29+
LWZ_R0_R1x1C_LWZ_R30_R1x10_MTLR_R0_LWZ_R31_R1x14_ADDI_R1x18_ADD_R3_R7_BLR equ (RPX_OFFSET + 0x021507F8)
30+
MTCTR_R12_BCTRL_LI_R3_0_LWZ_R0_R1x14_LWZ_R31_R1xC_MTLR_R0_ADDI_R1x10_BLR equ (RPX_OFFSET + 0x020241EC)
31+
32+
; functions used from game
33+
NERD_CREATETHREAD equ (RPX_OFFSET + 0x02229E4C)
34+
NERD_STARTTHREAD equ (RPX_OFFSET + 0x0222A268)
35+
NERD_JOINTHREAD equ (RPX_OFFSET + 0x02229CF8)
36+
HACHI_APPLICATION_SHUTDOWNANDDESTROY equ (RPX_OFFSET + 0x02006B64)
37+
NERD_FASTWIIU_SHUTDOWN equ (RPX_OFFSET + 0x0201FC44)
38+
CORE_SHUTDOWN equ (RPX_OFFSET + 0x0222993C)
39+
_START_EXIT equ (RPX_OFFSET + 0x02026314)

‎dsrom/sfcommand_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x107968AC)
3+
HAX_TARGET_ADDRESS equ (0x10796964-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C8C938)
66
; arm9 rom location address

‎dsrom/sm64ds_defs.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
; game stack return address (note: not ideal here)
3-
HAX_TARGET_ADDRESS equ (0x1079914C)
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x107991A4-0xC0)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C8F938)
66
; arm9 rom location address

‎dsrom/yoshids_defs.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
; game stack return address
3-
HAX_TARGET_ADDRESS equ (0x1079B52C)
3+
HAX_TARGET_ADDRESS equ (0x1079B5E4-0xB8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C91938)
66
; arm9 rom location address

‎dsrom/zeldaph_defs.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
; game stack return address (note: not ideal here)
3-
HAX_TARGET_ADDRESS equ (0x10799CBC)
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x10799D24-0xC0)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C8F938)
66
; arm9 rom location address

‎dsrom/zeldast_defs.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
; game stack return address (note: not ideal here)
3-
HAX_TARGET_ADDRESS equ (0x1079C50C)
2+
; game stack return address
3+
HAX_TARGET_ADDRESS equ (0x1079C564-0xC8)
44
; application memory pointer
55
HACHI_APPLICATION_PTR equ (0x10C92938)
66
; arm9 rom location address

0 commit comments

Comments
 (0)