Split game_0f09f0 into game_0fd660 and decompile activemenuGetSlotDetails

This commit is contained in:
Ryan Dwyer 2020-02-26 17:09:30 +10:00
parent e3758839ed
commit 07a30ec7c9
303 changed files with 5103 additions and 5629 deletions

View File

@ -105,6 +105,7 @@
src/game/game_0d7070.o (section); \
src/game/game_0dcdb0.o (section); \
src/game/game_0f09f0.o (section); \
src/game/game_0fd660.o (section); \
src/game/game_102230.o (section); \
src/game/game_102240.o (section); \
src/game/cheats.o (section); \

View File

@ -3,7 +3,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0dcdb0.h"

View File

@ -3,7 +3,6 @@
#include "game/cheats.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_10ccd0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -5,7 +5,6 @@
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000920.h"

View File

@ -5,7 +5,6 @@
#include "game/data/ailists.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -1,6 +1,7 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_0f09f0.h"
#include "game/game_0fd660.h"
#include "game/game_102240.h"
#include "game/cheats.h"
#include "game/game_107fb0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000090.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000130.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000850.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000860.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000870.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000880.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0008e0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0008f0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000900.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000910.h"

View File

@ -3,7 +3,6 @@
#include "game/cheats.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000920.h"

View File

@ -3,7 +3,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000920.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_187770.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_166e40.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_00b320.h"

View File

@ -4,7 +4,6 @@
#include "game/chr/chrai.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_00b820.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_00c240.h"

View File

@ -4,7 +4,6 @@
#include "game/data/ailists.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_00b480.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/data/inventory.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_097ba0.h"

View File

@ -3,7 +3,6 @@
#include "game/cheats.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/data/inventory.h"

View File

@ -3,7 +3,6 @@
#include "game/cheats.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_012450.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0125a0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/pad.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_013260.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_013cf0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_013ee0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0147d0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_014f10.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_015010.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_015260.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_015270.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0601b0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0601b0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_015400.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_015410.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_015470.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_016100.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,12 +2,11 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0f09f0.h"
#include "game/game_0fd660.h"
#include "game/game_111600.h"
#include "game/game_127910.h"
#include "game/pdoptions.h"
@ -755,13 +754,13 @@ glabel func0f01b160
/* f01ba74: 00000000 */ sll $zero,$zero,0x0
/* f01ba78: 8c84a244 */ lw $a0,-0x5dbc($a0)
/* f01ba7c: 00002825 */ or $a1,$zero,$zero
/* f01ba80: 0fc2c42e */ jal func0f0b10b8
/* f01ba80: 0fc2c42e */ jal weaponGetFunction
/* f01ba84: 24840638 */ addiu $a0,$a0,%lo(var800a0638)
/* f01ba88: 3c04800a */ lui $a0,%hi(var800a0638)
/* f01ba8c: 8c84a244 */ lw $a0,-0x5dbc($a0)
/* f01ba90: 00408025 */ or $s0,$v0,$zero
/* f01ba94: 24050001 */ addiu $a1,$zero,0x1
/* f01ba98: 0fc2c42e */ jal func0f0b10b8
/* f01ba98: 0fc2c42e */ jal weaponGetFunction
/* f01ba9c: 24840638 */ addiu $a0,$a0,%lo(var800a0638)
/* f01baa0: 16000005 */ bnez $s0,.L0f01bab8
/* f01baa4: 00000000 */ sll $zero,$zero,0x0
@ -801,7 +800,7 @@ glabel func0f01b160
.L0f01bb24:
/* f01bb24: 02402025 */ or $a0,$s2,$zero
/* f01bb28: 27a50070 */ addiu $a1,$sp,0x70
/* f01bb2c: 0fc3f8a0 */ jal func0f0fe280
/* f01bb2c: 0fc3f8a0 */ jal activemenuGetSlotDetails
/* f01bb30: 27a60074 */ addiu $a2,$sp,0x74
/* f01bb34: 3c057f1b */ lui $a1,0x7f1b
/* f01bb38: 24a585a0 */ addiu $a1,$a1,-31328

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_005fd0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_1668e0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_01d9f0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -4,7 +4,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_01e250.h"
@ -4845,7 +4844,7 @@ glabel func0f022624
/* f022908: 30640040 */ andi $a0,$v1,0x40
/* f02290c: 10800020 */ beqz $a0,.L0f022990
/* f022910: 00000000 */ sll $zero,$zero,0x0
/* f022914: 0fc2a5dc */ jal func0f0a9770
/* f022914: 0fc2a5dc */ jal ammoGetQuantity
/* f022918: 24040014 */ addiu $a0,$zero,0x14
/* f02291c: 18400012 */ blez $v0,.L0f022968
/* f022920: 00000000 */ sll $zero,$zero,0x0

View File

@ -4,7 +4,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_01e250.h"

View File

@ -3,7 +3,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_000920.h"

View File

@ -38895,7 +38895,7 @@ glabel func0f088028
/* f08803c: afa60030 */ sw $a2,0x30($sp)
/* f088040: 18a00051 */ blez $a1,.L0f088188
/* f088044: afa70034 */ sw $a3,0x34($sp)
/* f088048: 0fc2a5dc */ jal func0f0a9770
/* f088048: 0fc2a5dc */ jal ammoGetQuantity
/* f08804c: 00000000 */ sll $zero,$zero,0x0
/* f088050: afa20020 */ sw $v0,0x20($sp)
/* f088054: 0fc2a63d */ jal func0f0a98f4
@ -38904,7 +38904,7 @@ glabel func0f088028
/* f088060: 01e2082a */ slt $at,$t7,$v0
/* f088064: 5020000e */ beqzl $at,.L0f0880a0
/* f088068: 8fa80030 */ lw $t0,0x30($sp)
/* f08806c: 0fc2a5dc */ jal func0f0a9770
/* f08806c: 0fc2a5dc */ jal ammoGetQuantity
/* f088070: 02002025 */ or $a0,$s0,$zero
/* f088074: 8fb8002c */ lw $t8,0x2c($sp)
/* f088078: 02002025 */ or $a0,$s0,$zero
@ -39790,10 +39790,10 @@ glabel func0f088840
/* f088cb4: 8fa40074 */ lw $a0,0x74($sp)
/* f088cb8: 18400019 */ blez $v0,.L0f088d20
/* f088cbc: afa20058 */ sw $v0,0x58($sp)
/* f088cc0: 0fc2a5dc */ jal func0f0a9770
/* f088cc0: 0fc2a5dc */ jal ammoGetQuantity
/* f088cc4: 8fa4006c */ lw $a0,0x6c($sp)
/* f088cc8: 8fa4006c */ lw $a0,0x6c($sp)
/* f088ccc: 0fc2a5dc */ jal func0f0a9770
/* f088ccc: 0fc2a5dc */ jal ammoGetQuantity
/* f088cd0: afa20054 */ sw $v0,0x54($sp)
/* f088cd4: 8fa4006c */ lw $a0,0x6c($sp)
/* f088cd8: 0fc2a63d */ jal func0f0a98f4
@ -39824,7 +39824,7 @@ glabel func0f088840
/* f088d34: 0fc22095 */ jal func0f088254
/* f088d38: 01802025 */ or $a0,$t4,$zero
/* f088d3c: afa20050 */ sw $v0,0x50($sp)
/* f088d40: 0fc2a5dc */ jal func0f0a9770
/* f088d40: 0fc2a5dc */ jal ammoGetQuantity
/* f088d44: 2404000b */ addiu $a0,$zero,0xb
/* f088d48: 2404000b */ addiu $a0,$zero,0xb
/* f088d4c: 0fc2a63d */ jal func0f0a98f4
@ -39833,7 +39833,7 @@ glabel func0f088840
/* f088d58: 00c2082a */ slt $at,$a2,$v0
/* f088d5c: 5020000f */ beqzl $at,.L0f088d9c
/* f088d60: 8fb80074 */ lw $t8,0x74($sp)
/* f088d64: 0fc2a5dc */ jal func0f0a9770
/* f088d64: 0fc2a5dc */ jal ammoGetQuantity
/* f088d68: 2404000b */ addiu $a0,$zero,0xb
/* f088d6c: 2404000b */ addiu $a0,$zero,0xb
/* f088d70: 0fc2a58a */ jal currentPlayerGiveAmmo
@ -40315,7 +40315,7 @@ glabel func0f089014
/* f089400: 1441004d */ bne $v0,$at,.L0f089538
/* f089404: 8fb90088 */ lw $t9,0x88($sp)
/* f089408: 8f300004 */ lw $s0,0x4($t9)
/* f08940c: 0fc2a5dc */ jal func0f0a9770
/* f08940c: 0fc2a5dc */ jal ammoGetQuantity
/* f089410: 8e04005c */ lw $a0,0x5c($s0)
/* f089414: 8e04005c */ lw $a0,0x5c($s0)
/* f089418: 0fc2a63d */ jal func0f0a98f4
@ -40422,7 +40422,7 @@ glabel func0f089014
/* f089580: 59600041 */ blezl $t3,.L0f089688
/* f089584: 8fa20060 */ lw $v0,0x60($sp)
/* f089588: afa20060 */ sw $v0,0x60($sp)
/* f08958c: 0fc2a5dc */ jal func0f0a9770
/* f08958c: 0fc2a5dc */ jal ammoGetQuantity
/* f089590: afa30028 */ sw $v1,0x28($sp)
/* f089594: 02002025 */ or $a0,$s0,$zero
/* f089598: 0fc2a63d */ jal func0f0a98f4

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_066310.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0969d0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_096890.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_096890.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0969d0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_097a50.h"

View File

@ -4,7 +4,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_005fd0.h"
@ -1320,7 +1319,7 @@ glabel func0f098ca0
/* f098cb4: afa60038 */ sw $a2,0x38($sp)
/* f098cb8: afa3002c */ sw $v1,0x2c($sp)
/* f098cbc: 8fa50030 */ lw $a1,0x30($sp)
/* f098cc0: 0fc2c42e */ jal func0f0b10b8
/* f098cc0: 0fc2c42e */ jal weaponGetFunction
/* f098cc4: 00c02025 */ or $a0,$a2,$zero
/* f098cc8: 8fa3002c */ lw $v1,0x2c($sp)
/* f098ccc: 8fa90034 */ lw $t1,0x34($sp)
@ -1418,7 +1417,7 @@ glabel func0f098df8
/* f098e0c: afa40038 */ sw $a0,0x38($sp)
/* f098e10: afa60040 */ sw $a2,0x40($sp)
/* f098e14: afa70044 */ sw $a3,0x44($sp)
/* f098e18: 0fc2c42e */ jal func0f0b10b8
/* f098e18: 0fc2c42e */ jal weaponGetFunction
/* f098e1c: 00c02025 */ or $a0,$a2,$zero
/* f098e20: 50400056 */ beqzl $v0,.L0f098f7c
/* f098e24: 8fbf001c */ lw $ra,0x1c($sp)
@ -1533,7 +1532,7 @@ glabel func0f098f8c
/* f098fb0: 24120002 */ addiu $s2,$zero,0x2
/* f098fb4: 02202025 */ or $a0,$s1,$zero
.L0f098fb8:
/* f098fb8: 0fc2c42e */ jal func0f0b10b8
/* f098fb8: 0fc2c42e */ jal weaponGetFunction
/* f098fbc: 02002825 */ or $a1,$s0,$zero
/* f098fc0: 10400007 */ beqz $v0,.L0f098fe0
/* f098fc4: 02002025 */ or $a0,$s0,$zero
@ -1675,7 +1674,7 @@ glabel func0f099188
/* f099188: 27bdffe0 */ addiu $sp,$sp,-32
/* f09918c: afbf0014 */ sw $ra,0x14($sp)
/* f099190: afa40020 */ sw $a0,0x20($sp)
/* f099194: 0fc2c42e */ jal func0f0b10b8
/* f099194: 0fc2c42e */ jal weaponGetFunction
/* f099198: afa50024 */ sw $a1,0x24($sp)
/* f09919c: 8fae0020 */ lw $t6,0x20($sp)
/* f0991a0: afa2001c */ sw $v0,0x1c($sp)
@ -1893,7 +1892,7 @@ glabel func0f0991e4
/* f0994ac: 2403ffff */ addiu $v1,$zero,-1
/* f0994b0: 920d0003 */ lbu $t5,0x3($s0)
/* f0994b4: afa30030 */ sw $v1,0x30($sp)
/* f0994b8: 0fc2c42e */ jal func0f0b10b8
/* f0994b8: 0fc2c42e */ jal weaponGetFunction
/* f0994bc: 012d2823 */ subu $a1,$t1,$t5
/* f0994c0: 8c4f0000 */ lw $t7,0x0($v0)
/* f0994c4: 24010003 */ addiu $at,$zero,0x3
@ -5937,7 +5936,7 @@ glabel func0f09cd18
/* f09cd68: afa60018 */ sw $a2,0x18($sp)
/* f09cd6c: afa3001c */ sw $v1,0x1c($sp)
/* f09cd70: 00c02025 */ or $a0,$a2,$zero
/* f09cd74: 0fc2c42e */ jal func0f0b10b8
/* f09cd74: 0fc2c42e */ jal weaponGetFunction
/* f09cd78: 03382823 */ subu $a1,$t9,$t8
/* f09cd7c: 8fa3001c */ lw $v1,0x1c($sp)
/* f09cd80: 8fa60018 */ lw $a2,0x18($sp)
@ -20137,7 +20136,7 @@ glabel currentPlayerGiveAmmo
);
GLOBAL_ASM(
glabel func0f0a9770
glabel ammoGetQuantity
/* f0a9770: 27bdffc8 */ addiu $sp,$sp,-56
/* f0a9774: afb50028 */ sw $s5,0x28($sp)
/* f0a9778: 3c02800a */ lui $v0,0x800a
@ -20383,7 +20382,7 @@ glabel func0f0a9a74
/* f0a9a94: 8f03001c */ lw $v1,0x1c($t8)
/* f0a9a98: 50600006 */ beqzl $v1,.L0f0a9ab4
/* f0a9a9c: 00001025 */ or $v0,$zero,$zero
/* f0a9aa0: 0fc2a5dc */ jal func0f0a9770
/* f0a9aa0: 0fc2a5dc */ jal ammoGetQuantity
/* f0a9aa4: 8c640000 */ lw $a0,0x0($v1)
/* f0a9aa8: 10000003 */ beqz $zero,.L0f0a9ab8
/* f0a9aac: 8fbf0014 */ lw $ra,0x14($sp)

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0969d0.h"

View File

@ -3,7 +3,6 @@
#include "game/cheats.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/data/inventory.h"
@ -1019,7 +1018,7 @@ glabel func0f0b107c
);
GLOBAL_ASM(
glabel func0f0b10b8
glabel weaponGetFunction
/* f0b10b8: 908e0000 */ lbu $t6,0x0($a0)
/* f0b10bc: 3c038007 */ lui $v1,0x8007
/* f0b10c0: 0005c080 */ sll $t8,$a1,0x2

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0b2150.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0b28d0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_096750.h"

View File

@ -4,7 +4,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_005fd0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "gvars/gvars.h"

View File

@ -4,7 +4,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_005fd0.h"

View File

@ -4,7 +4,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_005fd0.h"
@ -22,7 +21,7 @@
#include "game/game_0c37d0.h"
#include "game/game_0c79f0.h"
#include "game/game_0d1fe0.h"
#include "game/game_0f09f0.h"
#include "game/game_0fd660.h"
#include "game/game_113220.h"
#include "game/game_11ecf0.h"
#include "game/game_127910.h"

View File

@ -3,7 +3,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_01e250.h"

View File

@ -3,7 +3,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0601b0.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0b3350.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_0b63b0.h"

View File

@ -3,7 +3,6 @@
#include "game/chr/chraction.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_066310.h"

View File

@ -2,7 +2,6 @@
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_020df0.h"
#include "game/game_005fd0.h"

File diff suppressed because it is too large Load Diff

5016
src/game/game_0fd660.c Normal file

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More